diff --git a/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternConverter.java b/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternConverter.java index 984bead8cbe6..5fe6e98920de 100644 --- a/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternConverter.java +++ b/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternConverter.java @@ -16,17 +16,15 @@ * */ - package org.apache.skywalking.apm.toolkit.log.log4j.v1.x; import org.apache.log4j.helpers.PatternConverter; import org.apache.log4j.spi.LoggingEvent; /** - * Default implementation outputs "TID: N/A". - * But, if in sky-walking agent active mode, output will become the real ids. + * Default implementation outputs "TID: N/A". But, if in sky-walking agent active mode, output will become the real + * ids. *

- * Created by wusheng on 2016/12/7. */ public class TraceIdPatternConverter extends PatternConverter { diff --git a/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternLayout.java b/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternLayout.java index 54ab282e4d21..172d2a4cf1ea 100644 --- a/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternLayout.java +++ b/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternLayout.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.log.log4j.v1.x; import org.apache.log4j.PatternLayout; @@ -25,8 +24,6 @@ /** * 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/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternParser.java b/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternParser.java index a8ea3a01d63f..173cb526b499 100644 --- a/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternParser.java +++ b/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternParser.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.log.log4j.v1.x; import org.apache.log4j.helpers.PatternParser; @@ -24,7 +23,6 @@ /** * Base on '%T', use {@link TraceIdPatternConverter} to convert the '%t' to traceId. *

- * Created by wusheng on 2016/12/7. */ public class TraceIdPatternParser extends PatternParser { public TraceIdPatternParser(String pattern) { diff --git a/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/Log4j2OutputAppender.java b/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/Log4j2OutputAppender.java index b1bf6f3ff232..bc3d017bf6d9 100644 --- a/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/Log4j2OutputAppender.java +++ b/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/Log4j2OutputAppender.java @@ -16,16 +16,12 @@ * */ - package org.apache.skywalking.apm.toolkit.log.log4j.v2.x; -/** - * Created by wusheng on 2016/12/11. - */ public class Log4j2OutputAppender { /** - * As default, append "TID: N/A" to the output message, - * if sky-walking agent in active mode, append the real traceId in the recent Context, if existed, or empty String. + * As default, append "TID: N/A" to the output message, if sky-walking agent in active mode, append the real traceId + * in the recent Context, if existed, or empty String. * * @param toAppendTo origin output message. */ diff --git a/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/TraceIdConverter.java b/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/TraceIdConverter.java index 3bf772a08967..f61c2c2f6e08 100644 --- a/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/TraceIdConverter.java +++ b/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v2/x/TraceIdConverter.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.log.log4j.v2.x; import org.apache.logging.log4j.core.LogEvent; @@ -25,12 +24,9 @@ import org.apache.logging.log4j.core.pattern.LogEventPatternConverter; /** - * {@link TraceIdConverter} is a log4j2 plugin, by annotation as {@link Plugin}. - * It convert the pattern key: traceId. - * Use '%traceId' in log4j2's config. - * '%traceId' will output as TID:xxxx + * {@link TraceIdConverter} is a log4j2 plugin, by annotation as {@link Plugin}. It convert the pattern key: traceId. + * Use '%traceId' in log4j2's config. '%traceId' will output as TID:xxxx *

- * Created by wusheng on 2016/12/7. */ @Plugin(name = "TraceIdConverter", category = "Converter") @ConverterKeys({"traceId"}) @@ -39,7 +35,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/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/LogbackPatternConverter.java b/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/LogbackPatternConverter.java index 6a1cb1828207..bde970e8b292 100644 --- a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/LogbackPatternConverter.java +++ b/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/LogbackPatternConverter.java @@ -16,19 +16,15 @@ * */ - package org.apache.skywalking.apm.toolkit.log.logback.v1.x; import ch.qos.logback.classic.pattern.ClassicConverter; import ch.qos.logback.classic.spi.ILoggingEvent; -/** - * Created by wusheng on 2016/12/7. - */ public class LogbackPatternConverter extends ClassicConverter { /** - * As default, return "TID: N/A" to the output message, - * if sky-walking agent in active mode, return the real traceId in the recent Context, if existed. + * As default, return "TID: N/A" to the output message, if sky-walking agent in active mode, return the real traceId + * in the recent Context, if existed. * * @param iLoggingEvent the event * @return the traceId: N/A, empty String, or the real traceId. diff --git a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/TraceIdPatternLogbackLayout.java b/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/TraceIdPatternLogbackLayout.java index 3e991fe7048f..b35090912b72 100644 --- a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/TraceIdPatternLogbackLayout.java +++ b/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/TraceIdPatternLogbackLayout.java @@ -16,17 +16,14 @@ * */ - package org.apache.skywalking.apm.toolkit.log.logback.v1.x; import ch.qos.logback.classic.PatternLayout; /** - * Based on the logback-compoenent convert register mechanism, - * register {@link LogbackPatternConverter} as a new convert, match to "tid". - * You can use "%tid" in logback config file, "Pattern" section. + * Based on the logback-compoenent convert register mechanism, register {@link LogbackPatternConverter} as a new + * convert, match to "tid". You can use "%tid" in logback config file, "Pattern" section. *

- * Created by wusheng on 2016/12/7. */ public class TraceIdPatternLogbackLayout extends PatternLayout { static { diff --git a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/logstash/TraceIdJsonProvider.java b/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/logstash/TraceIdJsonProvider.java index 3469edd715d5..b5f2571df25d 100644 --- a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/logstash/TraceIdJsonProvider.java +++ b/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/logstash/TraceIdJsonProvider.java @@ -27,9 +27,6 @@ import net.logstash.logback.composite.JsonWritingUtils; import net.logstash.logback.fieldnames.LogstashFieldNames; -/** - * @author wuxingye - */ public class TraceIdJsonProvider extends AbstractFieldJsonProvider implements FieldNamesAware { public static final String TRACING_ID = "TID"; diff --git a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/mdc/LogbackMDCPatternConverter.java b/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/mdc/LogbackMDCPatternConverter.java index c54541d89173..b45921ec4db5 100644 --- a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/mdc/LogbackMDCPatternConverter.java +++ b/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/mdc/LogbackMDCPatternConverter.java @@ -16,20 +16,17 @@ * */ - package org.apache.skywalking.apm.toolkit.log.logback.v1.x.mdc; import ch.qos.logback.classic.pattern.MDCConverter; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.util.OptionHelper; -/** - * @author zhangkewei - */ public class LogbackMDCPatternConverter extends MDCConverter { - private static final String CONVERT_KEY = "tid"; + private static final String CONVERT_KEY = "tid"; private boolean convert4TID = false; + @Override public void start() { super.start(); @@ -38,6 +35,7 @@ public void start() { convert4TID = true; } } + @Override public String convert(ILoggingEvent iLoggingEvent) { return convert4TID ? convertTID(iLoggingEvent) : super.convert(iLoggingEvent); diff --git a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/mdc/TraceIdMDCPatternLogbackLayout.java b/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/mdc/TraceIdMDCPatternLogbackLayout.java index c970abbb298a..737a05bbfd5c 100644 --- a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/mdc/TraceIdMDCPatternLogbackLayout.java +++ b/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/logback/v1/x/mdc/TraceIdMDCPatternLogbackLayout.java @@ -16,14 +16,12 @@ * */ - package org.apache.skywalking.apm.toolkit.log.logback.v1.x.mdc; import ch.qos.logback.classic.PatternLayout; /** * Override "X",SuperClass run before Subclass. - * @author zhangkewei */ public class TraceIdMDCPatternLogbackLayout extends PatternLayout { static { diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/ByteBufferContext.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/ByteBufferContext.java index c48da9fdbcdc..401315ff583a 100644 --- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/ByteBufferContext.java +++ b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/ByteBufferContext.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.opentracing; import io.opentracing.SpanContext; @@ -25,9 +24,6 @@ import java.util.HashMap; import java.util.Map; -/** - * Created by wusheng on 2016/12/21. - */ public class ByteBufferContext implements SpanContext { static final Charset CHARSET = Charset.forName("UTF-8"); diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/NeedSnifferActivation.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/NeedSnifferActivation.java index 884d8ef9a123..f03080733dff 100644 --- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/NeedSnifferActivation.java +++ b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/NeedSnifferActivation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.opentracing; import java.lang.annotation.ElementType; @@ -25,12 +24,13 @@ import java.lang.annotation.Target; /** - * The NeedSnifferActivation annotation is flag for reader and maintainers, - * which represents this method should be activated/intercepted in sniffer. - * - * @author wusheng + * The NeedSnifferActivation annotation is flag for reader and maintainers, which represents this method + * should be activated/intercepted in sniffer. */ -@Target({ElementType.METHOD, ElementType.CONSTRUCTOR}) +@Target({ + ElementType.METHOD, + ElementType.CONSTRUCTOR +}) @Retention(RetentionPolicy.SOURCE) public @interface NeedSnifferActivation { String value() default "What should interceptor do?"; diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingActiveSpan.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingActiveSpan.java index bb5ac6bfbf55..fc59c8f49e6e 100644 --- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingActiveSpan.java +++ b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingActiveSpan.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.opentracing; import io.opentracing.ActiveSpan; @@ -24,10 +23,8 @@ import java.util.Map; /** - * The SkywalkingActiveSpan is an extension of {@link SkywalkingSpan}, - * but because of Java inheritance restrict, only can do with a facade mode. - * - * @author wusheng + * The SkywalkingActiveSpan is an extension of {@link SkywalkingSpan}, but because of Java inheritance + * restrict, only can do with a facade mode. */ public class SkywalkingActiveSpan implements ActiveSpan { private SkywalkingSpan span; diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingContext.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingContext.java index 7f76a14e2649..39ff824173fa 100644 --- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingContext.java +++ b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingContext.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.opentracing; import io.opentracing.SpanContext; @@ -25,8 +24,6 @@ /** * Skywalking tracer context based on {@link ThreadLocal} auto mechanism. - * - * @author wusheng */ public class SkywalkingContext implements SpanContext { public static final SkywalkingContext INSTANCE = new SkywalkingContext(); diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingContinuation.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingContinuation.java index 37fdcaf49127..9f8ef0d8c312 100644 --- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingContinuation.java +++ b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingContinuation.java @@ -16,22 +16,16 @@ * */ - package org.apache.skywalking.apm.toolkit.opentracing; import io.opentracing.ActiveSpan; -/** - * @author wusheng - */ public class SkywalkingContinuation implements ActiveSpan.Continuation { - @NeedSnifferActivation("1. ContextManager#capture" + - "2. set ContextSnapshot to the dynamic field") + @NeedSnifferActivation("1. ContextManager#capture" + "2. set ContextSnapshot to the dynamic field") public SkywalkingContinuation() { } - @NeedSnifferActivation("1. get ContextSnapshot from the dynamic field" + - "2. ContextManager#continued") + @NeedSnifferActivation("1. get ContextSnapshot from the dynamic field" + "2. ContextManager#continued") @Override public ActiveSpan activate() { SkywalkingSpanBuilder builder = new SkywalkingSpanBuilder("Thread/" + Thread.currentThread().getName()); diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingSpan.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingSpan.java index 61f9dd59c51f..c6d833b9a563 100644 --- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingSpan.java +++ b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingSpan.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.opentracing; import io.opentracing.Span; @@ -24,23 +23,15 @@ import java.util.HashMap; import java.util.Map; -/** - * @author wusheng - */ public class SkywalkingSpan implements Span { - @NeedSnifferActivation( - "1.ContextManager#createSpan (Entry,Exit,Local based on builder)." + - "2.set the span reference to the dynamic field of enhanced SkywalkingSpan") SkywalkingSpan( - SkywalkingSpanBuilder builder) { + @NeedSnifferActivation("1.ContextManager#createSpan (Entry,Exit,Local based on builder)." + "2.set the span reference to the dynamic field of enhanced SkywalkingSpan") + SkywalkingSpan(SkywalkingSpanBuilder builder) { } /** * Create a shell span for {@link SkywalkingTracer#activeSpan()} - * - * @param tracer */ - @NeedSnifferActivation( - "1. set the span reference to the dynamic field of enhanced SkywalkingSpan") + @NeedSnifferActivation("1. set the span reference to the dynamic field of enhanced SkywalkingSpan") public SkywalkingSpan(SkywalkingTracer tracer) { } @@ -59,12 +50,8 @@ public Span log(long timestampMicroseconds, Map fields) { /** * Stop the active span - * - * @param finishMicros */ - @NeedSnifferActivation( - "1.ContextManager#stopSpan(AbstractSpan span)" + - "2. The parameter of stop methed is from the dynamic field of enhanced SkywalkingSpan") + @NeedSnifferActivation("1.ContextManager#stopSpan(AbstractSpan span)" + "2. The parameter of stop methed is from the dynamic field of enhanced SkywalkingSpan") @Override public void finish(long finishMicros) { @@ -87,18 +74,19 @@ public SpanContext context() { return SkywalkingContext.INSTANCE; } - @NeedSnifferActivation( - "1. ContextManager#activeSpan()" + - "2. SkywalkingSpan#setTag(String, String)") - @Override public Span setTag(String key, String value) { + @NeedSnifferActivation("1. ContextManager#activeSpan()" + "2. SkywalkingSpan#setTag(String, String)") + @Override + public Span setTag(String key, String value) { return this; } - @Override public Span setTag(String key, boolean value) { + @Override + public Span setTag(String key, boolean value) { return setTag(key, String.valueOf(value)); } - @Override public Span setTag(String key, Number value) { + @Override + public Span setTag(String key, Number value) { return setTag(key, String.valueOf(value)); } diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingSpanBuilder.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingSpanBuilder.java index e335c3a0d628..20af251ca407 100644 --- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingSpanBuilder.java +++ b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingSpanBuilder.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.opentracing; import io.opentracing.ActiveSpan; @@ -30,9 +29,6 @@ import java.util.LinkedList; import java.util.List; -/** - * @author wusheng - */ public class SkywalkingSpanBuilder implements Tracer.SpanBuilder { private List tags = new LinkedList(); private String operationName; @@ -66,10 +62,6 @@ public Tracer.SpanBuilder asChildOf(BaseSpan parent) { /** * Ignore the reference type. the span always the entry or has a parent span. - * - * @param referenceType - * @param referencedContext - * @return */ @Override public Tracer.SpanBuilder addReference(String referenceType, SpanContext referencedContext) { @@ -94,8 +86,9 @@ public Tracer.SpanBuilder withTag(String key, String value) { isEntry = false; isExit = false; } - } else if (Tags.PEER_HOST_IPV4.getKey().equals(key) || Tags.PEER_HOST_IPV6.getKey().equals(key) - || Tags.PEER_HOSTNAME.getKey().equals(key)) { + } else if (Tags.PEER_HOST_IPV4.getKey().equals(key) || Tags.PEER_HOST_IPV6.getKey() + .equals(key) || Tags.PEER_HOSTNAME.getKey() + .equals(key)) { peer = value; } else if (Tags.PEER_SERVICE.getKey().equals(key)) { operationName = value; diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingTracer.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingTracer.java index 96d1324d2705..dcdf6c09b534 100644 --- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingTracer.java +++ b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingTracer.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.opentracing; import io.opentracing.ActiveSpan; @@ -25,9 +24,6 @@ import io.opentracing.Tracer; import io.opentracing.propagation.Format; -/** - * @author wusheng - */ public class SkywalkingTracer implements Tracer { public SpanBuilder buildSpan(String operationName) { @@ -54,7 +50,7 @@ public ActiveSpan activeSpan() { @Override public ActiveSpan makeActive(Span span) { if (span instanceof SkywalkingSpan) { - return new SkywalkingActiveSpan((SkywalkingSpan)span); + return new SkywalkingActiveSpan((SkywalkingSpan) span); } else { throw new IllegalArgumentException("span must be a type of SkywalkingSpan"); } diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/Tag.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/Tag.java index cc3f8ede32d6..04253b74bd52 100644 --- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/Tag.java +++ b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/Tag.java @@ -16,12 +16,8 @@ * */ - package org.apache.skywalking.apm.toolkit.opentracing; -/** - * @author wusheng - */ public class Tag { private String key; private String value; diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/TextMapContext.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/TextMapContext.java index 47198919842f..919786549fe5 100644 --- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/TextMapContext.java +++ b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/TextMapContext.java @@ -16,16 +16,12 @@ * */ - package org.apache.skywalking.apm.toolkit.opentracing; import io.opentracing.SpanContext; import java.util.HashMap; import java.util.Map; -/** - * Created by wusheng on 2016/12/21. - */ public class TextMapContext implements SpanContext { public TextMapContext() { } diff --git a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/ActiveSpan.java b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/ActiveSpan.java index a34707fec339..2878905d3c38 100644 --- a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/ActiveSpan.java +++ b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/ActiveSpan.java @@ -16,13 +16,10 @@ * */ - package org.apache.skywalking.apm.toolkit.trace; /** * provide custom api that set tag for current active span. - * - * @author zhangxin */ public class ActiveSpan { /** diff --git a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/CallableWrapper.java b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/CallableWrapper.java index 32c8f31c96f4..57b66fd37461 100644 --- a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/CallableWrapper.java +++ b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/CallableWrapper.java @@ -15,13 +15,11 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.toolkit.trace; import java.util.concurrent.Callable; -/** - * @author carlvine500 - */ @TraceCrossThread public class CallableWrapper implements Callable { final Callable callable; diff --git a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/RunnableWrapper.java b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/RunnableWrapper.java index 60cd912dcc61..25e204c64408 100644 --- a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/RunnableWrapper.java +++ b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/RunnableWrapper.java @@ -14,11 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.apm.toolkit.trace; -/** - * @author lican - */ @TraceCrossThread public class RunnableWrapper implements Runnable { final Runnable runnable; @@ -31,7 +29,6 @@ public static RunnableWrapper of(Runnable r) { return new RunnableWrapper(r); } - @Override public void run() { this.runnable.run(); diff --git a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/SupplierWrapper.java b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/SupplierWrapper.java index 31eda0996f4f..1595772cf061 100644 --- a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/SupplierWrapper.java +++ b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/SupplierWrapper.java @@ -15,13 +15,11 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.toolkit.trace; import java.util.function.Supplier; -/** - * @author sxzaihua - */ @TraceCrossThread public class SupplierWrapper implements Supplier { final Supplier supplier; diff --git a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/Tag.java b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/Tag.java index a916c285f16d..ea43c3806da6 100644 --- a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/Tag.java +++ b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/Tag.java @@ -24,10 +24,9 @@ import java.lang.annotation.Target; /** - * Tag the current active span with key {@link #key()} and value {@link #value()}, - * if there is no active span, this annotation takes no effect. + * Tag the current active span with key {@link #key()} and value {@link #value()}, if there is no active span, this + * annotation takes no effect. * - * @author kezhenxu94 * @see Tags */ @Target(ElementType.METHOD) @@ -39,9 +38,8 @@ String key(); /** - * @return the value of the tag to be injected into the current active span, - * in the form of the customized enhancement rules, for more information, - * refer to https://github.com/apache/skywalking/blob/master/docs/en/setup/service-agent/java-agent/Customize-enhance-trace.md#how-to-configure + * @return the value of the tag to be injected into the current active span, in the form of the customized + * enhancement rules, for more information, refer to https://github.com/apache/skywalking/blob/master/docs/en/setup/service-agent/java-agent/Customize-enhance-trace.md#how-to-configure */ String value(); } diff --git a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/Tags.java b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/Tags.java index 4b763f08e5b6..b5970715808d 100644 --- a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/Tags.java +++ b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/Tags.java @@ -24,8 +24,7 @@ import java.lang.annotation.Target; /** - * A wrapper annotation for {@link Tag} that allows to - * apply multiple tags to a single method span, + * A wrapper annotation for {@link Tag} that allows to apply multiple tags to a single method span, * * 

  * @Tag(key = "tag1", value = "arg[0]")
@@ -35,7 +34,6 @@
  * }
  *
* - * @author kezhenxu94 * @see Tag */ @Target(ElementType.METHOD) diff --git a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/Trace.java b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/Trace.java index b76236db90bc..a06bdab29311 100644 --- a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/Trace.java +++ b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/Trace.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.trace; import java.lang.annotation.ElementType; @@ -28,8 +27,6 @@ * The agent create local span if the method that annotation with {@link Trace}. The value of span operation name will * fetch by {@link #operationName()}. if the value of {@link #operationName()} is blank string. the operation name will * be set the class name + method name. - * - * @author zhangxin */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) diff --git a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/TraceContext.java b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/TraceContext.java index a890b6fa8f12..fb9a66ed46e4 100644 --- a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/TraceContext.java +++ b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/TraceContext.java @@ -16,16 +16,12 @@ * */ - package org.apache.skywalking.apm.toolkit.trace; /** - * Try to access the sky-walking tracer context. - * The context is not existed, always. - * only the middleware, component, or rpc-framework are supported in the current invoke stack, in the same thread, - * the context will be available. + * Try to access the sky-walking tracer context. The context is not existed, always. only the middleware, component, or + * rpc-framework are supported in the current invoke stack, in the same thread, the context will be available. *

- * Created by xin on 2016/12/15. */ public class TraceContext { diff --git a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/TraceCrossThread.java b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/TraceCrossThread.java index 1eaf87a3a57b..e6049c61b85a 100644 --- a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/TraceCrossThread.java +++ b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/TraceCrossThread.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.toolkit.trace; import java.lang.annotation.ElementType; @@ -22,9 +23,6 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -/** - * @author carlvine500 - */ @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) public @interface TraceCrossThread { diff --git a/apm-checkstyle/checkStyle.xml b/apm-checkstyle/checkStyle.xml index 00b501b87526..20e8a91458a4 100755 --- a/apm-checkstyle/checkStyle.xml +++ b/apm-checkstyle/checkStyle.xml @@ -20,19 +20,31 @@ - - - + + + + + + + + + + + + + + + @@ -45,10 +57,11 @@ - - - + + + + @@ -95,32 +108,25 @@ - - - - - - - + + - + + + + + - - + + - - + + - - - - - - diff --git a/apm-commons/apm-datacarrier/pom.xml b/apm-commons/apm-datacarrier/pom.xml index 909c562c7b39..a5a3e206cd6f 100644 --- a/apm-commons/apm-datacarrier/pom.xml +++ b/apm-commons/apm-datacarrier/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-commons org.apache.skywalking diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/DataCarrier.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/DataCarrier.java index 40f823858b39..7288339ce463 100644 --- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/DataCarrier.java +++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/DataCarrier.java @@ -18,9 +18,14 @@ package org.apache.skywalking.apm.commons.datacarrier; -import org.apache.skywalking.apm.commons.datacarrier.buffer.*; -import org.apache.skywalking.apm.commons.datacarrier.consumer.*; -import org.apache.skywalking.apm.commons.datacarrier.partition.*; +import org.apache.skywalking.apm.commons.datacarrier.buffer.BufferStrategy; +import org.apache.skywalking.apm.commons.datacarrier.buffer.Channels; +import org.apache.skywalking.apm.commons.datacarrier.consumer.ConsumeDriver; +import org.apache.skywalking.apm.commons.datacarrier.consumer.ConsumerPool; +import org.apache.skywalking.apm.commons.datacarrier.consumer.IConsumer; +import org.apache.skywalking.apm.commons.datacarrier.consumer.IDriver; +import org.apache.skywalking.apm.commons.datacarrier.partition.IDataPartitioner; +import org.apache.skywalking.apm.commons.datacarrier.partition.SimpleRollingPartitioner; /** * DataCarrier main class. use this instance to set Producer/Consumer Model. @@ -61,8 +66,6 @@ public DataCarrier setPartitioner(IDataPartitioner dataPartitioner) { /** * override the strategy at runtime. Notice, {@link Channels} will override several channels one by one. - * - * @param strategy */ public DataCarrier setBufferStrategy(BufferStrategy strategy) { this.channels.setStrategy(strategy); @@ -72,7 +75,6 @@ public DataCarrier setBufferStrategy(BufferStrategy strategy) { /** * produce data to buffer, using the given {@link BufferStrategy}. * - * @param data * @return false means produce data failure. The data will not be consumed. */ public boolean produce(T data) { @@ -89,7 +91,7 @@ public boolean produce(T data) { * set consumeDriver to this Carrier. consumer begin to run when {@link DataCarrier#produce} begin to work. * * @param consumerClass class of consumer - * @param num number of consumer threads + * @param num number of consumer threads */ public DataCarrier consume(Class> consumerClass, int num, long consumeCycle) { if (driver != null) { @@ -105,7 +107,7 @@ public DataCarrier consume(Class> consumerClass, int num, * millis consume cycle. * * @param consumerClass class of consumer - * @param num number of consumer threads + * @param num number of consumer threads */ public DataCarrier consume(Class> consumerClass, int num) { return this.consume(consumerClass, num, 20); @@ -115,8 +117,7 @@ public DataCarrier consume(Class> consumerClass, int num) * set consumeDriver to this Carrier. consumer begin to run when {@link DataCarrier#produce} begin to work. * * @param consumer single instance of consumer, all consumer threads will all use this instance. - * @param num number of consumer threads - * @return + * @param num number of consumer threads */ public DataCarrier consume(IConsumer consumer, int num, long consumeCycle) { if (driver != null) { @@ -132,8 +133,7 @@ public DataCarrier consume(IConsumer consumer, int num, long consumeCycle) { * millis consume cycle. * * @param consumer single instance of consumer, all consumer threads will all use this instance. - * @param num number of consumer threads - * @return + * @param num number of consumer threads */ public DataCarrier consume(IConsumer consumer, int num) { return this.consume(consumer, num, 20); @@ -142,9 +142,6 @@ public DataCarrier consume(IConsumer consumer, int num) { /** * Set a consumer pool to manage the channels of this DataCarrier. Then consumerPool could use its own consuming * model to adjust the consumer thread and throughput. - * - * @param consumerPool - * @return */ public DataCarrier consume(ConsumerPool consumerPool, IConsumer consumer) { driver = consumerPool; diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/EnvUtil.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/EnvUtil.java index bdcdf18cd4fc..5ede4d2799c1 100644 --- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/EnvUtil.java +++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/EnvUtil.java @@ -20,8 +20,6 @@ /** * Read value from system env. - * - * @author wusheng */ public class EnvUtil { public static int getInt(String envName, int defaultValue) { diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/ArrayBlockingQueueBuffer.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/ArrayBlockingQueueBuffer.java index 4ce61dde322a..1867099724be 100644 --- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/ArrayBlockingQueueBuffer.java +++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/ArrayBlockingQueueBuffer.java @@ -23,11 +23,9 @@ /** * The buffer implementation based on JDK ArrayBlockingQueue. - * + *

* This implementation has better performance in server side. We are still trying to research whether this is suitable * for agent side, which is more sensitive about blocks. - * - * @author wusheng */ public class ArrayBlockingQueueBuffer implements QueueBuffer { private BufferStrategy strategy; @@ -40,7 +38,8 @@ public class ArrayBlockingQueueBuffer implements QueueBuffer { this.bufferSize = bufferSize; } - @Override public boolean save(T data) { + @Override + public boolean save(T data) { switch (strategy) { case IF_POSSIBLE: return queue.offer(data); @@ -55,15 +54,18 @@ public class ArrayBlockingQueueBuffer implements QueueBuffer { return true; } - @Override public void setStrategy(BufferStrategy strategy) { + @Override + public void setStrategy(BufferStrategy strategy) { this.strategy = strategy; } - @Override public void obtain(List consumeList) { + @Override + public void obtain(List consumeList) { queue.drainTo(consumeList); } - @Override public int getBufferSize() { + @Override + public int getBufferSize() { return bufferSize; } } diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/Buffer.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/Buffer.java index b4419a767e6b..d1f9217a1b57 100644 --- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/Buffer.java +++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/Buffer.java @@ -23,8 +23,6 @@ /** * Self implementation ring queue. - * - * @author wusheng */ public class Buffer implements QueueBuffer { private final Object[] buffer; @@ -41,7 +39,6 @@ public void setStrategy(BufferStrategy strategy) { this.strategy = strategy; } - public boolean save(T data) { int i = index.getAndIncrement(); if (buffer[i] != null) { @@ -74,7 +71,7 @@ public void obtain(List consumeList) { void obtain(List consumeList, int start, int end) { for (int i = start; i < end; i++) { if (buffer[i] != null) { - consumeList.add((T)buffer[i]); + consumeList.add((T) buffer[i]); buffer[i] = null; } } diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/BufferStrategy.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/BufferStrategy.java index a26a3240d3d5..acb5b970691e 100644 --- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/BufferStrategy.java +++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/BufferStrategy.java @@ -16,13 +16,8 @@ * */ - package org.apache.skywalking.apm.commons.datacarrier.buffer; -/** - * Created by wusheng on 2016/10/25. - */ public enum BufferStrategy { - BLOCKING, - IF_POSSIBLE + BLOCKING, IF_POSSIBLE } diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/Channels.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/Channels.java index 1f13cc2785a0..26c7ab03c66d 100644 --- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/Channels.java +++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/Channels.java @@ -68,8 +68,6 @@ public void setPartitioner(IDataPartitioner dataPartitioner) { /** * override the strategy at runtime. Notice, this will override several channels one by one. So, when running * setStrategy, each channel may use different BufferStrategy - * - * @param strategy */ public void setStrategy(BufferStrategy strategy) { for (QueueBuffer buffer : bufferChannels) { @@ -79,8 +77,6 @@ public void setStrategy(BufferStrategy strategy) { /** * get channelSize - * - * @return */ public int getChannelSize() { return this.bufferChannels.length; diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/QueueBuffer.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/QueueBuffer.java index 5789919124ec..372606a18835 100644 --- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/QueueBuffer.java +++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/QueueBuffer.java @@ -22,12 +22,11 @@ /** * Queue buffer interface. - * - * @author wusheng */ public interface QueueBuffer { /** * Save data into the queue; + * * @param data to add. * @return true if saved */ @@ -35,13 +34,11 @@ public interface QueueBuffer { /** * Set different strategy when queue is full. - * @param strategy */ void setStrategy(BufferStrategy strategy); /** * Obtain the existing data from the queue - * @param consumeList */ void obtain(List consumeList); diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/common/AtomicRangeInteger.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/common/AtomicRangeInteger.java index 4d31823aba09..f722a0d1c1c1 100644 --- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/common/AtomicRangeInteger.java +++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/common/AtomicRangeInteger.java @@ -16,15 +16,11 @@ * */ - package org.apache.skywalking.apm.commons.datacarrier.common; import java.io.Serializable; import java.util.concurrent.atomic.AtomicIntegerArray; -/** - * Created by lkxiaolou - */ public class AtomicRangeInteger extends Number implements Serializable { private static final long serialVersionUID = -4099792402691141643L; private AtomicIntegerArray values; @@ -48,7 +44,8 @@ public final int getAndIncrement() { if (next > endValue && this.values.compareAndSet(VALUE_OFFSET, next, startValue)) { return endValue; } - } while (next > endValue); + } + while (next > endValue); return next - 1; } diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/BulkConsumePool.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/BulkConsumePool.java index 0043f09c1e1a..2d2195d3f6d4 100644 --- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/BulkConsumePool.java +++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/BulkConsumePool.java @@ -18,7 +18,8 @@ package org.apache.skywalking.apm.commons.datacarrier.consumer; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import java.util.concurrent.Callable; import org.apache.skywalking.apm.commons.datacarrier.EnvUtil; import org.apache.skywalking.apm.commons.datacarrier.buffer.Channels; @@ -26,10 +27,8 @@ /** * BulkConsumePool works for consuming data from multiple channels(DataCarrier instances), with multiple {@link * MultipleChannelsConsumer}s. - * + *

* In typical case, the number of {@link MultipleChannelsConsumer} should be less than the number of channels. - * - * @author wusheng */ public class BulkConsumePool implements ConsumerPool { private List allConsumers; @@ -45,7 +44,8 @@ public BulkConsumePool(String name, int size, long consumeCycle) { } } - @Override synchronized public void add(String name, Channels channels, IConsumer consumer) { + @Override + synchronized public void add(String name, Channels channels, IConsumer consumer) { MultipleChannelsConsumer multipleChannelsConsumer = getLowestPayload(); multipleChannelsConsumer.addNewTarget(channels, consumer); } @@ -67,20 +67,22 @@ private MultipleChannelsConsumer getLowestPayload() { } /** - * @param channels - * @return + * */ - @Override public boolean isRunning(Channels channels) { + @Override + public boolean isRunning(Channels channels) { return isStarted; } - @Override public void close(Channels channels) { + @Override + public void close(Channels channels) { for (MultipleChannelsConsumer consumer : allConsumers) { consumer.shutdown(); } } - @Override public void begin(Channels channels) { + @Override + public void begin(Channels channels) { if (isStarted) { return; } @@ -104,7 +106,8 @@ public Creator(String name, int poolSize, long consumeCycle) { this.consumeCycle = consumeCycle; } - @Override public ConsumerPool call() { + @Override + public ConsumerPool call() { return new BulkConsumePool(name, size, consumeCycle); } diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerCannotBeCreatedException.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerCannotBeCreatedException.java index 3d60ef6d5fb1..66545da0312a 100644 --- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerCannotBeCreatedException.java +++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerCannotBeCreatedException.java @@ -16,12 +16,8 @@ * */ - package org.apache.skywalking.apm.commons.datacarrier.consumer; -/** - * Created by wusheng on 2016/11/15. - */ public class ConsumerCannotBeCreatedException extends RuntimeException { ConsumerCannotBeCreatedException(Throwable t) { super(t); diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerPool.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerPool.java index a09827429ac5..46b23b93a670 100644 --- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerPool.java +++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerPool.java @@ -22,10 +22,8 @@ import org.apache.skywalking.apm.commons.datacarrier.buffer.Channels; /** - * The Consumer pool could support data consumer from multiple {@link DataCarrier}s, - * by using different consume thread management models. - * - * @author wusheng + * The Consumer pool could support data consumer from multiple {@link DataCarrier}s, by using different consume thread + * management models. */ public interface ConsumerPool extends IDriver { void add(String name, Channels channels, IConsumer consumer); diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerPoolFactory.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerPoolFactory.java index 7f86873d102d..7c7a7d0920da 100644 --- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerPoolFactory.java +++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerPoolFactory.java @@ -18,14 +18,13 @@ package org.apache.skywalking.apm.commons.datacarrier.consumer; -import java.util.*; +import java.util.HashMap; +import java.util.Map; import java.util.concurrent.Callable; import org.apache.skywalking.apm.commons.datacarrier.buffer.Channels; /** * Consumer Pool Factory provides global management for all Consumer Pool. - * - * @author wusheng */ public enum ConsumerPoolFactory { INSTANCE; @@ -56,7 +55,8 @@ public ConsumerPool get(String poolName) { public static final ConsumerPool DEFAULT_POOL = new ConsumerPool() { private Map allDrivers = new HashMap(); - @Override synchronized public void add(String name, Channels channels, IConsumer consumer) { + @Override + synchronized public void add(String name, Channels channels, IConsumer consumer) { if (!allDrivers.containsKey(channels)) { ConsumeDriver consumeDriver = new ConsumeDriver(name, channels, consumer, 1, 20); allDrivers.put(channels, consumeDriver); @@ -65,21 +65,22 @@ public ConsumerPool get(String poolName) { /** * Always return true. - * @param channels - * @return */ - @Override public boolean isRunning(Channels channels) { + @Override + public boolean isRunning(Channels channels) { return true; } - @Override public void close(Channels channels) { + @Override + public void close(Channels channels) { ConsumeDriver driver = allDrivers.get(channels); if (driver != null) { driver.close(channels); } } - @Override public void begin(Channels channels) { + @Override + public void begin(Channels channels) { ConsumeDriver driver = allDrivers.get(channels); if (driver != null) { driver.begin(channels); diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerThread.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerThread.java index 15c01f5900c3..5f35408a5d20 100644 --- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerThread.java +++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerThread.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.commons.datacarrier.consumer; import java.util.ArrayList; @@ -24,9 +23,6 @@ import org.apache.skywalking.apm.commons.datacarrier.buffer.Buffer; import org.apache.skywalking.apm.commons.datacarrier.buffer.QueueBuffer; -/** - * Created by wusheng on 2016/10/25. - */ public class ConsumerThread extends Thread { private volatile boolean running; private IConsumer consumer; @@ -43,8 +39,6 @@ public class ConsumerThread extends Thread { /** * add whole buffer to consume - * - * @param sourceBuffer */ void addDataSource(QueueBuffer sourceBuffer) { this.dataSources.add(new DataSource(sourceBuffer)); diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/IConsumer.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/IConsumer.java index 2b00c5e206e6..3c6dc0d57ad8 100644 --- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/IConsumer.java +++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/IConsumer.java @@ -16,14 +16,10 @@ * */ - package org.apache.skywalking.apm.commons.datacarrier.consumer; import java.util.List; -/** - * Created by wusheng on 2016/10/25. - */ public interface IConsumer { void init(); diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/IDriver.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/IDriver.java index 74368ce716c4..66845e543af2 100644 --- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/IDriver.java +++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/IDriver.java @@ -22,11 +22,11 @@ /** * The driver of consumer. - * - * @author wusheng */ public interface IDriver { boolean isRunning(Channels channels); + void close(Channels channels); + void begin(Channels channels); } diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/MultipleChannelsConsumer.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/MultipleChannelsConsumer.java index 708325ed512d..b70bb8f298a2 100644 --- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/MultipleChannelsConsumer.java +++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/MultipleChannelsConsumer.java @@ -26,8 +26,6 @@ /** * MultipleChannelsConsumer represent a single consumer thread, but support multiple channels with their {@link * IConsumer}s - * - * @author wusheng */ public class MultipleChannelsConsumer extends Thread { private volatile boolean running; @@ -91,9 +89,6 @@ private boolean consume(Group target, List consumeList) { /** * Add a new target channels. - * - * @param channels - * @param consumer */ public void addNewTarget(Channels channels, IConsumer consumer) { Group group = new Group(channels, consumer); diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/partition/IDataPartitioner.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/partition/IDataPartitioner.java index 7c74e84d657d..fc985c9a50ce 100644 --- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/partition/IDataPartitioner.java +++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/partition/IDataPartitioner.java @@ -16,20 +16,16 @@ * */ - package org.apache.skywalking.apm.commons.datacarrier.partition; import org.apache.skywalking.apm.commons.datacarrier.buffer.BufferStrategy; -/** - * Created by wusheng on 2016/10/25. - */ public interface IDataPartitioner { int partition(int total, T data); /** * @return an integer represents how many times should retry when {@link BufferStrategy#IF_POSSIBLE}. - * + *

* Less or equal 1, means not support retry. */ int maxRetryCount(); diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/partition/ProducerThreadPartitioner.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/partition/ProducerThreadPartitioner.java index 90ee56cb3131..5d1e84a0aa33 100644 --- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/partition/ProducerThreadPartitioner.java +++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/partition/ProducerThreadPartitioner.java @@ -16,13 +16,10 @@ * */ - package org.apache.skywalking.apm.commons.datacarrier.partition; /** * use threadid % total to partition - * - * Created by wusheng on 2016/10/25. */ public class ProducerThreadPartitioner implements IDataPartitioner { private int retryTime = 3; @@ -36,7 +33,7 @@ public ProducerThreadPartitioner(int retryTime) { @Override public int partition(int total, T data) { - return (int)Thread.currentThread().getId() % total; + return (int) Thread.currentThread().getId() % total; } @Override diff --git a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/partition/SimpleRollingPartitioner.java b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/partition/SimpleRollingPartitioner.java index b01c24d66ed6..ff3bdf5d32a7 100644 --- a/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/partition/SimpleRollingPartitioner.java +++ b/apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/partition/SimpleRollingPartitioner.java @@ -16,14 +16,10 @@ * */ - package org.apache.skywalking.apm.commons.datacarrier.partition; /** * use normal int to rolling. - * - * - * Created by wusheng on 2016/10/25. */ public class SimpleRollingPartitioner implements IDataPartitioner { private volatile int i = 0; diff --git a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/DataCarrierTest.java b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/DataCarrierTest.java index 1da8b8c726ed..ee11a7752f25 100644 --- a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/DataCarrierTest.java +++ b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/DataCarrierTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.commons.datacarrier; import java.util.ArrayList; @@ -31,17 +30,17 @@ import org.junit.Test; import org.powermock.api.support.membermodification.MemberModifier; -/** - * Created by wusheng on 2016/10/25. - */ public class DataCarrierTest { @Test public void testCreateDataCarrier() throws IllegalAccessException { DataCarrier carrier = new DataCarrier(5, 100); - Assert.assertEquals(((Integer)(MemberModifier.field(DataCarrier.class, "bufferSize").get(carrier))).intValue(), 100); - Assert.assertEquals(((Integer)(MemberModifier.field(DataCarrier.class, "channelSize").get(carrier))).intValue(), 5); + Assert.assertEquals(((Integer) (MemberModifier.field(DataCarrier.class, "bufferSize") + .get(carrier))).intValue(), 100); + Assert.assertEquals(((Integer) (MemberModifier.field(DataCarrier.class, "channelSize") + .get(carrier))).intValue(), 5); - Channels channels = (Channels)(MemberModifier.field(DataCarrier.class, "channels").get(carrier)); + Channels channels = (Channels) (MemberModifier.field(DataCarrier.class, "channels") + .get(carrier)); Assert.assertEquals(5, channels.getChannelSize()); QueueBuffer buffer = channels.getBuffer(0); @@ -49,11 +48,16 @@ public void testCreateDataCarrier() throws IllegalAccessException { Assert.assertEquals(MemberModifier.field(buffer.getClass(), "strategy").get(buffer), BufferStrategy.BLOCKING); carrier.setBufferStrategy(BufferStrategy.IF_POSSIBLE); - Assert.assertEquals(MemberModifier.field(buffer.getClass(), "strategy").get(buffer), BufferStrategy.IF_POSSIBLE); + Assert.assertEquals(MemberModifier.field(buffer.getClass(), "strategy") + .get(buffer), BufferStrategy.IF_POSSIBLE); - Assert.assertEquals(MemberModifier.field(Channels.class, "dataPartitioner").get(channels).getClass(), SimpleRollingPartitioner.class); + Assert.assertEquals(MemberModifier.field(Channels.class, "dataPartitioner") + .get(channels) + .getClass(), SimpleRollingPartitioner.class); carrier.setPartitioner(new ProducerThreadPartitioner()); - Assert.assertEquals(MemberModifier.field(Channels.class, "dataPartitioner").get(channels).getClass(), ProducerThreadPartitioner.class); + Assert.assertEquals(MemberModifier.field(Channels.class, "dataPartitioner") + .get(channels) + .getClass(), ProducerThreadPartitioner.class); } @Test @@ -64,7 +68,8 @@ public void testProduce() throws IllegalAccessException { Assert.assertTrue(carrier.produce(new SampleData().setName("c"))); Assert.assertTrue(carrier.produce(new SampleData().setName("d"))); - Channels channels = (Channels)(MemberModifier.field(DataCarrier.class, "channels").get(carrier)); + Channels channels = (Channels) (MemberModifier.field(DataCarrier.class, "channels") + .get(carrier)); QueueBuffer buffer1 = channels.getBuffer(0); List result = new ArrayList(); @@ -91,7 +96,8 @@ public void testIfPossibleProduce() throws IllegalAccessException { Assert.assertFalse(carrier.produce(new SampleData().setName("d" + i + "_2"))); } - Channels channels = (Channels)(MemberModifier.field(DataCarrier.class, "channels").get(carrier)); + Channels channels = (Channels) (MemberModifier.field(DataCarrier.class, "channels") + .get(carrier)); QueueBuffer buffer1 = channels.getBuffer(0); List result = new ArrayList(); buffer1.obtain(result); diff --git a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/EnvUtilTest.java b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/EnvUtilTest.java index 640b23dd177b..9b1a8525a80a 100644 --- a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/EnvUtilTest.java +++ b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/EnvUtilTest.java @@ -28,10 +28,6 @@ import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.when; -/** - * @author dengming - * 2019-04-20 - */ @RunWith(PowerMockRunner.class) @PrepareForTest(EnvUtil.class) public class EnvUtilTest { diff --git a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/LinkedArrayBenchmark.java b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/LinkedArrayBenchmark.java index 4df3a0f2ca92..6c57d755c0d4 100644 --- a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/LinkedArrayBenchmark.java +++ b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/LinkedArrayBenchmark.java @@ -168,12 +168,11 @@ public void testLinked200K() { } public static void main(String[] args) throws RunnerException { - Options opt = new OptionsBuilder() - .include(LinkedArrayBenchmark.class.getName()) - .addProfiler(GCProfiler.class) - .jvmArgsAppend("-Xmx512m", "-Xms512m") - .forks(1) - .build(); + Options opt = new OptionsBuilder().include(LinkedArrayBenchmark.class.getName()) + .addProfiler(GCProfiler.class) + .jvmArgsAppend("-Xmx512m", "-Xms512m") + .forks(1) + .build(); new Runner(opt).run(); } /* diff --git a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/SampleData.java b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/SampleData.java index 56b893827b77..812a56f057ff 100644 --- a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/SampleData.java +++ b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/SampleData.java @@ -16,12 +16,8 @@ * */ - package org.apache.skywalking.apm.commons.datacarrier; -/** - * Created by wusheng on 2016/10/25. - */ public class SampleData { private int intValue; diff --git a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/common/AtomicRangeIntegerTest.java b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/common/AtomicRangeIntegerTest.java index a865af6e64e8..68ed6ac64611 100644 --- a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/common/AtomicRangeIntegerTest.java +++ b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/common/AtomicRangeIntegerTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.commons.datacarrier.common; import org.junit.Assert; @@ -27,9 +26,6 @@ import org.openjdk.jmh.runner.options.Options; import org.openjdk.jmh.runner.options.OptionsBuilder; -/** - * Created by xin on 2017/7/14. - */ public class AtomicRangeIntegerTest { private static AtomicRangeInteger ATOMIC_V3 = new AtomicRangeInteger(0, 100); @@ -46,8 +42,8 @@ public void testGetAndIncrement() { Assert.assertEquals(1, atomicI.get()); Assert.assertEquals(1, atomicI.intValue()); Assert.assertEquals(1, atomicI.longValue()); - Assert.assertEquals(1, (int)atomicI.floatValue()); - Assert.assertEquals(1, (int)atomicI.doubleValue()); + Assert.assertEquals(1, (int) atomicI.floatValue()); + Assert.assertEquals(1, (int) atomicI.doubleValue()); } @Test @@ -69,15 +65,14 @@ public void testGetAndIncrementV3Performance() { } public static void main(String[] args) throws RunnerException { - Options opt = new OptionsBuilder() - .include(AtomicRangeIntegerTest.class.getSimpleName()) - .forks(1) - .warmupIterations(3) - .threads(128) - .syncIterations(false) - .output("/tmp/jmh.log") - .measurementIterations(5) - .build(); + Options opt = new OptionsBuilder().include(AtomicRangeIntegerTest.class.getSimpleName()) + .forks(1) + .warmupIterations(3) + .threads(128) + .syncIterations(false) + .output("/tmp/jmh.log") + .measurementIterations(5) + .build(); new Runner(opt).run(); } diff --git a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/common/AtomicRangeIntegerV1.java b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/common/AtomicRangeIntegerV1.java index 4ce28786e75e..e7cb5afaccc7 100644 --- a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/common/AtomicRangeIntegerV1.java +++ b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/common/AtomicRangeIntegerV1.java @@ -16,14 +16,12 @@ * */ - package org.apache.skywalking.apm.commons.datacarrier.common; import java.io.Serializable; import java.util.concurrent.atomic.AtomicInteger; /** - * Created by wusheng on 2016/10/25. * This is moved from SkyWalking 6.1 */ public class AtomicRangeIntegerV1 extends Number implements Serializable { diff --git a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/common/AtomicRangeIntegerV2.java b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/common/AtomicRangeIntegerV2.java index 15bb9c149989..e623c946e15c 100644 --- a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/common/AtomicRangeIntegerV2.java +++ b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/common/AtomicRangeIntegerV2.java @@ -16,14 +16,12 @@ * */ - package org.apache.skywalking.apm.commons.datacarrier.common; import java.io.Serializable; import java.util.concurrent.atomic.AtomicInteger; /** - * Created by lkxiaolou * This comes from PR#2874 */ public class AtomicRangeIntegerV2 extends Number implements Serializable { @@ -45,7 +43,8 @@ public final int getAndIncrement() { if (next > endValue && this.value.compareAndSet(next, startValue)) { return endValue; } - } while (next > endValue); + } + while (next > endValue); return next - 1; } diff --git a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumeDriverTest.java b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumeDriverTest.java index ec59162ea2ed..b96e08bb2a8a 100644 --- a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumeDriverTest.java +++ b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumeDriverTest.java @@ -16,20 +16,16 @@ * */ - package org.apache.skywalking.apm.commons.datacarrier.consumer; +import org.apache.skywalking.apm.commons.datacarrier.SampleData; +import org.apache.skywalking.apm.commons.datacarrier.buffer.BufferStrategy; import org.apache.skywalking.apm.commons.datacarrier.buffer.Channels; import org.apache.skywalking.apm.commons.datacarrier.partition.SimpleRollingPartitioner; import org.junit.Assert; import org.junit.Test; import org.powermock.api.support.membermodification.MemberModifier; -import org.apache.skywalking.apm.commons.datacarrier.SampleData; -import org.apache.skywalking.apm.commons.datacarrier.buffer.BufferStrategy; -/** - * Created by wusheng on 2016/10/26. - */ public class ConsumeDriverTest { @Test public void testBeginConsumeDriver() throws IllegalAccessException { @@ -37,7 +33,8 @@ public void testBeginConsumeDriver() throws IllegalAccessException { ConsumeDriver pool = new ConsumeDriver("default", channels, new SampleConsumer(), 2, 20); pool.begin(channels); - ConsumerThread[] threads = (ConsumerThread[])MemberModifier.field(ConsumeDriver.class, "consumerThreads").get(pool); + ConsumerThread[] threads = (ConsumerThread[]) MemberModifier.field(ConsumeDriver.class, "consumerThreads") + .get(pool); Assert.assertEquals(2, threads.length); Assert.assertTrue(threads[0].isAlive()); Assert.assertTrue(threads[1].isAlive()); @@ -51,10 +48,11 @@ public void testCloseConsumeDriver() throws InterruptedException, IllegalAccessE Thread.sleep(5000); pool.close(channels); - ConsumerThread[] threads = (ConsumerThread[])MemberModifier.field(ConsumeDriver.class, "consumerThreads").get(pool); + ConsumerThread[] threads = (ConsumerThread[]) MemberModifier.field(ConsumeDriver.class, "consumerThreads") + .get(pool); Assert.assertEquals(2, threads.length); - Assert.assertFalse((Boolean)MemberModifier.field(ConsumerThread.class, "running").get(threads[0])); - Assert.assertFalse((Boolean)MemberModifier.field(ConsumerThread.class, "running").get(threads[1])); + Assert.assertFalse((Boolean) MemberModifier.field(ConsumerThread.class, "running").get(threads[0])); + Assert.assertFalse((Boolean) MemberModifier.field(ConsumerThread.class, "running").get(threads[1])); } } diff --git a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerPoolFactoryTest.java b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerPoolFactoryTest.java index 737eb23e0f5a..5ef4b09b15fe 100644 --- a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerPoolFactoryTest.java +++ b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerPoolFactoryTest.java @@ -21,12 +21,10 @@ import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; -/** - * @author dengming - * 2019-04-20 - */ public class ConsumerPoolFactoryTest { @Before diff --git a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerTest.java b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerTest.java index b9dfd8f783da..e92c35e42739 100644 --- a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerTest.java +++ b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.commons.datacarrier.consumer; import java.util.ArrayList; @@ -29,9 +28,6 @@ import org.junit.Test; import org.powermock.api.support.membermodification.MemberModifier; -/** - * Created by wusheng on 2016/10/26. - */ public class ConsumerTest { public static LinkedBlockingQueue BUFFER = new LinkedBlockingQueue(); @@ -48,12 +44,12 @@ public void testConsumerLessThanChannel() throws IllegalAccessException { consumer.i = 100; carrier.consume(SampleConsumer.class, 1); - Assert.assertEquals(1, ((SampleConsumer)getConsumer(carrier)).i); + Assert.assertEquals(1, ((SampleConsumer) getConsumer(carrier)).i); SampleConsumer2 consumer2 = new SampleConsumer2(); consumer2.i = 100; carrier.consume(consumer2, 1); - Assert.assertEquals(100, ((SampleConsumer2)getConsumer(carrier)).i); + Assert.assertEquals(100, ((SampleConsumer2) getConsumer(carrier)).i); carrier.shutdownConsumers(); } @@ -129,9 +125,10 @@ public void onExit() { } private IConsumer getConsumer(DataCarrier carrier) throws IllegalAccessException { - ConsumeDriver pool = (ConsumeDriver)MemberModifier.field(DataCarrier.class, "driver").get(carrier); - ConsumerThread[] threads = (ConsumerThread[])MemberModifier.field(ConsumeDriver.class, "consumerThreads").get(pool); + ConsumeDriver pool = (ConsumeDriver) MemberModifier.field(DataCarrier.class, "driver").get(carrier); + ConsumerThread[] threads = (ConsumerThread[]) MemberModifier.field(ConsumeDriver.class, "consumerThreads") + .get(pool); - return (IConsumer)MemberModifier.field(ConsumerThread.class, "consumer").get(threads[0]); + return (IConsumer) MemberModifier.field(ConsumerThread.class, "consumer").get(threads[0]); } } diff --git a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/consumer/SampleConsumer.java b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/consumer/SampleConsumer.java index 13274cda7983..b23ef03bd4e8 100644 --- a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/consumer/SampleConsumer.java +++ b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/consumer/SampleConsumer.java @@ -16,15 +16,11 @@ * */ - package org.apache.skywalking.apm.commons.datacarrier.consumer; import java.util.List; import org.apache.skywalking.apm.commons.datacarrier.SampleData; -/** - * Created by wusheng on 2016/10/26. - */ public class SampleConsumer implements IConsumer { public int i = 1; diff --git a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/partition/ProducerThreadPartitionerTest.java b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/partition/ProducerThreadPartitionerTest.java index 7cba146a9e49..d0a38ab2f1aa 100644 --- a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/partition/ProducerThreadPartitionerTest.java +++ b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/partition/ProducerThreadPartitionerTest.java @@ -16,20 +16,16 @@ * */ - package org.apache.skywalking.apm.commons.datacarrier.partition; import org.apache.skywalking.apm.commons.datacarrier.SampleData; import org.junit.Assert; import org.junit.Test; -/** - * Created by wusheng on 2016/10/25. - */ public class ProducerThreadPartitionerTest { @Test public void testPartition() { - int partitionNum = (int)Thread.currentThread().getId() % 10; + int partitionNum = (int) Thread.currentThread().getId() % 10; ProducerThreadPartitioner partitioner = new ProducerThreadPartitioner(); Assert.assertEquals(partitioner.partition(10, new SampleData()), partitionNum); Assert.assertEquals(partitioner.partition(10, new SampleData()), partitionNum); diff --git a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/partition/SimpleRollingPartitionerTest.java b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/partition/SimpleRollingPartitionerTest.java index cd17879d1dcf..92284f51df94 100644 --- a/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/partition/SimpleRollingPartitionerTest.java +++ b/apm-commons/apm-datacarrier/src/test/java/org/apache/skywalking/apm/commons/datacarrier/partition/SimpleRollingPartitionerTest.java @@ -16,16 +16,12 @@ * */ - package org.apache.skywalking.apm.commons.datacarrier.partition; import org.apache.skywalking.apm.commons.datacarrier.SampleData; import org.junit.Assert; import org.junit.Test; -/** - * Created by wusheng on 2016/10/25. - */ public class SimpleRollingPartitionerTest { @Test public void testPartition() { diff --git a/apm-commons/apm-util/pom.xml b/apm-commons/apm-util/pom.xml index 41967ffb58d1..27b5db4f95b6 100644 --- a/apm-commons/apm-util/pom.xml +++ b/apm-commons/apm-util/pom.xml @@ -16,7 +16,8 @@ ~ --> - + apm-commons org.apache.skywalking diff --git a/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/ConfigInitializer.java b/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/ConfigInitializer.java index a7be27e3f1cc..f4efb0d75725 100644 --- a/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/ConfigInitializer.java +++ b/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/ConfigInitializer.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.util; import java.lang.reflect.Field; @@ -34,7 +33,6 @@ /** * Init a class's static fields by a {@link Properties}, including static fields and static inner classes. *

- * Created by wusheng on 2017/1/9. */ public class ConfigInitializer { private static final Logger logger = Logger.getLogger(ConfigInitializer.class.getName()); @@ -56,7 +54,7 @@ private static void initNextLevel(Properties properties, Class recentConfigTy * Such as plugin.opgroup.resttemplate.rule[abc]=/url/path */ // Deduct two generic types of the map - ParameterizedType genericType = (ParameterizedType)field.getGenericType(); + ParameterizedType genericType = (ParameterizedType) field.getGenericType(); Type[] argumentTypes = genericType.getActualTypeArguments(); Type keyType = null; @@ -66,7 +64,7 @@ private static void initNextLevel(Properties properties, Class recentConfigTy keyType = argumentTypes[0]; valueType = argumentTypes[1]; } - Map map = (Map)field.get(null); + Map map = (Map) field.get(null); // Set the map from config key and properties setForMapType(configKey, map, properties, keyType, valueType); } else { @@ -91,7 +89,8 @@ private static void initNextLevel(Properties properties, Class recentConfigTy /** * Convert string value to typical type. - * @param type type to convert + * + * @param type type to convert * @param value string value to be converted * @return converted value or null */ @@ -116,9 +115,9 @@ private static Object convertToTypicalType(Type type, String value) { } else if (List.class.equals(type)) { result = convert2List(value); } else if (type instanceof Class) { - Class clazz = (Class)type; + Class clazz = (Class) type; if (clazz.isEnum()) { - result = Enum.valueOf((Class)type, value.toUpperCase()); + result = Enum.valueOf((Class) type, value.toUpperCase()); } } return result; @@ -126,15 +125,15 @@ private static Object convertToTypicalType(Type type, String value) { /** * Set map items. - * @param configKey config key must not be null - * @param map map to set must not be null + * + * @param configKey config key must not be null + * @param map map to set must not be null * @param properties properties must not be null - * @param keyType key type of the map - * @param valueType value type of the map + * @param keyType key type of the map + * @param valueType value type of the map */ private static void setForMapType(String configKey, Map map, Properties properties, - final Type keyType, - final Type valueType) { + final Type keyType, final Type valueType) { Objects.requireNonNull(configKey); Objects.requireNonNull(map); diff --git a/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/MachineInfo.java b/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/MachineInfo.java index f300644d8fed..808bc4221ae8 100644 --- a/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/MachineInfo.java +++ b/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/MachineInfo.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.util; import java.lang.management.ManagementFactory; diff --git a/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/PlaceholderConfigurerSupport.java b/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/PlaceholderConfigurerSupport.java index 7f96b25dd458..e2f25d0c9f88 100644 --- a/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/PlaceholderConfigurerSupport.java +++ b/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/PlaceholderConfigurerSupport.java @@ -18,18 +18,21 @@ package org.apache.skywalking.apm.util; -/** - * @author jian.tan - */ public class PlaceholderConfigurerSupport { - /** Default placeholder prefix: {@value} */ + /** + * Default placeholder prefix: {@value} + */ public static final String DEFAULT_PLACEHOLDER_PREFIX = "${"; - /** Default placeholder suffix: {@value} */ + /** + * Default placeholder suffix: {@value} + */ public static final String DEFAULT_PLACEHOLDER_SUFFIX = "}"; - /** Default value separator: {@value} */ + /** + * Default value separator: {@value} + */ public static final String DEFAULT_VALUE_SEPARATOR = ":"; } diff --git a/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/PropertyPlaceholderHelper.java b/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/PropertyPlaceholderHelper.java index 10de12200c8e..4e985bafb9ba 100644 --- a/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/PropertyPlaceholderHelper.java +++ b/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/PropertyPlaceholderHelper.java @@ -31,9 +31,7 @@ */ public enum PropertyPlaceholderHelper { - INSTANCE(PlaceholderConfigurerSupport.DEFAULT_PLACEHOLDER_PREFIX, - PlaceholderConfigurerSupport.DEFAULT_PLACEHOLDER_SUFFIX, - PlaceholderConfigurerSupport.DEFAULT_VALUE_SEPARATOR, true); + INSTANCE(PlaceholderConfigurerSupport.DEFAULT_PLACEHOLDER_PREFIX, PlaceholderConfigurerSupport.DEFAULT_PLACEHOLDER_SUFFIX, PlaceholderConfigurerSupport.DEFAULT_VALUE_SEPARATOR, true); private final String placeholderPrefix; @@ -48,15 +46,15 @@ public enum PropertyPlaceholderHelper { /** * Creates a new {@code PropertyPlaceholderHelper} that uses the supplied prefix and suffix. * - * @param placeholderPrefix the prefix that denotes the start of a placeholder - * @param placeholderSuffix the suffix that denotes the end of a placeholder - * @param valueSeparator the separating character between the placeholder variable and the associated default value, - * if any + * @param placeholderPrefix the prefix that denotes the start of a placeholder + * @param placeholderSuffix the suffix that denotes the end of a placeholder + * @param valueSeparator the separating character between the placeholder variable and the + * associated default value, if any * @param ignoreUnresolvablePlaceholders indicates whether unresolvable placeholders should be ignored ({@code - * true}) or cause an exception ({@code false}) + * true}) or cause an exception ({@code false}) */ - PropertyPlaceholderHelper(String placeholderPrefix, String placeholderSuffix, - String valueSeparator, boolean ignoreUnresolvablePlaceholders) { + PropertyPlaceholderHelper(String placeholderPrefix, String placeholderSuffix, String valueSeparator, + boolean ignoreUnresolvablePlaceholders) { if (StringUtil.isEmpty(placeholderPrefix) || StringUtil.isEmpty(placeholderSuffix)) { throw new UnsupportedOperationException("'placeholderPrefix or placeholderSuffix' must not be null"); } @@ -83,7 +81,7 @@ public enum PropertyPlaceholderHelper { * Replaces all placeholders of format {@code ${name}} with the corresponding property from the supplied {@link * Properties}. * - * @param value the value containing the placeholders to be replaced + * @param value the value containing the placeholders to be replaced * @param properties the {@code Properties} to use for replacement * @return the supplied value with placeholders replaced inline */ @@ -111,7 +109,7 @@ private String getConfigValue(String key, final Properties properties) { * Replaces all placeholders of format {@code ${name}} with the value returned from the supplied {@link * PlaceholderResolver}. * - * @param value the value containing the placeholders to be replaced + * @param value the value containing the placeholders to be replaced * @param placeholderResolver the {@code PlaceholderResolver} to use for replacement * @return the supplied value with placeholders replaced inline */ @@ -131,8 +129,7 @@ protected String parseStringValue(String value, PlaceholderResolver placeholderR String placeholder = result.substring(startIndex + this.placeholderPrefix.length(), endIndex); String originalPlaceholder = placeholder; if (!visitedPlaceholders.add(originalPlaceholder)) { - throw new IllegalArgumentException( - "Circular placeholder reference '" + originalPlaceholder + "' in property definitions"); + throw new IllegalArgumentException("Circular placeholder reference '" + originalPlaceholder + "' in property definitions"); } // Recursive invocation, parsing placeholders contained in the placeholder key. placeholder = parseStringValue(placeholder, placeholderResolver, visitedPlaceholders); @@ -159,8 +156,7 @@ protected String parseStringValue(String value, PlaceholderResolver placeholderR // Proceed with unprocessed value. startIndex = result.indexOf(this.placeholderPrefix, endIndex + this.placeholderSuffix.length()); } else { - throw new IllegalArgumentException("Could not resolve placeholder '" + - placeholder + "'" + " in value \"" + value + "\""); + throw new IllegalArgumentException("Could not resolve placeholder '" + placeholder + "'" + " in value \"" + value + "\""); } visitedPlaceholders.remove(originalPlaceholder); } else { diff --git a/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/RunnableWithExceptionProtection.java b/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/RunnableWithExceptionProtection.java index d03e83258804..e3d6136dbe81 100644 --- a/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/RunnableWithExceptionProtection.java +++ b/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/RunnableWithExceptionProtection.java @@ -18,9 +18,6 @@ package org.apache.skywalking.apm.util; -/** - * @author wusheng - */ public class RunnableWithExceptionProtection implements Runnable { private Runnable run; private CallbackWhenException callback; diff --git a/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/StringFormatGroup.java b/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/StringFormatGroup.java index 497e8152c28a..1350206a805a 100644 --- a/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/StringFormatGroup.java +++ b/apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/StringFormatGroup.java @@ -18,26 +18,29 @@ package org.apache.skywalking.apm.util; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import java.util.regex.Pattern; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import lombok.ToString; /** * Group patterns use {@link java.util.regex.Pattern} as core, could group the input strings to matched group or return * original string. - * - * @author wusheng */ +@ToString public class StringFormatGroup { private final List rules; public StringFormatGroup() { - rules = new ArrayList(); + rules = new ArrayList<>(); } /** * Add a new match rule. The rule will follow the order of being added. * - * @param name will be used when ruleRegex matched. + * @param name will be used when ruleRegex matched. * @param ruleRegex to match target string. */ public void addRule(String name, String ruleRegex) { @@ -65,52 +68,22 @@ public FormatResult format(String string) { return new FormatResult(false, string); } - @Override public String toString() { - return "StringFormatGroup{" + - "rules=" + rules + - '}'; - } - + @Getter + @RequiredArgsConstructor public static class FormatResult { - private boolean match; - private String name; - - public FormatResult(boolean match, String name) { - this.match = match; - this.name = name; - } - - public boolean isMatch() { - return match; - } - - public String getName() { - return name; - } + private final boolean match; + private final String name; } + @Getter + @ToString private static class PatternRule { - private String name; - private Pattern pattern; + private final String name; + private final Pattern pattern; private PatternRule(String name, String ruleRegex) { this.name = name; pattern = Pattern.compile(ruleRegex); } - - public String getName() { - return name; - } - - public Pattern getPattern() { - return pattern; - } - - @Override public String toString() { - return "PatternRule{" + - "name='" + name + '\'' + - ", pattern=" + pattern + - '}'; - } } } diff --git a/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/ConfigInitializerTest.java b/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/ConfigInitializerTest.java index 75a69c893788..2dbb590e1fa8 100644 --- a/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/ConfigInitializerTest.java +++ b/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/ConfigInitializerTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.util; import org.junit.Assert; @@ -26,9 +25,6 @@ import java.util.List; import java.util.Properties; -/** - * Created by wusheng on 2017/2/27. - */ public class ConfigInitializerTest { @Test public void testInitialize() throws IllegalAccessException { @@ -47,7 +43,7 @@ public void testInitialize() throws IllegalAccessException { Assert.assertEquals(1000, TestPropertiesObject.Level1Object.Level2Object.INT_ATTR); Assert.assertEquals(1000L, TestPropertiesObject.Level1Object.Level2Object.LONG_ATTR); Assert.assertEquals(true, TestPropertiesObject.Level1Object.Level2Object.BOOLEAN_ATTR); - Assert.assertArrayEquals(new String[]{}, TestPropertiesObject.Level1Object.LIST_EMPTY_ATTR.toArray()); + Assert.assertArrayEquals(new String[] {}, TestPropertiesObject.Level1Object.LIST_EMPTY_ATTR.toArray()); Assert.assertEquals(TestColorEnum.RED, TestPropertiesObject.Level1Object.Level2Object.ENUM_ATTR); //make sure that when descs is empty,toString() work right; Assert.assertEquals(new ConfigDesc().toString(), ""); diff --git a/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/MachineInfoTest.java b/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/MachineInfoTest.java index b228104ac406..7bf074293b16 100644 --- a/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/MachineInfoTest.java +++ b/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/MachineInfoTest.java @@ -21,9 +21,6 @@ import org.junit.Assert; import org.junit.Test; -/** - * @author lican - */ public class MachineInfoTest { @Test diff --git a/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/RunnableWithExceptionProtectionTest.java b/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/RunnableWithExceptionProtectionTest.java index 5f0c1e4d747d..b3cbfa9b4dae 100644 --- a/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/RunnableWithExceptionProtectionTest.java +++ b/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/RunnableWithExceptionProtectionTest.java @@ -21,9 +21,6 @@ import org.junit.Assert; import org.junit.Test; -/** - * @author lican - */ public class RunnableWithExceptionProtectionTest { @Test diff --git a/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/StringFormatGroupTest.java b/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/StringFormatGroupTest.java index 4640220b8535..c573e5432348 100644 --- a/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/StringFormatGroupTest.java +++ b/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/StringFormatGroupTest.java @@ -19,10 +19,16 @@ package org.apache.skywalking.apm.util; import java.util.concurrent.TimeUnit; -import org.junit.*; -import org.openjdk.jmh.annotations.*; -import org.openjdk.jmh.runner.*; -import org.openjdk.jmh.runner.options.*; +import org.junit.Assert; +import org.junit.Test; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.OutputTimeUnit; +import org.openjdk.jmh.runner.Runner; +import org.openjdk.jmh.runner.RunnerException; +import org.openjdk.jmh.runner.options.Options; +import org.openjdk.jmh.runner.options.OptionsBuilder; public class StringFormatGroupTest { @Benchmark @@ -49,20 +55,16 @@ public void test100Rule() { } /** - * The report below shows this pattern match performance is much about rule numbers. - * This is a single thread test. - * - * @throws RunnerException + * The report below shows this pattern match performance is much about rule numbers. This is a single thread test. */ @BenchmarkMode(Mode.AverageTime) @OutputTimeUnit(TimeUnit.MICROSECONDS) public void performanceBenchmark() throws RunnerException { - Options opt = new OptionsBuilder() - .include(StringFormatGroupTest.class.getSimpleName()) - .forks(1) - .warmupIterations(0) - .measurementIterations(5) - .build(); + Options opt = new OptionsBuilder().include(StringFormatGroupTest.class.getSimpleName()) + .forks(1) + .warmupIterations(0) + .measurementIterations(5) + .build(); new Runner(opt).run(); } diff --git a/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/StringUtilTest.java b/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/StringUtilTest.java index e5158a3a3705..e1b968dbb15d 100644 --- a/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/StringUtilTest.java +++ b/apm-commons/apm-util/src/test/java/org/apache/skywalking/apm/util/StringUtilTest.java @@ -16,15 +16,11 @@ * */ - package org.apache.skywalking.apm.util; import org.junit.Assert; import org.junit.Test; -/** - * Created by wusheng on 2017/2/27. - */ public class StringUtilTest { @Test public void testIsEmpty() { diff --git a/apm-commons/pom.xml b/apm-commons/pom.xml index 5c0330ecf0d4..c55a705ae6cc 100644 --- a/apm-commons/pom.xml +++ b/apm-commons/pom.xml @@ -16,7 +16,8 @@ ~ --> - + apm org.apache.skywalking diff --git a/apm-dist-es7/pom.xml b/apm-dist-es7/pom.xml index b505db55586c..5cda4f0624c1 100644 --- a/apm-dist-es7/pom.xml +++ b/apm-dist-es7/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm org.apache.skywalking @@ -107,7 +108,9 @@ - + diff --git a/apm-protocol/apm-network/pom.xml b/apm-protocol/apm-network/pom.xml index 3221a1dcbb48..bc8c2553cd55 100644 --- a/apm-protocol/apm-network/pom.xml +++ b/apm-protocol/apm-network/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-protocol org.apache.skywalking @@ -80,10 +81,12 @@ protobuf-java directly, you will be transitively depending on the protobuf-java version that grpc depends on. --> - com.google.protobuf:protoc:${com.google.protobuf.protoc.version}:exe:${os.detected.classifier} + + com.google.protobuf:protoc:${com.google.protobuf.protoc.version}:exe:${os.detected.classifier} grpc-java - io.grpc:protoc-gen-grpc-java:${protoc-gen-grpc-java.plugin.version}:exe:${os.detected.classifier} + + io.grpc:protoc-gen-grpc-java:${protoc-gen-grpc-java.plugin.version}:exe:${os.detected.classifier} diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/ProtocolVersion.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/ProtocolVersion.java index 899c28109854..e9b5b0100671 100644 --- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/ProtocolVersion.java +++ b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/ProtocolVersion.java @@ -20,8 +20,6 @@ /** * The version of the protocol between agent and backend. - * - * @author kezhenxu94 */ public enum ProtocolVersion { V2(2); diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/constants/ProfileConstants.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/constants/ProfileConstants.java index 6e6f7aca5221..0745cc05f22f 100644 --- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/constants/ProfileConstants.java +++ b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/constants/ProfileConstants.java @@ -15,12 +15,11 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.network.constants; /** * profile task limit constants - * - * @author MrPro */ public class ProfileConstants { diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/Component.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/Component.java index b2f118d8ef48..1a6d2dbcd265 100644 --- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/Component.java +++ b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/Component.java @@ -16,16 +16,12 @@ * */ - package org.apache.skywalking.apm.network.trace.component; /** - * The Component represents component library, - * which has been supported by skywalking sniffer. - * + * The Component represents component library, which has been supported by skywalking sniffer. + *

* The supported list is in {@link ComponentsDefine}. - * - * @author wusheng */ public interface Component { int getId(); diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java index 40812232484c..296b8dd32e36 100755 --- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java +++ b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java @@ -16,13 +16,10 @@ * */ - package org.apache.skywalking.apm.network.trace.component; /** * The supported list of skywalking java sniffer. - * - * @author wusheng */ public class ComponentsDefine { @@ -64,11 +61,11 @@ public class ComponentsDefine { public static final OfficialComponent SERVICECOMB = new OfficialComponent(28, "ServiceComb"); - public static final OfficialComponent HYSTRIX = new OfficialComponent(29, "Hystrix"); + public static final OfficialComponent HYSTRIX = new OfficialComponent(29, "Hystrix"); - public static final OfficialComponent JEDIS = new OfficialComponent(30, "Jedis"); + public static final OfficialComponent JEDIS = new OfficialComponent(30, "Jedis"); - public static final OfficialComponent H2_JDBC_DRIVER = new OfficialComponent(32, "jdbc-jdbc-driver"); + public static final OfficialComponent H2_JDBC_DRIVER = new OfficialComponent(32, "jdbc-jdbc-driver"); public static final OfficialComponent MYSQL_JDBC_DRIVER = new OfficialComponent(33, "mysql-connector-java"); @@ -90,39 +87,39 @@ public class ComponentsDefine { public static final OfficialComponent MONGO_DRIVER = new OfficialComponent(42, "mongodb-driver"); - public static final OfficialComponent SOFARPC = new OfficialComponent(43, "SOFARPC"); + public static final OfficialComponent SOFARPC = new OfficialComponent(43, "SOFARPC"); + + public static final OfficialComponent ACTIVEMQ_PRODUCER = new OfficialComponent(45, "activemq-producer"); - public static final OfficialComponent ACTIVEMQ_PRODUCER = new OfficialComponent(45,"activemq-producer"); + public static final OfficialComponent ACTIVEMQ_CONSUMER = new OfficialComponent(46, "activemq-consumer"); - public static final OfficialComponent ACTIVEMQ_CONSUMER = new OfficialComponent(46,"activemq-consumer"); + public static final OfficialComponent TRANSPORT_CLIENT = new OfficialComponent(48, "transport-client"); - public static final OfficialComponent TRANSPORT_CLIENT = new OfficialComponent(48, "transport-client"); + public static final OfficialComponent UNDERTOW = new OfficialComponent(49, "Undertow"); - public static final OfficialComponent UNDERTOW = new OfficialComponent(49, "Undertow"); + public static final OfficialComponent RABBITMQ_PRODUCER = new OfficialComponent(52, "rabbitmq-producer"); - public static final OfficialComponent RABBITMQ_PRODUCER = new OfficialComponent(52,"rabbitmq-producer"); + public static final OfficialComponent RABBITMQ_CONSUMER = new OfficialComponent(53, "rabbitmq-consumer"); - public static final OfficialComponent RABBITMQ_CONSUMER = new OfficialComponent(53,"rabbitmq-consumer"); + public static final OfficialComponent CANAL = new OfficialComponent(54, "Canal"); - public static final OfficialComponent CANAL = new OfficialComponent(54,"Canal"); - - public static final OfficialComponent GSON = new OfficialComponent(55,"Gson"); - - public static final OfficialComponent REDISSON = new OfficialComponent(56, "Redisson"); + public static final OfficialComponent GSON = new OfficialComponent(55, "Gson"); - public static final OfficialComponent LETTUCE = new OfficialComponent(57, "Lettuce"); + public static final OfficialComponent REDISSON = new OfficialComponent(56, "Redisson"); - public static final OfficialComponent ZOOKEEPER = new OfficialComponent(58, "Zookeeper"); + public static final OfficialComponent LETTUCE = new OfficialComponent(57, "Lettuce"); - public static final OfficialComponent VERTX = new OfficialComponent(59, "Vert.x"); + public static final OfficialComponent ZOOKEEPER = new OfficialComponent(58, "Zookeeper"); + + public static final OfficialComponent VERTX = new OfficialComponent(59, "Vert.x"); public static final OfficialComponent SHARDING_SPHERE = new OfficialComponent(60, "ShardingSphere"); - public static final OfficialComponent SPRING_CLOUD_GATEWAY = new OfficialComponent(61, "spring-cloud-gateway"); + public static final OfficialComponent SPRING_CLOUD_GATEWAY = new OfficialComponent(61, "spring-cloud-gateway"); - public static final OfficialComponent RESTEASY = new OfficialComponent(62, "RESTEasy"); + public static final OfficialComponent RESTEASY = new OfficialComponent(62, "RESTEasy"); - public static final OfficialComponent SOLRJ = new OfficialComponent(63, "solrj"); + public static final OfficialComponent SOLRJ = new OfficialComponent(63, "solrj"); public static final OfficialComponent SPRING_ASYNC = new OfficialComponent(65, "SpringAsync"); @@ -133,7 +130,7 @@ public class ComponentsDefine { public static final OfficialComponent PLAY = new OfficialComponent(68, "Play"); public static final OfficialComponent CASSANDRA_JAVA_DRIVER = new OfficialComponent(69, "cassandra-java-driver"); - + public static final OfficialComponent LIGHT_4J = new OfficialComponent(71, "Light4J"); public static final OfficialComponent PULSAR_PRODUCER = new OfficialComponent(73, "pulsar-producer"); diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/OfficialComponent.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/OfficialComponent.java index 3c94ae485e7e..57be115b5cb0 100644 --- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/OfficialComponent.java +++ b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/OfficialComponent.java @@ -16,12 +16,8 @@ * */ - package org.apache.skywalking.apm.network.trace.component; -/** - * @author wusheng - */ public class OfficialComponent implements Component { private int id; private String name; diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/BaseCommand.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/BaseCommand.java index 0e98338edf82..658cdeb08d26 100644 --- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/BaseCommand.java +++ b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/BaseCommand.java @@ -18,11 +18,9 @@ package org.apache.skywalking.apm.network.trace.component.command; -import org.apache.skywalking.apm.network.common.*; +import org.apache.skywalking.apm.network.common.Command; +import org.apache.skywalking.apm.network.common.KeyStringValuePair; -/** - * @author peng-yongsheng - */ public abstract class BaseCommand { private final String command; diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/CommandDeserializer.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/CommandDeserializer.java index 7824f49e48e5..ebf4e54478f9 100644 --- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/CommandDeserializer.java +++ b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/CommandDeserializer.java @@ -19,9 +19,6 @@ import org.apache.skywalking.apm.network.common.Command; -/** - * @author kezhenxu94 - */ public class CommandDeserializer { public static BaseCommand deserialize(final Command command) { diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/Deserializable.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/Deserializable.java index 8c8a00bdea70..b91b83840ae9 100644 --- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/Deserializable.java +++ b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/Deserializable.java @@ -20,9 +20,6 @@ import org.apache.skywalking.apm.network.common.Command; -/** - * @author peng-yongsheng - */ public interface Deserializable { T deserialize(Command command); } diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/EndpointResetCommand.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/EndpointResetCommand.java index 83fc129cb92f..6dda8ffcd5bb 100644 --- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/EndpointResetCommand.java +++ b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/EndpointResetCommand.java @@ -18,13 +18,12 @@ package org.apache.skywalking.apm.network.trace.component.command; -import org.apache.skywalking.apm.network.common.*; +import org.apache.skywalking.apm.network.common.Command; +import org.apache.skywalking.apm.network.common.KeyStringValuePair; /** - * Remove the specified endpoint names from endpoint metadata cache, and re-register it. - * If not specified, clear whole endpoint metadata cache. - * - * @author peng-yongsheng + * Remove the specified endpoint names from endpoint metadata cache, and re-register it. If not specified, clear whole + * endpoint metadata cache. */ public class EndpointResetCommand extends BaseCommand implements Serializable { @@ -32,7 +31,8 @@ public EndpointResetCommand(String serialNumber) { super("EndpointMetadataReset", serialNumber); } - @Override public Command.Builder serialize() { + @Override + public Command.Builder serialize() { return commandBuilder(); } diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/InstanceResetCommand.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/InstanceResetCommand.java index 7c06828dcfa6..2e187d0761ff 100644 --- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/InstanceResetCommand.java +++ b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/InstanceResetCommand.java @@ -22,8 +22,6 @@ /** * Clear the service instance metadata cache, and re-register it. - * - * @author peng-yongsheng */ public class InstanceResetCommand extends BaseCommand implements Serializable { @@ -31,7 +29,8 @@ public InstanceResetCommand(String serialNumber) { super("InstanceMetadataReset", serialNumber); } - @Override public Command.Builder serialize() { + @Override + public Command.Builder serialize() { return commandBuilder(); } } diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/NetworkResetCommand.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/NetworkResetCommand.java index 2faca4854e30..04a41b8fd02c 100644 --- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/NetworkResetCommand.java +++ b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/NetworkResetCommand.java @@ -18,13 +18,12 @@ package org.apache.skywalking.apm.network.trace.component.command; -import org.apache.skywalking.apm.network.common.*; +import org.apache.skywalking.apm.network.common.Command; +import org.apache.skywalking.apm.network.common.KeyStringValuePair; /** - * Remove the specified network addresses from network address metadata cache, and re-register it. - * If not specified, clear whole network address metadata cache. - * - * @author peng-yongsheng + * Remove the specified network addresses from network address metadata cache, and re-register it. If not specified, + * clear whole network address metadata cache. */ public class NetworkResetCommand extends BaseCommand implements Serializable { @@ -32,7 +31,8 @@ public NetworkResetCommand(String serialNumber) { super("NetworkAddressMetadataReset", serialNumber); } - @Override public Command.Builder serialize() { + @Override + public Command.Builder serialize() { return commandBuilder(); } diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/ProfileTaskCommand.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/ProfileTaskCommand.java index f595fda65d2b..0bd6855390c1 100644 --- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/ProfileTaskCommand.java +++ b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/ProfileTaskCommand.java @@ -23,9 +23,6 @@ import java.util.List; -/** - * @author MrPro - */ public class ProfileTaskCommand extends BaseCommand implements Serializable, Deserializable { public static final Deserializable DESERIALIZER = new ProfileTaskCommand("", "", "", 0, 0, 0, 0, 0, 0); public static final String NAME = "ProfileTaskQuery"; @@ -40,7 +37,8 @@ public class ProfileTaskCommand extends BaseCommand implements Serializable, Des private long startTime; private long createTime; - public ProfileTaskCommand(String serialNumber, String taskId, String endpointName, int duration, int minDurationThreshold, int dumpPeriod, int maxSamplingCount, long startTime, long createTime) { + public ProfileTaskCommand(String serialNumber, String taskId, String endpointName, int duration, + int minDurationThreshold, int dumpPeriod, int maxSamplingCount, long startTime, long createTime) { super(NAME, serialNumber); this.taskId = taskId; this.endpointName = endpointName; @@ -94,13 +92,17 @@ public ProfileTaskCommand deserialize(Command command) { public Command.Builder serialize() { final Command.Builder builder = commandBuilder(); builder.addArgs(KeyStringValuePair.newBuilder().setKey("TaskId").setValue(taskId)) - .addArgs(KeyStringValuePair.newBuilder().setKey("EndpointName").setValue(endpointName)) - .addArgs(KeyStringValuePair.newBuilder().setKey("Duration").setValue(String.valueOf(duration))) - .addArgs(KeyStringValuePair.newBuilder().setKey("MinDurationThreshold").setValue(String.valueOf(minDurationThreshold))) - .addArgs(KeyStringValuePair.newBuilder().setKey("DumpPeriod").setValue(String.valueOf(dumpPeriod))) - .addArgs(KeyStringValuePair.newBuilder().setKey("MaxSamplingCount").setValue(String.valueOf(maxSamplingCount))) - .addArgs(KeyStringValuePair.newBuilder().setKey("StartTime").setValue(String.valueOf(startTime))) - .addArgs(KeyStringValuePair.newBuilder().setKey("CreateTime").setValue(String.valueOf(createTime))); + .addArgs(KeyStringValuePair.newBuilder().setKey("EndpointName").setValue(endpointName)) + .addArgs(KeyStringValuePair.newBuilder().setKey("Duration").setValue(String.valueOf(duration))) + .addArgs(KeyStringValuePair.newBuilder() + .setKey("MinDurationThreshold") + .setValue(String.valueOf(minDurationThreshold))) + .addArgs(KeyStringValuePair.newBuilder().setKey("DumpPeriod").setValue(String.valueOf(dumpPeriod))) + .addArgs(KeyStringValuePair.newBuilder() + .setKey("MaxSamplingCount") + .setValue(String.valueOf(maxSamplingCount))) + .addArgs(KeyStringValuePair.newBuilder().setKey("StartTime").setValue(String.valueOf(startTime))) + .addArgs(KeyStringValuePair.newBuilder().setKey("CreateTime").setValue(String.valueOf(createTime))); return builder; } diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/Serializable.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/Serializable.java index 9aaae541cce6..20abf88bfd0a 100644 --- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/Serializable.java +++ b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/Serializable.java @@ -20,9 +20,6 @@ import org.apache.skywalking.apm.network.common.Command; -/** - * @author peng-yongsheng - */ public interface Serializable { Command.Builder serialize(); } diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/ServiceResetCommand.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/ServiceResetCommand.java index 360c2465f8fa..a80f82218c5b 100644 --- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/ServiceResetCommand.java +++ b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/ServiceResetCommand.java @@ -25,8 +25,6 @@ /** * Clear the service metadata cache and other metadata caches belong to it, and re-register them. - * - * @author peng-yongsheng */ public class ServiceResetCommand extends BaseCommand implements Serializable, Deserializable { public static final Deserializable DESERIALIZER = new ServiceResetCommand(""); diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/TraceIgnoreCommand.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/TraceIgnoreCommand.java index 0a074f6e2248..6bf9f596b909 100644 --- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/TraceIgnoreCommand.java +++ b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/TraceIgnoreCommand.java @@ -18,12 +18,11 @@ package org.apache.skywalking.apm.network.trace.component.command; -import org.apache.skywalking.apm.network.common.*; +import org.apache.skywalking.apm.network.common.Command; +import org.apache.skywalking.apm.network.common.KeyStringValuePair; /** * Trace ignore sync, each configuration downstream is the full amount of data related to the received agent. - * - * @author peng-yongsheng */ public class TraceIgnoreCommand extends BaseCommand implements Serializable { @@ -31,7 +30,8 @@ public TraceIgnoreCommand(String serialNumber) { super("TraceIgnore", serialNumber); } - @Override public Command.Builder serialize() { + @Override + public Command.Builder serialize() { return commandBuilder(); } diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/UnsupportedCommandException.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/UnsupportedCommandException.java index d8265c8304ba..b014da402944 100644 --- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/UnsupportedCommandException.java +++ b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/UnsupportedCommandException.java @@ -19,9 +19,6 @@ import org.apache.skywalking.apm.network.common.Command; -/** - * @author kezhenxu94 - */ public class UnsupportedCommandException extends RuntimeException { private final Command command; diff --git a/apm-protocol/apm-network/src/test/java/org/apache/skywalking/api/network/trace/component/command/ServiceResetCommandTest.java b/apm-protocol/apm-network/src/test/java/org/apache/skywalking/api/network/trace/component/command/ServiceResetCommandTest.java index 91f128a25913..06af5725ff59 100644 --- a/apm-protocol/apm-network/src/test/java/org/apache/skywalking/api/network/trace/component/command/ServiceResetCommandTest.java +++ b/apm-protocol/apm-network/src/test/java/org/apache/skywalking/api/network/trace/component/command/ServiceResetCommandTest.java @@ -24,9 +24,6 @@ import org.junit.Assert; import org.junit.Test; -/** - * @author jsbxyyx - */ public class ServiceResetCommandTest { @Test @@ -43,8 +40,8 @@ public void deserialize_NullPointerException_CommandKeyIsNotSerialNumber() throw ServiceResetCommand command = new ServiceResetCommand("aa"); Command command1 = Command.newBuilder() - .addArgs(KeyStringValuePair.newBuilder().setKey("aa").setValue("aa").build()) - .build(); + .addArgs(KeyStringValuePair.newBuilder().setKey("aa").setValue("aa").build()) + .build(); boolean exception = false; try { command.deserialize(command1); @@ -59,8 +56,11 @@ public void deserialize_SerialNumberCompare_CommandKeyIsSerialNumberValueIsaa() ServiceResetCommand command = new ServiceResetCommand("aa"); Command command2 = Command.newBuilder() - .addArgs(KeyStringValuePair.newBuilder().setKey("SerialNumber").setValue("aa").build()) - .build(); + .addArgs(KeyStringValuePair.newBuilder() + .setKey("SerialNumber") + .setValue("aa") + .build()) + .build(); ServiceResetCommand deserialize2 = command.deserialize(command2); Assert.assertEquals("aa", deserialize2.getSerialNumber()); } diff --git a/apm-protocol/apm-network/src/test/java/org/apache/skywalking/apm/network/trace/proto/GRPCNoServerTest.java b/apm-protocol/apm-network/src/test/java/org/apache/skywalking/apm/network/trace/proto/GRPCNoServerTest.java index d27914b9549f..350f53394e18 100644 --- a/apm-protocol/apm-network/src/test/java/org/apache/skywalking/apm/network/trace/proto/GRPCNoServerTest.java +++ b/apm-protocol/apm-network/src/test/java/org/apache/skywalking/apm/network/trace/proto/GRPCNoServerTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.network.trace.proto; import io.grpc.ManagedChannel; @@ -27,33 +26,32 @@ import io.grpc.netty.NettyChannelBuilder; import io.grpc.stub.StreamObserver; import org.apache.skywalking.apm.network.common.Commands; +import org.apache.skywalking.apm.network.language.agent.UpstreamSegment; import org.apache.skywalking.apm.network.language.agent.v2.TraceSegmentReportServiceGrpc; import org.junit.Assert; -import org.apache.skywalking.apm.network.language.agent.UpstreamSegment; -/** - * @author wusheng - */ public class GRPCNoServerTest { public static void main(String[] args) throws InterruptedException { - ManagedChannelBuilder channelBuilder = - NettyChannelBuilder.forAddress("127.0.0.1", 8080) - .nameResolverFactory(new DnsNameResolverProvider()) - .maxInboundMessageSize(1024 * 1024 * 50) - .usePlaintext(); + ManagedChannelBuilder channelBuilder = NettyChannelBuilder.forAddress("127.0.0.1", 8080) + .nameResolverFactory(new DnsNameResolverProvider()) + .maxInboundMessageSize(1024 * 1024 * 50) + .usePlaintext(); ManagedChannel channel = channelBuilder.build(); TraceSegmentReportServiceGrpc.TraceSegmentReportServiceStub serviceStub = TraceSegmentReportServiceGrpc.newStub(channel); final Status[] status = {null}; StreamObserver streamObserver = serviceStub.collect(new StreamObserver() { - @Override public void onNext(Commands value) { + @Override + public void onNext(Commands value) { } - @Override public void onError(Throwable t) { - status[0] = ((StatusRuntimeException)t).getStatus(); + @Override + public void onError(Throwable t) { + status[0] = ((StatusRuntimeException) t).getStatus(); } - @Override public void onCompleted() { + @Override + public void onCompleted() { } }); diff --git a/apm-protocol/pom.xml b/apm-protocol/pom.xml index 367b5755951c..f5fd77ee892a 100644 --- a/apm-protocol/pom.xml +++ b/apm-protocol/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm org.apache.skywalking diff --git a/apm-sniffer/apm-agent-core/pom.xml b/apm-sniffer/apm-agent-core/pom.xml index 386bead99207..bb60cc0db82d 100644 --- a/apm-sniffer/apm-agent-core/pom.xml +++ b/apm-sniffer/apm-agent-core/pom.xml @@ -16,7 +16,8 @@ ~ --> - + 4.0.0 @@ -181,7 +182,8 @@ - + @@ -197,7 +199,7 @@ - + @@ -206,14 +208,22 @@ package - - - - - - - - + + + + + + + + diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/base64/Base64.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/base64/Base64.java index 11d8d6563c6b..02f3f46fd072 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/base64/Base64.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/base64/Base64.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.agent.core.base64; import java.nio.charset.StandardCharsets; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/AgentPackageNotFoundException.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/AgentPackageNotFoundException.java index 50ab184c0b20..b9249ba2732a 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/AgentPackageNotFoundException.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/AgentPackageNotFoundException.java @@ -16,12 +16,8 @@ * */ - package org.apache.skywalking.apm.agent.core.boot; -/** - * @author wusheng - */ public class AgentPackageNotFoundException extends Exception { public AgentPackageNotFoundException(String message) { super(message); diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/AgentPackagePath.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/AgentPackagePath.java index f391a2ecef46..b4bafe5bacbe 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/AgentPackagePath.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/AgentPackagePath.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.boot; import java.net.URISyntaxException; @@ -27,9 +26,6 @@ import java.net.MalformedURLException; import java.net.URL; -/** - * @author wusheng - */ public class AgentPackagePath { private static final ILog logger = LogManager.getLogger(AgentPackagePath.class); @@ -63,9 +59,7 @@ private static File findPath() throws AgentPackageNotFoundException { File agentJarFile = null; try { agentJarFile = new File(new URL(urlString).toURI()); - } catch (MalformedURLException e) { - logger.error(e, "Can not locate agent jar file by url:" + urlString); - } catch (URISyntaxException e) { + } catch (MalformedURLException | URISyntaxException e) { logger.error(e, "Can not locate agent jar file by url:" + urlString); } if (agentJarFile.exists()) { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/BootService.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/BootService.java index 57932caba81f..eae8a5c6aed4 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/BootService.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/BootService.java @@ -16,15 +16,11 @@ * */ - package org.apache.skywalking.apm.agent.core.boot; /** - * The BootService is an interface to all remote, which need to boot when plugin mechanism begins to - * work. + * The BootService is an interface to all remote, which need to boot when plugin mechanism begins to work. * {@link #boot()} will be called when BootService start up. - * - * @author wusheng */ public interface BootService { void prepare() throws Throwable; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/DefaultImplementor.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/DefaultImplementor.java index 11de3816f6b2..0b5694fed337 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/DefaultImplementor.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/DefaultImplementor.java @@ -23,9 +23,6 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -/** - * @author wusheng - */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface DefaultImplementor { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/DefaultNamedThreadFactory.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/DefaultNamedThreadFactory.java index 588ca9a4deb6..e255d94ee95e 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/DefaultNamedThreadFactory.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/DefaultNamedThreadFactory.java @@ -21,19 +21,18 @@ import java.util.concurrent.ThreadFactory; import java.util.concurrent.atomic.AtomicInteger; -/** - * @author zhangkewei - */ public class DefaultNamedThreadFactory implements ThreadFactory { private static final AtomicInteger BOOT_SERVICE_SEQ = new AtomicInteger(0); private final AtomicInteger threadSeq = new AtomicInteger(0); private final String namePrefix; + public DefaultNamedThreadFactory(String name) { namePrefix = "SkywalkingAgent-" + BOOT_SERVICE_SEQ.incrementAndGet() + "-" + name + "-"; } + @Override public Thread newThread(Runnable r) { - Thread t = new Thread(r,namePrefix + threadSeq.getAndIncrement()); + Thread t = new Thread(r, namePrefix + threadSeq.getAndIncrement()); t.setDaemon(true); return t; } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/OverrideImplementor.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/OverrideImplementor.java index f3b63677aa7f..11e84648b04f 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/OverrideImplementor.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/OverrideImplementor.java @@ -23,9 +23,6 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -/** - * @author wusheng - */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface OverrideImplementor { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/ServiceConflictException.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/ServiceConflictException.java index 5f8a9bde1ec5..a9133229217c 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/ServiceConflictException.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/ServiceConflictException.java @@ -18,9 +18,6 @@ package org.apache.skywalking.apm.agent.core.boot; -/** - * @author wusheng - */ public class ServiceConflictException extends RuntimeException { public ServiceConflictException(String message) { super(message); diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/ServiceManager.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/ServiceManager.java index 638bcc6341b0..97cc0e5f83a0 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/ServiceManager.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/boot/ServiceManager.java @@ -19,7 +19,6 @@ package org.apache.skywalking.apm.agent.core.boot; import java.util.Collections; -import java.util.Iterator; import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; @@ -30,10 +29,7 @@ import org.apache.skywalking.apm.agent.core.plugin.loader.AgentClassLoader; /** - * The ServiceManager bases on {@link ServiceLoader}, - * load all {@link BootService} implementations. - * - * @author wusheng + * The ServiceManager bases on {@link ServiceLoader}, load all {@link BootService} implementations. */ public enum ServiceManager { INSTANCE; @@ -60,13 +56,10 @@ public void shutdown() { } private Map loadAllServices() { - Map bootedServices = new LinkedHashMap(); - List allServices = new LinkedList(); + Map bootedServices = new LinkedHashMap<>(); + List allServices = new LinkedList<>(); load(allServices); - Iterator serviceIterator = allServices.iterator(); - while (serviceIterator.hasNext()) { - BootService bootService = serviceIterator.next(); - + for (final BootService bootService : allServices) { Class bootServiceClass = bootService.getClass(); boolean isDefaultImplementor = bootServiceClass.isAnnotationPresent(DefaultImplementor.class); if (isDefaultImplementor) { @@ -86,12 +79,14 @@ private Map loadAllServices() { } else { Class targetService = overrideImplementor.value(); if (bootedServices.containsKey(targetService)) { - boolean presentDefault = bootedServices.get(targetService).getClass().isAnnotationPresent(DefaultImplementor.class); + boolean presentDefault = bootedServices.get(targetService) + .getClass() + .isAnnotationPresent(DefaultImplementor.class); if (presentDefault) { bootedServices.put(targetService, bootService); } else { - throw new ServiceConflictException("Service " + bootServiceClass + " overrides conflict, " + - "exist more than one service want to override :" + targetService); + throw new ServiceConflictException( + "Service " + bootServiceClass + " overrides conflict, " + "exist more than one service want to override :" + targetService); } } else { bootedServices.put(targetService, bootService); @@ -137,17 +132,16 @@ private void onComplete() { * Find a {@link BootService} implementation, which is already started. * * @param serviceClass class name. - * @param {@link BootService} implementation class. + * @param {@link BootService} implementation class. * @return {@link BootService} instance */ public T findService(Class serviceClass) { - return (T)bootedServices.get(serviceClass); + return (T) bootedServices.get(serviceClass); } void load(List allServices) { - Iterator iterator = ServiceLoader.load(BootService.class, AgentClassLoader.getDefault()).iterator(); - while (iterator.hasNext()) { - allServices.add(iterator.next()); + for (final BootService bootService : ServiceLoader.load(BootService.class, AgentClassLoader.getDefault())) { + allServices.add(bootService); } } } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandExecutionException.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandExecutionException.java index e8b6e1e0b180..311239d7db7f 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandExecutionException.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandExecutionException.java @@ -21,16 +21,12 @@ /** * Indicates that the execution of a command failed - * - * @author Zhang Xin - * @author kezhenxu94 */ public class CommandExecutionException extends Throwable { private final Command command; /** - * Constructs a new {@code ExecuteFailedException} with null detail message - * and the command whose execution failed + * Constructs a new {@code ExecuteFailedException} with null detail message and the command whose execution failed * * @param command the command whose execution failed */ @@ -39,8 +35,7 @@ public CommandExecutionException(final Command command) { } /** - * Constructs a new {@code ExecuteFailedException} with given detail message - * and the command whose execution failed + * Constructs a new {@code ExecuteFailedException} with given detail message and the command whose execution failed * * @param message the detail message of the exception * @param command the command whose execution failed diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandExecutor.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandExecutor.java index 58fc44964356..1a60706c072e 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandExecutor.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandExecutor.java @@ -20,11 +20,8 @@ import org.apache.skywalking.apm.network.trace.component.command.BaseCommand; /** - * Command executor that can handle a given command, implementations are required to be stateless, - * i.e. the previous execution of a command cannot affect the next execution of another command. - * - * @author Zhang Xin - * @author kezhenxu94 + * Command executor that can handle a given command, implementations are required to be stateless, i.e. the previous + * execution of a command cannot affect the next execution of another command. */ public interface CommandExecutor { /** diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandExecutorService.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandExecutorService.java index 09db9618d445..7ce57278ee25 100755 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandExecutorService.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandExecutorService.java @@ -30,16 +30,11 @@ import java.util.Map; /** - * Command executor service, acts like a routing executor that controls all commands' execution, - * is responsible for managing all the mappings between commands and their executors, - * one can simply invoke {@link #execute(BaseCommand)} and it will routes the - * command to corresponding executor. - * - * Registering command executor for new command in {@link #commandExecutorMap} - * is required to support new command. - * - * @author Zhang Xin - * @author kezhenxu94 + * Command executor service, acts like a routing executor that controls all commands' execution, is responsible for + * managing all the mappings between commands and their executors, one can simply invoke {@link #execute(BaseCommand)} + * and it will routes the command to corresponding executor. + *

+ * Registering command executor for new command in {@link #commandExecutorMap} is required to support new command. */ @DefaultImplementor public class CommandExecutorService implements BootService, CommandExecutor { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandSerialNumberCache.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandSerialNumberCache.java index 966ea58e52db..14c03a510c97 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandSerialNumberCache.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandSerialNumberCache.java @@ -20,9 +20,6 @@ import java.util.Deque; import java.util.concurrent.LinkedBlockingDeque; -/** - * @author Zhang Xin - */ public class CommandSerialNumberCache { private static final int DEFAULT_MAX_CAPACITY = 64; private final Deque queue; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandService.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandService.java index cde041fede3f..ed18f84316d6 100755 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandService.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/CommandService.java @@ -111,8 +111,8 @@ public void receiveCommand(Commands commands) { boolean success = this.commands.offer(baseCommand); if (!success && LOGGER.isWarnEnable()) { - LOGGER.warn("Command[{}, {}] cannot add to command list. because the command list is full.", - baseCommand.getCommand(), baseCommand.getSerialNumber()); + LOGGER.warn("Command[{}, {}] cannot add to command list. because the command list is full.", baseCommand + .getCommand(), baseCommand.getSerialNumber()); } } catch (UnsupportedCommandException e) { if (LOGGER.isWarnEnable()) { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/executor/ProfileTaskCommandExecutor.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/executor/ProfileTaskCommandExecutor.java index eb6212ca3e3d..f2838d6df148 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/executor/ProfileTaskCommandExecutor.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/executor/ProfileTaskCommandExecutor.java @@ -28,8 +28,6 @@ /** * Command executor that executes the {@link ProfileTaskCommand} command - * - * @author MrPro */ public class ProfileTaskCommandExecutor implements CommandExecutor { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/executor/ServiceResetCommandExecutor.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/executor/ServiceResetCommandExecutor.java index 99f2b647c4f8..4443ffbb2ca7 100755 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/executor/ServiceResetCommandExecutor.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/executor/ServiceResetCommandExecutor.java @@ -32,9 +32,6 @@ /** * Command executor that executes the {@link ServiceResetCommand} command - * - * @author Zhang Xin - * @author kezhenxu94 */ public class ServiceResetCommandExecutor implements CommandExecutor { private static final ILog LOGGER = LogManager.getLogger(ServiceResetCommandExecutor.class); diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java index d356e2bf1059..ee4f87e56a39 100755 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.conf; import org.apache.skywalking.apm.agent.core.context.trace.TraceSegment; @@ -29,8 +28,6 @@ /** * This is the core config in sniffer agent. - * - * @author wusheng */ public class Config { @@ -135,7 +132,8 @@ public static class Collector { public static class Profile { /** - * If true, skywalking agent will enable profile when user create a new profile task. Otherwise disable profile. + * If true, skywalking agent will enable profile when user create a new profile task. Otherwise disable + * profile. */ public static boolean ACTIVE = true; @@ -189,9 +187,9 @@ public static class Logging { public static String FILE_NAME = "skywalking-api.log"; /** - * Log files directory. Default is blank string, means, use "{theSkywalkingAgentJarDir}/logs " to output logs. + * Log files directory. Default is blank string, means, use "{theSkywalkingAgentJarDir}/logs " to output logs. * {theSkywalkingAgentJarDir} is the directory where the skywalking agent jar file is located. - * + *

* Ref to {@link WriterFactory#getLogWriter()} */ public static String DIR = ""; @@ -203,8 +201,8 @@ public static class Logging { public static int MAX_FILE_SIZE = 300 * 1024 * 1024; /** - * The max history log files. When rollover happened, if log files exceed this number, - * then the oldest file will be delete. Negative or zero means off, by default. + * The max history log files. When rollover happened, if log files exceed this number, then the oldest file will + * be delete. Negative or zero means off, by default. */ public static int MAX_HISTORY_FILES = -1; @@ -247,7 +245,7 @@ public static class MongoDB { /** * For the sake of performance, SkyWalking won't save the entire parameters string into the tag, but only * the first {@code FILTER_LENGTH_LIMIT} characters. - * + *

* Set a negative number to save the complete parameter string to the tag. */ public static int FILTER_LENGTH_LIMIT = 256; @@ -275,8 +273,7 @@ public static class Customize { public static class Tomcat { /** - * This config item controls that whether the Tomcat plugin should - * collect the parameters of the request. + * This config item controls that whether the Tomcat plugin should collect the parameters of the request. */ public static boolean COLLECT_HTTP_PARAMS = false; } @@ -289,8 +286,8 @@ public static class SpringMVC { public static boolean USE_QUALIFIED_NAME_AS_ENDPOINT_NAME = false; /** - * This config item controls that whether the SpringMVC plugin should - * collect the parameters of the request. + * This config item controls that whether the SpringMVC plugin should collect the parameters of the + * request. */ public static boolean COLLECT_HTTP_PARAMS = false; } @@ -312,7 +309,7 @@ public static class MySQL { /** * For the sake of performance, SkyWalking won't save the entire parameters string into the tag, but only * the first {@code SQL_PARAMETERS_MAX_LENGTH} characters. - * + *

* Set a negative number to save the complete parameter string to the tag. */ public static int SQL_PARAMETERS_MAX_LENGTH = 512; @@ -328,7 +325,7 @@ public static class POSTGRESQL { /** * For the sake of performance, SkyWalking won't save the entire parameters string into the tag, but only * the first {@code SQL_PARAMETERS_MAX_LENGTH} characters. - * + *

* Set a negative number to save the complete parameter string to the tag. */ public static int SQL_PARAMETERS_MAX_LENGTH = 512; @@ -357,9 +354,9 @@ public static class OPGroup { * * Keep this commented, just as a reminder that, it will be reused in a RPC server side plugin. */ -// public static class RestTemplate implements OPGroupDefinition { -// public static Map RULE = new HashMap(); -// } + // public static class RestTemplate implements OPGroupDefinition { + // public static Map RULE = new HashMap(); + // } } public static class Light4J { @@ -381,20 +378,18 @@ public static class SpringTransaction { public static class JdkThreading { /** - * Threading classes ({@link java.lang.Runnable} and {@link java.util.concurrent.Callable} - * and their subclasses, including anonymous inner classes) - * whose name matches any one of the {@code THREADING_CLASS_PREFIXES} (splitted by ,) - * will be instrumented + * Threading classes ({@link java.lang.Runnable} and {@link java.util.concurrent.Callable} and their + * subclasses, including anonymous inner classes) whose name matches any one of the {@code + * THREADING_CLASS_PREFIXES} (splitted by ,) will be instrumented */ public static String THREADING_CLASS_PREFIXES = ""; } public static class Http { /** - * When either {@link Tomcat#COLLECT_HTTP_PARAMS} or {@link SpringMVC#COLLECT_HTTP_PARAMS} - * is enabled, how many characters to keep and send to the OAP backend, - * use negative values to keep and send the complete parameters, - * NB. this config item is added for the sake of performance + * When either {@link Tomcat#COLLECT_HTTP_PARAMS} or {@link SpringMVC#COLLECT_HTTP_PARAMS} is enabled, how + * many characters to keep and send to the OAP backend, use negative values to keep and send the complete + * parameters, NB. this config item is added for the sake of performance */ public static int HTTP_PARAMS_LENGTH_THRESHOLD = 1024; } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/ConfigNotFoundException.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/ConfigNotFoundException.java index 93d9d01495e4..d4997c378d78 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/ConfigNotFoundException.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/ConfigNotFoundException.java @@ -16,12 +16,8 @@ * */ - package org.apache.skywalking.apm.agent.core.conf; -/** - * @author wusheng - */ public class ConfigNotFoundException extends Exception { public ConfigNotFoundException(String message, Throwable cause) { super(message, cause); diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/ConfigReadFailedException.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/ConfigReadFailedException.java deleted file mode 100644 index 00a5ca90c605..000000000000 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/ConfigReadFailedException.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package org.apache.skywalking.apm.agent.core.conf; - -public class ConfigReadFailedException extends Exception { - public ConfigReadFailedException(String message, Throwable parent) { - super(message, parent); - } -} diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Constants.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Constants.java index 8d8ae1279f6b..98baf0d6ef23 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Constants.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Constants.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.conf; public class Constants { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/OPGroupDefinition.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/OPGroupDefinition.java index 604205412f0b..ccffb61a3dab 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/OPGroupDefinition.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/OPGroupDefinition.java @@ -18,8 +18,5 @@ package org.apache.skywalking.apm.agent.core.conf; -/** - * @author wusheng - */ public interface OPGroupDefinition { } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/RemoteDownstreamConfig.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/RemoteDownstreamConfig.java index 210601b71b1d..bd27b98e7ab2 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/RemoteDownstreamConfig.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/RemoteDownstreamConfig.java @@ -16,16 +16,13 @@ * */ - package org.apache.skywalking.apm.agent.core.conf; import org.apache.skywalking.apm.agent.core.dictionary.DictionaryUtil; /** - * The RemoteDownstreamConfig includes configurations from collector side. - * All of them initialized null, Null-Value or empty collection. - * - * @author wusheng + * The RemoteDownstreamConfig includes configurations from collector side. All of them initialized null, + * Null-Value or empty collection. */ public class RemoteDownstreamConfig { public static class Agent { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/SnifferConfigInitializer.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/SnifferConfigInitializer.java index 9d8d9602dfb0..1c0d24e86fd6 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/SnifferConfigInitializer.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/SnifferConfigInitializer.java @@ -18,7 +18,16 @@ package org.apache.skywalking.apm.agent.core.conf; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.InputStream; +import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Properties; import org.apache.skywalking.apm.agent.core.boot.AgentPackageNotFoundException; import org.apache.skywalking.apm.agent.core.boot.AgentPackagePath; import org.apache.skywalking.apm.agent.core.logging.api.ILog; @@ -27,13 +36,8 @@ import org.apache.skywalking.apm.util.PropertyPlaceholderHelper; import org.apache.skywalking.apm.util.StringUtil; -import java.io.*; -import java.util.*; - /** * The SnifferConfigInitializer initializes all configs in several way. - * - * @author wusheng */ public class SnifferConfigInitializer { private static final ILog logger = LogManager.getLogger(SnifferConfigInitializer.class); @@ -47,9 +51,9 @@ public class SnifferConfigInitializer { * specified agent config path is not set , the agent will try to locate `agent.config`, which should be in the * /config directory of agent package. *

- * Also try to override the config by system.properties. All the keys in this place should - * start with {@link #ENV_KEY_PREFIX}. e.g. in env `skywalking.agent.service_name=yourAppName` to override - * `agent.service_name` in config file. + * Also try to override the config by system.properties. All the keys in this place should start with {@link + * #ENV_KEY_PREFIX}. e.g. in env `skywalking.agent.service_name=yourAppName` to override `agent.service_name` in + * config file. *

* At the end, `agent.service_name` and `collector.servers` must not be blank. */ @@ -58,7 +62,7 @@ public static void initialize(String agentOptions) { Properties properties = new Properties(); properties.load(configFileStream); for (String key : properties.stringPropertyNames()) { - String value = (String)properties.get(key); + String value = (String) properties.get(key); properties.put(key, PropertyPlaceholderHelper.INSTANCE.replacePlaceholders(value, properties)); } ConfigInitializer.initialize(properties, Config.class); @@ -142,11 +146,10 @@ public static boolean isInitCompleted() { } /** - * Override the config by system properties. The property key must start with `skywalking`, the result should be as same - * as in `agent.config` + * Override the config by system properties. The property key must start with `skywalking`, the result should be as + * same as in `agent.config` *

* such as: Property key of `agent.service_name` should be `skywalking.agent.service_name` - * */ private static void overrideConfigBySystemProp() throws IllegalAccessException { Properties properties = new Properties(); diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/AbstractTracerContext.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/AbstractTracerContext.java index 6c76873c1059..7ce1c59d98e2 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/AbstractTracerContext.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/AbstractTracerContext.java @@ -22,8 +22,6 @@ /** * The AbstractTracerContext represents the tracer context manager. - * - * @author wusheng */ public interface AbstractTracerContext { /** @@ -84,7 +82,7 @@ public interface AbstractTracerContext { * Create an exit span * * @param operationName most likely a service name of remote - * @param remotePeer the network id(ip:port, hostname:port or ip1:port1,ip2,port, etc.) + * @param remotePeer the network id(ip:port, hostname:port or ip1:port1,ip2,port, etc.) * @return the span represent an exit point of this segment. */ AbstractSpan createExitSpan(String operationName, String remotePeer); diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/AsyncSpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/AsyncSpan.java index 8e2483e23cad..e65287f162a4 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/AsyncSpan.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/AsyncSpan.java @@ -22,23 +22,20 @@ /** * Span could use these APIs to active and extend its lift cycle across thread. - * + *

* This is typical used in async plugin, especially RPC plugins. - * - * @author wusheng */ public interface AsyncSpan { /** * The span finish at current tracing context, but the current span is still alive, until {@link #asyncFinish} * called. - * + *

* This method must be called - * - * 1. In original thread(tracing context). - * 2. Current span is active span. - * + *

+ * 1. In original thread(tracing context). 2. Current span is active span. + *

* During alive, tags, logs and attributes of the span could be changed, in any thread. - * + *

* The execution times of {@link #prepareForAsync} and {@link #asyncFinish()} must match. * * @return the current span @@ -47,7 +44,7 @@ public interface AsyncSpan { /** * Notify the span, it could be finished. - * + *

* The execution times of {@link #prepareForAsync} and {@link #asyncFinish()} must match. * * @return the current span diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/CarrierItem.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/CarrierItem.java index 8cb146f1ce0f..bc1c1d2e1d08 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/CarrierItem.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/CarrierItem.java @@ -23,9 +23,6 @@ import static org.apache.skywalking.apm.agent.core.conf.Config.Agent.NAMESPACE; -/** - * @author wusheng - */ public class CarrierItem implements Iterator { private String headKey; private String headValue; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/CarrierItemHead.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/CarrierItemHead.java index d5a85514cb0f..f04a66161912 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/CarrierItemHead.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/CarrierItemHead.java @@ -16,12 +16,8 @@ * */ - package org.apache.skywalking.apm.agent.core.context; -/** - * @author wusheng - */ public class CarrierItemHead extends CarrierItem { public CarrierItemHead(CarrierItem next) { super("", "", next); diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextCarrier.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextCarrier.java index 03eaf0514a0b..fd3e079667f1 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextCarrier.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextCarrier.java @@ -31,7 +31,6 @@ * {@link ContextCarrier} is a data carrier of {@link TracingContext}. It holds the snapshot (current state) of {@link * TracingContext}. *

- * Created by wusheng on 2017/2/17. */ public class ContextCarrier implements Serializable { private ID traceSegmentId; @@ -83,7 +82,8 @@ public CarrierItem items() { */ String serialize(HeaderVersion version) { if (this.isValid(version)) { - return StringUtil.join('-', + return StringUtil.join( + '-', "1", Base64.encode(this.getPrimaryDistributedTraceId().encode()), Base64.encode(this.getTraceSegmentId().encode()), @@ -92,7 +92,8 @@ String serialize(HeaderVersion version) { this.getEntryServiceInstanceId() + "", Base64.encode(this.getPeerHost()), Base64.encode(this.getEntryEndpointName()), - Base64.encode(this.getParentEndpointName())); + Base64.encode(this.getParentEndpointName()) + ); } return ""; } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextManager.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextManager.java index 9a0dfa63913e..d6094921f8e8 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextManager.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextManager.java @@ -18,11 +18,14 @@ package org.apache.skywalking.apm.agent.core.context; -import org.apache.skywalking.apm.agent.core.boot.*; +import org.apache.skywalking.apm.agent.core.boot.BootService; +import org.apache.skywalking.apm.agent.core.boot.ServiceManager; import org.apache.skywalking.apm.agent.core.conf.RemoteDownstreamConfig; -import org.apache.skywalking.apm.agent.core.context.trace.*; +import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan; +import org.apache.skywalking.apm.agent.core.context.trace.TraceSegment; import org.apache.skywalking.apm.agent.core.dictionary.DictionaryUtil; -import org.apache.skywalking.apm.agent.core.logging.api.*; +import org.apache.skywalking.apm.agent.core.logging.api.ILog; +import org.apache.skywalking.apm.agent.core.logging.api.LogManager; import org.apache.skywalking.apm.agent.core.sampling.SamplingService; import org.apache.skywalking.apm.util.StringUtil; @@ -35,8 +38,6 @@ * https://github.com/opentracing/specification/blob/master/specification.md#references-between-spans * *

Also, {@link ContextManager} delegates to all {@link AbstractTracerContext}'s major methods. - * - * @author wusheng */ public class ContextManager implements BootService { private static final ILog logger = LogManager.getLogger(ContextManager.class); @@ -54,14 +55,13 @@ private static AbstractTracerContext getOrCreate(String operationName, boolean f context = new IgnoredTracerContext(); } else { if (RemoteDownstreamConfig.Agent.SERVICE_ID != DictionaryUtil.nullValue() - && RemoteDownstreamConfig.Agent.SERVICE_INSTANCE_ID != DictionaryUtil.nullValue() - ) { + && RemoteDownstreamConfig.Agent.SERVICE_INSTANCE_ID != DictionaryUtil.nullValue()) { if (EXTEND_SERVICE == null) { EXTEND_SERVICE = ServiceManager.INSTANCE.findService(ContextManagerExtendService.class); } context = EXTEND_SERVICE.createTraceContext(operationName, forceSampling); } else { - /** + /* * Can't register to collector, no need to trace anything. */ context = new IgnoredTracerContext(); @@ -125,8 +125,7 @@ public static AbstractSpan createExitSpan(String operationName, ContextCarrier c public static AbstractSpan createExitSpan(String operationName, String remotePeer) { operationName = StringUtil.cut(operationName, OPERATION_NAME_THRESHOLD); AbstractTracerContext context = getOrCreate(operationName, false); - AbstractSpan span = context.createExitSpan(operationName, remotePeer); - return span; + return context.createExitSpan(operationName, remotePeer); } public static void inject(ContextCarrier carrier) { @@ -165,21 +164,21 @@ public static AbstractTracerContext awaitFinishAsync(AbstractSpan span) { } /** - * If not sure has the active span, use this method, will be cause NPE when has no active span, - * use ContextManager::isActive method to determine whether there has the active span. + * If not sure has the active span, use this method, will be cause NPE when has no active span, use + * ContextManager::isActive method to determine whether there has the active span. */ public static AbstractSpan activeSpan() { return get().activeSpan(); } /** - * Recommend use ContextManager::stopSpan(AbstractSpan span), because in that way, - * the TracingContext core could verify this span is the active one, in order to avoid stop unexpected span. - * If the current span is hard to get or only could get by low-performance way, this stop way is still acceptable. - */ + * Recommend use ContextManager::stopSpan(AbstractSpan span), because in that way, the TracingContext core could + * verify this span is the active one, in order to avoid stop unexpected span. If the current span is hard to get or + * only could get by low-performance way, this stop way is still acceptable. + */ public static void stopSpan() { final AbstractTracerContext context = get(); - stopSpan(context.activeSpan(),context); + stopSpan(context.activeSpan(), context); } public static void stopSpan(AbstractSpan span) { @@ -194,7 +193,7 @@ private static void stopSpan(AbstractSpan span, final AbstractTracerContext cont } @Override - public void prepare() throws Throwable { + public void prepare() { } @@ -203,11 +202,12 @@ public void boot() { } @Override - public void onComplete() throws Throwable { + public void onComplete() { } - @Override public void shutdown() throws Throwable { + @Override + public void shutdown() { } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextManagerExtendService.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextManagerExtendService.java index 1331f62a2bb3..cad1afb1c8df 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextManagerExtendService.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextManagerExtendService.java @@ -18,28 +18,31 @@ package org.apache.skywalking.apm.agent.core.context; -import org.apache.skywalking.apm.agent.core.boot.*; +import org.apache.skywalking.apm.agent.core.boot.BootService; +import org.apache.skywalking.apm.agent.core.boot.DefaultImplementor; +import org.apache.skywalking.apm.agent.core.boot.ServiceManager; import org.apache.skywalking.apm.agent.core.conf.Config; import org.apache.skywalking.apm.agent.core.sampling.SamplingService; -/** - * @author wusheng - */ @DefaultImplementor public class ContextManagerExtendService implements BootService { - @Override public void prepare() { + @Override + public void prepare() { } - @Override public void boot() { + @Override + public void boot() { } - @Override public void onComplete() { + @Override + public void onComplete() { } - @Override public void shutdown() { + @Override + public void shutdown() { } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextSnapshot.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextSnapshot.java index 0898d0a7c1c1..ec8d08dd4b18 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextSnapshot.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextSnapshot.java @@ -26,8 +26,6 @@ /** * The ContextSnapshot is a snapshot for current context. The snapshot carries the info for building * reference between two segments in two thread, but have a causal relationship. - * - * @author wusheng */ public class ContextSnapshot { /** @@ -51,8 +49,7 @@ public class ContextSnapshot { private int entryApplicationInstanceId = DictionaryUtil.nullValue(); - ContextSnapshot(ID traceSegmentId, int spanId, - List distributedTraceIds) { + ContextSnapshot(ID traceSegmentId, int spanId, List distributedTraceIds) { this.traceSegmentId = traceSegmentId; this.spanId = spanId; if (distributedTraceIds != null) { @@ -93,10 +90,7 @@ public String getParentOperationName() { } public boolean isValid() { - return traceSegmentId != null - && spanId > -1 - && entryApplicationInstanceId != DictionaryUtil.nullValue() - && primaryDistributedTraceId != null; + return traceSegmentId != null && spanId > -1 && entryApplicationInstanceId != DictionaryUtil.nullValue() && primaryDistributedTraceId != null; } public String getEntryOperationName() { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/IgnoreTracerContextListener.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/IgnoreTracerContextListener.java index 143a07bdd178..4ef1c6a04229 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/IgnoreTracerContextListener.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/IgnoreTracerContextListener.java @@ -16,12 +16,8 @@ * */ - package org.apache.skywalking.apm.agent.core.context; -/** - * @author wusheng - */ public interface IgnoreTracerContextListener { void afterFinished(IgnoredTracerContext traceSegment); } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/IgnoredTracerContext.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/IgnoredTracerContext.java index 59bc05cd4702..1a5d8c6e65ec 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/IgnoredTracerContext.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/IgnoredTracerContext.java @@ -18,16 +18,16 @@ package org.apache.skywalking.apm.agent.core.context; -import java.util.*; -import org.apache.skywalking.apm.agent.core.context.trace.*; +import java.util.LinkedList; +import java.util.List; +import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan; +import org.apache.skywalking.apm.agent.core.context.trace.NoopSpan; /** * The IgnoredTracerContext represent a context should be ignored. So it just maintains the stack with an * integer depth field. - * + *

* All operations through this will be ignored, and keep the memory and gc cost as low as possible. - * - * @author wusheng */ public class IgnoredTracerContext implements AbstractTracerContext { private static final NoopSpan NOOP_SPAN = new NoopSpan(); @@ -48,11 +48,13 @@ public void extract(ContextCarrier carrier) { } - @Override public ContextSnapshot capture() { + @Override + public ContextSnapshot capture() { return new ContextSnapshot(null, -1, null); } - @Override public void continued(ContextSnapshot snapshot) { + @Override + public void continued(ContextSnapshot snapshot) { } @@ -93,16 +95,18 @@ public boolean stopSpan(AbstractSpan span) { return stackDepth == 0; } - @Override public AbstractTracerContext awaitFinishAsync() { + @Override + public AbstractTracerContext awaitFinishAsync() { return this; } - @Override public void asyncStop(AsyncSpan span) { + @Override + public void asyncStop(AsyncSpan span) { } public static class ListenerManager { - private static List LISTENERS = new LinkedList(); + private static List LISTENERS = new LinkedList<>(); /** * Add the given {@link IgnoreTracerContextListener} to {@link #LISTENERS} list. @@ -117,8 +121,6 @@ public static synchronized void add(IgnoreTracerContextListener listener) { * Notify the {@link IgnoredTracerContext.ListenerManager} about the given {@link IgnoredTracerContext} have * finished. And trigger {@link IgnoredTracerContext.ListenerManager} to notify all {@link #LISTENERS} 's {@link * IgnoreTracerContextListener#afterFinished(IgnoredTracerContext)} - * - * @param ignoredTracerContext */ static void notifyFinish(IgnoredTracerContext ignoredTracerContext) { for (IgnoreTracerContextListener listener : LISTENERS) { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/OperationNameFormatService.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/OperationNameFormatService.java index 6fef376ade0f..210201f3f069 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/OperationNameFormatService.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/OperationNameFormatService.java @@ -29,17 +29,16 @@ /** * Support operation name format by config. Every plugin could declare its own rule to avoid performance concerns. - * + *

* Right now, the rule is REGEX based, it definitely has much space to optimize, because basically, only `*` is required * to be supported. - * - * @author wusheng */ @DefaultImplementor public class OperationNameFormatService implements BootService { private static final Map RULES = new ConcurrentHashMap(); - @Override public void prepare() throws Throwable { + @Override + public void prepare() throws Throwable { for (Class ruleName : Config.Plugin.OPGroup.class.getClasses()) { if (!OPGroupDefinition.class.isAssignableFrom(ruleName)) { continue; @@ -51,7 +50,7 @@ public class OperationNameFormatService implements BootService { } for (Field ruleNameField : ruleName.getFields()) { if (ruleNameField.getType().equals(Map.class)) { - Map rule = (Map)ruleNameField.get(null); + Map rule = (Map) ruleNameField.get(null); for (Map.Entry entry : rule.entrySet()) { formatGroup.addRule(entry.getKey(), entry.getValue()); } @@ -60,15 +59,18 @@ public class OperationNameFormatService implements BootService { } } - @Override public void boot() throws Throwable { + @Override + public void boot() { } - @Override public void onComplete() throws Throwable { + @Override + public void onComplete() { } - @Override public void shutdown() throws Throwable { + @Override + public void shutdown() { } @@ -76,7 +78,7 @@ public class OperationNameFormatService implements BootService { * Format the operation name based on group rules * * @param definition in the Config - * @param opName represents the operation name literal string + * @param opName represents the operation name literal string * @return format string if rule matched or the given opName */ public String formatOperationName(Class definition, String opName) { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/RuntimeContext.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/RuntimeContext.java index a96098fae14a..23999ed67dbb 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/RuntimeContext.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/RuntimeContext.java @@ -25,16 +25,14 @@ import org.apache.skywalking.apm.agent.core.conf.RuntimeContextConfiguration; /** - * RuntimeContext is alive during the tracing context. - * It will not be serialized to the collector, and always stays in the same context only. - * + * RuntimeContext is alive during the tracing context. It will not be serialized to the collector, and always stays in + * the same context only. + *

* In most cases, it means it only stays in a single thread for context propagation. - * - * @author wusheng, ascrutae */ public class RuntimeContext { private final ThreadLocal contextThreadLocal; - private Map context = new ConcurrentHashMap(0); + private Map context = new ConcurrentHashMap<>(0); public RuntimeContext(ThreadLocal contextThreadLocal) { this.contextThreadLocal = contextThreadLocal; @@ -48,8 +46,9 @@ public Object get(Object key) { return context.get(key); } + @SuppressWarnings("unchecked") public T get(Object key, Class type) { - return (T)context.get(key); + return (T) context.get(key); } public void remove(Object key) { @@ -61,7 +60,7 @@ public void remove(Object key) { } public RuntimeContextSnapshot capture() { - Map runtimeContextMap = new HashMap(); + Map runtimeContextMap = new HashMap<>(); for (String key : RuntimeContextConfiguration.NEED_PROPAGATE_CONTEXT_KEY) { Object value = this.get(key); if (value != null) { @@ -73,9 +72,9 @@ public RuntimeContextSnapshot capture() { } public void accept(RuntimeContextSnapshot snapshot) { - Iterator iterator = snapshot.iterator(); + Iterator> iterator = snapshot.iterator(); while (iterator.hasNext()) { - Map.Entry runtimeContextItem = iterator.next(); + Map.Entry runtimeContextItem = iterator.next(); ContextManager.getRuntimeContext().put(runtimeContextItem.getKey(), runtimeContextItem.getValue()); } } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/RuntimeContextSnapshot.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/RuntimeContextSnapshot.java index 5bc203776a01..01273888c4cd 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/RuntimeContextSnapshot.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/RuntimeContextSnapshot.java @@ -23,13 +23,13 @@ import java.util.Map; public class RuntimeContextSnapshot { - private final Map map; + private final Map map; - public RuntimeContextSnapshot(Map map) { + public RuntimeContextSnapshot(Map map) { this.map = map; } - public Iterator iterator() { + public Iterator> iterator() { return map.entrySet().iterator(); } } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/SW6CarrierItem.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/SW6CarrierItem.java index 8068fdfa428d..f071b05d3ae7 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/SW6CarrierItem.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/SW6CarrierItem.java @@ -18,9 +18,6 @@ package org.apache.skywalking.apm.agent.core.context; -/** - * @author wusheng - */ public class SW6CarrierItem extends CarrierItem { public static final String HEADER_NAME = "sw6"; private ContextCarrier carrier; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/TracingContext.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/TracingContext.java index 717e02b9fc98..fdf148d84d95 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/TracingContext.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/TracingContext.java @@ -46,16 +46,13 @@ /** * The TracingContext represents a core tracing logic controller. It build the final {@link * TracingContext}, by the stack mechanism, which is similar with the codes work. - * + *

* In opentracing concept, it means, all spans in a segment tracing context(thread) are CHILD_OF relationship, but no * FOLLOW_OF. - * + *

* In skywalking core concept, FOLLOW_OF is an abstract concept when cross-process MQ or cross-thread async/batch tasks * happen, we used {@link TraceSegmentRef} for these scenarios. Check {@link TraceSegmentRef} which is from {@link * ContextCarrier} or {@link ContextSnapshot}. - * - * @author wusheng - * @author zhang xin */ public class TracingContext implements AbstractTracerContext { private static final ILog logger = LogManager.getLogger(TracingContext.class); @@ -132,8 +129,7 @@ public class TracingContext implements AbstractTracerContext { * Inject the context into the given carrier, only when the active span is an exit one. * * @param carrier to carry the context for crossing process. - * @throws IllegalStateException if the active span isn't an exit one. Ref to {@link - * AbstractTracerContext#inject(ContextCarrier)} + * @throws IllegalStateException if the active span isn't an exit one. Ref to {@link AbstractTracerContext#inject(ContextCarrier)} */ @Override public void inject(ContextCarrier carrier) { @@ -142,7 +138,7 @@ public void inject(ContextCarrier carrier) { throw new IllegalStateException("Inject can be done only in Exit Span"); } - WithPeerInfo spanWithPeer = (WithPeerInfo)span; + WithPeerInfo spanWithPeer = (WithPeerInfo) span; String peer = spanWithPeer.getPeer(); int peerId = spanWithPeer.getPeerId(); @@ -218,8 +214,7 @@ public void inject(ContextCarrier carrier) { /** * Extract the carrier to build the reference for the pre segment. * - * @param carrier carried the context from a cross-process segment. Ref to {@link - * AbstractTracerContext#extract(ContextCarrier)} + * @param carrier carried the context from a cross-process segment. Ref to {@link AbstractTracerContext#extract(ContextCarrier)} */ @Override public void extract(ContextCarrier carrier) { @@ -240,9 +235,7 @@ public void extract(ContextCarrier carrier) { @Override public ContextSnapshot capture() { List refs = this.segment.getRefs(); - ContextSnapshot snapshot = new ContextSnapshot(segment.getTraceSegmentId(), - activeSpan().getSpanId(), - segment.getRelatedGlobalTraces()); + ContextSnapshot snapshot = new ContextSnapshot(segment.getTraceSegmentId(), activeSpan().getSpanId(), segment.getRelatedGlobalTraces()); int entryOperationId; String entryOperationName = ""; int entryApplicationInstanceId; @@ -337,16 +330,17 @@ public AbstractSpan createEntrySpan(final String operationName) { final AbstractSpan parentSpan = peek(); final int parentSpanId = parentSpan == null ? -1 : parentSpan.getSpanId(); if (parentSpan != null && parentSpan.isEntry()) { - entrySpan = (AbstractTracingSpan)DictionaryManager.findEndpointSection() - .findOnly(segment.getServiceId(), operationName) - .doInCondition(parentSpan::setOperationId, () -> parentSpan.setOperationName(operationName)); + entrySpan = (AbstractTracingSpan) DictionaryManager.findEndpointSection() + .findOnly(segment.getServiceId(), operationName) + .doInCondition(parentSpan::setOperationId, () -> parentSpan + .setOperationName(operationName)); return entrySpan.start(); } else { - entrySpan = (AbstractTracingSpan)DictionaryManager.findEndpointSection() - .findOnly(segment.getServiceId(), operationName) - .doInCondition(operationId -> new EntrySpan(spanIdGenerator++, parentSpanId, operationId, owner), () -> { - return new EntrySpan(spanIdGenerator++, parentSpanId, operationName, owner); - }); + entrySpan = (AbstractTracingSpan) DictionaryManager.findEndpointSection() + .findOnly(segment.getServiceId(), operationName) + .doInCondition(operationId -> new EntrySpan(spanIdGenerator++, parentSpanId, operationId, owner), () -> { + return new EntrySpan(spanIdGenerator++, parentSpanId, operationName, owner); + }); entrySpan.start(); return push(entrySpan); } @@ -379,7 +373,7 @@ public AbstractSpan createLocalSpan(final String operationName) { * Create an exit span * * @param operationName most likely a service name of remote - * @param remotePeer the network id(ip:port, hostname:port or ip1:port1,ip2,port, etc.) + * @param remotePeer the network id(ip:port, hostname:port or ip1:port1,ip2,port, etc.) * @return the span represent an exit point of this segment. * @see ExitSpan */ @@ -397,12 +391,11 @@ public AbstractSpan createExitSpan(final String operationName, final String remo exitSpan = parentSpan; } else { final int parentSpanId = parentSpan == null ? -1 : parentSpan.getSpanId(); - exitSpan = (AbstractSpan)DictionaryManager.findNetworkAddressSection() - .find(remotePeer).doInCondition( - peerId -> new ExitSpan(spanIdGenerator++, parentSpanId, operationName, peerId, owner), - () -> { - return new ExitSpan(spanIdGenerator++, parentSpanId, operationName, remotePeer, owner); - }); + exitSpan = (AbstractSpan) DictionaryManager.findNetworkAddressSection() + .find(remotePeer) + .doInCondition(peerId -> new ExitSpan(spanIdGenerator++, parentSpanId, operationName, peerId, owner), () -> { + return new ExitSpan(spanIdGenerator++, parentSpanId, operationName, remotePeer, owner); + }); push(exitSpan); } exitSpan.start(); @@ -432,7 +425,7 @@ public boolean stopSpan(AbstractSpan span) { AbstractSpan lastSpan = peek(); if (lastSpan == span) { if (lastSpan instanceof AbstractTracingSpan) { - AbstractTracingSpan toFinishSpan = (AbstractTracingSpan)lastSpan; + AbstractTracingSpan toFinishSpan = (AbstractTracingSpan) lastSpan; if (toFinishSpan.finish(segment)) { pop(); } @@ -448,7 +441,8 @@ public boolean stopSpan(AbstractSpan span) { return activeSpanStack.isEmpty(); } - @Override public AbstractTracerContext awaitFinishAsync() { + @Override + public AbstractTracerContext awaitFinishAsync() { if (!isRunningInAsyncMode) { synchronized (this) { if (!isRunningInAsyncMode) { @@ -462,7 +456,8 @@ public boolean stopSpan(AbstractSpan span) { return this; } - @Override public void asyncStop(AsyncSpan span) { + @Override + public void asyncStop(AsyncSpan span) { ASYNC_SPAN_COUNTER_UPDATER.decrementAndGet(this); finish(); } @@ -470,7 +465,7 @@ public boolean stopSpan(AbstractSpan span) { /** * Re-check current trace need profiling, encase third part plugin change the operation name. * - * @param span current modify span + * @param span current modify span * @param operationName change to operation name */ public void profilingRecheck(AbstractSpan span, String operationName) { @@ -627,8 +622,7 @@ private boolean isLimitMechanismWorking() { if (spanIdGenerator >= Config.Agent.SPAN_LIMIT_PER_SEGMENT) { long currentTimeMillis = System.currentTimeMillis(); if (currentTimeMillis - lastWarningTimestamp > 30 * 1000) { - logger.warn(new RuntimeException("Shadow tracing context. Thread dump"), "More than {} spans required to create", - Config.Agent.SPAN_LIMIT_PER_SEGMENT); + logger.warn(new RuntimeException("Shadow tracing context. Thread dump"), "More than {} spans required to create", Config.Agent.SPAN_LIMIT_PER_SEGMENT); lastWarningTimestamp = currentTimeMillis; } return true; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/TracingContextListener.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/TracingContextListener.java index 4786ecf059cf..7824226841ee 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/TracingContextListener.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/TracingContextListener.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.context; import org.apache.skywalking.apm.agent.core.context.trace.TraceSegment; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/TracingThreadListener.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/TracingThreadListener.java index c175454d5781..bd6007a5743d 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/TracingThreadListener.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/TracingThreadListener.java @@ -18,9 +18,6 @@ package org.apache.skywalking.apm.agent.core.context; -/** - * @author MrPro - */ public interface TracingThreadListener { void afterMainThreadFinish(TracingContext tracingContext); diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/DistributedTraceId.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/DistributedTraceId.java index 779b6e69080a..7fd60ab17ecc 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/DistributedTraceId.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/DistributedTraceId.java @@ -16,23 +16,21 @@ * */ - package org.apache.skywalking.apm.agent.core.context.ids; -import org.apache.skywalking.apm.network.language.agent.*; +import java.util.Objects; +import org.apache.skywalking.apm.network.language.agent.UniqueId; /** * The DistributedTraceId presents a distributed call chain. *

* This call chain has a unique (service) entrance, *

- * such as: Service : http://www.skywalking.com/cust/query, all the remote, called behind this service, rest remote, - * db executions, are using the same DistributedTraceId even in different JVM. + * such as: Service : http://www.skywalking.com/cust/query, all the remote, called behind this service, rest remote, db + * executions, are using the same DistributedTraceId even in different JVM. *

* The DistributedTraceId contains only one string, and can NOT be reset, creating a new instance is the * only option. - * - * @author wusheng */ public abstract class DistributedTraceId { private ID id; @@ -59,8 +57,8 @@ public UniqueId toUniqueId() { } /** - * Compare the two DistributedTraceId by its {@link #id}, - * even these two DistributedTraceIds are not the same instances. + * Compare the two DistributedTraceId by its {@link #id}, even these two + * DistributedTraceIds are not the same instances. * * @param o target DistributedTraceId * @return return if they have the same {@link #id} @@ -72,9 +70,9 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) return false; - DistributedTraceId id1 = (DistributedTraceId)o; + DistributedTraceId id1 = (DistributedTraceId) o; - return id != null ? id.equals(id1.id) : id1.id == null; + return Objects.equals(id, id1.id); } @Override diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/DistributedTraceIds.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/DistributedTraceIds.java index 63e58f9bdd77..f1a2d1efd8e6 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/DistributedTraceIds.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/DistributedTraceIds.java @@ -16,16 +16,12 @@ * */ - package org.apache.skywalking.apm.agent.core.context.ids; import java.util.Collections; import java.util.LinkedList; import java.util.List; -/** - * @author wusheng - */ public class DistributedTraceIds { private LinkedList relatedGlobalTraces; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/GlobalIdGenerator.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/GlobalIdGenerator.java index da2f20686f01..c92d525aa455 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/GlobalIdGenerator.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/GlobalIdGenerator.java @@ -23,28 +23,23 @@ import org.apache.skywalking.apm.agent.core.dictionary.DictionaryUtil; public final class GlobalIdGenerator { - private static final ThreadLocal THREAD_ID_SEQUENCE = new ThreadLocal() { - @Override - protected IDContext initialValue() { - return new IDContext(System.currentTimeMillis(), (short)0); - } - }; + private static final ThreadLocal THREAD_ID_SEQUENCE = ThreadLocal.withInitial( + () -> new IDContext(System.currentTimeMillis(), (short) 0)); private GlobalIdGenerator() { } /** * Generate a new id, combined by three long numbers. - * + *

* The first one represents application instance id. (most likely just an integer value, would be helpful in * protobuf) - * + *

* The second one represents thread id. (most likely just an integer value, would be helpful in protobuf) - * - * The third one also has two parts, - * 1) a timestamp, measured in milliseconds - * 2) a seq, in current thread, between 0(included) and 9999(included) - * + *

+ * The third one also has two parts, 1) a timestamp, measured in milliseconds 2) a seq, in current thread, between + * 0(included) and 9999(included) + *

* Notice, a long costs 8 bytes, three longs cost 24 bytes. And at the same time, a char costs 2 bytes. So * sky-walking's old global and segment id like this: "S.1490097253214.-866187727.57515.1.1" which costs at least 72 * bytes. diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/ID.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/ID.java index 4fb604205ecc..f1b45e49b1d2 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/ID.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/ID.java @@ -16,13 +16,10 @@ * */ - package org.apache.skywalking.apm.agent.core.context.ids; -import org.apache.skywalking.apm.network.language.agent.*; -/** - * @author wusheng - */ +import org.apache.skywalking.apm.network.language.agent.UniqueId; + public class ID { private long part1; private long part2; @@ -65,17 +62,19 @@ public String encode() { return encoding; } - @Override public String toString() { + @Override + public String toString() { return part1 + "." + part2 + '.' + part3; } - @Override public boolean equals(Object o) { + @Override + public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - ID id = (ID)o; + ID id = (ID) o; if (part1 != id.part1) return false; @@ -84,10 +83,11 @@ public String encode() { return part3 == id.part3; } - @Override public int hashCode() { - int result = (int)(part1 ^ (part1 >>> 32)); - result = 31 * result + (int)(part2 ^ (part2 >>> 32)); - result = 31 * result + (int)(part3 ^ (part3 >>> 32)); + @Override + public int hashCode() { + int result = (int) (part1 ^ (part1 >>> 32)); + result = 31 * result + (int) (part2 ^ (part2 >>> 32)); + result = 31 * result + (int) (part3 ^ (part3 >>> 32)); return result; } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/NewDistributedTraceId.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/NewDistributedTraceId.java index 438add655871..75647d888fdc 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/NewDistributedTraceId.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/NewDistributedTraceId.java @@ -16,13 +16,10 @@ * */ - package org.apache.skywalking.apm.agent.core.context.ids; /** * The NewDistributedTraceId is a {@link DistributedTraceId} with a new generated id. - * - * @author wusheng */ public class NewDistributedTraceId extends DistributedTraceId { public NewDistributedTraceId() { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/PropagatedTraceId.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/PropagatedTraceId.java index 4f5cccc3d8a2..f3f24e18d8fa 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/PropagatedTraceId.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ids/PropagatedTraceId.java @@ -16,13 +16,10 @@ * */ - package org.apache.skywalking.apm.agent.core.context.ids; /** * The PropagatedTraceId represents a {@link DistributedTraceId}, which is propagated from the peer. - * - * @author wusheng */ public class PropagatedTraceId extends DistributedTraceId { public PropagatedTraceId(String id) { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/tag/AbstractTag.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/tag/AbstractTag.java index c4cbcc99bfef..66c3213466bc 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/tag/AbstractTag.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/tag/AbstractTag.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.context.tag; import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/tag/StringTag.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/tag/StringTag.java index 0b1a1653870c..b2d3faeeb3cc 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/tag/StringTag.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/tag/StringTag.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.context.tag; import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan; @@ -24,7 +23,6 @@ /** * A subclass of {@link AbstractTag}, represent a tag with a {@link String} value. *

- * Created by wusheng on 2017/2/17. */ public class StringTag extends AbstractTag { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/tag/Tags.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/tag/Tags.java index c6e9d375d2f8..bafa79902b1b 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/tag/Tags.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/tag/Tags.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.context.tag; import java.util.Map; @@ -26,7 +25,6 @@ * The span tags are supported by sky-walking engine. As default, all tags will be stored, but these ones have * particular meanings. *

- * Created by wusheng on 2017/2/17. */ public final class Tags { private static final Map TAG_PROTOTYPES = new ConcurrentHashMap<>(); @@ -86,8 +84,8 @@ public static final class HTTP { } /** - * Creates a {@code StringTag} with the given key and cache it, - * if it's created before, simply return it without creating a new one. + * Creates a {@code StringTag} with the given key and cache it, if it's created before, simply return it without + * creating a new one. * * @param key the {@code key} of the tag * @return the {@code StringTag} diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/AbstractSpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/AbstractSpan.java index 2c99f0cf3d63..88ee2127daed 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/AbstractSpan.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/AbstractSpan.java @@ -27,14 +27,11 @@ /** * The AbstractSpan represents the span's skeleton, which contains all open methods. - * - * @author wusheng */ public interface AbstractSpan extends AsyncSpan { /** * Set the component id, which defines in {@link ComponentsDefine} * - * @param component * @return the span for chaining. */ AbstractSpan setComponent(Component component); @@ -43,7 +40,6 @@ public interface AbstractSpan extends AsyncSpan { * Only use this method in explicit instrumentation, like opentracing-skywalking-bridge. It is highly recommended * not to use this method for performance reasons. * - * @param componentName * @return the span for chaining. */ AbstractSpan setComponent(String componentName); @@ -60,9 +56,7 @@ public interface AbstractSpan extends AsyncSpan { AbstractSpan tag(String key, String value); /** - * @param tag - * @param value - * @return + * */ AbstractSpan tag(AbstractTag tag, String value); @@ -90,7 +84,7 @@ public interface AbstractSpan extends AsyncSpan { * Record an event at a specific timestamp. * * @param timestamp The explicit timestamp for the log record. - * @param event the events + * @param event the events * @return the Span, for chaining */ AbstractSpan log(long timestamp, Map event); diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/AbstractTracingSpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/AbstractTracingSpan.java index af28e19ead22..d3f2591d6308 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/AbstractTracingSpan.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/AbstractTracingSpan.java @@ -18,10 +18,17 @@ package org.apache.skywalking.apm.agent.core.context.trace; -import java.util.*; -import org.apache.skywalking.apm.agent.core.context.*; -import org.apache.skywalking.apm.agent.core.context.tag.*; -import org.apache.skywalking.apm.agent.core.context.util.*; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import org.apache.skywalking.apm.agent.core.context.ContextManager; +import org.apache.skywalking.apm.agent.core.context.TracingContext; +import org.apache.skywalking.apm.agent.core.context.tag.AbstractTag; +import org.apache.skywalking.apm.agent.core.context.tag.Tags; +import org.apache.skywalking.apm.agent.core.context.util.KeyValuePair; +import org.apache.skywalking.apm.agent.core.context.util.TagValuePair; +import org.apache.skywalking.apm.agent.core.context.util.ThrowableTransformer; import org.apache.skywalking.apm.agent.core.dictionary.DictionaryUtil; import org.apache.skywalking.apm.network.language.agent.SpanType; import org.apache.skywalking.apm.network.language.agent.v2.SpanObjectV2; @@ -30,8 +37,6 @@ /** * The AbstractTracingSpan represents a group of {@link AbstractSpan} implementations, which belongs a real * distributed trace. - * - * @author wusheng */ public abstract class AbstractTracingSpan implements AbstractSpan { protected int spanId; @@ -101,8 +106,9 @@ protected AbstractTracingSpan(int spanId, int parentSpanId, int operationId, Tra /** * Set a key:value tag on the Span. - * + *

* {@inheritDoc} + * * @return this Span instance, for chaining */ @Override @@ -158,19 +164,17 @@ public AbstractTracingSpan log(Throwable t) { if (logs == null) { logs = new LinkedList<>(); } - logs.add(new LogDataEntity.Builder() - .add(new KeyValuePair("event", "error")) - .add(new KeyValuePair("error.kind", t.getClass().getName())) - .add(new KeyValuePair("message", t.getMessage())) - .add(new KeyValuePair("stack", ThrowableTransformer.INSTANCE.convert2String(t, 4000))) - .build(System.currentTimeMillis())); + logs.add(new LogDataEntity.Builder().add(new KeyValuePair("event", "error")) + .add(new KeyValuePair("error.kind", t.getClass().getName())) + .add(new KeyValuePair("message", t.getMessage())) + .add(new KeyValuePair("stack", ThrowableTransformer.INSTANCE.convert2String(t, 4000))) + .build(System.currentTimeMillis())); return this; } /** * Record a common log with multi fields, for supporting opentracing-java * - * @param fields * @return the Span, for chaining */ @Override @@ -202,7 +206,6 @@ public AbstractTracingSpan errorOccurred() { * Set the operation name, just because these is not compress dictionary value for this name. Use the entire string * temporarily, the agent will compress this name in async mode. * - * @param operationName * @return span instance, for chaining. */ @Override @@ -218,7 +221,6 @@ public AbstractTracingSpan setOperationName(String operationName) { /** * Set the operation id, which compress by the name. * - * @param operationId * @return span instance, for chaining. */ @Override @@ -252,7 +254,6 @@ public AbstractTracingSpan setLayer(SpanLayer layer) { /** * Set the component of this span, with internal supported. Highly recommend to use this way. * - * @param component * @return span instance, for chaining. */ @Override @@ -264,7 +265,6 @@ public AbstractTracingSpan setComponent(Component component) { /** * Set the component name. By using this, cost more memory and network. * - * @param componentName * @return span instance, for chaining. */ @Override @@ -328,7 +328,8 @@ public SpanObjectV2.Builder transform() { return spanBuilder; } - @Override public void ref(TraceSegmentRef ref) { + @Override + public void ref(TraceSegmentRef ref) { if (refs == null) { refs = new LinkedList<>(); } @@ -337,7 +338,8 @@ public SpanObjectV2.Builder transform() { } } - @Override public AbstractSpan prepareForAsync() { + @Override + public AbstractSpan prepareForAsync() { if (isInAsyncMode) { throw new RuntimeException("Prepare for async repeatedly. Span is already in async mode."); } @@ -346,7 +348,8 @@ public SpanObjectV2.Builder transform() { return this; } - @Override public AbstractSpan asyncFinish() { + @Override + public AbstractSpan asyncFinish() { if (!isInAsyncMode) { throw new RuntimeException("Span is not in async mode, please use '#prepareForAsync' to active."); } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/EntrySpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/EntrySpan.java index 7d83af9371b9..70d0f42837ea 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/EntrySpan.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/EntrySpan.java @@ -24,15 +24,13 @@ /** * The EntrySpan represents a service provider point, such as Tomcat server entrance. - * + *

* It is a start point of {@link TraceSegment}, even in a complex application, there maybe have multi-layer entry point, * the EntrySpan only represents the first one. - * + *

* But with the last EntrySpan's tags and logs, which have more details about a service provider. - * + *

* Such as: Tomcat Embed - Dubbox The EntrySpan represents the Dubbox span. - * - * @author wusheng */ public class EntrySpan extends StackBasedTracingSpan { @@ -119,11 +117,13 @@ public EntrySpan log(Throwable t) { return this; } - @Override public boolean isEntry() { + @Override + public boolean isEntry() { return true; } - @Override public boolean isExit() { + @Override + public boolean isExit() { return false; } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/ExitSpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/ExitSpan.java index c51cac7ffe8d..4d167b2c5f63 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/ExitSpan.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/ExitSpan.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.context.trace; import org.apache.skywalking.apm.agent.core.context.TracingContext; @@ -25,16 +24,14 @@ /** * The ExitSpan represents a service consumer point, such as Feign, Okhttp client for an Http service. - * + *

* It is an exit point or a leaf span(our old name) of trace tree. In a single rpc call, because of a combination of * discovery libs, there maybe contain multi-layer exit point: - * + *

* The ExitSpan only presents the first one. - * + *

* Such as: Dubbox - Apache Httpcomponent - ...(Remote) The ExitSpan represents the Dubbox span, and ignore * the httpcomponent span's info. - * - * @author wusheng */ public class ExitSpan extends StackBasedTracingSpan implements WithPeerInfo { @@ -73,7 +70,8 @@ public ExitSpan tag(String key, String value) { return this; } - @Override public AbstractTracingSpan tag(AbstractTag tag, String value) { + @Override + public AbstractTracingSpan tag(AbstractTag tag, String value) { if (stackDepth == 1 || tag.isCanOverwrite()) { super.tag(tag, value); } @@ -143,11 +141,13 @@ public String getPeer() { return peer; } - @Override public boolean isEntry() { + @Override + public boolean isEntry() { return false; } - @Override public boolean isExit() { + @Override + public boolean isExit() { return true; } } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/LocalSpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/LocalSpan.java index b3613c1f4046..292f53dc67c1 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/LocalSpan.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/LocalSpan.java @@ -16,15 +16,12 @@ * */ - package org.apache.skywalking.apm.agent.core.context.trace; import org.apache.skywalking.apm.agent.core.context.TracingContext; /** * The LocalSpan represents a normal tracing point, such as a local method. - * - * @author wusheng */ public class LocalSpan extends AbstractTracingSpan { @@ -36,15 +33,18 @@ public LocalSpan(int spanId, int parentSpanId, String operationName, TracingCont super(spanId, parentSpanId, operationName, owner); } - @Override public boolean isEntry() { + @Override + public boolean isEntry() { return false; } - @Override public boolean isExit() { + @Override + public boolean isExit() { return false; } - @Override public AbstractSpan setPeer(String remotePeer) { + @Override + public AbstractSpan setPeer(String remotePeer) { return this; } } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/LogDataEntity.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/LogDataEntity.java index dbca6db1cbcd..ee6580c06cab 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/LogDataEntity.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/LogDataEntity.java @@ -18,6 +18,7 @@ package org.apache.skywalking.apm.agent.core.context.trace; +import java.util.Collections; import java.util.LinkedList; import java.util.List; import org.apache.skywalking.apm.agent.core.context.util.KeyValuePair; @@ -26,11 +27,9 @@ /** * The LogDataEntity represents a collection of {@link KeyValuePair}, contains several fields of a logging * operation. - * - * @author wusheng */ public class LogDataEntity { - private long timestamp = 0; + private long timestamp; private List logs; private LogDataEntity(long timestamp, List logs) { @@ -46,13 +45,11 @@ public static class Builder { protected List logs; public Builder() { - logs = new LinkedList(); + logs = new LinkedList<>(); } public Builder add(KeyValuePair... fields) { - for (KeyValuePair field : fields) { - logs.add(field); - } + Collections.addAll(logs, fields); return this; } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/NoopExitSpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/NoopExitSpan.java index 5270ab91b55b..bb2018b42df9 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/NoopExitSpan.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/NoopExitSpan.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.context.trace; public class NoopExitSpan extends NoopSpan implements WithPeerInfo { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/NoopSpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/NoopSpan.java index 69b4fa482146..c08db0eec698 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/NoopSpan.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/NoopSpan.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.context.trace; import java.util.Map; @@ -25,11 +24,8 @@ import org.apache.skywalking.apm.network.trace.component.Component; /** - * The NoopSpan represents a span implementation without any actual operation. - * This span implementation is for {@link IgnoredTracerContext}, - * for keeping the memory and gc cost as low as possible. - * - * @author wusheng + * The NoopSpan represents a span implementation without any actual operation. This span implementation is + * for {@link IgnoredTracerContext}, for keeping the memory and gc cost as low as possible. */ public class NoopSpan implements AbstractSpan { public NoopSpan() { @@ -40,7 +36,8 @@ public AbstractSpan log(Throwable t) { return this; } - @Override public AbstractSpan errorOccurred() { + @Override + public AbstractSpan errorOccurred() { return this; } @@ -48,15 +45,18 @@ public void finish() { } - @Override public AbstractSpan setComponent(Component component) { + @Override + public AbstractSpan setComponent(Component component) { return this; } - @Override public AbstractSpan setComponent(String componentName) { + @Override + public AbstractSpan setComponent(String componentName) { return this; } - @Override public AbstractSpan setLayer(SpanLayer layer) { + @Override + public AbstractSpan setLayer(SpanLayer layer) { return this; } @@ -65,62 +65,77 @@ public AbstractSpan tag(String key, String value) { return this; } - @Override public AbstractSpan tag(AbstractTag tag, String value) { + @Override + public AbstractSpan tag(AbstractTag tag, String value) { return this; } - @Override public boolean isEntry() { + @Override + public boolean isEntry() { return false; } - @Override public boolean isExit() { + @Override + public boolean isExit() { return false; } - @Override public AbstractSpan log(long timestamp, Map event) { + @Override + public AbstractSpan log(long timestamp, Map event) { return this; } - @Override public AbstractSpan setOperationName(String operationName) { + @Override + public AbstractSpan setOperationName(String operationName) { return this; } - @Override public AbstractSpan start() { + @Override + public AbstractSpan start() { return this; } - @Override public int getSpanId() { + @Override + public int getSpanId() { return 0; } - @Override public int getOperationId() { + @Override + public int getOperationId() { return 0; } - @Override public String getOperationName() { + @Override + public String getOperationName() { return ""; } - @Override public AbstractSpan setOperationId(int operationId) { + @Override + public AbstractSpan setOperationId(int operationId) { return this; } - @Override public void ref(TraceSegmentRef ref) { + @Override + public void ref(TraceSegmentRef ref) { } - @Override public AbstractSpan start(long startTime) { + @Override + public AbstractSpan start(long startTime) { return this; } - @Override public AbstractSpan setPeer(String remotePeer) { + @Override + public AbstractSpan setPeer(String remotePeer) { return this; } - @Override public AbstractSpan prepareForAsync() { + @Override + public AbstractSpan prepareForAsync() { return this; } - @Override public AbstractSpan asyncFinish() { + @Override + public AbstractSpan asyncFinish() { return this; } } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/SpanLayer.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/SpanLayer.java index 5bd5980d33c0..4ee9395ac950 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/SpanLayer.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/SpanLayer.java @@ -18,15 +18,8 @@ package org.apache.skywalking.apm.agent.core.context.trace; -/** - * @author wusheng - */ public enum SpanLayer { - DB(1), - RPC_FRAMEWORK(2), - HTTP(3), - MQ(4), - CACHE(5); + DB(1), RPC_FRAMEWORK(2), HTTP(3), MQ(4), CACHE(5); private int code; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/StackBasedTracingSpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/StackBasedTracingSpan.java index 19000fbec7eb..d6ba150c633a 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/StackBasedTracingSpan.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/StackBasedTracingSpan.java @@ -21,15 +21,12 @@ import org.apache.skywalking.apm.agent.core.context.TracingContext; import org.apache.skywalking.apm.agent.core.dictionary.DictionaryManager; import org.apache.skywalking.apm.agent.core.dictionary.DictionaryUtil; -import org.apache.skywalking.apm.agent.core.dictionary.PossibleFound; import org.apache.skywalking.apm.network.language.agent.v2.SpanObjectV2; /** * The StackBasedTracingSpan represents a span with an inside stack construction. - * + *

* This kind of span can start and finish multi times in a stack-like invoke line. - * - * @author wusheng */ public abstract class StackBasedTracingSpan extends AbstractTracingSpan { protected int stackDepth; @@ -62,13 +59,15 @@ public StackBasedTracingSpan(int spanId, int parentSpanId, int operationId, Stri this.peerId = DictionaryUtil.nullValue(); } - protected StackBasedTracingSpan(int spanId, int parentSpanId, String operationName, String peer, TracingContext owner) { + protected StackBasedTracingSpan(int spanId, int parentSpanId, String operationName, String peer, + TracingContext owner) { super(spanId, parentSpanId, operationName, owner); this.peer = peer; this.peerId = DictionaryUtil.nullValue(); } - protected StackBasedTracingSpan(int spanId, int parentSpanId, String operationName, int peerId, TracingContext owner) { + protected StackBasedTracingSpan(int spanId, int parentSpanId, String operationName, int peerId, + TracingContext owner) { super(spanId, parentSpanId, operationName, owner); this.peer = null; this.peerId = peerId; @@ -90,25 +89,15 @@ public SpanObjectV2.Builder transform() { @Override public boolean finish(TraceSegment owner) { if (--stackDepth == 0) { - /** + /* * Since 6.6.0, only entry span requires the op name register, which is endpoint. */ if (this.isEntry()) { if (this.operationId == DictionaryUtil.nullValue()) { - this.operationId = (Integer)DictionaryManager.findEndpointSection() - .findOrPrepare4Register(owner.getServiceId(), operationName) - .doInCondition( - new PossibleFound.FoundAndObtain() { - @Override public Object doProcess(int value) { - return value; - } - }, - new PossibleFound.NotFoundAndObtain() { - @Override public Object doProcess() { - return DictionaryUtil.nullValue(); - } - } - ); + this.operationId = + (Integer) DictionaryManager.findEndpointSection() + .findOrPrepare4Register(owner.getServiceId(), operationName) + .doInCondition(value -> value, DictionaryUtil::nullValue); } } return super.finish(owner); @@ -117,18 +106,11 @@ public boolean finish(TraceSegment owner) { } } - @Override public AbstractSpan setPeer(final String remotePeer) { + @Override + public AbstractSpan setPeer(final String remotePeer) { DictionaryManager.findNetworkAddressSection().find(remotePeer).doInCondition( - new PossibleFound.Found() { - @Override - public void doProcess(int remotePeerId) { - peerId = remotePeerId; - } - }, new PossibleFound.NotFound() { - @Override - public void doProcess() { - peer = remotePeer; - } + remotePeerId -> peerId = remotePeerId, () -> { + peer = remotePeer; } ); return this; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/TraceSegment.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/TraceSegment.java index aef5a5936b03..1244500cddb2 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/TraceSegment.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/TraceSegment.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.context.trace; import java.util.LinkedList; @@ -27,15 +26,13 @@ import org.apache.skywalking.apm.agent.core.context.ids.GlobalIdGenerator; import org.apache.skywalking.apm.agent.core.context.ids.ID; import org.apache.skywalking.apm.agent.core.context.ids.NewDistributedTraceId; -import org.apache.skywalking.apm.network.language.agent.*; +import org.apache.skywalking.apm.network.language.agent.UpstreamSegment; import org.apache.skywalking.apm.network.language.agent.v2.SegmentObject; /** * {@link TraceSegment} is a segment or fragment of the distributed trace. See https://github.com/opentracing/specification/blob/master/specification.md#the-opentracing-data-model * A {@link TraceSegment} means the segment, which exists in current {@link Thread}. And the distributed trace is formed * by multi {@link TraceSegment}s, because the distributed trace crosses multi-processes, multi-threads.

- * - * @author wusheng */ public class TraceSegment { /** @@ -46,8 +43,8 @@ public class TraceSegment { /** * The refs of parent trace segments, except the primary one. For most RPC call, {@link #refs} contains only one * element, but if this segment is a start span of batch process, the segment faces multi parents, at this moment, - * we use this {@link #refs} to link them. - * + * we use this {@code #refs} to link them. + *

* This field will not be serialized. Keeping this field is only for quick accessing. */ private List refs; @@ -79,7 +76,7 @@ public class TraceSegment { */ public TraceSegment() { this.traceSegmentId = GlobalIdGenerator.generate(); - this.spans = new LinkedList(); + this.spans = new LinkedList<>(); this.relatedGlobalTraces = new DistributedTraceIds(); this.relatedGlobalTraces.append(new NewDistributedTraceId()); this.createTime = System.currentTimeMillis(); @@ -92,7 +89,7 @@ public TraceSegment() { */ public void ref(TraceSegmentRef refSegment) { if (refs == null) { - refs = new LinkedList(); + refs = new LinkedList<>(); } if (!refs.contains(refSegment)) { refs.add(refSegment); @@ -109,8 +106,6 @@ public void relatedGlobalTraces(DistributedTraceId distributedTraceId) { /** * After {@link AbstractSpan} is finished, as be controller by "skywalking-api" module, notify the {@link * TraceSegment} to archive it. - * - * @param finishedSpan */ public void archive(AbstractTracingSpan finishedSpan) { spans.add(finishedSpan); @@ -167,7 +162,7 @@ public UpstreamSegment transform() { upstreamBuilder = upstreamBuilder.addGlobalTraceIds(distributedTraceId.toUniqueId()); } SegmentObject.Builder traceSegmentBuilder = SegmentObject.newBuilder(); - /** + /* * Trace Segment */ traceSegmentBuilder.setTraceSegmentId(this.traceSegmentId.transform()); @@ -187,12 +182,7 @@ public UpstreamSegment transform() { @Override public String toString() { - return "TraceSegment{" + - "traceSegmentId='" + traceSegmentId + '\'' + - ", refs=" + refs + - ", spans=" + spans + - ", relatedGlobalTraces=" + relatedGlobalTraces + - '}'; + return "TraceSegment{" + "traceSegmentId='" + traceSegmentId + '\'' + ", refs=" + refs + ", spans=" + spans + ", relatedGlobalTraces=" + relatedGlobalTraces + '}'; } public int getApplicationInstanceId() { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/TraceSegmentRef.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/TraceSegmentRef.java index 24abf071a807..cf4082ed03f9 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/TraceSegmentRef.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/TraceSegmentRef.java @@ -31,22 +31,21 @@ * {@link TraceSegmentRef} is like a pointer, which ref to another {@link TraceSegment}, use {@link #spanId} point to * the exact span of the ref {@link TraceSegment}. *

- * Created by wusheng on 2017/2/17. */ public class TraceSegmentRef { private SegmentRefType type; private ID traceSegmentId; - private int spanId = -1; + private int spanId; private int peerId = DictionaryUtil.nullValue(); private String peerHost; - private int entryServiceInstanceId = DictionaryUtil.nullValue(); + private int entryServiceInstanceId; - private int parentServiceInstanceId = DictionaryUtil.nullValue(); + private int parentServiceInstanceId; private String entryEndpointName; @@ -144,7 +143,7 @@ public SegmentReference transform() { refBuilder.setEntryServiceInstanceId(entryServiceInstanceId); refBuilder.setParentTraceSegmentId(traceSegmentId.transform()); refBuilder.setParentSpanId(spanId); - /** + /* * entryEndpointId/entryEndpointName and parentEndpointId/parentEndpointName could be empty at same time. * This is accepted in v2 format. * @@ -173,7 +172,7 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) return false; - TraceSegmentRef ref = (TraceSegmentRef)o; + TraceSegmentRef ref = (TraceSegmentRef) o; if (spanId != ref.spanId) return false; @@ -188,7 +187,6 @@ public int hashCode() { } public enum SegmentRefType { - CROSS_PROCESS, - CROSS_THREAD + CROSS_PROCESS, CROSS_THREAD } } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/WithPeerInfo.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/WithPeerInfo.java index d67d0b4fdd0c..249febe92f6e 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/WithPeerInfo.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/WithPeerInfo.java @@ -16,12 +16,8 @@ * */ - package org.apache.skywalking.apm.agent.core.context.trace; -/** - * @author wusheng - */ public interface WithPeerInfo { int getPeerId(); diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/util/KeyValuePair.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/util/KeyValuePair.java index 86b4822fb9e7..14e68b778ae1 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/util/KeyValuePair.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/util/KeyValuePair.java @@ -16,15 +16,12 @@ * */ - package org.apache.skywalking.apm.agent.core.context.util; import org.apache.skywalking.apm.network.common.KeyStringValuePair; /** * The KeyValuePair represents a object which contains a string key and a string value. - * - * @author wusheng */ public class KeyValuePair { private String key; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/util/PeerFormat.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/util/PeerFormat.java index 1c27c3691338..1874978c930e 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/util/PeerFormat.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/util/PeerFormat.java @@ -21,10 +21,6 @@ import org.apache.skywalking.apm.agent.core.conf.Config; import org.apache.skywalking.apm.util.StringUtil; -/** - * @author zhaoyuguang - */ - public class PeerFormat { private static final String ABBR = "..."; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/util/ThrowableTransformer.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/util/ThrowableTransformer.java index ea02f45cb5f2..ff297d86b90b 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/util/ThrowableTransformer.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/util/ThrowableTransformer.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.context.util; import static org.apache.skywalking.apm.agent.core.conf.Config.Agent.CAUSE_EXCEPTION_DEPTH; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/DictionaryManager.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/DictionaryManager.java index bd50d47fc802..b0fc1ab90a40 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/DictionaryManager.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/DictionaryManager.java @@ -16,12 +16,8 @@ * */ - package org.apache.skywalking.apm.agent.core.dictionary; -/** - * @author wusheng - */ public class DictionaryManager { /** * @return {@link NetworkAddressDictionary} to find application id for application code and network address. diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/DictionaryUtil.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/DictionaryUtil.java index d8ac1d55ec89..bf184b86d1dc 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/DictionaryUtil.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/DictionaryUtil.java @@ -16,12 +16,8 @@ * */ - package org.apache.skywalking.apm.agent.core.dictionary; -/** - * @author wusheng - */ public class DictionaryUtil { public static int nullValue() { return 0; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/EndpointNameDictionary.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/EndpointNameDictionary.java index 3447d8a18e1a..721fb09b7e5c 100755 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/EndpointNameDictionary.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/EndpointNameDictionary.java @@ -18,24 +18,26 @@ package org.apache.skywalking.apm.agent.core.dictionary; -import io.netty.util.internal.ConcurrentSet; -import java.util.*; +import java.util.Map; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import org.apache.skywalking.apm.agent.core.logging.api.*; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import lombok.ToString; import org.apache.skywalking.apm.network.common.DetectPoint; -import org.apache.skywalking.apm.network.register.v2.*; +import org.apache.skywalking.apm.network.register.v2.Endpoint; +import org.apache.skywalking.apm.network.register.v2.EndpointMapping; +import org.apache.skywalking.apm.network.register.v2.EndpointMappingElement; +import org.apache.skywalking.apm.network.register.v2.Endpoints; +import org.apache.skywalking.apm.network.register.v2.RegisterGrpc; import static org.apache.skywalking.apm.agent.core.conf.Config.Dictionary.ENDPOINT_NAME_BUFFER_SIZE; -/** - * @author wusheng - */ public enum EndpointNameDictionary { INSTANCE; - private static final ILog logger = LogManager.getLogger(EndpointNameDictionary.class); - private Map endpointDictionary = new ConcurrentHashMap(); - private Set unRegisterEndpoints = new ConcurrentSet(); + private Map endpointDictionary = new ConcurrentHashMap<>(); + private Set unRegisterEndpoints = ConcurrentHashMap.newKeySet(); public PossibleFound findOrPrepare4Register(int serviceId, String endpointName) { return find0(serviceId, endpointName, true); @@ -45,8 +47,7 @@ public PossibleFound findOnly(int serviceId, String endpointName) { return find0(serviceId, endpointName, false); } - private PossibleFound find0(int serviceId, String endpointName, - boolean registerWhenNotFound) { + private PossibleFound find0(int serviceId, String endpointName, boolean registerWhenNotFound) { if (endpointName == null || endpointName.length() == 0) { return new NotFound(); } @@ -55,32 +56,29 @@ private PossibleFound find0(int serviceId, String endpointName, if (operationId != null) { return new Found(operationId); } else { - if (registerWhenNotFound && - endpointDictionary.size() + unRegisterEndpoints.size() < ENDPOINT_NAME_BUFFER_SIZE) { + if (registerWhenNotFound && endpointDictionary.size() + unRegisterEndpoints.size() < ENDPOINT_NAME_BUFFER_SIZE) { unRegisterEndpoints.add(key); } return new NotFound(); } } - public void syncRemoteDictionary( - RegisterGrpc.RegisterBlockingStub serviceNameDiscoveryServiceBlockingStub) { + public void syncRemoteDictionary(RegisterGrpc.RegisterBlockingStub serviceNameDiscoveryServiceBlockingStub) { if (unRegisterEndpoints.size() > 0) { Endpoints.Builder builder = Endpoints.newBuilder(); for (OperationNameKey operationNameKey : unRegisterEndpoints) { Endpoint endpoint = Endpoint.newBuilder() - .setServiceId(operationNameKey.getServiceId()) - .setEndpointName(operationNameKey.getEndpointName()) - .setFrom(DetectPoint.server) - .build(); + .setServiceId(operationNameKey.getServiceId()) + .setEndpointName(operationNameKey.getEndpointName()) + .setFrom(DetectPoint.server) + .build(); builder.addEndpoints(endpoint); } - EndpointMapping serviceNameMappingCollection = serviceNameDiscoveryServiceBlockingStub.doEndpointRegister(builder.build()); + EndpointMapping serviceNameMappingCollection = serviceNameDiscoveryServiceBlockingStub.doEndpointRegister(builder + .build()); if (serviceNameMappingCollection.getElementsCount() > 0) { for (EndpointMappingElement element : serviceNameMappingCollection.getElementsList()) { - OperationNameKey key = new OperationNameKey( - element.getServiceId(), - element.getEndpointName()); + OperationNameKey key = new OperationNameKey(element.getServiceId(), element.getEndpointName()); unRegisterEndpoints.remove(key); endpointDictionary.put(key, element.getEndpointId()); } @@ -92,30 +90,21 @@ public void clear() { endpointDictionary.clear(); } - private class OperationNameKey { - private int serviceId; - private String endpointName; - - public OperationNameKey(int serviceId, String endpointName) { - this.serviceId = serviceId; - this.endpointName = endpointName; - } - - public int getServiceId() { - return serviceId; - } - - public String getEndpointName() { - return endpointName; - } + @Getter + @ToString + @RequiredArgsConstructor + private static class OperationNameKey { + private final int serviceId; + private final String endpointName; - @Override public boolean equals(Object o) { + @Override + public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - OperationNameKey key = (OperationNameKey)o; + OperationNameKey key = (OperationNameKey) o; boolean isServiceEndpointMatch = false; if (serviceId == key.serviceId && endpointName.equals(key.endpointName)) { @@ -124,18 +113,11 @@ public String getEndpointName() { return isServiceEndpointMatch; } - @Override public int hashCode() { + @Override + public int hashCode() { int result = serviceId; result = 31 * result + endpointName.hashCode(); return result; } - - - @Override public String toString() { - return "OperationNameKey{" + - "serviceId=" + serviceId + - ", endpointName='" + endpointName + '\'' + - '}'; - } } } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/Found.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/Found.java index f05042c1dcbb..0d1328fecfe7 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/Found.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/Found.java @@ -16,12 +16,8 @@ * */ - package org.apache.skywalking.apm.agent.core.dictionary; -/** - * @author wusheng - */ public class Found extends PossibleFound { public Found(int value) { super(value); diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/NetworkAddressDictionary.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/NetworkAddressDictionary.java index 2155ab47469b..99f187dc85af 100755 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/NetworkAddressDictionary.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/NetworkAddressDictionary.java @@ -16,10 +16,8 @@ * */ - package org.apache.skywalking.apm.agent.core.dictionary; -import io.netty.util.internal.ConcurrentSet; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; @@ -32,13 +30,11 @@ /** * Map of network address id to network literal address, which is from the collector side. - * - * @author wusheng */ public enum NetworkAddressDictionary { INSTANCE; - private Map serviceDictionary = new ConcurrentHashMap(); - private Set unRegisterServices = new ConcurrentSet(); + private Map serviceDictionary = new ConcurrentHashMap<>(); + private Set unRegisterServices = ConcurrentHashMap.newKeySet(); public PossibleFound find(String networkAddress) { Integer applicationId = serviceDictionary.get(networkAddress); @@ -52,11 +48,12 @@ public PossibleFound find(String networkAddress) { } } - public void syncRemoteDictionary( - RegisterGrpc.RegisterBlockingStub networkAddressRegisterServiceBlockingStub) { + public void syncRemoteDictionary(RegisterGrpc.RegisterBlockingStub networkAddressRegisterServiceBlockingStub) { if (unRegisterServices.size() > 0) { - NetAddressMapping networkAddressMappings = networkAddressRegisterServiceBlockingStub.doNetworkAddressRegister( - NetAddresses.newBuilder().addAllAddresses(unRegisterServices).build()); + NetAddressMapping networkAddressMappings = networkAddressRegisterServiceBlockingStub + .doNetworkAddressRegister(NetAddresses.newBuilder() + .addAllAddresses(unRegisterServices) + .build()); if (networkAddressMappings.getAddressIdsCount() > 0) { for (KeyIntValuePair keyWithIntegerValue : networkAddressMappings.getAddressIdsList()) { unRegisterServices.remove(keyWithIntegerValue.getKey()); diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/NotFound.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/NotFound.java index 7412a121693d..cb5e88cb12b3 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/NotFound.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/NotFound.java @@ -16,12 +16,8 @@ * */ - package org.apache.skywalking.apm.agent.core.dictionary; -/** - * @author wusheng - */ public class NotFound extends PossibleFound { public NotFound() { super(); diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/PossibleFound.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/PossibleFound.java index 8db3e8cd03c0..ae37029f6ae8 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/PossibleFound.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/PossibleFound.java @@ -16,13 +16,10 @@ * */ - package org.apache.skywalking.apm.agent.core.dictionary; /** * The PossibleFound represents a value, which may needEnhance or not. - * - * @author wusheng */ public abstract class PossibleFound { private boolean found; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/JVMService.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/JVMService.java index 598cd36394e2..694589899bbb 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/JVMService.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/JVMService.java @@ -52,8 +52,6 @@ /** * The JVMService represents a timer, which collectors JVM cpu, memory, memorypool and gc info, and send * the collected info to Collector through the channel provided by {@link GRPCChannelManager} - * - * @author wusheng */ @DefaultImplementor public class JVMService implements BootService, Runnable { @@ -72,21 +70,20 @@ public void prepare() throws Throwable { @Override public void boot() throws Throwable { - collectMetricFuture = Executors - .newSingleThreadScheduledExecutor(new DefaultNamedThreadFactory("JVMService-produce")) - .scheduleAtFixedRate(new RunnableWithExceptionProtection(this, new RunnableWithExceptionProtection.CallbackWhenException() { - @Override public void handle(Throwable t) { - logger.error("JVMService produces metrics failure.", t); - } - }), 0, 1, TimeUnit.SECONDS); - sendMetricFuture = Executors - .newSingleThreadScheduledExecutor(new DefaultNamedThreadFactory("JVMService-consume")) - .scheduleAtFixedRate(new RunnableWithExceptionProtection(sender, new RunnableWithExceptionProtection.CallbackWhenException() { - @Override public void handle(Throwable t) { - logger.error("JVMService consumes and upload failure.", t); - } - } - ), 0, 1, TimeUnit.SECONDS); + collectMetricFuture = Executors.newSingleThreadScheduledExecutor(new DefaultNamedThreadFactory("JVMService-produce")) + .scheduleAtFixedRate(new RunnableWithExceptionProtection(this, new RunnableWithExceptionProtection.CallbackWhenException() { + @Override + public void handle(Throwable t) { + logger.error("JVMService produces metrics failure.", t); + } + }), 0, 1, TimeUnit.SECONDS); + sendMetricFuture = Executors.newSingleThreadScheduledExecutor(new DefaultNamedThreadFactory("JVMService-consume")) + .scheduleAtFixedRate(new RunnableWithExceptionProtection(sender, new RunnableWithExceptionProtection.CallbackWhenException() { + @Override + public void handle(Throwable t) { + logger.error("JVMService consumes and upload failure.", t); + } + }), 0, 1, TimeUnit.SECONDS); } @Override @@ -102,9 +99,8 @@ public void shutdown() throws Throwable { @Override public void run() { - if (RemoteDownstreamConfig.Agent.SERVICE_ID != DictionaryUtil.nullValue() - && RemoteDownstreamConfig.Agent.SERVICE_INSTANCE_ID != DictionaryUtil.nullValue() - ) { + if (RemoteDownstreamConfig.Agent.SERVICE_ID != DictionaryUtil.nullValue() && RemoteDownstreamConfig.Agent.SERVICE_INSTANCE_ID != DictionaryUtil + .nullValue()) { long currentTimeMillis = System.currentTimeMillis(); try { JVMMetric.Builder jvmBuilder = JVMMetric.newBuilder(); @@ -131,9 +127,8 @@ private class Sender implements Runnable, GRPCChannelListener { @Override public void run() { - if (RemoteDownstreamConfig.Agent.SERVICE_ID != DictionaryUtil.nullValue() - && RemoteDownstreamConfig.Agent.SERVICE_INSTANCE_ID != DictionaryUtil.nullValue() - ) { + if (RemoteDownstreamConfig.Agent.SERVICE_ID != DictionaryUtil.nullValue() && RemoteDownstreamConfig.Agent.SERVICE_INSTANCE_ID != DictionaryUtil + .nullValue()) { if (status == GRPCChannelStatus.CONNECTED) { try { JVMMetricCollection.Builder builder = JVMMetricCollection.newBuilder(); @@ -142,7 +137,8 @@ public void run() { if (buffer.size() > 0) { builder.addAllMetrics(buffer); builder.setServiceInstanceId(RemoteDownstreamConfig.Agent.SERVICE_INSTANCE_ID); - Commands commands = stub.withDeadlineAfter(GRPC_UPSTREAM_TIMEOUT, TimeUnit.SECONDS).collect(builder.build()); + Commands commands = stub.withDeadlineAfter(GRPC_UPSTREAM_TIMEOUT, TimeUnit.SECONDS) + .collect(builder.build()); ServiceManager.INSTANCE.findService(CommandService.class).receiveCommand(commands); } } catch (Throwable t) { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/CPUMetricsAccessor.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/CPUMetricsAccessor.java index d44184b1d206..1b007e7bc034 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/CPUMetricsAccessor.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/CPUMetricsAccessor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.jvm.cpu; import org.apache.skywalking.apm.network.common.CPU; @@ -24,8 +23,6 @@ /** * The unit of CPU usage is 1/10000. The backend is using `avg` func directly, and query for percentage requires this * unit. - * - * @author wusheng */ public abstract class CPUMetricsAccessor { private long lastCPUTimeNs; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/CPUProvider.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/CPUProvider.java index b906fbcd7431..2450e54af1fc 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/CPUProvider.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/CPUProvider.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.jvm.cpu; import org.apache.skywalking.apm.agent.core.logging.api.ILog; @@ -24,9 +23,6 @@ import org.apache.skywalking.apm.agent.core.os.ProcessorUtil; import org.apache.skywalking.apm.network.common.CPU; -/** - * @author wusheng - */ public enum CPUProvider { INSTANCE; private CPUMetricsAccessor cpuMetricsAccessor; @@ -34,9 +30,10 @@ public enum CPUProvider { CPUProvider() { int processorNum = ProcessorUtil.getNumberOfProcessors(); try { - this.cpuMetricsAccessor = - (CPUMetricsAccessor)CPUProvider.class.getClassLoader().loadClass("org.apache.skywalking.apm.agent.core.jvm.cpu.SunCpuAccessor") - .getConstructor(int.class).newInstance(processorNum); + this.cpuMetricsAccessor = (CPUMetricsAccessor) CPUProvider.class.getClassLoader() + .loadClass("org.apache.skywalking.apm.agent.core.jvm.cpu.SunCpuAccessor") + .getConstructor(int.class) + .newInstance(processorNum); } catch (Exception e) { this.cpuMetricsAccessor = new NoSupportedCPUAccessor(processorNum); ILog logger = LogManager.getLogger(CPUProvider.class); diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/NoSupportedCPUAccessor.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/NoSupportedCPUAccessor.java index c2865cfa1238..6aad82189abf 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/NoSupportedCPUAccessor.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/NoSupportedCPUAccessor.java @@ -16,12 +16,8 @@ * */ - package org.apache.skywalking.apm.agent.core.jvm.cpu; -/** - * @author wusheng - */ public class NoSupportedCPUAccessor extends CPUMetricsAccessor { public NoSupportedCPUAccessor(int cpuCoreNum) { super(cpuCoreNum); diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/SunCpuAccessor.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/SunCpuAccessor.java index f46300f5ba2e..8cd1aa662616 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/SunCpuAccessor.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/SunCpuAccessor.java @@ -16,21 +16,17 @@ * */ - package org.apache.skywalking.apm.agent.core.jvm.cpu; import com.sun.management.OperatingSystemMXBean; import java.lang.management.ManagementFactory; -/** - * @author wusheng - */ public class SunCpuAccessor extends CPUMetricsAccessor { private final OperatingSystemMXBean osMBean; public SunCpuAccessor(int cpuCoreNum) { super(cpuCoreNum); - this.osMBean = (OperatingSystemMXBean)ManagementFactory.getOperatingSystemMXBean(); + this.osMBean = (OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean(); this.init(); } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/CMSGCModule.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/CMSGCModule.java index b619b08582f5..ac0a7ccb29a1 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/CMSGCModule.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/CMSGCModule.java @@ -16,25 +16,23 @@ * */ - package org.apache.skywalking.apm.agent.core.jvm.gc; import java.lang.management.GarbageCollectorMXBean; import java.util.List; -/** - * @author wusheng - */ public class CMSGCModule extends GCModule { public CMSGCModule(List beans) { super(beans); } - @Override protected String getOldGCName() { + @Override + protected String getOldGCName() { return "ConcurrentMarkSweep"; } - @Override protected String getNewGCName() { + @Override + protected String getNewGCName() { return "ParNew"; } } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/G1GCModule.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/G1GCModule.java index e2ecbb5a7640..d8226a7447b8 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/G1GCModule.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/G1GCModule.java @@ -16,25 +16,23 @@ * */ - package org.apache.skywalking.apm.agent.core.jvm.gc; import java.lang.management.GarbageCollectorMXBean; import java.util.List; -/** - * @author wusheng - */ public class G1GCModule extends GCModule { public G1GCModule(List beans) { super(beans); } - @Override protected String getOldGCName() { + @Override + protected String getOldGCName() { return "G1 Old Generation"; } - @Override protected String getNewGCName() { + @Override + protected String getNewGCName() { return "G1 Young Generation"; } } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/GCMetricAccessor.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/GCMetricAccessor.java index f706b9a87139..9193d64d4b0f 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/GCMetricAccessor.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/GCMetricAccessor.java @@ -16,15 +16,11 @@ * */ - package org.apache.skywalking.apm.agent.core.jvm.gc; import java.util.List; -import org.apache.skywalking.apm.network.language.agent.*; +import org.apache.skywalking.apm.network.language.agent.GC; -/** - * @author wusheng - */ public interface GCMetricAccessor { List getGCList(); } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/GCModule.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/GCModule.java index 4090b0fca41a..42fe534a4e67 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/GCModule.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/GCModule.java @@ -21,11 +21,9 @@ import java.lang.management.GarbageCollectorMXBean; import java.util.LinkedList; import java.util.List; -import org.apache.skywalking.apm.network.language.agent.*; +import org.apache.skywalking.apm.network.language.agent.GC; +import org.apache.skywalking.apm.network.language.agent.GCPhrase; -/** - * @author wusheng - */ public abstract class GCModule implements GCMetricAccessor { private List beans; @@ -68,12 +66,7 @@ public List getGCList() { continue; } - gcList.add( - GC.newBuilder().setPhrase(phrase) - .setCount(gcCount) - .setTime(gcTime) - .build() - ); + gcList.add(GC.newBuilder().setPhrase(phrase).setCount(gcCount).setTime(gcTime).build()); } return gcList; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/GCProvider.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/GCProvider.java index d28f1d7b7026..1d7d7ab888e7 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/GCProvider.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/GCProvider.java @@ -16,17 +16,13 @@ * */ - package org.apache.skywalking.apm.agent.core.jvm.gc; import java.lang.management.GarbageCollectorMXBean; import java.lang.management.ManagementFactory; import java.util.List; -import org.apache.skywalking.apm.network.language.agent.*; +import org.apache.skywalking.apm.network.language.agent.GC; -/** - * @author wusheng - */ public enum GCProvider { INSTANCE; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/ParallelGCModule.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/ParallelGCModule.java index c9565a9d30d0..1773756e3959 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/ParallelGCModule.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/ParallelGCModule.java @@ -16,25 +16,23 @@ * */ - package org.apache.skywalking.apm.agent.core.jvm.gc; import java.lang.management.GarbageCollectorMXBean; import java.util.List; -/** - * @author wusheng - */ public class ParallelGCModule extends GCModule { public ParallelGCModule(List beans) { super(beans); } - @Override protected String getOldGCName() { + @Override + protected String getOldGCName() { return "PS MarkSweep"; } - @Override protected String getNewGCName() { + @Override + protected String getNewGCName() { return "PS Scavenge"; } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/SerialGCModule.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/SerialGCModule.java index ba7ab4c3890f..b1c866767432 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/SerialGCModule.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/SerialGCModule.java @@ -16,25 +16,23 @@ * */ - package org.apache.skywalking.apm.agent.core.jvm.gc; import java.lang.management.GarbageCollectorMXBean; import java.util.List; -/** - * @author wusheng - */ public class SerialGCModule extends GCModule { public SerialGCModule(List beans) { super(beans); } - @Override protected String getOldGCName() { + @Override + protected String getOldGCName() { return "MarkSweepCompact"; } - @Override protected String getNewGCName() { + @Override + protected String getNewGCName() { return "Copy"; } } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/UnknowGC.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/UnknowGC.java index dc71cfff6d22..25b5adf5f5f9 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/UnknowGC.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/UnknowGC.java @@ -16,16 +16,13 @@ * */ - package org.apache.skywalking.apm.agent.core.jvm.gc; import java.util.LinkedList; import java.util.List; -import org.apache.skywalking.apm.network.language.agent.*; +import org.apache.skywalking.apm.network.language.agent.GC; +import org.apache.skywalking.apm.network.language.agent.GCPhrase; -/** - * @author wusheng - */ public class UnknowGC implements GCMetricAccessor { @Override public List getGCList() { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memory/MemoryProvider.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memory/MemoryProvider.java index f31e068e0312..7c73d626d3fa 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memory/MemoryProvider.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memory/MemoryProvider.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.jvm.memory; import java.lang.management.ManagementFactory; @@ -24,11 +23,8 @@ import java.lang.management.MemoryUsage; import java.util.LinkedList; import java.util.List; -import org.apache.skywalking.apm.network.language.agent.*; +import org.apache.skywalking.apm.network.language.agent.Memory; -/** - * @author wusheng - */ public enum MemoryProvider { INSTANCE; private final MemoryMXBean memoryMXBean; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/CMSCollectorModule.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/CMSCollectorModule.java index 79ae69c46714..ba54bf7d1444 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/CMSCollectorModule.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/CMSCollectorModule.java @@ -16,41 +16,46 @@ * */ - package org.apache.skywalking.apm.agent.core.jvm.memorypool; import java.lang.management.MemoryPoolMXBean; import java.util.List; -/** - * @author wusheng - */ public class CMSCollectorModule extends MemoryPoolModule { public CMSCollectorModule(List beans) { super(beans); } - @Override protected String[] getPermNames() { - return new String[] {"CMS Perm Gen", "Compressed Class Space"}; + @Override + protected String[] getPermNames() { + return new String[] { + "CMS Perm Gen", + "Compressed Class Space" + }; } - @Override protected String[] getCodeCacheNames() { + @Override + protected String[] getCodeCacheNames() { return new String[] {"Code Cache"}; } - @Override protected String[] getEdenNames() { + @Override + protected String[] getEdenNames() { return new String[] {"Par Eden Space"}; } - @Override protected String[] getOldNames() { + @Override + protected String[] getOldNames() { return new String[] {"CMS Old Gen"}; } - @Override protected String[] getSurvivorNames() { + @Override + protected String[] getSurvivorNames() { return new String[] {"Par Survivor Space"}; } - @Override protected String[] getMetaspaceNames() { + @Override + protected String[] getMetaspaceNames() { return new String[] {"Metaspace"}; } } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/G1CollectorModule.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/G1CollectorModule.java index 2fcd560b5549..b0b398e4a1f8 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/G1CollectorModule.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/G1CollectorModule.java @@ -16,41 +16,46 @@ * */ - package org.apache.skywalking.apm.agent.core.jvm.memorypool; import java.lang.management.MemoryPoolMXBean; import java.util.List; -/** - * @author wusheng - */ public class G1CollectorModule extends MemoryPoolModule { public G1CollectorModule(List beans) { super(beans); } - @Override protected String[] getPermNames() { - return new String[] {"G1 Perm Gen", "Compressed Class Space"}; + @Override + protected String[] getPermNames() { + return new String[] { + "G1 Perm Gen", + "Compressed Class Space" + }; } - @Override protected String[] getCodeCacheNames() { + @Override + protected String[] getCodeCacheNames() { return new String[] {"Code Cache"}; } - @Override protected String[] getEdenNames() { + @Override + protected String[] getEdenNames() { return new String[] {"G1 Eden Space"}; } - @Override protected String[] getOldNames() { + @Override + protected String[] getOldNames() { return new String[] {"G1 Old Gen"}; } - @Override protected String[] getSurvivorNames() { + @Override + protected String[] getSurvivorNames() { return new String[] {"G1 Survivor Space"}; } - @Override protected String[] getMetaspaceNames() { + @Override + protected String[] getMetaspaceNames() { return new String[] {"Metaspace"}; } } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolMetricsAccessor.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolMetricsAccessor.java index 7a38f1078e83..562eecc39250 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolMetricsAccessor.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolMetricsAccessor.java @@ -21,9 +21,6 @@ import java.util.List; import org.apache.skywalking.apm.network.language.agent.MemoryPool; -/** - * @author wusheng - */ public interface MemoryPoolMetricsAccessor { List getMemoryPoolMetricsList(); } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolModule.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolModule.java index 3ab0291c1fc0..839712b4bb79 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolModule.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolModule.java @@ -18,13 +18,13 @@ package org.apache.skywalking.apm.agent.core.jvm.memorypool; -import java.lang.management.*; -import java.util.*; -import org.apache.skywalking.apm.network.language.agent.*; +import java.lang.management.MemoryPoolMXBean; +import java.lang.management.MemoryUsage; +import java.util.LinkedList; +import java.util.List; +import org.apache.skywalking.apm.network.language.agent.MemoryPool; +import org.apache.skywalking.apm.network.language.agent.PoolType; -/** - * @author wusheng - */ public abstract class MemoryPoolModule implements MemoryPoolMetricsAccessor { private List beans; @@ -55,12 +55,13 @@ public List getMemoryPoolMetricsList() { } MemoryUsage usage = bean.getUsage(); - poolList.add(MemoryPool.newBuilder().setType(type) - .setInit(usage.getInit()) - .setMax(usage.getMax()) - .setCommited(usage.getCommitted()) - .setUsed(usage.getUsed()) - .build()); + poolList.add(MemoryPool.newBuilder() + .setType(type) + .setInit(usage.getInit()) + .setMax(usage.getMax()) + .setCommited(usage.getCommitted()) + .setUsed(usage.getUsed()) + .build()); } return poolList; } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolProvider.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolProvider.java index d85c478536b3..d728652d81ff 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolProvider.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/MemoryPoolProvider.java @@ -16,16 +16,13 @@ * */ - package org.apache.skywalking.apm.agent.core.jvm.memorypool; -import java.lang.management.*; +import java.lang.management.ManagementFactory; +import java.lang.management.MemoryPoolMXBean; import java.util.List; import org.apache.skywalking.apm.network.language.agent.MemoryPool; -/** - * @author wusheng - */ public enum MemoryPoolProvider { INSTANCE; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/ParallelCollectorModule.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/ParallelCollectorModule.java index ee90c68ba2b6..241d2306e0fc 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/ParallelCollectorModule.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/ParallelCollectorModule.java @@ -16,42 +16,47 @@ * */ - package org.apache.skywalking.apm.agent.core.jvm.memorypool; import java.lang.management.MemoryPoolMXBean; import java.util.List; -/** - * @author wusheng - */ public class ParallelCollectorModule extends MemoryPoolModule { public ParallelCollectorModule(List beans) { super(beans); } - @Override protected String[] getPermNames() { - return new String[] {"PS Perm Gen", "Compressed Class Space"}; + @Override + protected String[] getPermNames() { + return new String[] { + "PS Perm Gen", + "Compressed Class Space" + }; } - @Override protected String[] getCodeCacheNames() { + @Override + protected String[] getCodeCacheNames() { return new String[] {"Code Cache"}; } - @Override protected String[] getEdenNames() { + @Override + protected String[] getEdenNames() { return new String[] {"PS Eden Space"}; } - @Override protected String[] getOldNames() { + @Override + protected String[] getOldNames() { return new String[] {"PS Old Gen"}; } - @Override protected String[] getSurvivorNames() { + @Override + protected String[] getSurvivorNames() { return new String[] {"PS Survivor Space"}; } - @Override protected String[] getMetaspaceNames() { + @Override + protected String[] getMetaspaceNames() { return new String[] {"Metaspace"}; } } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/SerialCollectorModule.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/SerialCollectorModule.java index b587c0ecf191..b4b13ae5d72b 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/SerialCollectorModule.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/SerialCollectorModule.java @@ -16,41 +16,46 @@ * */ - package org.apache.skywalking.apm.agent.core.jvm.memorypool; import java.lang.management.MemoryPoolMXBean; import java.util.List; -/** - * @author wusheng - */ public class SerialCollectorModule extends MemoryPoolModule { public SerialCollectorModule(List beans) { super(beans); } - @Override protected String[] getPermNames() { - return new String[] {"Perm Gen", "Compressed Class Space"}; + @Override + protected String[] getPermNames() { + return new String[] { + "Perm Gen", + "Compressed Class Space" + }; } - @Override protected String[] getCodeCacheNames() { + @Override + protected String[] getCodeCacheNames() { return new String[] {"Code Cache"}; } - @Override protected String[] getEdenNames() { + @Override + protected String[] getEdenNames() { return new String[] {"Eden Space"}; } - @Override protected String[] getOldNames() { + @Override + protected String[] getOldNames() { return new String[] {"Tenured Gen"}; } - @Override protected String[] getSurvivorNames() { + @Override + protected String[] getSurvivorNames() { return new String[] {"Survivor Space"}; } - @Override protected String[] getMetaspaceNames() { + @Override + protected String[] getMetaspaceNames() { return new String[] {"Metaspace"}; } } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/UnknownMemoryPool.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/UnknownMemoryPool.java index 32428fb6613a..75195315384d 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/UnknownMemoryPool.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/UnknownMemoryPool.java @@ -16,16 +16,13 @@ * */ - package org.apache.skywalking.apm.agent.core.jvm.memorypool; import java.util.LinkedList; import java.util.List; -import org.apache.skywalking.apm.network.language.agent.*; +import org.apache.skywalking.apm.network.language.agent.MemoryPool; +import org.apache.skywalking.apm.network.language.agent.PoolType; -/** - * @author wusheng - */ public class UnknownMemoryPool implements MemoryPoolMetricsAccessor { @Override public List getMemoryPoolMetricsList() { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/ILog.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/ILog.java index afd5fd2a494f..11db0d01da59 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/ILog.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/ILog.java @@ -16,15 +16,11 @@ * */ - package org.apache.skywalking.apm.agent.core.logging.api; /** - * The Log interface. - * It's very easy to understand, like any other log-component. - * Do just like log4j or log4j2 does. + * The Log interface. It's very easy to understand, like any other log-component. Do just like log4j or log4j2 does. *

- * Created by xin on 2016/11/10. */ public interface ILog { void info(String format); diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/LogManager.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/LogManager.java index a8afb250fccf..a3bcf9ab3d91 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/LogManager.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/LogManager.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.logging.api; import org.apache.skywalking.apm.agent.core.logging.core.PatternLogResolver; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/LogResolver.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/LogResolver.java index c54d7fde9d54..f88b9ddc746f 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/LogResolver.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/LogResolver.java @@ -16,17 +16,15 @@ * */ - package org.apache.skywalking.apm.agent.core.logging.api; /** * {@link LogResolver} just do only one thing: return the {@link ILog} implementation. *

- * Created by xin on 2016/11/10. */ public interface LogResolver { /** - * @param clazz, the class is showed in log message. + * @param clazz the class is showed in log message. * @return {@link ILog} implementation. */ ILog getLogger(Class clazz); diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/NoopLogger.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/NoopLogger.java index 016cc43463fd..b78fc55e4c14 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/NoopLogger.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/api/NoopLogger.java @@ -16,14 +16,11 @@ * */ - package org.apache.skywalking.apm.agent.core.logging.api; /** - * No operation logger implementation. - * Just implement {@link ILog} interface, but do nothing. + * No operation logger implementation. Just implement {@link ILog} interface, but do nothing. *

- * Created by xin on 2016/11/10. */ public enum NoopLogger implements ILog { INSTANCE; @@ -93,7 +90,6 @@ public void error(Throwable e, String format, Object... arguments) { } - @Override public void warn(Throwable e, String format, Object... arguments) { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/Converter.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/Converter.java index 05612263f62e..504d816d9395 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/Converter.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/Converter.java @@ -16,13 +16,10 @@ * */ - package org.apache.skywalking.apm.agent.core.logging.core; - /** * The Converter, It is used to convert the LogEvent to the String. - * @author alvin */ public interface Converter { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/FileWriter.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/FileWriter.java index aa18c59b4c11..866bc4f3d607 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/FileWriter.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/FileWriter.java @@ -16,15 +16,13 @@ * */ - package org.apache.skywalking.apm.agent.core.logging.core; -import org.apache.skywalking.apm.agent.core.boot.DefaultNamedThreadFactory; -import org.apache.skywalking.apm.agent.core.conf.Config; -import org.apache.skywalking.apm.agent.core.conf.Constants; -import org.apache.skywalking.apm.util.RunnableWithExceptionProtection; - -import java.io.*; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.FilenameFilter; +import java.io.IOException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; @@ -35,11 +33,13 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.regex.Pattern; +import org.apache.skywalking.apm.agent.core.boot.DefaultNamedThreadFactory; +import org.apache.skywalking.apm.agent.core.conf.Config; +import org.apache.skywalking.apm.agent.core.conf.Constants; +import org.apache.skywalking.apm.util.RunnableWithExceptionProtection; /** * The FileWriter support async file output, by using a queue as buffer. - * - * @author wusheng */ public class FileWriter implements IWriter { private static FileWriter INSTANCE; @@ -63,29 +63,29 @@ public static FileWriter get() { private FileWriter() { logBuffer = new ArrayBlockingQueue(1024); final ArrayList outputLogs = new ArrayList(200); - Executors - .newSingleThreadScheduledExecutor(new DefaultNamedThreadFactory("LogFileWriter")) - .scheduleAtFixedRate(new RunnableWithExceptionProtection(new Runnable() { - @Override public void run() { - try { - logBuffer.drainTo(outputLogs); - for (String log : outputLogs) { - writeToFile(log + Constants.LINE_SEPARATOR); - } - try { - fileOutputStream.flush(); - } catch (IOException e) { - e.printStackTrace(); - } - } finally { - outputLogs.clear(); - } - } - }, new RunnableWithExceptionProtection.CallbackWhenException() { - @Override public void handle(Throwable t) { - } - } - ), 0, 1, TimeUnit.SECONDS); + Executors.newSingleThreadScheduledExecutor(new DefaultNamedThreadFactory("LogFileWriter")) + .scheduleAtFixedRate(new RunnableWithExceptionProtection(new Runnable() { + @Override + public void run() { + try { + logBuffer.drainTo(outputLogs); + for (String log : outputLogs) { + writeToFile(log + Constants.LINE_SEPARATOR); + } + try { + fileOutputStream.flush(); + } catch (IOException e) { + e.printStackTrace(); + } + } finally { + outputLogs.clear(); + } + } + }, new RunnableWithExceptionProtection.CallbackWhenException() { + @Override + public void handle(Throwable t) { + } + }), 0, 1, TimeUnit.SECONDS); } /** @@ -123,9 +123,8 @@ public Object call() throws Exception { forceExecute(new Callable() { @Override public Object call() throws Exception { - new File(Config.Logging.DIR, Config.Logging.FILE_NAME) - .renameTo(new File(Config.Logging.DIR, - Config.Logging.FILE_NAME + new SimpleDateFormat(".yyyy_MM_dd_HH_mm_ss").format(new Date()))); + new File(Config.Logging.DIR, Config.Logging.FILE_NAME).renameTo(new File(Config.Logging.DIR, Config.Logging.FILE_NAME + new SimpleDateFormat(".yyyy_MM_dd_HH_mm_ss") + .format(new Date()))); return null; } }); @@ -145,6 +144,7 @@ public Object call() throws Exception { /** * load history log file name array + * * @return history log file name array */ private String[] getHistoryFilePath() { @@ -216,7 +216,8 @@ private boolean prepareWriteStream() { * * @param message to log */ - @Override public void write(String message) { + @Override + public void write(String message) { logBuffer.offer(message); } } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/IWriter.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/IWriter.java index 9d193e9f19e6..2388f09bd4a7 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/IWriter.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/IWriter.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.logging.core; public interface IWriter { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/LogEvent.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/LogEvent.java index 7783134e666d..f660d00174e1 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/LogEvent.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/LogEvent.java @@ -16,13 +16,10 @@ * */ - package org.apache.skywalking.apm.agent.core.logging.core; /** * The representation of logging events. This instance is pass around to the List of Converter. - * - * @author alvin */ public class LogEvent { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/LogLevel.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/LogLevel.java index d53704e7aaf5..702c3ee17c77 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/LogLevel.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/LogLevel.java @@ -16,12 +16,8 @@ * */ - package org.apache.skywalking.apm.agent.core.logging.core; -/** - * Created by xin on 2016/12/7. - */ public enum LogLevel { DEBUG, INFO, WARN, ERROR, OFF } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/LogMessageHolder.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/LogMessageHolder.java index d5eeb8f3ee07..af128ca64821 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/LogMessageHolder.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/LogMessageHolder.java @@ -16,14 +16,11 @@ * */ - package org.apache.skywalking.apm.agent.core.logging.core; /** - * The LogMessageHolder is a {@link String} holder, - * in order to in-process propagation String across the disruptor queue. - * - * @author wusheng + * The LogMessageHolder is a {@link String} holder, in order to in-process propagation String across the + * disruptor queue. */ public class LogMessageHolder { private String message; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/LogOutput.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/LogOutput.java index 556654cc0d0c..b4394fa29f75 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/LogOutput.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/LogOutput.java @@ -16,12 +16,8 @@ * */ - package org.apache.skywalking.apm.agent.core.logging.core; -/** - * @author alvin - */ public enum LogOutput { FILE, CONSOLE } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/Parser.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/Parser.java index 743364eff62a..8f3fa9bb2248 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/Parser.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/Parser.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.logging.core; import org.apache.skywalking.apm.agent.core.logging.core.coverts.LiteralConverter; @@ -27,7 +26,6 @@ /** * Parser of LogPattern. It is used to parse a pattern to the List of Converter. - * @author alvin */ public class Parser { private final Map> convertMaps; @@ -36,7 +34,6 @@ enum State { LITERAL_STATE, KEYWORD_STATE } - public static final char ESCAPE_CHAR = '\\'; public static final char PERCENT_CHAR = '%'; @@ -45,7 +42,6 @@ enum State { private int pointer = 0; private State state = State.LITERAL_STATE; - public Parser(String pattern, Map> convertMaps) { if (pattern == null || pattern.length() == 0) { throw new IllegalArgumentException("null or empty pattern string not allowed"); @@ -191,5 +187,4 @@ private void escape(String escapeChars, StringBuilder buf, char next) { } } - } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/PatternLogResolver.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/PatternLogResolver.java index 328cc513e9cd..d86dd297a77e 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/PatternLogResolver.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/PatternLogResolver.java @@ -16,16 +16,12 @@ * */ - package org.apache.skywalking.apm.agent.core.logging.core; import org.apache.skywalking.apm.agent.core.conf.Config; import org.apache.skywalking.apm.agent.core.logging.api.ILog; import org.apache.skywalking.apm.agent.core.logging.api.LogResolver; -/** - * @author alvin - */ public class PatternLogResolver implements LogResolver { @Override diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/PatternLogger.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/PatternLogger.java index 9a2bc530b9d3..87e92c7e71e0 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/PatternLogger.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/PatternLogger.java @@ -35,16 +35,12 @@ import java.util.regex.Matcher; /** - * A flexible Logger configurable with pattern string. - * This is default implementation of {@link ILog} - * This can parse a pattern to the List of converter with Parser. - * We package LogEvent with message, level,timestamp ..., passing around to the List of converter to concat actually Log-String. - * - * @author alvin + * A flexible Logger configurable with pattern string. This is default implementation of {@link ILog} This can parse a + * pattern to the List of converter with Parser. We package LogEvent with message, level,timestamp ..., passing around + * to the List of converter to concat actually Log-String. */ public class PatternLogger implements ILog { - public static final Map> DEFAULT_CONVERTER_MAP = new HashMap>(); static { @@ -84,7 +80,6 @@ public void setPattern(String pattern) { converters = new Parser(pattern, DEFAULT_CONVERTER_MAP).parse(); } - protected void logger(LogLevel level, String message, Throwable e) { WriterFactory.getLogWriter().write(format(level, message, e)); } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/SystemOutWriter.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/SystemOutWriter.java index 432915edbd48..42e4b441fbd7 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/SystemOutWriter.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/SystemOutWriter.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.logging.core; import java.io.PrintStream; @@ -25,10 +24,7 @@ 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 + * Tricky codes for avoiding style-check. Because, in here, "system.out.println" is the only choice to output logs. */ @Override public void write(String message) { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/WriterFactory.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/WriterFactory.java index 95db3dd70c19..e8adf48d2bdc 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/WriterFactory.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/WriterFactory.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.logging.core; import org.apache.skywalking.apm.agent.core.boot.AgentPackageNotFoundException; @@ -25,9 +24,6 @@ import org.apache.skywalking.apm.agent.core.conf.SnifferConfigInitializer; import org.apache.skywalking.apm.util.StringUtil; -/** - * @author Alan Lau - */ public class WriterFactory { private static IWriter WRITER; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/AgentNameConverter.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/AgentNameConverter.java index 3b47c809941a..0c690a197fc6 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/AgentNameConverter.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/AgentNameConverter.java @@ -16,17 +16,12 @@ * */ - package org.apache.skywalking.apm.agent.core.logging.core.coverts; import org.apache.skywalking.apm.agent.core.conf.Config; import org.apache.skywalking.apm.agent.core.logging.core.Converter; import org.apache.skywalking.apm.agent.core.logging.core.LogEvent; -/** - * - * @author alvin - */ public class AgentNameConverter implements Converter { @Override public String convert(LogEvent logEvent) { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/ClassConverter.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/ClassConverter.java index 650b2c4c8dc0..3bcf5a2cbbd7 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/ClassConverter.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/ClassConverter.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.logging.core.coverts; import org.apache.skywalking.apm.agent.core.logging.core.Converter; @@ -24,11 +23,9 @@ /** * Just return logEvent.getTargetClass(). - * @author alvin */ public class ClassConverter implements Converter { - @Override public String convert(LogEvent logEvent) { return logEvent.getTargetClass(); diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/DateConverter.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/DateConverter.java index c4cbc4f52e92..7487556fbbe6 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/DateConverter.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/DateConverter.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.logging.core.coverts; import org.apache.skywalking.apm.agent.core.logging.core.Converter; @@ -27,8 +26,6 @@ /** * The Converter is used to return a now date with format. - * - * @author alvin */ public class DateConverter implements Converter { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/LevelConverter.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/LevelConverter.java index 83e57b82f3fb..f016cf3b8764 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/LevelConverter.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/LevelConverter.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.logging.core.coverts; import org.apache.skywalking.apm.agent.core.logging.core.Converter; @@ -24,7 +23,6 @@ /** * Just return logEvent.getLevel().name() - * @author alvin */ public class LevelConverter implements Converter { @Override diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/LiteralConverter.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/LiteralConverter.java index 2fbb41343892..411b31a1ad11 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/LiteralConverter.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/LiteralConverter.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.logging.core.coverts; import org.apache.skywalking.apm.agent.core.logging.core.Converter; @@ -24,7 +23,6 @@ /** * This Converter is used to return the literal. - * @author alvin */ public class LiteralConverter implements Converter { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/MessageConverter.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/MessageConverter.java index 4bd34b36000a..106c26630c85 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/MessageConverter.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/MessageConverter.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.logging.core.coverts; import org.apache.skywalking.apm.agent.core.logging.core.Converter; @@ -24,7 +23,6 @@ /** * Just return the logEvent.getMessage() - * @author alvin */ public class MessageConverter implements Converter { @Override diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/ThreadConverter.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/ThreadConverter.java index 6fc2ba9ace1a..45e421dee6a8 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/ThreadConverter.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/ThreadConverter.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.logging.core.coverts; import org.apache.skywalking.apm.agent.core.logging.core.Converter; @@ -24,7 +23,6 @@ /** * Just return the Thread.currentThread().getName() - * @author alvin */ public class ThreadConverter implements Converter { @Override diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/ThrowableConverter.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/ThrowableConverter.java index 09797e11f96e..106782936a4d 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/ThrowableConverter.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/logging/core/coverts/ThrowableConverter.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.logging.core.coverts; import org.apache.skywalking.apm.agent.core.conf.Constants; @@ -28,7 +27,6 @@ /** * Return the StackTrace of String with logEvent.getThrowable() - * @author alvin */ public class ThrowableConverter implements Converter { @Override diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/os/OSUtil.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/os/OSUtil.java index 8a2fde4a6da2..aad9f40c6bf0 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/os/OSUtil.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/os/OSUtil.java @@ -30,9 +30,6 @@ import java.util.List; import org.apache.skywalking.apm.network.common.KeyStringValuePair; -/** - * @author wusheng - */ public class OSUtil { private static volatile String OS_NAME; private static volatile String HOST_NAME; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/os/ProcessorUtil.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/os/ProcessorUtil.java index 3bcac657948e..13c6231d2e7e 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/os/ProcessorUtil.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/os/ProcessorUtil.java @@ -16,14 +16,10 @@ * */ - package org.apache.skywalking.apm.agent.core.os; import java.lang.management.ManagementFactory; -/** - * @author wusheng - */ public class ProcessorUtil { public static int getNumberOfProcessors() { return ManagementFactory.getOperatingSystemMXBean().getAvailableProcessors(); diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/AbstractClassEnhancePluginDefine.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/AbstractClassEnhancePluginDefine.java index 0bc52c78628b..76cad6a06435 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/AbstractClassEnhancePluginDefine.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/AbstractClassEnhancePluginDefine.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin; import net.bytebuddy.description.type.TypeDescription; @@ -33,8 +32,8 @@ /** * Basic abstract class of all sky-walking auto-instrumentation plugins. *

- * It provides the outline of enhancing the target class. - * If you want to know more about enhancing, you should go to see {@link ClassEnhancePluginDefine} + * It provides the outline of enhancing the target class. If you want to know more about enhancing, you should go to see + * {@link ClassEnhancePluginDefine} */ public abstract class AbstractClassEnhancePluginDefine { private static final ILog logger = LogManager.getLogger(AbstractClassEnhancePluginDefine.class); @@ -43,13 +42,13 @@ public abstract class AbstractClassEnhancePluginDefine { * Main entrance of enhancing the class. * * @param typeDescription target class description. - * @param builder byte-buddy's builder to manipulate target class's bytecode. - * @param classLoader load the given transformClass + * @param builder byte-buddy's builder to manipulate target class's bytecode. + * @param classLoader load the given transformClass * @return the new builder, or null if not be enhanced. * @throws PluginException when set builder failure. */ - public DynamicType.Builder define(TypeDescription typeDescription, - DynamicType.Builder builder, ClassLoader classLoader, EnhanceContext context) throws PluginException { + public DynamicType.Builder define(TypeDescription typeDescription, DynamicType.Builder builder, + ClassLoader classLoader, EnhanceContext context) throws PluginException { String interceptorDefineClassName = this.getClass().getName(); String transformClassName = typeDescription.getTypeName(); if (StringUtil.isEmpty(transformClassName)) { @@ -66,8 +65,7 @@ public DynamicType.Builder define(TypeDescription typeDescription, if (witnessClasses != null) { for (String witnessClass : witnessClasses) { if (!WitnessClassFinder.INSTANCE.exist(witnessClass, classLoader)) { - logger.warn("enhance class {} by plugin {} is not working. Because witness class {} is not existed.", transformClassName, interceptorDefineClassName, - witnessClass); + logger.warn("enhance class {} by plugin {} is not working. Because witness class {} is not existed.", transformClassName, interceptorDefineClassName, witnessClass); return null; } } @@ -101,8 +99,6 @@ protected abstract DynamicType.Builder enhance(TypeDescription typeDescriptio * (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 */ protected String[] witnessClasses() { return new String[] {}; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/ByteBuddyCoreClasses.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/ByteBuddyCoreClasses.java index ee7324839671..883158b233ea 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/ByteBuddyCoreClasses.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/ByteBuddyCoreClasses.java @@ -20,8 +20,6 @@ /** * All ByteBuddy core classes required to expose, including open edge for JDK 9+ module, or Bootstrap instrumentation. - * - * @author wusheng */ public class ByteBuddyCoreClasses { private static final String SHADE_PACKAGE = "org.apache.skywalking.apm.dependencies."; @@ -34,5 +32,5 @@ public class ByteBuddyCoreClasses { SHADE_PACKAGE + "net.bytebuddy.implementation.bind.annotation.SuperCall", SHADE_PACKAGE + "net.bytebuddy.implementation.bind.annotation.Origin", SHADE_PACKAGE + "net.bytebuddy.implementation.bind.annotation.Morph", - }; + }; } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/DynamicPluginLoader.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/DynamicPluginLoader.java index d8f522b0fee4..4e5700925fc0 100755 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/DynamicPluginLoader.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/DynamicPluginLoader.java @@ -27,8 +27,6 @@ /** * The plugin can be inserted into the kernel by implementing this spi return PluginDefine list. - * - * @author zhaoyuguang */ public enum DynamicPluginLoader { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/EnhanceContext.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/EnhanceContext.java index aee5822eb304..ff46f72293c5 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/EnhanceContext.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/EnhanceContext.java @@ -16,24 +16,20 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassEnhancePluginDefine; /** * The EnhanceContext represents the context or status for processing a class. - * - * Based on this context, the plugin core {@link ClassEnhancePluginDefine} - * knows how to process the specific steps for every particular plugin. - * - * @author wusheng + *

+ * Based on this context, the plugin core {@link ClassEnhancePluginDefine} knows how to process the specific steps for + * every particular plugin. */ public class EnhanceContext { private boolean isEnhanced = false; /** - * The object has already been enhanced or extended. - * e.g. added the new field, or implemented the new interface + * The object has already been enhanced or extended. e.g. added the new field, or implemented the new interface */ private boolean objectExtended = false; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/InstrumentDebuggingClass.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/InstrumentDebuggingClass.java index bbf2b750e5d4..b5244b62fe08 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/InstrumentDebuggingClass.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/InstrumentDebuggingClass.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin; import java.io.File; @@ -31,8 +30,6 @@ /** * The manipulated class output. Write the dynamic classes to the `debugging` folder, when we need to do some debug and * recheck. - * - * @author wu-sheng */ public enum InstrumentDebuggingClass { INSTANCE; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/PluginBootstrap.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/PluginBootstrap.java index 73dc34f14d08..2ab7c6c02991 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/PluginBootstrap.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/PluginBootstrap.java @@ -27,11 +27,8 @@ import org.apache.skywalking.apm.agent.core.logging.api.LogManager; /** - * Plugins finder. - * Use {@link PluginResourcesResolver} to find all plugins, - * and ask {@link PluginCfg} to load all plugin definitions. - * - * @author wusheng + * Plugins finder. Use {@link PluginResourcesResolver} to find all plugins, and ask {@link PluginCfg} to load all plugin + * definitions. */ public class PluginBootstrap { private static final ILog logger = LogManager.getLogger(PluginBootstrap.class); @@ -66,11 +63,8 @@ public List loadPlugins() throws AgentPackageN for (PluginDefine pluginDefine : pluginClassList) { try { logger.debug("loading plugin class {}.", pluginDefine.getDefineClass()); - AbstractClassEnhancePluginDefine plugin = - (AbstractClassEnhancePluginDefine)Class.forName(pluginDefine.getDefineClass(), - true, - AgentClassLoader.getDefault()) - .newInstance(); + AbstractClassEnhancePluginDefine plugin = (AbstractClassEnhancePluginDefine) Class.forName(pluginDefine.getDefineClass(), true, AgentClassLoader + .getDefault()).newInstance(); plugins.add(plugin); } catch (Throwable t) { logger.error(t, "load plugin [{}] failure.", pluginDefine.getDefineClass()); diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/PluginCfg.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/PluginCfg.java index 29de3124a789..7ea50fe4801a 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/PluginCfg.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/PluginCfg.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin; import org.apache.skywalking.apm.agent.core.plugin.exception.IllegalPluginDefineException; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/PluginDefine.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/PluginDefine.java index 573461ac4522..7bbc14de6eb7 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/PluginDefine.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/PluginDefine.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin; import org.apache.skywalking.apm.agent.core.plugin.exception.IllegalPluginDefineException; @@ -58,4 +57,3 @@ public String getDefineClass() { } } - diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/PluginException.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/PluginException.java index 8e213542b829..adbc6b5773d9 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/PluginException.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/PluginException.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin; public class PluginException extends RuntimeException { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/PluginFinder.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/PluginFinder.java index edf7207145bf..6a2082ae3f0e 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/PluginFinder.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/PluginFinder.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin; import java.util.ArrayList; @@ -39,8 +38,6 @@ /** * The PluginFinder represents a finder , which assist to find the one from the given {@link * AbstractClassEnhancePluginDefine} list. - * - * @author wusheng */ public class PluginFinder { private final Map> nameMatchDefine = new HashMap>(); @@ -56,7 +53,7 @@ public PluginFinder(List plugins) { } if (match instanceof NameMatch) { - NameMatch nameMatch = (NameMatch)match; + NameMatch nameMatch = (NameMatch) match; LinkedList pluginDefines = nameMatchDefine.get(nameMatch.getClassName()); if (pluginDefines == null) { pluginDefines = new LinkedList(); @@ -81,7 +78,7 @@ public List find(TypeDescription typeDescripti } for (AbstractClassEnhancePluginDefine pluginDefine : signatureMatchDefine) { - IndirectMatch match = (IndirectMatch)pluginDefine.enhanceClass(); + IndirectMatch match = (IndirectMatch) pluginDefine.enhanceClass(); if (match.isMatch(typeDescription)) { matchedPlugins.add(pluginDefine); } @@ -101,7 +98,7 @@ public boolean matches(NamedElement target) { for (AbstractClassEnhancePluginDefine define : signatureMatchDefine) { ClassMatch match = define.enhanceClass(); if (match instanceof IndirectMatch) { - judge = judge.or(((IndirectMatch)match).buildJunction()); + judge = judge.or(((IndirectMatch) match).buildJunction()); } } return new ProtectiveShieldMatcher(judge); diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/PluginResourcesResolver.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/PluginResourcesResolver.java index 878e2b90566e..15df883e4bc7 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/PluginResourcesResolver.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/PluginResourcesResolver.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin; import java.io.IOException; @@ -29,10 +28,7 @@ import org.apache.skywalking.apm.agent.core.plugin.loader.AgentClassLoader; /** - * Use the current classloader to read all plugin define file. - * The file must be named 'skywalking-plugin.def' - * - * @author wusheng + * Use the current classloader to read all plugin define file. The file must be named 'skywalking-plugin.def' */ public class PluginResourcesResolver { private static final ILog logger = LogManager.getLogger(PluginResourcesResolver.class); diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/WitnessClassFinder.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/WitnessClassFinder.java index 5c5f16018227..8211281f8301 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/WitnessClassFinder.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/WitnessClassFinder.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin; import java.util.HashMap; @@ -24,11 +23,8 @@ import net.bytebuddy.pool.TypePool; /** - * The WitnessClassFinder represents a pool of {@link TypePool}s, - * each {@link TypePool} matches a {@link ClassLoader}, - * which helps to find the class define existed or not. - * - * @author wusheng + * The WitnessClassFinder represents a pool of {@link TypePool}s, each {@link TypePool} matches a {@link + * ClassLoader}, which helps to find the class define existed or not. */ public enum WitnessClassFinder { INSTANCE; @@ -36,7 +32,6 @@ public enum WitnessClassFinder { private Map poolMap = new HashMap(); /** - * @param witnessClass * @param classLoader for finding the witnessClass * @return true, if the given witnessClass exists, through the given classLoader. */ diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/BootstrapInstrumentBoost.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/BootstrapInstrumentBoost.java index ebb403514092..79d42f5099c4 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/BootstrapInstrumentBoost.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/BootstrapInstrumentBoost.java @@ -50,8 +50,6 @@ /** * If there is Bootstrap instrumentation plugin declared in plugin list, BootstrapInstrumentBoost inject the necessary * classes into bootstrap class loader, including generated dynamic delegate classes. - * - * @author wusheng */ public class BootstrapInstrumentBoost { private static final ILog logger = LogManager.getLogger(BootstrapInstrumentBoost.class); @@ -73,8 +71,8 @@ public class BootstrapInstrumentBoost { private static String STATIC_METHOD_DELEGATE_TEMPLATE = "org.apache.skywalking.apm.agent.core.plugin.bootstrap.template.StaticMethodInterTemplate"; private static String STATIC_METHOD_WITH_OVERRIDE_ARGS_DELEGATE_TEMPLATE = "org.apache.skywalking.apm.agent.core.plugin.bootstrap.template.StaticMethodInterWithOverrideArgsTemplate"; - public static AgentBuilder inject(PluginFinder pluginFinder, Instrumentation instrumentation, AgentBuilder agentBuilder, - JDK9ModuleExporter.EdgeClasses edgeClasses) throws PluginException { + public static AgentBuilder inject(PluginFinder pluginFinder, Instrumentation instrumentation, + AgentBuilder agentBuilder, JDK9ModuleExporter.EdgeClasses edgeClasses) throws PluginException { Map classesTypeMap = new HashMap(); if (!prepareJREInstrumentation(pluginFinder, classesTypeMap)) { @@ -103,7 +101,6 @@ public static AgentBuilder inject(PluginFinder pluginFinder, Instrumentation ins factory.make(null, null).injectRaw(classesTypeMap); agentBuilder = agentBuilder.with(new AgentBuilder.InjectionStrategy.UsingUnsafe.OfFactory(factory)); - return agentBuilder; } @@ -134,7 +131,7 @@ public static Class forInternalDelegateClass(String methodsInterceptor) { /** * Generate dynamic delegate for ByteBuddy * - * @param pluginFinder gets the whole plugin list. + * @param pluginFinder gets the whole plugin list. * @param classesTypeMap hosts the class binary. * @return true if have JRE instrumentation requirement. * @throws PluginException when generate failure. @@ -146,7 +143,8 @@ private static boolean prepareJREInstrumentation(PluginFinder pluginFinder, for (AbstractClassEnhancePluginDefine define : bootstrapClassMatchDefines) { for (InstanceMethodsInterceptPoint point : define.getInstanceMethodsInterceptPoints()) { if (point.isOverrideArgs()) { - generateDelegator(classesTypeMap, typePool, INSTANCE_METHOD_WITH_OVERRIDE_ARGS_DELEGATE_TEMPLATE, point.getMethodsInterceptor()); + generateDelegator(classesTypeMap, typePool, INSTANCE_METHOD_WITH_OVERRIDE_ARGS_DELEGATE_TEMPLATE, point + .getMethodsInterceptor()); } else { generateDelegator(classesTypeMap, typePool, INSTANCE_METHOD_DELEGATE_TEMPLATE, point.getMethodsInterceptor()); } @@ -158,7 +156,8 @@ private static boolean prepareJREInstrumentation(PluginFinder pluginFinder, for (StaticMethodsInterceptPoint point : define.getStaticMethodsInterceptPoints()) { if (point.isOverrideArgs()) { - generateDelegator(classesTypeMap, typePool, STATIC_METHOD_WITH_OVERRIDE_ARGS_DELEGATE_TEMPLATE, point.getMethodsInterceptor()); + generateDelegator(classesTypeMap, typePool, STATIC_METHOD_WITH_OVERRIDE_ARGS_DELEGATE_TEMPLATE, point + .getMethodsInterceptor()); } else { generateDelegator(classesTypeMap, typePool, STATIC_METHOD_DELEGATE_TEMPLATE, point.getMethodsInterceptor()); } @@ -169,27 +168,26 @@ private static boolean prepareJREInstrumentation(PluginFinder pluginFinder, /** * Generate the delegator class based on given template class. This is preparation stage level code generation. - * + *

* One key step to avoid class confliction between AppClassLoader and BootstrapClassLoader * - * @param classesTypeMap hosts injected binary of generated class - * @param typePool to generate new class + * @param classesTypeMap hosts injected binary of generated class + * @param typePool to generate new class * @param templateClassName represents the class as template in this generation process. The templates are - * pre-defined in SkyWalking agent core. - * @param methodsInterceptor + * pre-defined in SkyWalking agent core. */ private static void generateDelegator(Map classesTypeMap, TypePool typePool, String templateClassName, String methodsInterceptor) { String internalInterceptorName = internalDelegate(methodsInterceptor); try { - TypeDescription templateTypeDescription = typePool.describe(templateClassName) - .resolve(); + TypeDescription templateTypeDescription = typePool.describe(templateClassName).resolve(); - DynamicType.Unloaded interceptorType = new ByteBuddy() - .redefine(templateTypeDescription, ClassFileLocator.ForClassLoader.of(BootstrapInstrumentBoost.class.getClassLoader())) - .name(internalInterceptorName) - .field(named("TARGET_INTERCEPTOR")).value(methodsInterceptor) - .make(); + DynamicType.Unloaded interceptorType = new ByteBuddy().redefine(templateTypeDescription, ClassFileLocator.ForClassLoader + .of(BootstrapInstrumentBoost.class.getClassLoader())) + .name(internalInterceptorName) + .field(named("TARGET_INTERCEPTOR")) + .value(methodsInterceptor) + .make(); classesTypeMap.put(internalInterceptorName, interceptorType.getBytes()); @@ -204,7 +202,7 @@ private static void generateDelegator(Map classesTypeMap, TypePo * instrumentation active by any plugin * * @param loadedTypeMap hosts all injected class - * @param className to load + * @param className to load */ private static void loadHighPriorityClass(Map loadedTypeMap, String className) throws PluginException { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/BootstrapPluginLogBridge.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/BootstrapPluginLogBridge.java index 8535321d4ddc..8c1e2974b5c1 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/BootstrapPluginLogBridge.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/BootstrapPluginLogBridge.java @@ -23,8 +23,6 @@ /** * The log bridge makes the ILog accessible inside bootstrap classloader, especially for internal interceptor. - * - * @author wusheng */ public class BootstrapPluginLogBridge implements IBootstrapLog { public static IBootstrapLog getLogger(String clazz) { @@ -37,55 +35,68 @@ private BootstrapPluginLogBridge(String clazz) { logger = LogManager.getLogger(clazz); } - @Override public void info(String format) { + @Override + public void info(String format) { logger.info(format); } - @Override public void info(String format, Object... arguments) { + @Override + public void info(String format, Object... arguments) { logger.info(format, arguments); } - @Override public void warn(String format, Object... arguments) { + @Override + public void warn(String format, Object... arguments) { logger.warn(format, arguments); } - @Override public void warn(Throwable e, String format, Object... arguments) { + @Override + public void warn(Throwable e, String format, Object... arguments) { logger.warn(e, format, arguments); } - @Override public void error(String format, Throwable e) { + @Override + public void error(String format, Throwable e) { logger.error(format, e); } - @Override public void error(Throwable e, String format, Object... arguments) { + @Override + public void error(Throwable e, String format, Object... arguments) { logger.error(e, format, arguments); } - @Override public boolean isDebugEnable() { + @Override + public boolean isDebugEnable() { return logger.isDebugEnable(); } - @Override public boolean isInfoEnable() { + @Override + public boolean isInfoEnable() { return logger.isInfoEnable(); } - @Override public boolean isWarnEnable() { + @Override + public boolean isWarnEnable() { return logger.isWarnEnable(); } - @Override public boolean isErrorEnable() { + @Override + public boolean isErrorEnable() { return logger.isErrorEnable(); } - @Override public void debug(String format) { + @Override + public void debug(String format) { logger.debug(format); } - @Override public void debug(String format, Object... arguments) { + @Override + public void debug(String format, Object... arguments) { logger.debug(format, arguments); } - @Override public void error(String format) { + @Override + public void error(String format) { logger.error(format); } } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/IBootstrapLog.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/IBootstrapLog.java index 4278c8414a3e..b345482e8b8d 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/IBootstrapLog.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/IBootstrapLog.java @@ -20,10 +20,8 @@ /** * The log interface used in bootstrap internal interceptors. - * + *

* Never used in any plugin or tracing core. - * - * @author wusheng */ public interface IBootstrapLog { void info(String format); diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/template/ConstructorInterTemplate.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/template/ConstructorInterTemplate.java index 03ff8ae838dc..756d03f299eb 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/template/ConstructorInterTemplate.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/template/ConstructorInterTemplate.java @@ -33,10 +33,8 @@ * instrumentation.

*

Date, 24th July 2019

* ------------------------------- - * + *

* This class wouldn't be loaded in real env. This is a class template for dynamic class generation. - * - * @author wusheng */ public class ConstructorInterTemplate { /** @@ -50,16 +48,15 @@ public class ConstructorInterTemplate { /** * Intercept the target constructor. * - * @param obj target class instance. + * @param obj target class instance. * @param allArguments all constructor arguments */ @RuntimeType - public static void intercept(@This Object obj, - @AllArguments Object[] allArguments) { + public static void intercept(@This Object obj, @AllArguments Object[] allArguments) { try { prepare(); - EnhancedInstance targetObject = (EnhancedInstance)obj; + EnhancedInstance targetObject = (EnhancedInstance) obj; if (INTERCEPTOR == null) { return; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/template/InstanceMethodInterTemplate.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/template/InstanceMethodInterTemplate.java index e23925570c8c..ef70a5722bd5 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/template/InstanceMethodInterTemplate.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/template/InstanceMethodInterTemplate.java @@ -38,10 +38,8 @@ * instrumentation.

*

Date, 24th July 2019

* ------------------------------- - * + *

* This class wouldn't be loaded in real env. This is a class template for dynamic class generation. - * - * @author wusheng */ public class InstanceMethodInterTemplate { /** @@ -55,29 +53,25 @@ public class InstanceMethodInterTemplate { /** * Intercept the target instance method. * - * @param obj target class instance. + * @param obj target class instance. * @param allArguments all method arguments - * @param method method description. - * @param zuper the origin call ref. + * @param method method description. + * @param zuper the origin call ref. * @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 ). + * bug, if anything triggers this condition ). */ @RuntimeType - public static Object intercept(@This Object obj, - @AllArguments Object[] allArguments, - @SuperCall Callable zuper, - @Origin Method method - ) throws Throwable { - EnhancedInstance targetObject = (EnhancedInstance)obj; + public static Object intercept(@This Object obj, @AllArguments Object[] allArguments, @SuperCall Callable zuper, + @Origin Method method) throws Throwable { + EnhancedInstance targetObject = (EnhancedInstance) obj; prepare(); MethodInterceptResult result = new MethodInterceptResult(); try { if (INTERCEPTOR != null) { - INTERCEPTOR.beforeMethod(targetObject, method, allArguments, method.getParameterTypes(), - result); + INTERCEPTOR.beforeMethod(targetObject, method, allArguments, method.getParameterTypes(), result); } } catch (Throwable t) { if (LOGGER != null) { @@ -95,8 +89,7 @@ public static Object intercept(@This Object obj, } catch (Throwable t) { try { if (INTERCEPTOR != null) { - INTERCEPTOR.handleMethodException(targetObject, method, allArguments, method.getParameterTypes(), - t); + INTERCEPTOR.handleMethodException(targetObject, method, allArguments, method.getParameterTypes(), t); } } catch (Throwable t2) { if (LOGGER != null) { @@ -107,8 +100,7 @@ public static Object intercept(@This Object obj, } finally { try { if (INTERCEPTOR != null) { - ret = INTERCEPTOR.afterMethod(targetObject, method, allArguments, method.getParameterTypes(), - ret); + ret = INTERCEPTOR.afterMethod(targetObject, method, allArguments, method.getParameterTypes(), ret); } } catch (Throwable t) { if (LOGGER != null) { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/template/InstanceMethodInterWithOverrideArgsTemplate.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/template/InstanceMethodInterWithOverrideArgsTemplate.java index 94258614d2a1..1ba0464de090 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/template/InstanceMethodInterWithOverrideArgsTemplate.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/template/InstanceMethodInterWithOverrideArgsTemplate.java @@ -38,10 +38,8 @@ * instrumentation.

*

Date, 24th July 2019

* ------------------------------- - * + *

* This class wouldn't be loaded in real env. This is a class template for dynamic class generation. - * - * @author wusheng */ public class InstanceMethodInterWithOverrideArgsTemplate { /** @@ -55,29 +53,25 @@ public class InstanceMethodInterWithOverrideArgsTemplate { /** * Intercept the target instance method. * - * @param obj target class instance. + * @param obj target class instance. * @param allArguments all method arguments - * @param method method description. - * @param zuper the origin call ref. + * @param method method description. + * @param zuper the origin call ref. * @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 ). + * bug, if anything triggers this condition ). */ @RuntimeType - public static Object intercept(@This Object obj, - @AllArguments Object[] allArguments, - @Morph OverrideCallable zuper, - @Origin Method method - ) throws Throwable { - EnhancedInstance targetObject = (EnhancedInstance)obj; + public static Object intercept(@This Object obj, @AllArguments Object[] allArguments, @Morph OverrideCallable zuper, + @Origin Method method) throws Throwable { + EnhancedInstance targetObject = (EnhancedInstance) obj; prepare(); MethodInterceptResult result = new MethodInterceptResult(); try { if (INTERCEPTOR != null) { - INTERCEPTOR.beforeMethod(targetObject, method, allArguments, method.getParameterTypes(), - result); + INTERCEPTOR.beforeMethod(targetObject, method, allArguments, method.getParameterTypes(), result); } } catch (Throwable t) { if (LOGGER != null) { @@ -95,8 +89,7 @@ public static Object intercept(@This Object obj, } catch (Throwable t) { try { if (INTERCEPTOR != null) { - INTERCEPTOR.handleMethodException(targetObject, method, allArguments, method.getParameterTypes(), - t); + INTERCEPTOR.handleMethodException(targetObject, method, allArguments, method.getParameterTypes(), t); } } catch (Throwable t2) { if (LOGGER != null) { @@ -107,8 +100,7 @@ public static Object intercept(@This Object obj, } finally { try { if (INTERCEPTOR != null) { - ret = INTERCEPTOR.afterMethod(targetObject, method, allArguments, method.getParameterTypes(), - ret); + ret = INTERCEPTOR.afterMethod(targetObject, method, allArguments, method.getParameterTypes(), ret); } } catch (Throwable t) { if (LOGGER != null) { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/template/StaticMethodInterTemplate.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/template/StaticMethodInterTemplate.java index ecabc2450bfc..a4caf96528e7 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/template/StaticMethodInterTemplate.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/template/StaticMethodInterTemplate.java @@ -36,10 +36,8 @@ * instrumentation.

*

Date, 24th July 2019

* ------------------------------- - * + *

* This class wouldn't be loaded in real env. This is a class template for dynamic class generation. - * - * @author wusheng */ public class StaticMethodInterTemplate { /** @@ -53,13 +51,13 @@ public class StaticMethodInterTemplate { /** * Intercept the target static method. * - * @param clazz target class + * @param clazz target class * @param allArguments all method arguments - * @param method method description. - * @param zuper the origin call ref. + * @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 ). + * bug, if anything triggers this condition ). */ @RuntimeType public static Object intercept(@Origin Class clazz, @AllArguments Object[] allArguments, @Origin Method method, diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/template/StaticMethodInterWithOverrideArgsTemplate.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/template/StaticMethodInterWithOverrideArgsTemplate.java index aebd6a5b588c..6dd7ac0b00e7 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/template/StaticMethodInterWithOverrideArgsTemplate.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bootstrap/template/StaticMethodInterWithOverrideArgsTemplate.java @@ -36,10 +36,8 @@ * instrumentation.

*

Date, 24th July 2019

* ------------------------------- - * + *

* This class wouldn't be loaded in real env. This is a class template for dynamic class generation. - * - * @author wusheng */ public class StaticMethodInterWithOverrideArgsTemplate { /** @@ -53,13 +51,13 @@ public class StaticMethodInterWithOverrideArgsTemplate { /** * Intercept the target static method. * - * @param clazz target class + * @param clazz target class * @param allArguments all method arguments - * @param method method description. - * @param zuper the origin call ref. + * @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 ). + * bug, if anything triggers this condition ). */ @RuntimeType public static Object intercept(@Origin Class clazz, @AllArguments Object[] allArguments, @Origin Method method, diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/AbstractJunction.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/AbstractJunction.java index f96264839976..dffaf6c81066 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/AbstractJunction.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/AbstractJunction.java @@ -16,14 +16,10 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin.bytebuddy; import net.bytebuddy.matcher.ElementMatcher; -/** - * Created by wusheng on 16/7/31. - */ public abstract class AbstractJunction implements ElementMatcher.Junction { @Override public Junction and(ElementMatcher other) { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/AnnotationTypeNameMatch.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/AnnotationTypeNameMatch.java index 1a0da7c0eccc..fe13541e9374 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/AnnotationTypeNameMatch.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/AnnotationTypeNameMatch.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.agent.core.plugin.bytebuddy; import net.bytebuddy.description.annotation.AnnotationDescription; @@ -24,13 +25,10 @@ import net.bytebuddy.matcher.ElementMatcher; /** - * Annotation Type match. - * Similar with {@link net.bytebuddy.matcher.ElementMatchers#isAnnotatedWith}, - * the only different between them is this match use {@link String} to declare the type, instead of {@link Class}. - * This can avoid the classloader risk. + * Annotation Type match. Similar with {@link net.bytebuddy.matcher.ElementMatchers#isAnnotatedWith}, the only different + * between them is this match use {@link String} to declare the type, instead of {@link Class}. This can avoid the + * classloader risk. *

- * - * @author AI * 2019-08-15 */ public class AnnotationTypeNameMatch implements ElementMatcher { @@ -58,14 +56,15 @@ public boolean matches(T target) { } /** - * The static method to create {@link AnnotationTypeNameMatch} - * This is a delegate method to follow byte-buddy {@link ElementMatcher}'s code style. + * The static method to create {@link AnnotationTypeNameMatch} This is a delegate method to follow byte-buddy {@link + * ElementMatcher}'s code style. * * @param annotationTypeName target annotation type * @param The type of the object that is being matched. * @return new {@link AnnotationTypeNameMatch} instance. */ - public static ElementMatcher.Junction isAnnotatedWithType(String annotationTypeName) { + public static ElementMatcher.Junction isAnnotatedWithType( + String annotationTypeName) { final AnnotationTypeNameMatch matcher = new AnnotationTypeNameMatch(annotationTypeName); return new DeclaringAnnotationMatcher(new CollectionItemMatcher(matcher)); } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/ArgumentTypeNameMatch.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/ArgumentTypeNameMatch.java index de73e6b5aa27..cc09ff673578 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/ArgumentTypeNameMatch.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/ArgumentTypeNameMatch.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin.bytebuddy; import net.bytebuddy.description.method.MethodDescription; @@ -24,12 +23,10 @@ import net.bytebuddy.matcher.ElementMatcher; /** - * Argument Type match. - * Similar with {@link net.bytebuddy.matcher.ElementMatchers#takesArgument}, - * the only different between them is this match use {@link String} to declare the type, instead of {@link Class}. - * This can avoid the classloader risk. + * Argument Type match. Similar with {@link net.bytebuddy.matcher.ElementMatchers#takesArgument}, the only different + * between them is this match use {@link String} to declare the type, instead of {@link Class}. This can avoid the + * classloader risk. *

- * Created by wusheng on 2016/12/1. */ public class ArgumentTypeNameMatch implements ElementMatcher { /** @@ -45,7 +42,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 index the index of arguments list. * @param argumentTypeName target argument type */ private ArgumentTypeNameMatch(int index, String argumentTypeName) { @@ -70,10 +67,10 @@ public boolean matches(MethodDescription target) { } /** - * The static method to create {@link ArgumentTypeNameMatch} - * This is a delegate method to follow byte-buddy {@link ElementMatcher}'s code style. + * The static method to create {@link ArgumentTypeNameMatch} This is a delegate method to follow byte-buddy {@link + * ElementMatcher}'s code style. * - * @param index the index of arguments list. + * @param index the index of arguments list. * @param argumentTypeName target argument type * @return new {@link ArgumentTypeNameMatch} instance. */ diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/ReturnTypeNameMatch.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/ReturnTypeNameMatch.java index c26b02f2fcb3..11592ba15408 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/ReturnTypeNameMatch.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/ReturnTypeNameMatch.java @@ -15,20 +15,17 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.agent.core.plugin.bytebuddy; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; - /** - * Return Type match. - * Similar with {@link net.bytebuddy.matcher.ElementMatchers#returns}, - * the only different between them is this match use {@link String} to declare the type, instead of {@link Class}. - * This can avoid the classloader risk. + * Return Type match. Similar with {@link net.bytebuddy.matcher.ElementMatchers#returns}, the only different between + * them is this match use {@link String} to declare the type, instead of {@link Class}. This can avoid the classloader + * risk. *

- * - * @author AI * 2019-08-15 */ public class ReturnTypeNameMatch implements ElementMatcher { @@ -56,8 +53,8 @@ public boolean matches(MethodDescription target) { } /** - * The static method to create {@link ReturnTypeNameMatch} - * This is a delegate method to follow byte-buddy {@link ElementMatcher}'s code style. + * The static method to create {@link ReturnTypeNameMatch} This is a delegate method to follow byte-buddy {@link + * ElementMatcher}'s code style. * * @param returnTypeName target return type * @return new {@link ReturnTypeNameMatch} instance. diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/exception/IllegalPluginDefineException.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/exception/IllegalPluginDefineException.java index 8be1e8d9363a..ab87e640040e 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/exception/IllegalPluginDefineException.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/exception/IllegalPluginDefineException.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin.exception; /** diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/ConstructorInterceptPoint.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/ConstructorInterceptPoint.java index 3cbf44f6260c..9c984194668b 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/ConstructorInterceptPoint.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/ConstructorInterceptPoint.java @@ -16,20 +16,17 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin.interceptor; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; /** - * One of the three "Intercept Point". - * "Intercept Point" is a definition about where and how intercept happens. - * In this "Intercept Point", the definition targets class's constructors, and the interceptor. + * One of the three "Intercept Point". "Intercept Point" is a definition about where and how intercept happens. In this + * "Intercept Point", the definition targets class's constructors, and the interceptor. *

* ref to two others: {@link StaticMethodsInterceptPoint} and {@link InstanceMethodsInterceptPoint} *

- * Created by wusheng on 2016/11/29. */ public interface ConstructorInterceptPoint { /** diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/DeclaredInstanceMethodsInterceptPoint.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/DeclaredInstanceMethodsInterceptPoint.java index 909392fe8ecb..dae25f29498b 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/DeclaredInstanceMethodsInterceptPoint.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/DeclaredInstanceMethodsInterceptPoint.java @@ -19,10 +19,8 @@ package org.apache.skywalking.apm.agent.core.plugin.interceptor; /** - * this interface for those who only want to enhance declared method in case of some unexpected issue, - * such as spring controller - * - * @author lican + * this interface for those who only want to enhance declared method in case of some unexpected issue, such as spring + * controller */ public interface DeclaredInstanceMethodsInterceptPoint extends InstanceMethodsInterceptPoint { } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/EnhanceException.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/EnhanceException.java index 4199728d1737..1abb8f5581c2 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/EnhanceException.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/EnhanceException.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin.interceptor; import org.apache.skywalking.apm.agent.core.plugin.PluginException; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/InstanceMethodsInterceptPoint.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/InstanceMethodsInterceptPoint.java index 5bdec14c7eec..6ae8057e90fd 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/InstanceMethodsInterceptPoint.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/InstanceMethodsInterceptPoint.java @@ -16,20 +16,17 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin.interceptor; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; /** - * One of the three "Intercept Point". - * "Intercept Point" is a definition about where and how intercept happens. - * In this "Intercept Point", the definition targets class's instance methods, and the interceptor. + * One of the three "Intercept Point". "Intercept Point" is a definition about where and how intercept happens. In this + * "Intercept Point", the definition targets class's instance methods, and the interceptor. *

* ref to two others: {@link ConstructorInterceptPoint} and {@link StaticMethodsInterceptPoint} *

- * Created by wusheng on 2016/11/29. */ public interface InstanceMethodsInterceptPoint { /** diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/StaticMethodsInterceptPoint.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/StaticMethodsInterceptPoint.java index 4ef524781d0a..2af763bc29c2 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/StaticMethodsInterceptPoint.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/StaticMethodsInterceptPoint.java @@ -16,20 +16,17 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin.interceptor; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; /** - * One of the three "Intercept Point". - * "Intercept Point" is a definition about where and how intercept happens. - * In this "Intercept Point", the definition targets class's static methods, and the interceptor. + * One of the three "Intercept Point". "Intercept Point" is a definition about where and how intercept happens. In this + * "Intercept Point", the definition targets class's static methods, and the interceptor. *

* ref to two others: {@link ConstructorInterceptPoint} and {@link InstanceMethodsInterceptPoint} *

- * Created by wusheng on 2016/11/29. */ public interface StaticMethodsInterceptPoint { /** diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/BootstrapInterRuntimeAssist.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/BootstrapInterRuntimeAssist.java index d27aff63de71..f667667a3e1e 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/BootstrapInterRuntimeAssist.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/BootstrapInterRuntimeAssist.java @@ -25,8 +25,6 @@ /** * This assist help all bootstrap class core interceptor. - * - * @author wusheng */ public class BootstrapInterRuntimeAssist { private static final String AGENT_CLASSLOADER_DEFAULT = "org.apache.skywalking.apm.agent.core.plugin.loader.AgentClassLoader"; @@ -44,7 +42,7 @@ public static ClassLoader getAgentClassLoader() { Class agentClassLoaderClass = Class.forName(AGENT_CLASSLOADER_DEFAULT, true, loader); Field defaultLoaderField = agentClassLoaderClass.getDeclaredField(DEFAULT_AGENT_CLASSLOADER_INSTANCE); defaultLoaderField.setAccessible(true); - ClassLoader defaultAgentClassLoader = (ClassLoader)defaultLoaderField.get(null); + ClassLoader defaultAgentClassLoader = (ClassLoader) defaultLoaderField.get(null); return defaultAgentClassLoader; } catch (Exception e) { @@ -57,18 +55,17 @@ public static IBootstrapLog getLogger(ClassLoader defaultAgentClassLoader, Strin try { Class logManagerClass = Class.forName(LOG_MANAGER_CLASS, true, defaultAgentClassLoader); Method getLogger = logManagerClass.getMethod(LOG_MANAGER_GET_LOGGER_METHOD, String.class); - return (IBootstrapLog)getLogger.invoke(null, interceptor + "_internal"); + return (IBootstrapLog) getLogger.invoke(null, interceptor + "_internal"); } catch (Exception e) { e.printStackTrace(OUT); return null; } } - public static T createInterceptor(ClassLoader defaultAgentClassLoader, - String className, IBootstrapLog log) { + public static T createInterceptor(ClassLoader defaultAgentClassLoader, String className, IBootstrapLog log) { try { Class interceptor = Class.forName(className, true, defaultAgentClassLoader); - return (T)interceptor.newInstance(); + return (T) interceptor.newInstance(); } catch (Exception e) { log.error(e, "Interceptor[{}] not found", className); } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassEnhancePluginDefine.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassEnhancePluginDefine.java index bc9c74ea33d2..d3689d68d76b 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassEnhancePluginDefine.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassEnhancePluginDefine.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance; import net.bytebuddy.description.method.MethodDescription; @@ -51,8 +50,6 @@ * 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 Object} type. - * - * @author wusheng */ public abstract class ClassEnhancePluginDefine extends AbstractClassEnhancePluginDefine { private static final ILog logger = LogManager.getLogger(ClassEnhancePluginDefine.class); @@ -70,9 +67,8 @@ public abstract class ClassEnhancePluginDefine extends AbstractClassEnhancePlugi * @return new byte-buddy's builder for further manipulation. */ @Override - protected DynamicType.Builder enhance(TypeDescription typeDescription, - DynamicType.Builder newClassBuilder, ClassLoader classLoader, - EnhanceContext context) throws PluginException { + protected DynamicType.Builder enhance(TypeDescription typeDescription, DynamicType.Builder newClassBuilder, + ClassLoader classLoader, EnhanceContext context) throws PluginException { newClassBuilder = this.enhanceClass(typeDescription, newClassBuilder, classLoader); newClassBuilder = this.enhanceInstance(typeDescription, newClassBuilder, classLoader, context); @@ -121,8 +117,8 @@ private DynamicType.Builder enhanceInstance(TypeDescription typeDescription, */ if (!context.isObjectExtended()) { newClassBuilder = newClassBuilder.defineField(CONTEXT_ATTR_NAME, Object.class, ACC_PRIVATE | ACC_VOLATILE) - .implement(EnhancedInstance.class) - .intercept(FieldAccessor.ofField(CONTEXT_ATTR_NAME)); + .implement(EnhancedInstance.class) + .intercept(FieldAccessor.ofField(CONTEXT_ATTR_NAME)); context.extendObjectCompleted(); } @@ -132,17 +128,16 @@ private DynamicType.Builder enhanceInstance(TypeDescription typeDescription, if (existedConstructorInterceptPoint) { for (ConstructorInterceptPoint constructorInterceptPoint : constructorInterceptPoints) { if (isBootstrapInstrumentation()) { - newClassBuilder = newClassBuilder.constructor(constructorInterceptPoint.getConstructorMatcher()).intercept(SuperMethodCall.INSTANCE - .andThen(MethodDelegation.withDefaultConfiguration() - .to(BootstrapInstrumentBoost.forInternalDelegateClass(constructorInterceptPoint.getConstructorInterceptor())) - ) - ); + newClassBuilder = newClassBuilder.constructor(constructorInterceptPoint.getConstructorMatcher()) + .intercept(SuperMethodCall.INSTANCE.andThen(MethodDelegation.withDefaultConfiguration() + .to(BootstrapInstrumentBoost + .forInternalDelegateClass(constructorInterceptPoint + .getConstructorInterceptor())))); } else { - newClassBuilder = newClassBuilder.constructor(constructorInterceptPoint.getConstructorMatcher()).intercept(SuperMethodCall.INSTANCE - .andThen(MethodDelegation.withDefaultConfiguration() - .to(new ConstructorInter(constructorInterceptPoint.getConstructorInterceptor(), classLoader)) - ) - ); + newClassBuilder = newClassBuilder.constructor(constructorInterceptPoint.getConstructorMatcher()) + .intercept(SuperMethodCall.INSTANCE.andThen(MethodDelegation.withDefaultConfiguration() + .to(new ConstructorInter(constructorInterceptPoint + .getConstructorInterceptor(), classLoader)))); } } } @@ -162,41 +157,25 @@ private DynamicType.Builder enhanceInstance(TypeDescription typeDescription, } if (instanceMethodsInterceptPoint.isOverrideArgs()) { if (isBootstrapInstrumentation()) { - newClassBuilder = - newClassBuilder.method(junction) - .intercept( - MethodDelegation.withDefaultConfiguration() - .withBinders( - Morph.Binder.install(OverrideCallable.class) - ) - .to(BootstrapInstrumentBoost.forInternalDelegateClass(interceptor)) - ); + newClassBuilder = newClassBuilder.method(junction) + .intercept(MethodDelegation.withDefaultConfiguration() + .withBinders(Morph.Binder.install(OverrideCallable.class)) + .to(BootstrapInstrumentBoost.forInternalDelegateClass(interceptor))); } else { - newClassBuilder = - newClassBuilder.method(junction) - .intercept( - MethodDelegation.withDefaultConfiguration() - .withBinders( - Morph.Binder.install(OverrideCallable.class) - ) - .to(new InstMethodsInterWithOverrideArgs(interceptor, classLoader)) - ); + newClassBuilder = newClassBuilder.method(junction) + .intercept(MethodDelegation.withDefaultConfiguration() + .withBinders(Morph.Binder.install(OverrideCallable.class)) + .to(new InstMethodsInterWithOverrideArgs(interceptor, classLoader))); } } else { if (isBootstrapInstrumentation()) { - newClassBuilder = - newClassBuilder.method(junction) - .intercept( - MethodDelegation.withDefaultConfiguration() - .to(BootstrapInstrumentBoost.forInternalDelegateClass(interceptor)) - ); + newClassBuilder = newClassBuilder.method(junction) + .intercept(MethodDelegation.withDefaultConfiguration() + .to(BootstrapInstrumentBoost.forInternalDelegateClass(interceptor))); } else { - newClassBuilder = - newClassBuilder.method(junction) - .intercept( - MethodDelegation.withDefaultConfiguration() - .to(new InstMethodsInter(interceptor, classLoader)) - ); + newClassBuilder = newClassBuilder.method(junction) + .intercept(MethodDelegation.withDefaultConfiguration() + .to(new InstMethodsInter(interceptor, classLoader))); } } } @@ -212,8 +191,8 @@ private DynamicType.Builder enhanceInstance(TypeDescription typeDescription, * @param newClassBuilder byte-buddy's builder to manipulate class bytecode. * @return new byte-buddy's builder for further manipulation. */ - private DynamicType.Builder enhanceClass(TypeDescription typeDescription, - DynamicType.Builder newClassBuilder, ClassLoader classLoader) throws PluginException { + private DynamicType.Builder enhanceClass(TypeDescription typeDescription, DynamicType.Builder newClassBuilder, + ClassLoader classLoader) throws PluginException { StaticMethodsInterceptPoint[] staticMethodsInterceptPoints = getStaticMethodsInterceptPoints(); String enhanceOriginClassName = typeDescription.getTypeName(); if (staticMethodsInterceptPoints == null || staticMethodsInterceptPoints.length == 0) { @@ -229,36 +208,24 @@ private DynamicType.Builder enhanceClass(TypeDescription typeDescription, if (staticMethodsInterceptPoint.isOverrideArgs()) { if (isBootstrapInstrumentation()) { newClassBuilder = newClassBuilder.method(isStatic().and(staticMethodsInterceptPoint.getMethodsMatcher())) - .intercept( - MethodDelegation.withDefaultConfiguration() - .withBinders( - Morph.Binder.install(OverrideCallable.class) - ) - .to(BootstrapInstrumentBoost.forInternalDelegateClass(interceptor)) - ); + .intercept(MethodDelegation.withDefaultConfiguration() + .withBinders(Morph.Binder.install(OverrideCallable.class)) + .to(BootstrapInstrumentBoost.forInternalDelegateClass(interceptor))); } else { newClassBuilder = newClassBuilder.method(isStatic().and(staticMethodsInterceptPoint.getMethodsMatcher())) - .intercept( - MethodDelegation.withDefaultConfiguration() - .withBinders( - Morph.Binder.install(OverrideCallable.class) - ) - .to(new StaticMethodsInterWithOverrideArgs(interceptor)) - ); + .intercept(MethodDelegation.withDefaultConfiguration() + .withBinders(Morph.Binder.install(OverrideCallable.class)) + .to(new StaticMethodsInterWithOverrideArgs(interceptor))); } } else { if (isBootstrapInstrumentation()) { newClassBuilder = newClassBuilder.method(isStatic().and(staticMethodsInterceptPoint.getMethodsMatcher())) - .intercept( - MethodDelegation.withDefaultConfiguration() - .to(BootstrapInstrumentBoost.forInternalDelegateClass(interceptor)) - ); + .intercept(MethodDelegation.withDefaultConfiguration() + .to(BootstrapInstrumentBoost.forInternalDelegateClass(interceptor))); } else { newClassBuilder = newClassBuilder.method(isStatic().and(staticMethodsInterceptPoint.getMethodsMatcher())) - .intercept( - MethodDelegation.withDefaultConfiguration() - .to(new StaticMethodsInter(interceptor)) - ); + .intercept(MethodDelegation.withDefaultConfiguration() + .to(new StaticMethodsInter(interceptor))); } } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java index dd56c41b5cb9..2e839e71f4e0 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance; import org.apache.skywalking.apm.agent.core.plugin.interceptor.StaticMethodsInterceptPoint; @@ -24,10 +23,8 @@ /** * 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 NULL, which means - * nothing to enhance. - * - * @author wusheng + * override {@link ClassEnhancePluginDefine#getStaticMethodsInterceptPoints}, and return NULL, which means nothing to + * enhance. */ public abstract class ClassInstanceMethodsEnhancePluginDefine extends ClassEnhancePluginDefine { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java index b011517d718c..cd9b53c3f5a1 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance; import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; @@ -26,10 +25,7 @@ * 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 NULL, which means nothing to - * enhance. - * - * @author wusheng + * ClassEnhancePluginDefine#getInstanceMethodsInterceptPoints}, and return NULL, which means nothing to enhance. */ public abstract class ClassStaticMethodsEnhancePluginDefine extends ClassEnhancePluginDefine { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/ConstructorInter.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/ConstructorInter.java index c14ae16729a7..8a1165478637 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/ConstructorInter.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/ConstructorInter.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance; import net.bytebuddy.implementation.bind.annotation.AllArguments; @@ -28,18 +27,16 @@ import org.apache.skywalking.apm.agent.core.logging.api.ILog; /** - * The actual byte-buddy's interceptor to intercept constructor methods. - * In this class, it provide a bridge between byte-buddy and sky-walking plugin. - * - * @author wusheng + * The actual byte-buddy's interceptor to intercept constructor methods. In this class, it provide a bridge between + * byte-buddy and sky-walking plugin. */ public class ConstructorInter { private static final ILog logger = LogManager.getLogger(ConstructorInter.class); /** - * An {@link InstanceConstructorInterceptor} - * This name should only stay in {@link String}, the real {@link Class} type will trigger classloader failure. - * If you want to know more, please check on books about Classloader or Classloader appointment mechanism. + * An {@link InstanceConstructorInterceptor} This name should only stay in {@link String}, the real {@link Class} + * type will trigger classloader failure. If you want to know more, please check on books about Classloader or + * Classloader appointment mechanism. */ private InstanceConstructorInterceptor interceptor; @@ -57,14 +54,13 @@ public ConstructorInter(String constructorInterceptorClassName, ClassLoader clas /** * Intercept the target constructor. * - * @param obj target class instance. + * @param obj target class instance. * @param allArguments all constructor arguments */ @RuntimeType - public void intercept(@This Object obj, - @AllArguments Object[] allArguments) { + public void intercept(@This Object obj, @AllArguments Object[] allArguments) { try { - EnhancedInstance targetObject = (EnhancedInstance)obj; + EnhancedInstance targetObject = (EnhancedInstance) obj; interceptor.onConstruct(targetObject, allArguments); } catch (Throwable t) { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/EnhancedInstance.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/EnhancedInstance.java index 6a209fdac189..4067f019c254 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/EnhancedInstance.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/EnhancedInstance.java @@ -16,12 +16,8 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance; -/** - * @author wusheng - */ public interface EnhancedInstance { Object getSkyWalkingDynamicField(); diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/InstMethodsInter.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/InstMethodsInter.java index 1545eb65bc48..b2b5db210339 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/InstMethodsInter.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/InstMethodsInter.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance; import java.lang.reflect.Method; @@ -32,18 +31,16 @@ import org.apache.skywalking.apm.agent.core.logging.api.ILog; /** - * The actual byte-buddy's interceptor to intercept class instance methods. - * In this class, it provide a bridge between byte-buddy and sky-walking plugin. - * - * @author wusheng + * The actual byte-buddy's interceptor to intercept class instance methods. In this class, it provide a bridge between + * byte-buddy and sky-walking plugin. */ public class InstMethodsInter { private static final ILog logger = LogManager.getLogger(InstMethodsInter.class); /** - * An {@link InstanceMethodsAroundInterceptor} - * This name should only stay in {@link String}, the real {@link Class} type will trigger classloader failure. - * If you want to know more, please check on books about Classloader or Classloader appointment mechanism. + * An {@link InstanceMethodsAroundInterceptor} This name should only stay in {@link String}, the real {@link Class} + * type will trigger classloader failure. If you want to know more, please check on books about Classloader or + * Classloader appointment mechanism. */ private InstanceMethodsAroundInterceptor interceptor; @@ -61,26 +58,22 @@ public InstMethodsInter(String instanceMethodsAroundInterceptorClassName, ClassL /** * Intercept the target instance method. * - * @param obj target class instance. + * @param obj target class instance. * @param allArguments all method arguments - * @param method method description. - * @param zuper the origin call ref. + * @param method method description. + * @param zuper the origin call ref. * @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 ). + * bug, if anything triggers this condition ). */ @RuntimeType - public Object intercept(@This Object obj, - @AllArguments Object[] allArguments, - @SuperCall Callable zuper, - @Origin Method method - ) throws Throwable { - EnhancedInstance targetObject = (EnhancedInstance)obj; + public Object intercept(@This Object obj, @AllArguments Object[] allArguments, @SuperCall Callable zuper, + @Origin Method method) throws Throwable { + EnhancedInstance targetObject = (EnhancedInstance) obj; MethodInterceptResult result = new MethodInterceptResult(); try { - interceptor.beforeMethod(targetObject, method, allArguments, method.getParameterTypes(), - result); + interceptor.beforeMethod(targetObject, method, allArguments, method.getParameterTypes(), result); } catch (Throwable t) { logger.error(t, "class[{}] before method[{}] intercept failure", obj.getClass(), method.getName()); } @@ -94,16 +87,14 @@ public Object intercept(@This Object obj, } } catch (Throwable t) { try { - interceptor.handleMethodException(targetObject, method, allArguments, method.getParameterTypes(), - t); + interceptor.handleMethodException(targetObject, method, allArguments, method.getParameterTypes(), t); } catch (Throwable t2) { logger.error(t2, "class[{}] handle method[{}] exception failure", obj.getClass(), method.getName()); } throw t; } finally { try { - ret = interceptor.afterMethod(targetObject, method, allArguments, method.getParameterTypes(), - ret); + ret = interceptor.afterMethod(targetObject, method, allArguments, method.getParameterTypes(), ret); } catch (Throwable t) { logger.error(t, "class[{}] after method[{}] intercept failure", obj.getClass(), method.getName()); } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/InstMethodsInterWithOverrideArgs.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/InstMethodsInterWithOverrideArgs.java index 4e6ca124f417..257ae60f1601 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/InstMethodsInterWithOverrideArgs.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/InstMethodsInterWithOverrideArgs.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance; import java.lang.reflect.Method; @@ -31,18 +30,16 @@ import org.apache.skywalking.apm.agent.core.logging.api.LogManager; /** - * The actual byte-buddy's interceptor to intercept class instance methods. - * In this class, it provide a bridge between byte-buddy and sky-walking plugin. - * - * @author wusheng + * The actual byte-buddy's interceptor to intercept class instance methods. In this class, it provide a bridge between + * byte-buddy and sky-walking plugin. */ public class InstMethodsInterWithOverrideArgs { private static final ILog logger = LogManager.getLogger(InstMethodsInterWithOverrideArgs.class); /** - * An {@link InstanceMethodsAroundInterceptor} - * This name should only stay in {@link String}, the real {@link Class} type will trigger classloader failure. - * If you want to know more, please check on books about Classloader or Classloader appointment mechanism. + * An {@link InstanceMethodsAroundInterceptor} This name should only stay in {@link String}, the real {@link Class} + * type will trigger classloader failure. If you want to know more, please check on books about Classloader or + * Classloader appointment mechanism. */ private InstanceMethodsAroundInterceptor interceptor; @@ -60,26 +57,22 @@ public InstMethodsInterWithOverrideArgs(String instanceMethodsAroundInterceptorC /** * Intercept the target instance method. * - * @param obj target class instance. + * @param obj target class instance. * @param allArguments all method arguments - * @param method method description. - * @param zuper the origin call ref. + * @param method method description. + * @param zuper the origin call ref. * @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 ). + * bug, if anything triggers this condition ). */ @RuntimeType - public Object intercept(@This Object obj, - @AllArguments Object[] allArguments, - @Origin Method method, - @Morph OverrideCallable zuper - ) throws Throwable { - EnhancedInstance targetObject = (EnhancedInstance)obj; + public Object intercept(@This Object obj, @AllArguments Object[] allArguments, @Origin Method method, + @Morph OverrideCallable zuper) throws Throwable { + EnhancedInstance targetObject = (EnhancedInstance) obj; MethodInterceptResult result = new MethodInterceptResult(); try { - interceptor.beforeMethod(targetObject, method, allArguments, method.getParameterTypes(), - result); + interceptor.beforeMethod(targetObject, method, allArguments, method.getParameterTypes(), result); } catch (Throwable t) { logger.error(t, "class[{}] before method[{}] intercept failure", obj.getClass(), method.getName()); } @@ -93,16 +86,14 @@ public Object intercept(@This Object obj, } } catch (Throwable t) { try { - interceptor.handleMethodException(targetObject, method, allArguments, method.getParameterTypes(), - t); + interceptor.handleMethodException(targetObject, method, allArguments, method.getParameterTypes(), t); } catch (Throwable t2) { logger.error(t2, "class[{}] handle method[{}] exception failure", obj.getClass(), method.getName()); } throw t; } finally { try { - ret = interceptor.afterMethod(targetObject, method, allArguments, method.getParameterTypes(), - ret); + ret = interceptor.afterMethod(targetObject, method, allArguments, method.getParameterTypes(), ret); } catch (Throwable t) { logger.error(t, "class[{}] after method[{}] intercept failure", obj.getClass(), method.getName()); } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/InstanceConstructorInterceptor.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/InstanceConstructorInterceptor.java index e7b6ee59ca48..012eccc14875 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/InstanceConstructorInterceptor.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/InstanceConstructorInterceptor.java @@ -16,15 +16,12 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance; /** - * The instance constructor's interceptor interface. - * Any plugin, which wants to intercept constructor, must implement this interface. + * The instance constructor's interceptor interface. Any plugin, which wants to intercept constructor, must implement + * this interface. *

- * - * @author wusheng */ public interface InstanceConstructorInterceptor { /** diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/InstanceMethodsAroundInterceptor.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/InstanceMethodsAroundInterceptor.java index 4d7fa5d3309d..c5ffbada9e93 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/InstanceMethodsAroundInterceptor.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/InstanceMethodsAroundInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance; import java.lang.reflect.Method; @@ -24,15 +23,12 @@ /** * 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 result change this result, if you want to truncate the method. - * @throws Throwable */ void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable; @@ -40,10 +36,8 @@ void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments /** * called after target method invocation. Even method's invocation triggers an exception. * - * @param method * @param ret the method's original return value. * @return the method's actual return value. - * @throws Throwable */ Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable; @@ -51,10 +45,8 @@ Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArgument /** * called when occur exception. * - * @param method * @param t the exception occur. */ void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, - Throwable t); + Class[] argumentsTypes, Throwable t); } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/MethodInterceptResult.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/MethodInterceptResult.java index 50e1c3850c96..6bb2686dd792 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/MethodInterceptResult.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/MethodInterceptResult.java @@ -21,13 +21,11 @@ import java.lang.reflect.Method; /** - * This is a method return value manipulator. When a interceptor's method, such as - * {@link InstanceMethodsAroundInterceptor#beforeMethod(EnhancedInstance, Method, Object[], Class[], MethodInterceptResult)} (org.apache.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext, - * 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 + * This is a method return value manipulator. When a interceptor's method, such as {@link + * InstanceMethodsAroundInterceptor#beforeMethod(EnhancedInstance, Method, Object[], Class[], MethodInterceptResult)} + * (org.apache.skywalking.apm.agent.core.plugin.interceptor.EnhancedClassInstanceContext, 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. */ public class MethodInterceptResult { private boolean isContinue = true; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/OverrideCallable.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/OverrideCallable.java index 1b41f53bb45e..421060680555 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/OverrideCallable.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/OverrideCallable.java @@ -16,12 +16,8 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance; -/** - * @author wusheng - */ public interface OverrideCallable { Object call(Object[] args); } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/StaticMethodsAroundInterceptor.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/StaticMethodsAroundInterceptor.java index 607a35f549e8..a904acb17797 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/StaticMethodsAroundInterceptor.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/StaticMethodsAroundInterceptor.java @@ -16,22 +16,18 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance; import java.lang.reflect.Method; /** - * The static method's interceptor interface. - * Any plugin, which wants to intercept static methods, must implement this interface. - * - * @author wusheng + * The static method's interceptor interface. Any plugin, which wants to intercept static methods, must implement this + * interface. */ public interface StaticMethodsAroundInterceptor { /** * called before target method invocation. * - * @param method * @param result change this result, if you want to truncate the method. */ void beforeMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, @@ -40,7 +36,6 @@ void beforeMethod(Class clazz, Method method, Object[] allArguments, Class[] /** * called after target method invocation. Even method's invocation triggers an exception. * - * @param method * @param ret the method's original return value. * @return the method's actual return value. */ @@ -49,7 +44,6 @@ void beforeMethod(Class clazz, Method method, Object[] allArguments, Class[] /** * called when occur exception. * - * @param method * @param t the exception occur. */ void handleMethodException(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/StaticMethodsInter.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/StaticMethodsInter.java index 6a9c51e7bf6d..3729d80b10d0 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/StaticMethodsInter.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/StaticMethodsInter.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance; import java.lang.reflect.Method; @@ -30,18 +29,16 @@ import org.apache.skywalking.apm.agent.core.logging.api.LogManager; /** - * The actual byte-buddy's interceptor to intercept class instance methods. - * In this class, it provide a bridge between byte-buddy and sky-walking plugin. - * - * @author wusheng + * The actual byte-buddy's interceptor to intercept class instance methods. In this class, it provide a bridge between + * byte-buddy and sky-walking plugin. */ public class StaticMethodsInter { private static final ILog logger = LogManager.getLogger(StaticMethodsInter.class); /** - * A class full name, and instanceof {@link StaticMethodsAroundInterceptor} - * This name should only stay in {@link String}, the real {@link Class} type will trigger classloader failure. - * If you want to know more, please check on books about Classloader or Classloader appointment mechanism. + * A class full name, and instanceof {@link StaticMethodsAroundInterceptor} This name should only stay in {@link + * String}, the real {@link Class} type will trigger classloader failure. If you want to know more, please check on + * books about Classloader or Classloader appointment mechanism. */ private String staticMethodsAroundInterceptorClassName; @@ -57,19 +54,19 @@ public StaticMethodsInter(String staticMethodsAroundInterceptorClassName) { /** * Intercept the target static method. * - * @param clazz target class + * @param clazz target class * @param allArguments all method arguments - * @param method method description. - * @param zuper the origin call ref. + * @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 ). + * bug, if anything triggers this condition ). */ @RuntimeType public Object intercept(@Origin Class clazz, @AllArguments Object[] allArguments, @Origin Method method, @SuperCall Callable zuper) throws Throwable { - StaticMethodsAroundInterceptor interceptor = InterceptorInstanceLoader - .load(staticMethodsAroundInterceptorClassName, clazz.getClassLoader()); + StaticMethodsAroundInterceptor interceptor = InterceptorInstanceLoader.load(staticMethodsAroundInterceptorClassName, clazz + .getClassLoader()); MethodInterceptResult result = new MethodInterceptResult(); try { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/StaticMethodsInterWithOverrideArgs.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/StaticMethodsInterWithOverrideArgs.java index 5fe7230fcf0f..00ff720f4b54 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/StaticMethodsInterWithOverrideArgs.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/StaticMethodsInterWithOverrideArgs.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance; import java.lang.reflect.Method; @@ -29,18 +28,16 @@ import org.apache.skywalking.apm.agent.core.logging.api.LogManager; /** - * The actual byte-buddy's interceptor to intercept class instance methods. - * In this class, it provide a bridge between byte-buddy and sky-walking plugin. - * - * @author wusheng + * The actual byte-buddy's interceptor to intercept class instance methods. In this class, it provide a bridge between + * byte-buddy and sky-walking plugin. */ public class StaticMethodsInterWithOverrideArgs { private static final ILog logger = LogManager.getLogger(StaticMethodsInterWithOverrideArgs.class); /** - * A class full name, and instanceof {@link StaticMethodsAroundInterceptor} - * This name should only stay in {@link String}, the real {@link Class} type will trigger classloader failure. - * If you want to know more, please check on books about Classloader or Classloader appointment mechanism. + * A class full name, and instanceof {@link StaticMethodsAroundInterceptor} This name should only stay in {@link + * String}, the real {@link Class} type will trigger classloader failure. If you want to know more, please check on + * books about Classloader or Classloader appointment mechanism. */ private String staticMethodsAroundInterceptorClassName; @@ -56,19 +53,19 @@ public StaticMethodsInterWithOverrideArgs(String staticMethodsAroundInterceptorC /** * Intercept the target static method. * - * @param clazz target class + * @param clazz target class * @param allArguments all method arguments - * @param method method description. - * @param zuper the origin call ref. + * @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 ). + * bug, if anything triggers this condition ). */ @RuntimeType public Object intercept(@Origin Class clazz, @AllArguments Object[] allArguments, @Origin Method method, @Morph OverrideCallable zuper) throws Throwable { - StaticMethodsAroundInterceptor interceptor = InterceptorInstanceLoader - .load(staticMethodsAroundInterceptorClassName, clazz.getClassLoader()); + StaticMethodsAroundInterceptor interceptor = InterceptorInstanceLoader.load(staticMethodsAroundInterceptorClassName, clazz + .getClassLoader()); MethodInterceptResult result = new MethodInterceptResult(); try { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/jdk9module/JDK9ModuleExporter.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/jdk9module/JDK9ModuleExporter.java index 92943af10206..02a46f994647 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/jdk9module/JDK9ModuleExporter.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/jdk9module/JDK9ModuleExporter.java @@ -28,8 +28,6 @@ /** * Since JDK 9, module concept has been introduced. By supporting that, agent core needs to open the - * - * @author wusheng */ public class JDK9ModuleExporter { private static final ILog logger = LogManager.getLogger(JDK9ModuleExporter.class); @@ -43,12 +41,12 @@ public class JDK9ModuleExporter { "org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstMethodsInterWithOverrideArgs", "org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.StaticMethodsInter", "org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.StaticMethodsInterWithOverrideArgs", - }; + }; /** * Assures that all modules of the supplied types are read by the module of any instrumented type. JDK Module system * was introduced since JDK9. - * + *

* The following codes work only JDK Module system exist. */ public static AgentBuilder openReadEdge(Instrumentation instrumentation, AgentBuilder agentBuilder, diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/loader/AgentClassLoader.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/loader/AgentClassLoader.java index b7bc58d65330..776390a15091 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/loader/AgentClassLoader.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/loader/AgentClassLoader.java @@ -39,10 +39,7 @@ import org.apache.skywalking.apm.agent.core.plugin.PluginBootstrap; /** - * The AgentClassLoader represents a classloader, - * which is in charge of finding plugins and interceptors. - * - * @author wusheng + * The AgentClassLoader represents a classloader, which is in charge of finding plugins and interceptors. */ public class AgentClassLoader extends ClassLoader { @@ -102,8 +99,7 @@ protected Class findClass(String name) throws ClassNotFoundException { try { URL classFileUrl = new URL("jar:file:" + jar.sourceFile.getAbsolutePath() + "!/" + path); byte[] data; - try (final BufferedInputStream is = new BufferedInputStream(classFileUrl.openStream()); - final ByteArrayOutputStream baos = new ByteArrayOutputStream()) { + try (final BufferedInputStream is = new BufferedInputStream(classFileUrl.openStream()); final ByteArrayOutputStream baos = new ByteArrayOutputStream()) { int ch; while ((ch = is.read()) != -1) { baos.write(ch); diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/loader/InstrumentationLoader.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/loader/InstrumentationLoader.java index 05614c94d13f..9064e3d7f968 100755 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/loader/InstrumentationLoader.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/loader/InstrumentationLoader.java @@ -24,8 +24,6 @@ /** * the spi of the InstrumentationLoader. - * - * @author : zhaoyuguang */ public interface InstrumentationLoader { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/loader/InterceptorInstanceLoader.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/loader/InterceptorInstanceLoader.java index 01bab5149e4f..2823c077b906 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/loader/InterceptorInstanceLoader.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/loader/InterceptorInstanceLoader.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin.loader; import org.apache.skywalking.apm.agent.core.boot.AgentPackageNotFoundException; @@ -32,7 +31,6 @@ * This is a very important class in sky-walking's auto-instrumentation mechanism. If you want to fully understand why * need this, and how it works, you need have knowledge about Classloader appointment mechanism. *

- * Created by wusheng on 16/8/2. */ public class InterceptorInstanceLoader { @@ -41,25 +39,22 @@ public class InterceptorInstanceLoader { private static Map EXTEND_PLUGIN_CLASSLOADERS = new HashMap(); /** - * Load an instance of interceptor, and keep it singleton. - * Create {@link AgentClassLoader} for each targetClassLoader, as an extend classloader. - * It can load interceptor classes from plugins, activations folders. + * Load an instance of interceptor, and keep it singleton. Create {@link AgentClassLoader} for each + * targetClassLoader, as an extend classloader. It can load interceptor classes from plugins, activations folders. * * @param className the interceptor class, which is expected to be found * @param targetClassLoader the class loader for current application context * @param expected type * @return the type reference. - * @throws IllegalAccessException - * @throws InstantiationException - * @throws ClassNotFoundException - * @throws AgentPackageNotFoundException */ - public static T load(String className, ClassLoader targetClassLoader) - throws IllegalAccessException, InstantiationException, ClassNotFoundException, AgentPackageNotFoundException { + public static T load(String className, + ClassLoader targetClassLoader) throws IllegalAccessException, InstantiationException, ClassNotFoundException, AgentPackageNotFoundException { if (targetClassLoader == null) { targetClassLoader = InterceptorInstanceLoader.class.getClassLoader(); } - String instanceKey = className + "_OF_" + targetClassLoader.getClass().getName() + "@" + Integer.toHexString(targetClassLoader.hashCode()); + String instanceKey = className + "_OF_" + targetClassLoader.getClass() + .getName() + "@" + Integer.toHexString(targetClassLoader + .hashCode()); Object inst = INSTANCE_CACHE.get(instanceKey); if (inst == null) { INSTANCE_LOAD_LOCK.lock(); diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/ClassAnnotationMatch.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/ClassAnnotationMatch.java index 5fa9a00992d2..41ecfe844101 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/ClassAnnotationMatch.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/ClassAnnotationMatch.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin.match; import java.util.ArrayList; @@ -34,8 +33,6 @@ /** * Match the class by the given annotations in class. - * - * @author wusheng */ public class ClassAnnotationMatch implements IndirectMatch { private String[] annotations; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/ClassMatch.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/ClassMatch.java index d4ee6d4b043d..3763a194f6ae 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/ClassMatch.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/ClassMatch.java @@ -16,11 +16,7 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin.match; -/** - * @author wusheng - */ public interface ClassMatch { } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/HierarchyMatch.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/HierarchyMatch.java index 314c4b3cc5ac..59263aad41b0 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/HierarchyMatch.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/HierarchyMatch.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin.match; import java.util.ArrayList; @@ -34,8 +33,6 @@ /** * Match the class by the given super class or interfaces. - * - * @author wusheng */ public class HierarchyMatch implements IndirectMatch { private String[] parentTypes; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/IndirectMatch.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/IndirectMatch.java index c93e11a9069c..f4a7e6ae1b44 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/IndirectMatch.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/IndirectMatch.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin.match; import net.bytebuddy.description.type.TypeDescription; @@ -24,8 +23,6 @@ /** * All implementations can't direct match the class like {@link NameMatch} did. - * - * @author wusheng */ public interface IndirectMatch extends ClassMatch { ElementMatcher.Junction buildJunction(); diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/MethodAnnotationMatch.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/MethodAnnotationMatch.java index a028f2f131a9..e1cc894b6168 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/MethodAnnotationMatch.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/MethodAnnotationMatch.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin.match; import java.util.ArrayList; @@ -35,10 +34,7 @@ import static net.bytebuddy.matcher.ElementMatchers.named; /** - * Match the class, which has methods with the certain annotations. - * This is a very complex match. - * - * @author wusheng + * Match the class, which has methods with the certain annotations. This is a very complex match. */ public class MethodAnnotationMatch implements IndirectMatch { private String[] annotations; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/MethodInheritanceAnnotationMatcher.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/MethodInheritanceAnnotationMatcher.java index 1b62350ceda1..21511c1b23d0 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/MethodInheritanceAnnotationMatcher.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/MethodInheritanceAnnotationMatcher.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.agent.core.plugin.match; import net.bytebuddy.build.HashCodeAndEqualsPlugin; @@ -35,7 +36,6 @@ /** * Matching used to match method annotations, Can match annotations on interface methods - * @author jialong */ @HashCodeAndEqualsPlugin.Enhance public class MethodInheritanceAnnotationMatcher extends ElementMatcher.Junction.AbstractBase { @@ -65,7 +65,6 @@ public boolean matches(T target) { return recursiveMatches(declaringType, name, parameters); } - private boolean recursiveMatches(TypeDefinition typeDefinition, String methodName, ParameterList parameters) { TypeList.Generic interfaces = typeDefinition.getInterfaces(); for (TypeDescription.Generic implInterface : interfaces) { @@ -82,7 +81,6 @@ private boolean recursiveMatches(TypeDefinition typeDefinition, String methodNam return false; } - private boolean parameterEquals(ParameterList source, ParameterList impl) { if (source.size() != impl.size()) { return false; @@ -95,7 +93,8 @@ private boolean parameterEquals(ParameterList source, ParameterList impl) return true; } - public static ElementMatcher.Junction byMethodInheritanceAnnotationMatcher(ElementMatcher matcher) { + public static ElementMatcher.Junction byMethodInheritanceAnnotationMatcher( + ElementMatcher matcher) { return new MethodInheritanceAnnotationMatcher(new CollectionItemMatcher<>(annotationType(matcher))); } } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/MultiClassNameMatch.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/MultiClassNameMatch.java index 6453facdff99..59954eeed738 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/MultiClassNameMatch.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/MultiClassNameMatch.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin.match; import java.util.Arrays; @@ -28,8 +27,6 @@ /** * Match class with a given set of classes. - * - * @author zhangxin */ public class MultiClassNameMatch implements IndirectMatch { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/NameMatch.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/NameMatch.java index dffb9e5bf647..96ab710db99b 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/NameMatch.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/NameMatch.java @@ -16,13 +16,10 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin.match; /** * Match the class with an explicit class name. - * - * @author wusheng */ public class NameMatch implements ClassMatch { private String className; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/PrefixMatch.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/PrefixMatch.java index d2cb78f65734..2324539ff367 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/PrefixMatch.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/PrefixMatch.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.plugin.match; import net.bytebuddy.description.type.TypeDescription; @@ -25,8 +24,6 @@ /** * Match classes by any one of the given {@link #prefixes} - * - * @author kezhenxu94 */ @SuppressWarnings("rawtypes") public class PrefixMatch implements IndirectMatch { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/ProtectiveShieldMatcher.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/ProtectiveShieldMatcher.java index 46a3cea5d3b4..7b539c70ec24 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/ProtectiveShieldMatcher.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/ProtectiveShieldMatcher.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.agent.core.plugin.match; import net.bytebuddy.matcher.ElementMatcher; @@ -24,14 +25,12 @@ /** * In some cases, some frameworks and libraries use some binary codes tech too. From the community feedback, some of * them have compatible issues with byte-buddy core, which trigger "Can't resolve type description" exception. - * + *

* So I build this protective shield by a nested matcher. When the origin matcher(s) can't resolve the type, the * SkyWalking agent ignores this types. - * + *

* Notice: this ignore mechanism may miss some instrumentations, but at most cases, it's same. If missing happens, * please pay attention to the WARNING logs. - * - * @author wu-sheng */ public class ProtectiveShieldMatcher extends ElementMatcher.Junction.AbstractBase { private static final ILog logger = LogManager.getLogger(ProtectiveShieldMatcher.class); diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/logical/LogicalAndMatch.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/logical/LogicalAndMatch.java index dc523aebebe1..5d70045e76ae 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/logical/LogicalAndMatch.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/logical/LogicalAndMatch.java @@ -24,8 +24,6 @@ /** * Match classes by multiple criteria with AND conjunction - * - * @author kezhenxu94 */ public class LogicalAndMatch implements IndirectMatch { private final IndirectMatch[] indirectMatches; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/logical/LogicalMatchOperation.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/logical/LogicalMatchOperation.java index c2fa422b58cf..af5ee3670abf 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/logical/LogicalMatchOperation.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/logical/LogicalMatchOperation.java @@ -25,8 +25,6 @@ /** * Util class to help to construct logical operations on {@link org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch}s - * - * @author kezhenxu94 */ public class LogicalMatchOperation { public static IndirectMatch and(final IndirectMatch... matches) { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/logical/LogicalOrMatch.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/logical/LogicalOrMatch.java index 1a10a4fb772f..b09503f30efb 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/logical/LogicalOrMatch.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/logical/LogicalOrMatch.java @@ -24,8 +24,6 @@ /** * Match classes by multiple criteria with OR conjunction - * - * @author kezhenxu94 */ public class LogicalOrMatch implements IndirectMatch { private final IndirectMatch[] indirectMatches; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/ProfileTask.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/ProfileTask.java index 2c4c6c1e0b2e..c09381d6d773 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/ProfileTask.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/ProfileTask.java @@ -22,8 +22,6 @@ /** * Profile task bean, receive from OAP server - * - * @author MrPro */ public class ProfileTask { @@ -117,17 +115,13 @@ public void setTaskId(String taskId) { @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; ProfileTask that = (ProfileTask) o; - return duration == that.duration && - minDurationThreshold == that.minDurationThreshold && - threadDumpPeriod == that.threadDumpPeriod && - maxSamplingCount == that.maxSamplingCount && - startTime == that.startTime && - createTime == that.createTime && - taskId.equals(that.taskId) && - fistSpanOPName.equals(that.fistSpanOPName); + return duration == that.duration && minDurationThreshold == that.minDurationThreshold && threadDumpPeriod == that.threadDumpPeriod && maxSamplingCount == that.maxSamplingCount && startTime == that.startTime && createTime == that.createTime && taskId + .equals(that.taskId) && fistSpanOPName.equals(that.fistSpanOPName); } @Override diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/ProfileTaskChannelService.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/ProfileTaskChannelService.java index 9a4b83993194..973dc0f9f4d2 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/ProfileTaskChannelService.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/ProfileTaskChannelService.java @@ -22,6 +22,12 @@ import io.grpc.Status; import io.grpc.StatusRuntimeException; import io.grpc.stub.StreamObserver; +import java.util.ArrayList; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.Executors; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.TimeUnit; import org.apache.skywalking.apm.agent.core.boot.BootService; import org.apache.skywalking.apm.agent.core.boot.DefaultImplementor; import org.apache.skywalking.apm.agent.core.boot.DefaultNamedThreadFactory; @@ -32,7 +38,10 @@ import org.apache.skywalking.apm.agent.core.dictionary.DictionaryUtil; import org.apache.skywalking.apm.agent.core.logging.api.ILog; import org.apache.skywalking.apm.agent.core.logging.api.LogManager; -import org.apache.skywalking.apm.agent.core.remote.*; +import org.apache.skywalking.apm.agent.core.remote.GRPCChannelListener; +import org.apache.skywalking.apm.agent.core.remote.GRPCChannelManager; +import org.apache.skywalking.apm.agent.core.remote.GRPCChannelStatus; +import org.apache.skywalking.apm.agent.core.remote.GRPCStreamServiceStatus; import org.apache.skywalking.apm.network.common.Commands; import org.apache.skywalking.apm.network.language.profile.ProfileTaskCommandQuery; import org.apache.skywalking.apm.network.language.profile.ProfileTaskFinishReport; @@ -40,21 +49,13 @@ import org.apache.skywalking.apm.network.language.profile.ThreadSnapshot; import org.apache.skywalking.apm.util.RunnableWithExceptionProtection; -import java.util.ArrayList; -import java.util.concurrent.Executors; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.TimeUnit; - import static org.apache.skywalking.apm.agent.core.conf.Config.Collector.GRPC_UPSTREAM_TIMEOUT; /** - * Sniffer and backend, about the communication service of profile task protocol. - * 1. Sniffer will check has new profile task list every {@link Config.Collector#GET_PROFILE_TASK_INTERVAL} second. - * 2. When there is a new profile task snapshot, the data is transferred to the back end. use {@link LinkedBlockingQueue} - * 3. When profiling task finish, it will send task finish status to backend - * - * @author MrPro + * Sniffer and backend, about the communication service of profile task protocol. 1. Sniffer will check has new profile + * task list every {@link Config.Collector#GET_PROFILE_TASK_INTERVAL} second. 2. When there is a new profile task + * snapshot, the data is transferred to the back end. use {@link LinkedBlockingQueue} 3. When profiling task finish, it + * will send task finish status to backend */ @DefaultImplementor public class ProfileTaskChannelService implements BootService, Runnable, GRPCChannelListener { @@ -68,7 +69,8 @@ public class ProfileTaskChannelService implements BootService, Runnable, GRPCCha private volatile ProfileTaskGrpc.ProfileTaskStub profileTaskStub; // segment snapshot sender - private final LinkedBlockingQueue snapshotQueue = new LinkedBlockingQueue<>(Config.Profile.SNAPSHOT_TRANSPORT_BUFFER_SIZE); + private final BlockingQueue snapshotQueue = new LinkedBlockingQueue<>( + Config.Profile.SNAPSHOT_TRANSPORT_BUFFER_SIZE); private volatile ScheduledFuture sendSnapshotFuture; // query task list schedule @@ -77,19 +79,22 @@ public class ProfileTaskChannelService implements BootService, Runnable, GRPCCha @Override public void run() { if (RemoteDownstreamConfig.Agent.SERVICE_ID != DictionaryUtil.nullValue() - && RemoteDownstreamConfig.Agent.SERVICE_INSTANCE_ID != DictionaryUtil.nullValue() - ) { + && RemoteDownstreamConfig.Agent.SERVICE_INSTANCE_ID != DictionaryUtil.nullValue()) { if (status == GRPCChannelStatus.CONNECTED) { try { ProfileTaskCommandQuery.Builder builder = ProfileTaskCommandQuery.newBuilder(); // sniffer info - builder.setServiceId(RemoteDownstreamConfig.Agent.SERVICE_ID).setInstanceId(RemoteDownstreamConfig.Agent.SERVICE_INSTANCE_ID); + builder.setServiceId(RemoteDownstreamConfig.Agent.SERVICE_ID) + .setInstanceId(RemoteDownstreamConfig.Agent.SERVICE_INSTANCE_ID); // last command create time - builder.setLastCommandTime(ServiceManager.INSTANCE.findService(ProfileTaskExecutionService.class).getLastCommandCreateTime()); + builder.setLastCommandTime(ServiceManager.INSTANCE.findService(ProfileTaskExecutionService.class) + .getLastCommandCreateTime()); + + Commands commands = profileTaskBlockingStub.withDeadlineAfter(GRPC_UPSTREAM_TIMEOUT, TimeUnit.SECONDS) + .getProfileTaskCommands(builder.build()); - Commands commands = profileTaskBlockingStub.withDeadlineAfter(GRPC_UPSTREAM_TIMEOUT, TimeUnit.SECONDS).getProfileTaskCommands(builder.build()); ServiceManager.INSTANCE.findService(CommandService.class).receiveCommand(commands); } catch (Throwable t) { if (!(t instanceof StatusRuntimeException)) { @@ -115,37 +120,40 @@ public void run() { } @Override - public void prepare() throws Throwable { + public void prepare() { ServiceManager.INSTANCE.findService(GRPCChannelManager.class).addChannelListener(this); } @Override - public void boot() throws Throwable { + public void boot() { if (Config.Profile.ACTIVE) { // query task list - getTaskListFuture = Executors.newSingleThreadScheduledExecutor(new DefaultNamedThreadFactory("ProfileGetTaskService")) - .scheduleWithFixedDelay(new RunnableWithExceptionProtection(this, new RunnableWithExceptionProtection.CallbackWhenException() { - @Override - public void handle(Throwable t) { - logger.error("Query profile task list failure.", t); - } - }), 0, Config.Collector.GET_PROFILE_TASK_INTERVAL, TimeUnit.SECONDS); + getTaskListFuture = Executors.newSingleThreadScheduledExecutor( + new DefaultNamedThreadFactory("ProfileGetTaskService") + ).scheduleWithFixedDelay( + new RunnableWithExceptionProtection( + this, + t -> logger.error("Query profile task list failure.", t) + ), 0, Config.Collector.GET_PROFILE_TASK_INTERVAL, TimeUnit.SECONDS + ); - sendSnapshotFuture = Executors.newSingleThreadScheduledExecutor(new DefaultNamedThreadFactory("ProfileSendSnapshotService")) - .scheduleWithFixedDelay(new RunnableWithExceptionProtection(new SnapshotSender(), new RunnableWithExceptionProtection.CallbackWhenException() { - @Override public void handle(Throwable t) { - logger.error("Profile segment snapshot upload failure.", t); - } - }), 0, 500, TimeUnit.MILLISECONDS); + sendSnapshotFuture = Executors.newSingleThreadScheduledExecutor( + new DefaultNamedThreadFactory("ProfileSendSnapshotService") + ).scheduleWithFixedDelay( + new RunnableWithExceptionProtection( + new SnapshotSender(), + t -> logger.error("Profile segment snapshot upload failure.", t) + ), 0, 500, TimeUnit.MILLISECONDS + ); } } @Override - public void onComplete() throws Throwable { + public void onComplete() { } @Override - public void shutdown() throws Throwable { + public void shutdown() { if (getTaskListFuture != null) { getTaskListFuture.cancel(true); } @@ -182,12 +190,14 @@ public void notifyProfileTaskFinish(ProfileTask task) { try { final ProfileTaskFinishReport.Builder reportBuilder = ProfileTaskFinishReport.newBuilder(); // sniffer info - reportBuilder.setServiceId(RemoteDownstreamConfig.Agent.SERVICE_ID).setInstanceId(RemoteDownstreamConfig.Agent.SERVICE_INSTANCE_ID); + reportBuilder.setServiceId(RemoteDownstreamConfig.Agent.SERVICE_ID) + .setInstanceId(RemoteDownstreamConfig.Agent.SERVICE_INSTANCE_ID); // task info reportBuilder.setTaskId(task.getTaskId()); // send data - profileTaskBlockingStub.withDeadlineAfter(GRPC_UPSTREAM_TIMEOUT, TimeUnit.SECONDS).reportTaskFinish(reportBuilder.build()); + profileTaskBlockingStub.withDeadlineAfter(GRPC_UPSTREAM_TIMEOUT, TimeUnit.SECONDS) + .reportTaskFinish(reportBuilder.build()); } catch (Throwable e) { logger.error(e, "Notify profile task finish to backend fail."); } @@ -206,25 +216,35 @@ public void run() { snapshotQueue.drainTo(buffer); if (buffer.size() > 0) { final GRPCStreamServiceStatus status = new GRPCStreamServiceStatus(false); - StreamObserver snapshotStreamObserver = profileTaskStub.withDeadlineAfter(GRPC_UPSTREAM_TIMEOUT, TimeUnit.SECONDS).collectSnapshot(new StreamObserver() { - @Override - public void onNext(Commands commands) { - } + StreamObserver snapshotStreamObserver = profileTaskStub.withDeadlineAfter( + GRPC_UPSTREAM_TIMEOUT, TimeUnit.SECONDS + ).collectSnapshot( + new StreamObserver() { + @Override + public void onNext( + Commands commands) { + } - @Override - public void onError(Throwable throwable) { - status.finished(); - if (logger.isErrorEnable()) { - logger.error(throwable, "Send profile segment snapshot to collector fail with a grpc internal exception."); + @Override + public void onError( + Throwable throwable) { + status.finished(); + if (logger.isErrorEnable()) { + logger.error( + throwable, + "Send profile segment snapshot to collector fail with a grpc internal exception." + ); + } + ServiceManager.INSTANCE.findService(GRPCChannelManager.class) + .reportError(throwable); } - ServiceManager.INSTANCE.findService(GRPCChannelManager.class).reportError(throwable); - } - @Override - public void onCompleted() { - status.finished(); + @Override + public void onCompleted() { + status.finished(); + } } - }); + ); for (TracingThreadSnapshot snapshot : buffer) { final ThreadSnapshot transformSnapshot = snapshot.transform(); snapshotStreamObserver.onNext(transformSnapshot); diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/ProfileTaskExecutionContext.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/ProfileTaskExecutionContext.java index 16d684c908a2..bb1949ff40a3 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/ProfileTaskExecutionContext.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/ProfileTaskExecutionContext.java @@ -30,8 +30,6 @@ /** * profile task execution context, it will create on process this profile task - * - * @author MrPro */ public class ProfileTaskExecutionContext { @@ -108,7 +106,6 @@ public boolean attemptProfiling(TracingContext tracingContext, ID traceSegmentId return true; } - /** * profiling recheck */ @@ -155,8 +152,10 @@ public boolean isStartProfileable() { @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; ProfileTaskExecutionContext that = (ProfileTaskExecutionContext) o; return Objects.equals(task, that.task); } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/ProfileTaskExecutionService.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/ProfileTaskExecutionService.java index 9a3f2703f7ea..afe840e5ea06 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/ProfileTaskExecutionService.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/ProfileTaskExecutionService.java @@ -18,6 +18,14 @@ package org.apache.skywalking.apm.agent.core.profile; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicReference; import org.apache.skywalking.apm.agent.core.boot.BootService; import org.apache.skywalking.apm.agent.core.boot.DefaultImplementor; import org.apache.skywalking.apm.agent.core.boot.DefaultNamedThreadFactory; @@ -30,16 +38,8 @@ import org.apache.skywalking.apm.network.constants.ProfileConstants; import org.apache.skywalking.apm.util.StringUtil; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; -import java.util.concurrent.*; -import java.util.concurrent.atomic.AtomicReference; - /** * Profile task executor, use {@link #addProfileTask(ProfileTask)} to add a new profile task. - * - * @author MrPro */ @DefaultImplementor public class ProfileTaskExecutionService implements BootService, TracingThreadListener { @@ -47,7 +47,8 @@ public class ProfileTaskExecutionService implements BootService, TracingThreadLi private static final ILog logger = LogManager.getLogger(ProfileTaskExecutionService.class); // add a schedule while waiting for the task to start or finish - private final static ScheduledExecutorService PROFILE_TASK_SCHEDULE = Executors.newSingleThreadScheduledExecutor(new DefaultNamedThreadFactory("PROFILE-TASK-SCHEDULE")); + private final static ScheduledExecutorService PROFILE_TASK_SCHEDULE = Executors.newSingleThreadScheduledExecutor( + new DefaultNamedThreadFactory("PROFILE-TASK-SCHEDULE")); // last command create time, use to next query task list private volatile long lastCommandCreateTime = -1; @@ -56,7 +57,8 @@ public class ProfileTaskExecutionService implements BootService, TracingThreadLi private final AtomicReference taskExecutionContext = new AtomicReference<>(); // profile executor thread pool, only running one thread - private final static ExecutorService PROFILE_EXECUTOR = Executors.newSingleThreadExecutor(new DefaultNamedThreadFactory("PROFILING-TASK")); + private final static ExecutorService PROFILE_EXECUTOR = Executors.newSingleThreadExecutor( + new DefaultNamedThreadFactory("PROFILING-TASK")); // profile task list, include running and waiting running tasks private final List profileTaskList = Collections.synchronizedList(new LinkedList<>()); @@ -73,7 +75,8 @@ public void addProfileTask(ProfileTask task) { // check profile task limit final CheckResult dataError = checkProfileTaskSuccess(task); if (!dataError.isSuccess()) { - logger.warn("check command error, cannot process this profile task. reason: {}", dataError.getErrorReason()); + logger.warn( + "check command error, cannot process this profile task. reason: {}", dataError.getErrorReason()); return; } @@ -82,12 +85,7 @@ public void addProfileTask(ProfileTask task) { // schedule to start task long timeToProcessMills = task.getStartTime() - System.currentTimeMillis(); - PROFILE_TASK_SCHEDULE.schedule(new Runnable() { - @Override - public void run() { - processProfileTask(task); - } - }, timeToProcessMills, TimeUnit.MILLISECONDS); + PROFILE_TASK_SCHEDULE.schedule(() -> processProfileTask(task), timeToProcessMills, TimeUnit.MILLISECONDS); } /** @@ -130,12 +128,8 @@ private synchronized void processProfileTask(ProfileTask task) { // start profiling this task currentStartedTaskContext.startProfiling(PROFILE_EXECUTOR); - PROFILE_TASK_SCHEDULE.schedule(new Runnable() { - @Override - public void run() { - stopCurrentProfileTask(currentStartedTaskContext); - } - }, task.getDuration(), TimeUnit.MINUTES); + PROFILE_TASK_SCHEDULE.schedule( + () -> stopCurrentProfileTask(currentStartedTaskContext), task.getDuration(), TimeUnit.MINUTES); } /** @@ -154,25 +148,26 @@ synchronized void stopCurrentProfileTask(ProfileTaskExecutionContext needToStop) profileTaskList.remove(needToStop.getTask()); // notify profiling task has finished - ServiceManager.INSTANCE.findService(ProfileTaskChannelService.class).notifyProfileTaskFinish(needToStop.getTask()); + ServiceManager.INSTANCE.findService(ProfileTaskChannelService.class) + .notifyProfileTaskFinish(needToStop.getTask()); } @Override - public void prepare() throws Throwable { + public void prepare() { } @Override - public void boot() throws Throwable { + public void boot() { } @Override - public void onComplete() throws Throwable { + public void onComplete() { // add trace finish notification TracingContext.TracingThreadListenerManager.add(this); } @Override - public void shutdown() throws Throwable { + public void shutdown() { // remove trace listener TracingContext.TracingThreadListenerManager.remove(this); @@ -196,10 +191,14 @@ private CheckResult checkProfileTaskSuccess(ProfileTask task) { // duration if (task.getDuration() < ProfileConstants.TASK_DURATION_MIN_MINUTE) { - return new CheckResult(false, "monitor duration must greater than " + ProfileConstants.TASK_DURATION_MIN_MINUTE + " minutes"); + return new CheckResult( + false, "monitor duration must greater than " + ProfileConstants.TASK_DURATION_MIN_MINUTE + " minutes"); } if (task.getDuration() > ProfileConstants.TASK_DURATION_MAX_MINUTE) { - return new CheckResult(false, "The duration of the monitoring task cannot be greater than " + ProfileConstants.TASK_DURATION_MAX_MINUTE + " minutes"); + return new CheckResult( + false, + "The duration of the monitoring task cannot be greater than " + ProfileConstants.TASK_DURATION_MAX_MINUTE + " minutes" + ); } // min duration threshold @@ -209,7 +208,10 @@ private CheckResult checkProfileTaskSuccess(ProfileTask task) { // dump period if (task.getThreadDumpPeriod() < ProfileConstants.TASK_DUMP_PERIOD_MIN_MILLIS) { - return new CheckResult(false, "dump period must be greater than or equals " + ProfileConstants.TASK_DUMP_PERIOD_MIN_MILLIS + " milliseconds"); + return new CheckResult( + false, + "dump period must be greater than or equals " + ProfileConstants.TASK_DUMP_PERIOD_MIN_MILLIS + " milliseconds" + ); } // max sampling count @@ -217,7 +219,8 @@ private CheckResult checkProfileTaskSuccess(ProfileTask task) { return new CheckResult(false, "max sampling count must greater than zero"); } if (task.getMaxSamplingCount() >= ProfileConstants.TASK_MAX_SAMPLING_COUNT) { - return new CheckResult(false, "max sampling count must less than " + ProfileConstants.TASK_MAX_SAMPLING_COUNT); + return new CheckResult( + false, "max sampling count must less than " + ProfileConstants.TASK_MAX_SAMPLING_COUNT); } // check task queue, check only one task in a certain time @@ -225,8 +228,13 @@ private CheckResult checkProfileTaskSuccess(ProfileTask task) { for (ProfileTask profileTask : profileTaskList) { // if the end time of the task to be added is during the execution of any data, means is a error data - if (taskProcessFinishTime >= profileTask.getStartTime() && taskProcessFinishTime <= calcProfileTaskFinishTime(profileTask)) { - return new CheckResult(false, "there already have processing task in time range, could not add a new task again. processing task monitor endpoint name: " + profileTask.getFistSpanOPName()); + if (taskProcessFinishTime >= profileTask.getStartTime() && taskProcessFinishTime <= calcProfileTaskFinishTime( + profileTask)) { + return new CheckResult( + false, + "there already have processing task in time range, could not add a new task again. processing task monitor endpoint name: " + + profileTask.getFistSpanOPName() + ); } } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/ProfileThread.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/ProfileThread.java index 086126f756d6..b8c6e442e940 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/ProfileThread.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/ProfileThread.java @@ -26,8 +26,6 @@ /** * Profile task process thread, dump the executing thread stack. - * - * @author MrPro */ public class ProfileThread implements Runnable { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/ProfilingStatus.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/ProfilingStatus.java index 5159c0ce42e9..305b8a868d2f 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/ProfilingStatus.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/ProfilingStatus.java @@ -18,9 +18,6 @@ package org.apache.skywalking.apm.agent.core.profile; -/** - * @author MrPro - */ public enum ProfilingStatus { READY, diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/ThreadProfiler.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/ThreadProfiler.java index 59b5e998f00c..b860b368886f 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/ThreadProfiler.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/ThreadProfiler.java @@ -26,9 +26,6 @@ import java.util.ArrayList; import java.util.concurrent.TimeUnit; -/** - * @author MrPro - */ public class ThreadProfiler { // current tracing context @@ -49,7 +46,8 @@ public class ThreadProfiler { // thread dump sequence private int dumpSequence = 0; - public ThreadProfiler(TracingContext tracingContext, ID traceSegmentId, Thread profilingThread, ProfileTaskExecutionContext executionContext) { + public ThreadProfiler(TracingContext tracingContext, ID traceSegmentId, Thread profilingThread, + ProfileTaskExecutionContext executionContext) { this.tracingContext = tracingContext; this.traceSegmentId = traceSegmentId; this.profilingThread = profilingThread; @@ -61,7 +59,8 @@ public ThreadProfiler(TracingContext tracingContext, ID traceSegmentId, Thread p * If tracing start time greater than {@link ProfileTask#getMinDurationThreshold()}, then start to profiling trace */ public void startProfilingIfNeed() { - if (System.currentTimeMillis() - tracingContext.createTime() > executionContext.getTask().getMinDurationThreshold()) { + if (System.currentTimeMillis() - tracingContext.createTime() > executionContext.getTask() + .getMinDurationThreshold()) { this.profilingStartTime = System.currentTimeMillis(); this.profilingStatus = ProfilingStatus.PROFILING; } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/TracingThreadSnapshot.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/TracingThreadSnapshot.java index dcfcf0597195..3311832f078c 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/TracingThreadSnapshot.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/TracingThreadSnapshot.java @@ -24,9 +24,6 @@ import java.util.List; -/** - * @author MrPro - */ public class TracingThreadSnapshot { // thread profiler @@ -69,5 +66,4 @@ public ThreadSnapshot transform() { return builder.build(); } - } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/AgentIDDecorator.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/AgentIDDecorator.java index daa8b4cbd546..bf71cbfb21c5 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/AgentIDDecorator.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/AgentIDDecorator.java @@ -37,13 +37,10 @@ /** * Add agent version(Described in MANIFEST.MF) to the connection establish stage. - * - * @author wusheng */ public class AgentIDDecorator implements ChannelDecorator { private static final ILog logger = LogManager.getLogger(AgentIDDecorator.class); - private static final Metadata.Key AGENT_VERSION_HEAD_HEADER_NAME = - Metadata.Key.of("Agent-Version", Metadata.ASCII_STRING_MARSHALLER); + private static final Metadata.Key AGENT_VERSION_HEAD_HEADER_NAME = Metadata.Key.of("Agent-Version", Metadata.ASCII_STRING_MARSHALLER); private String version = "UNKNOWN"; public AgentIDDecorator() { @@ -69,7 +66,8 @@ public AgentIDDecorator() { } } - @Override public Channel build(Channel channel) { + @Override + public Channel build(Channel channel) { return ClientInterceptors.intercept(channel, new ClientInterceptor() { @Override public ClientCall interceptCall(MethodDescriptor method, diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/AuthenticationDecorator.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/AuthenticationDecorator.java index 53c9ca898a60..a44fc07aa7e2 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/AuthenticationDecorator.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/AuthenticationDecorator.java @@ -31,12 +31,9 @@ /** * Active authentication header by Config.Agent.AUTHENTICATION - * - * @author wu-sheng, zhang xin */ public class AuthenticationDecorator implements ChannelDecorator { - private static final Metadata.Key AUTH_HEAD_HEADER_NAME = - Metadata.Key.of("Authentication", Metadata.ASCII_STRING_MARSHALLER); + private static final Metadata.Key AUTH_HEAD_HEADER_NAME = Metadata.Key.of("Authentication", Metadata.ASCII_STRING_MARSHALLER); @Override public Channel build(Channel channel) { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/ChannelBuilder.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/ChannelBuilder.java index f6b51c58090f..e22d0d202b05 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/ChannelBuilder.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/ChannelBuilder.java @@ -20,9 +20,6 @@ import io.grpc.ManagedChannelBuilder; -/** - * @author zhang xin - */ public interface ChannelBuilder { B build(B managedChannelBuilder) throws Exception; } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/ChannelDecorator.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/ChannelDecorator.java index 146d04e9f797..18ac7038f8f2 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/ChannelDecorator.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/ChannelDecorator.java @@ -20,9 +20,6 @@ import io.grpc.Channel; -/** - * @author zhang xin - */ public interface ChannelDecorator { Channel build(Channel channel); } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/GRPCChannel.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/GRPCChannel.java index 8e3afecff469..52fa36c8b1d2 100755 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/GRPCChannel.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/GRPCChannel.java @@ -26,9 +26,6 @@ import java.util.LinkedList; import java.util.List; -/** - * @author zhangxin - */ public class GRPCChannel { /** * origin channel @@ -91,8 +88,8 @@ public static class Builder { private Builder(String host, int port) { this.host = host; this.port = port; - this.channelBuilders = new LinkedList(); - this.decorators = new LinkedList(); + this.channelBuilders = new LinkedList<>(); + this.decorators = new LinkedList<>(); } public Builder addChannelDecorator(ChannelDecorator interceptor) { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/GRPCChannelListener.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/GRPCChannelListener.java index bf3e49d3ed36..403c072b65c1 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/GRPCChannelListener.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/GRPCChannelListener.java @@ -16,12 +16,8 @@ * */ - package org.apache.skywalking.apm.agent.core.remote; -/** - * @author wusheng - */ public interface GRPCChannelListener { void statusChanged(GRPCChannelStatus status); } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/GRPCChannelManager.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/GRPCChannelManager.java index 6aed148fa1fa..ee986001954f 100755 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/GRPCChannelManager.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/GRPCChannelManager.java @@ -37,9 +37,6 @@ import org.apache.skywalking.apm.agent.core.logging.api.LogManager; import org.apache.skywalking.apm.util.RunnableWithExceptionProtection; -/** - * @author wusheng, zhang xin - */ @DefaultImplementor public class GRPCChannelManager implements BootService, Runnable { private static final ILog logger = LogManager.getLogger(GRPCChannelManager.class); @@ -47,42 +44,42 @@ public class GRPCChannelManager implements BootService, Runnable { private volatile GRPCChannel managedChannel = null; private volatile ScheduledFuture connectCheckFuture; private volatile boolean reconnect = true; - private Random random = new Random(); - private List listeners = Collections.synchronizedList(new LinkedList()); + private final Random random = new Random(); + private final List listeners = Collections.synchronizedList(new LinkedList<>()); private volatile List grpcServers; private volatile int selectedIdx = -1; private volatile int reconnectCount = 0; @Override - public void prepare() throws Throwable { + public void prepare() { } @Override - public void boot() throws Throwable { + public void boot() { if (Config.Collector.BACKEND_SERVICE.trim().length() == 0) { logger.error("Collector server addresses are not set."); logger.error("Agent will not uplink any data."); return; } grpcServers = Arrays.asList(Config.Collector.BACKEND_SERVICE.split(",")); - connectCheckFuture = Executors - .newSingleThreadScheduledExecutor(new DefaultNamedThreadFactory("GRPCChannelManager")) - .scheduleAtFixedRate(new RunnableWithExceptionProtection(this, new RunnableWithExceptionProtection.CallbackWhenException() { - @Override - public void handle(Throwable t) { - logger.error("unexpected exception.", t); - } - }), 0, Config.Collector.GRPC_CHANNEL_CHECK_INTERVAL, TimeUnit.SECONDS); + connectCheckFuture = Executors.newSingleThreadScheduledExecutor( + new DefaultNamedThreadFactory("GRPCChannelManager") + ).scheduleAtFixedRate( + new RunnableWithExceptionProtection( + this, + t -> logger.error("unexpected exception.", t) + ), 0, Config.Collector.GRPC_CHANNEL_CHECK_INTERVAL, TimeUnit.SECONDS + ); } @Override - public void onComplete() throws Throwable { + public void onComplete() { } @Override - public void shutdown() throws Throwable { + public void shutdown() { if (connectCheckFuture != null) { connectCheckFuture.cancel(true); } @@ -111,11 +108,11 @@ public void run() { } managedChannel = GRPCChannel.newBuilder(ipAndPort[0], Integer.parseInt(ipAndPort[1])) - .addManagedChannelBuilder(new StandardChannelBuilder()) - .addManagedChannelBuilder(new TLSChannelBuilder()) - .addChannelDecorator(new AgentIDDecorator()) - .addChannelDecorator(new AuthenticationDecorator()) - .build(); + .addManagedChannelBuilder(new StandardChannelBuilder()) + .addManagedChannelBuilder(new TLSChannelBuilder()) + .addChannelDecorator(new AgentIDDecorator()) + .addChannelDecorator(new AuthenticationDecorator()) + .build(); notify(GRPCChannelStatus.CONNECTED); reconnectCount = 0; reconnect = false; @@ -134,7 +131,10 @@ public void run() { } } - logger.debug("Selected collector grpc service is not available. Wait {} seconds to retry", Config.Collector.GRPC_CHANNEL_CHECK_INTERVAL); + logger.debug( + "Selected collector grpc service is not available. Wait {} seconds to retry", + Config.Collector.GRPC_CHANNEL_CHECK_INTERVAL + ); } } @@ -148,8 +148,6 @@ public Channel getChannel() { /** * If the given expcetion is triggered by network problem, connect in background. - * - * @param throwable */ public void reportError(Throwable throwable) { if (isNetworkError(throwable)) { @@ -171,12 +169,9 @@ private void notify(GRPCChannelStatus status) { private boolean isNetworkError(Throwable throwable) { if (throwable instanceof StatusRuntimeException) { StatusRuntimeException statusRuntimeException = (StatusRuntimeException) throwable; - return statusEquals(statusRuntimeException.getStatus(), - Status.UNAVAILABLE, - Status.PERMISSION_DENIED, - Status.UNAUTHENTICATED, - Status.RESOURCE_EXHAUSTED, - Status.UNKNOWN + return statusEquals( + statusRuntimeException.getStatus(), Status.UNAVAILABLE, Status.PERMISSION_DENIED, + Status.UNAUTHENTICATED, Status.RESOURCE_EXHAUSTED, Status.UNKNOWN ); } return false; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/GRPCChannelStatus.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/GRPCChannelStatus.java index 7b7597b56632..d3abf533f3bc 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/GRPCChannelStatus.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/GRPCChannelStatus.java @@ -16,13 +16,8 @@ * */ - package org.apache.skywalking.apm.agent.core.remote; -/** - * @author wusheng - */ public enum GRPCChannelStatus { - CONNECTED, - DISCONNECT + CONNECTED, DISCONNECT } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/GRPCStreamServiceStatus.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/GRPCStreamServiceStatus.java index e3374ab418ba..a2c3e0a97051 100755 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/GRPCStreamServiceStatus.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/GRPCStreamServiceStatus.java @@ -21,9 +21,6 @@ import org.apache.skywalking.apm.agent.core.logging.api.ILog; import org.apache.skywalking.apm.agent.core.logging.api.LogManager; -/** - * @author wusheng - */ public class GRPCStreamServiceStatus { private static final ILog logger = LogManager.getLogger(GRPCStreamServiceStatus.class); private volatile boolean status; @@ -40,28 +37,13 @@ public void finished() { this.status = true; } - /** - * @param maxTimeout max wait time, milliseconds. - */ - public boolean wait4Finish(long maxTimeout) { - long time = 0; - while (!status) { - if (time > maxTimeout) { - break; - } - try2Sleep(5); - time += 5; - } - return status; - } - /** * Wait until success status reported. */ public void wait4Finish() { long recheckCycle = 5; long hasWaited = 0L; - long maxCycle = 30 * 1000L;// 30 seconds max. + long maxCycle = 30 * 1000L; // 30 seconds max. while (!status) { try2Sleep(recheckCycle); hasWaited += recheckCycle; @@ -69,7 +51,7 @@ public void wait4Finish() { if (recheckCycle >= maxCycle) { logger.warn("Collector traceSegment service doesn't response in {} seconds.", hasWaited / 1000); } else { - recheckCycle = recheckCycle * 2 > maxCycle ? maxCycle : recheckCycle * 2; + recheckCycle = Math.min(recheckCycle * 2, maxCycle); } } } @@ -82,7 +64,7 @@ public void wait4Finish() { private void try2Sleep(long millis) { try { Thread.sleep(millis); - } catch (InterruptedException e) { + } catch (InterruptedException ignored) { } } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/ServiceAndEndpointRegisterClient.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/ServiceAndEndpointRegisterClient.java index 2ed5aaa58c07..6307c3b8aeef 100755 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/ServiceAndEndpointRegisterClient.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/ServiceAndEndpointRegisterClient.java @@ -56,9 +56,6 @@ import static org.apache.skywalking.apm.agent.core.conf.Config.Collector.GRPC_UPSTREAM_TIMEOUT; -/** - * @author wusheng - */ @DefaultImplementor public class ServiceAndEndpointRegisterClient implements BootService, Runnable, GRPCChannelListener { private static final ILog logger = LogManager.getLogger(ServiceAndEndpointRegisterClient.class); @@ -85,38 +82,42 @@ public void statusChanged(GRPCChannelStatus status) { } @Override - public void prepare() throws Throwable { + public void prepare() { ServiceManager.INSTANCE.findService(GRPCChannelManager.class).addChannelListener(this); - INSTANCE_UUID = StringUtil.isEmpty(Config.Agent.INSTANCE_UUID) ? UUID.randomUUID().toString() - .replaceAll("-", "") : Config.Agent.INSTANCE_UUID; + INSTANCE_UUID = StringUtil.isEmpty(Config.Agent.INSTANCE_UUID) + ? UUID.randomUUID().toString().replaceAll("-", "") + : Config.Agent.INSTANCE_UUID; - SERVICE_INSTANCE_PROPERTIES = new ArrayList(); + SERVICE_INSTANCE_PROPERTIES = new ArrayList<>(); for (String key : Config.Agent.INSTANCE_PROPERTIES.keySet()) { SERVICE_INSTANCE_PROPERTIES.add(KeyStringValuePair.newBuilder() - .setKey(key).setValue(Config.Agent.INSTANCE_PROPERTIES.get(key)).build()); + .setKey(key) + .setValue(Config.Agent.INSTANCE_PROPERTIES.get(key)) + .build()); } } @Override - public void boot() throws Throwable { - applicationRegisterFuture = Executors - .newSingleThreadScheduledExecutor(new DefaultNamedThreadFactory("ServiceAndEndpointRegisterClient")) - .scheduleAtFixedRate(new RunnableWithExceptionProtection(this, new RunnableWithExceptionProtection.CallbackWhenException() { - @Override - public void handle(Throwable t) { - logger.error("unexpected exception.", t); - } - }), 0, Config.Collector.APP_AND_SERVICE_REGISTER_CHECK_INTERVAL, TimeUnit.SECONDS); + public void boot() { + applicationRegisterFuture = Executors.newSingleThreadScheduledExecutor( + new DefaultNamedThreadFactory("ServiceAndEndpointRegisterClient") + ).scheduleAtFixedRate( + new RunnableWithExceptionProtection( + this, + t -> logger.error("unexpected exception.", t) + ), 0, Config.Collector.APP_AND_SERVICE_REGISTER_CHECK_INTERVAL, + TimeUnit.SECONDS + ); } @Override - public void onComplete() throws Throwable { + public void onComplete() { } @Override - public void shutdown() throws Throwable { + public void shutdown() { applicationRegisterFuture.cancel(true); } @@ -141,8 +142,17 @@ public void run() { try { if (RemoteDownstreamConfig.Agent.SERVICE_ID == DictionaryUtil.nullValue()) { if (registerBlockingStub != null) { - ServiceRegisterMapping serviceRegisterMapping = registerBlockingStub.withDeadlineAfter(GRPC_UPSTREAM_TIMEOUT, TimeUnit.SECONDS).doServiceRegister( - Services.newBuilder().addServices(Service.newBuilder().setServiceName(Config.Agent.SERVICE_NAME).setType(ServiceType.normal)).build()); + ServiceRegisterMapping serviceRegisterMapping = registerBlockingStub.withDeadlineAfter( + GRPC_UPSTREAM_TIMEOUT, TimeUnit.SECONDS + ).doServiceRegister( + Services.newBuilder() + .addServices( + Service + .newBuilder() + .setServiceName(Config.Agent.SERVICE_NAME) + .setType(ServiceType.normal)) + .build() + ); if (serviceRegisterMapping != null) { for (KeyIntValuePair registered : serviceRegisterMapping.getServicesList()) { if (Config.Agent.SERVICE_NAME.equals(registered.getKey())) { @@ -156,16 +166,20 @@ public void run() { if (registerBlockingStub != null) { if (RemoteDownstreamConfig.Agent.SERVICE_INSTANCE_ID == DictionaryUtil.nullValue()) { - ServiceInstanceRegisterMapping instanceMapping = registerBlockingStub.withDeadlineAfter(GRPC_UPSTREAM_TIMEOUT, TimeUnit.SECONDS) - .doServiceInstanceRegister(ServiceInstances.newBuilder() - .addInstances( - ServiceInstance.newBuilder() - .setServiceId(RemoteDownstreamConfig.Agent.SERVICE_ID) - .setInstanceUUID(INSTANCE_UUID) - .setTime(System.currentTimeMillis()) - .addAllProperties(OSUtil.buildOSInfo()) - .addAllProperties(SERVICE_INSTANCE_PROPERTIES) - ).build()); + ServiceInstanceRegisterMapping instanceMapping = registerBlockingStub.withDeadlineAfter( + GRPC_UPSTREAM_TIMEOUT, TimeUnit.SECONDS + ).doServiceInstanceRegister( + ServiceInstances + .newBuilder() + .addInstances( + ServiceInstance + .newBuilder() + .setServiceId(RemoteDownstreamConfig.Agent.SERVICE_ID) + .setInstanceUUID(INSTANCE_UUID) + .setTime(System.currentTimeMillis()) + .addAllProperties(OSUtil.buildOSInfo()) + .addAllProperties(SERVICE_INSTANCE_PROPERTIES)) + .build()); for (KeyIntValuePair serviceInstance : instanceMapping.getServiceInstancesList()) { if (INSTANCE_UUID.equals(serviceInstance.getKey())) { int serviceInstanceId = serviceInstance.getValue(); @@ -176,15 +190,19 @@ public void run() { } } } else { - final Commands commands = serviceInstancePingStub.withDeadlineAfter(GRPC_UPSTREAM_TIMEOUT, TimeUnit.SECONDS) - .doPing(ServiceInstancePingPkg.newBuilder() - .setServiceInstanceId(RemoteDownstreamConfig.Agent.SERVICE_INSTANCE_ID) - .setTime(System.currentTimeMillis()) - .setServiceInstanceUUID(INSTANCE_UUID) - .build()); - - NetworkAddressDictionary.INSTANCE.syncRemoteDictionary(registerBlockingStub.withDeadlineAfter(GRPC_UPSTREAM_TIMEOUT, TimeUnit.SECONDS)); - EndpointNameDictionary.INSTANCE.syncRemoteDictionary(registerBlockingStub.withDeadlineAfter(GRPC_UPSTREAM_TIMEOUT, TimeUnit.SECONDS)); + final Commands commands = serviceInstancePingStub.withDeadlineAfter( + GRPC_UPSTREAM_TIMEOUT, TimeUnit.SECONDS + ).doPing(ServiceInstancePingPkg.newBuilder() + .setServiceInstanceId( + RemoteDownstreamConfig.Agent.SERVICE_INSTANCE_ID) + .setTime(System.currentTimeMillis()) + .setServiceInstanceUUID(INSTANCE_UUID) + .build()); + + NetworkAddressDictionary.INSTANCE.syncRemoteDictionary( + registerBlockingStub.withDeadlineAfter(GRPC_UPSTREAM_TIMEOUT, TimeUnit.SECONDS)); + EndpointNameDictionary.INSTANCE.syncRemoteDictionary( + registerBlockingStub.withDeadlineAfter(GRPC_UPSTREAM_TIMEOUT, TimeUnit.SECONDS)); ServiceManager.INSTANCE.findService(CommandService.class).receiveCommand(commands); } } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/StandardChannelBuilder.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/StandardChannelBuilder.java index 6c358fcc095e..fc0f268d73d5 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/StandardChannelBuilder.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/StandardChannelBuilder.java @@ -21,15 +21,13 @@ import io.grpc.ManagedChannelBuilder; import io.grpc.internal.DnsNameResolverProvider; -/** - * @author zhang xin - */ public class StandardChannelBuilder implements ChannelBuilder { private final static int MAX_INBOUND_MESSAGE_SIZE = 1024 * 1024 * 50; - @Override public ManagedChannelBuilder build(ManagedChannelBuilder managedChannelBuilder) throws Exception { + @Override + public ManagedChannelBuilder build(ManagedChannelBuilder managedChannelBuilder) { return managedChannelBuilder.nameResolverFactory(new DnsNameResolverProvider()) - .maxInboundMessageSize(MAX_INBOUND_MESSAGE_SIZE) - .usePlaintext(); + .maxInboundMessageSize(MAX_INBOUND_MESSAGE_SIZE) + .usePlaintext(); } } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/TLSChannelBuilder.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/TLSChannelBuilder.java index 5dacdf4ce470..f2726119b198 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/TLSChannelBuilder.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/TLSChannelBuilder.java @@ -30,20 +30,19 @@ /** * Detect the `/ca` folder in agent package, if `ca.crt` exists, start TLS (no mutual auth). - * - * @author wusheng */ public class TLSChannelBuilder implements ChannelBuilder { private static String CA_FILE_NAME = "ca" + Constants.PATH_SEPARATOR + "ca.crt"; - @Override public NettyChannelBuilder build( + @Override + public NettyChannelBuilder build( NettyChannelBuilder managedChannelBuilder) throws AgentPackageNotFoundException, SSLException { File caFile = new File(AgentPackagePath.getPath(), CA_FILE_NAME); if (caFile.exists() && caFile.isFile()) { SslContextBuilder builder = GrpcSslContexts.forClient(); builder.trustManager(caFile); managedChannelBuilder = managedChannelBuilder.negotiationType(NegotiationType.TLS) - .sslContext(builder.build()); + .sslContext(builder.build()); } return managedChannelBuilder; } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/TraceSegmentServiceClient.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/TraceSegmentServiceClient.java index 530299db0e37..4d639d55fdd6 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/TraceSegmentServiceClient.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/TraceSegmentServiceClient.java @@ -22,26 +22,27 @@ import io.grpc.stub.StreamObserver; import java.util.List; import java.util.concurrent.TimeUnit; - -import org.apache.skywalking.apm.agent.core.boot.*; +import org.apache.skywalking.apm.agent.core.boot.BootService; +import org.apache.skywalking.apm.agent.core.boot.DefaultImplementor; +import org.apache.skywalking.apm.agent.core.boot.ServiceManager; import org.apache.skywalking.apm.agent.core.commands.CommandService; import org.apache.skywalking.apm.agent.core.conf.Config; -import org.apache.skywalking.apm.agent.core.context.*; +import org.apache.skywalking.apm.agent.core.context.TracingContext; +import org.apache.skywalking.apm.agent.core.context.TracingContextListener; import org.apache.skywalking.apm.agent.core.context.trace.TraceSegment; -import org.apache.skywalking.apm.agent.core.logging.api.*; +import org.apache.skywalking.apm.agent.core.logging.api.ILog; +import org.apache.skywalking.apm.agent.core.logging.api.LogManager; import org.apache.skywalking.apm.commons.datacarrier.DataCarrier; import org.apache.skywalking.apm.commons.datacarrier.buffer.BufferStrategy; import org.apache.skywalking.apm.commons.datacarrier.consumer.IConsumer; import org.apache.skywalking.apm.network.common.Commands; -import org.apache.skywalking.apm.network.language.agent.*; +import org.apache.skywalking.apm.network.language.agent.UpstreamSegment; import org.apache.skywalking.apm.network.language.agent.v2.TraceSegmentReportServiceGrpc; -import static org.apache.skywalking.apm.agent.core.conf.Config.Buffer.*; +import static org.apache.skywalking.apm.agent.core.conf.Config.Buffer.BUFFER_SIZE; +import static org.apache.skywalking.apm.agent.core.conf.Config.Buffer.CHANNEL_SIZE; import static org.apache.skywalking.apm.agent.core.remote.GRPCChannelStatus.CONNECTED; -/** - * @author wusheng - */ @DefaultImplementor public class TraceSegmentServiceClient implements BootService, IConsumer, TracingContextListener, GRPCChannelListener { private static final ILog logger = LogManager.getLogger(TraceSegmentServiceClient.class); @@ -88,19 +89,28 @@ public void init() { public void consume(List data) { if (CONNECTED.equals(status)) { final GRPCStreamServiceStatus status = new GRPCStreamServiceStatus(false); - StreamObserver upstreamSegmentStreamObserver = serviceStub.withDeadlineAfter(Config.Collector.GRPC_UPSTREAM_TIMEOUT, TimeUnit.SECONDS).collect(new StreamObserver() { + StreamObserver upstreamSegmentStreamObserver = serviceStub.withDeadlineAfter( + Config.Collector.GRPC_UPSTREAM_TIMEOUT, TimeUnit.SECONDS + ).collect(new StreamObserver() { @Override public void onNext(Commands commands) { - ServiceManager.INSTANCE.findService(CommandService.class).receiveCommand(commands); + ServiceManager.INSTANCE.findService(CommandService.class) + .receiveCommand(commands); } @Override - public void onError(Throwable throwable) { + public void onError( + Throwable throwable) { status.finished(); if (logger.isErrorEnable()) { - logger.error(throwable, "Send UpstreamSegment to collector fail with a grpc internal exception."); + logger.error( + throwable, + "Send UpstreamSegment to collector fail with a grpc internal exception." + ); } - ServiceManager.INSTANCE.findService(GRPCChannelManager.class).reportError(throwable); + ServiceManager.INSTANCE + .findService(GRPCChannelManager.class) + .reportError(throwable); } @Override @@ -138,7 +148,8 @@ private void printUplinkStatus() { segmentUplinkedCounter = 0; } if (segmentAbandonedCounter > 0) { - logger.debug("{} trace segments have been abandoned, cause by no available channel.", segmentAbandonedCounter); + logger.debug( + "{} trace segments have been abandoned, cause by no available channel.", segmentAbandonedCounter); segmentAbandonedCounter = 0; } } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/sampling/SamplingService.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/sampling/SamplingService.java index 7c07c66c0e7a..c8bf212ee81f 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/sampling/SamplingService.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/sampling/SamplingService.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.sampling; import java.util.concurrent.Executors; @@ -39,8 +38,6 @@ * send all of them to collector, if SAMPLING is on. *

* By default, SAMPLING is on, and {@link Config.Agent#SAMPLE_N_PER_3_SECS } - * - * @author wusheng */ @DefaultImplementor public class SamplingService implements BootService { @@ -51,14 +48,14 @@ public class SamplingService implements BootService { private volatile ScheduledFuture scheduledFuture; @Override - public void prepare() throws Throwable { + public void prepare() { } @Override - public void boot() throws Throwable { + public void boot() { if (scheduledFuture != null) { - /** + /* * If {@link #boot()} invokes twice, mostly in test cases, * cancel the old one. */ @@ -67,29 +64,22 @@ public void boot() throws Throwable { if (Config.Agent.SAMPLE_N_PER_3_SECS > 0) { on = true; this.resetSamplingFactor(); - ScheduledExecutorService service = Executors - .newSingleThreadScheduledExecutor(new DefaultNamedThreadFactory("SamplingService")); - scheduledFuture = service.scheduleAtFixedRate(new RunnableWithExceptionProtection(new Runnable() { - @Override - public void run() { - resetSamplingFactor(); - } - }, new RunnableWithExceptionProtection.CallbackWhenException() { - @Override public void handle(Throwable t) { - logger.error("unexpected exception.", t); - } - }), 0, 3, TimeUnit.SECONDS); - logger.debug("Agent sampling mechanism started. Sample {} traces in 3 seconds.", Config.Agent.SAMPLE_N_PER_3_SECS); + ScheduledExecutorService service = Executors.newSingleThreadScheduledExecutor( + new DefaultNamedThreadFactory("SamplingService")); + scheduledFuture = service.scheduleAtFixedRate(new RunnableWithExceptionProtection( + this::resetSamplingFactor, t -> logger.error("unexpected exception.", t)), 0, 3, TimeUnit.SECONDS); + logger.debug( + "Agent sampling mechanism started. Sample {} traces in 3 seconds.", Config.Agent.SAMPLE_N_PER_3_SECS); } } @Override - public void onComplete() throws Throwable { + public void onComplete() { } @Override - public void shutdown() throws Throwable { + public void shutdown() { if (scheduledFuture != null) { scheduledFuture.cancel(true); } @@ -102,8 +92,7 @@ public boolean trySampling() { if (on) { int factor = samplingFactorHolder.get(); if (factor < Config.Agent.SAMPLE_N_PER_3_SECS) { - boolean success = samplingFactorHolder.compareAndSet(factor, factor + 1); - return success; + return samplingFactorHolder.compareAndSet(factor, factor + 1); } else { return false; } @@ -112,10 +101,8 @@ public boolean trySampling() { } /** - * Increase the sampling factor by force, - * to avoid sampling too many traces. - * If many distributed traces require sampled, - * the trace beginning at local, has less chance to be sampled. + * Increase the sampling factor by force, to avoid sampling too many traces. If many distributed traces require + * sampled, the trace beginning at local, has less chance to be sampled. */ public void forceSampled() { if (on) { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/util/CollectionUtil.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/util/CollectionUtil.java index a46cae8f18c5..7556fc3c3f11 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/util/CollectionUtil.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/util/CollectionUtil.java @@ -23,18 +23,16 @@ import java.util.stream.Collectors; /** - * Some utility methods for collections. - * Reinvent the wheels because importing third-party libs just for some methods is not worthwhile in agent side + * Some utility methods for collections. Reinvent the wheels because importing third-party libs just for some methods is + * not worthwhile in agent side * - * @author kezhenxu94 * @since 7.0.0 */ public final class CollectionUtil { public static String toString(final Map map) { - return map - .entrySet() - .stream() - .map(entry -> entry.getKey() + "=" + Arrays.toString(entry.getValue())) - .collect(Collectors.joining("\n")); + return map.entrySet() + .stream() + .map(entry -> entry.getKey() + "=" + Arrays.toString(entry.getValue())) + .collect(Collectors.joining("\n")); } } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/util/CustomizeExpression.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/util/CustomizeExpression.java index c9ab1cb2ca14..df261c77b6e4 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/util/CustomizeExpression.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/util/CustomizeExpression.java @@ -30,8 +30,6 @@ /** * a simple parsing expression - * - * @author zhaoyuguang */ public class CustomizeExpression { diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/util/MethodUtil.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/util/MethodUtil.java index cec696e471af..0d9a254f675a 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/util/MethodUtil.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/util/MethodUtil.java @@ -21,18 +21,14 @@ import java.lang.reflect.Method; /** - * According to the input parameter, - * return the OperationName for the span record, - * It can determine the unique method - * - * @author zhaoyuguang + * According to the input parameter, return the OperationName for the span record, It can determine the unique method */ public class MethodUtil { - public static String generateOperationName(Method method) { - StringBuilder operationName = new StringBuilder(method.getDeclaringClass().getName() + "." + method.getName() + "("); + StringBuilder operationName = new StringBuilder(method.getDeclaringClass() + .getName() + "." + method.getName() + "("); Class[] parameterTypes = method.getParameterTypes(); for (int i = 0; i < parameterTypes.length; i++) { operationName.append(parameterTypes[i].getName()); @@ -45,9 +41,11 @@ public static String generateOperationName(Method method) { } /** - * This is a low-performance method, recommand to use this when have to, make sure it is only executed once and the result is being cached. + * This is a low-performance method, recommand to use this when have to, make sure it is only executed once and the + * result is being cached. */ - public static boolean isMethodExist(ClassLoader classLoader, String className, String methodName, String... parameterTypes) { + public static boolean isMethodExist(ClassLoader classLoader, String className, String methodName, + String... parameterTypes) { try { Class clazz = Class.forName(className, true, classLoader); if (parameterTypes == null || parameterTypes.length == 0) { @@ -56,7 +54,8 @@ public static boolean isMethodExist(ClassLoader classLoader, String className, S } else { Method[] declaredMethods = clazz.getDeclaredMethods(); for (Method declaredMethod : declaredMethods) { - if (declaredMethod.getName().equals(methodName) && isParameterTypesEquals(declaredMethod.getParameterTypes(), parameterTypes)) { + if (declaredMethod.getName().equals(methodName) + && isParameterTypesEquals(declaredMethod.getParameterTypes(), parameterTypes)) { return true; } } @@ -67,7 +66,6 @@ public static boolean isMethodExist(ClassLoader classLoader, String className, S return false; } - private static boolean isParameterTypesEquals(Class[] parameterTypeClazz, String[] parameterTypeString) { if (parameterTypeClazz == null) { return false; diff --git a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/base64/Base64Test.java b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/base64/Base64Test.java index b46176358a2c..b242b5e60042 100644 --- a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/base64/Base64Test.java +++ b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/base64/Base64Test.java @@ -22,9 +22,6 @@ import org.junit.Test; -/** - * Created by SataQiu on 2019/5/8. - */ public class Base64Test { @Test diff --git a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/boot/DefaultNamedThreadFactoryTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/boot/DefaultNamedThreadFactoryTest.java index 262aaa1b0287..4bfac82b628e 100644 --- a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/boot/DefaultNamedThreadFactoryTest.java +++ b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/boot/DefaultNamedThreadFactoryTest.java @@ -23,9 +23,6 @@ import static org.junit.Assert.assertNotNull; -/** - * @author zhangkewei - */ public class DefaultNamedThreadFactoryTest { @Test diff --git a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/boot/ServiceManagerTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/boot/ServiceManagerTest.java index 53b4d4d8c953..f528ee0e73db 100644 --- a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/boot/ServiceManagerTest.java +++ b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/boot/ServiceManagerTest.java @@ -16,17 +16,19 @@ * */ - package org.apache.skywalking.apm.agent.core.boot; import java.lang.reflect.Field; import java.util.HashMap; import java.util.List; - -import org.apache.skywalking.apm.agent.core.context.*; +import org.apache.skywalking.apm.agent.core.context.ContextManager; +import org.apache.skywalking.apm.agent.core.context.IgnoredTracerContext; +import org.apache.skywalking.apm.agent.core.context.TracingContext; +import org.apache.skywalking.apm.agent.core.context.TracingContextListener; +import org.apache.skywalking.apm.agent.core.context.TracingThreadListener; import org.apache.skywalking.apm.agent.core.jvm.JVMService; -import org.apache.skywalking.apm.agent.core.profile.ProfileTaskExecutionService; import org.apache.skywalking.apm.agent.core.profile.ProfileTaskChannelService; +import org.apache.skywalking.apm.agent.core.profile.ProfileTaskExecutionService; import org.apache.skywalking.apm.agent.core.remote.GRPCChannelListener; import org.apache.skywalking.apm.agent.core.remote.GRPCChannelManager; import org.apache.skywalking.apm.agent.core.remote.TraceSegmentServiceClient; @@ -121,13 +123,13 @@ private void assertTraceSegmentServiceClient(TraceSegmentServiceClient service) private T getFieldValue(Object instance, String fieldName) throws Exception { Field field = instance.getClass().getDeclaredField(fieldName); field.setAccessible(true); - return (T)field.get(instance); + return (T) field.get(instance); } private T getFieldValue(Class clazz, String fieldName) throws Exception { Field field = clazz.getDeclaredField(fieldName); field.setAccessible(true); - return (T)field.get(clazz); + return (T) field.get(clazz); } } diff --git a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/conf/SnifferConfigInitializerTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/conf/SnifferConfigInitializerTest.java index 4d0ed5cbdfa3..15752610a5e9 100644 --- a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/conf/SnifferConfigInitializerTest.java +++ b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/conf/SnifferConfigInitializerTest.java @@ -40,8 +40,8 @@ public class SnifferConfigInitializerTest { * variables are reverted after the test. */ @Rule - public final EnvironmentVariables environmentVariables = new EnvironmentVariables() - .set("AGENT_SERVICE_NAME", "testAppFromSystemEnv").set("AGENT_COLLECTOR_SERVER", "localhost:11111"); + public final EnvironmentVariables environmentVariables = new EnvironmentVariables().set("AGENT_SERVICE_NAME", "testAppFromSystemEnv") + .set("AGENT_COLLECTOR_SERVER", "localhost:11111"); @Test public void testLoadConfigFromJavaAgentDir() throws AgentPackageNotFoundException, ConfigNotFoundException { @@ -85,8 +85,8 @@ public void testConfigOverridingFromSystemEnv() throws IllegalAccessException { properties.put("collector.backend_service", "${AGENT_COLLECTOR_SERVER:127.0.0.1:8090}"); properties.put("logging.level", "INFO"); PropertyPlaceholderHelper placeholderHelper = PropertyPlaceholderHelper.INSTANCE; - properties.put("agent.service_name", placeholderHelper.replacePlaceholders((String)properties.get("agent.service_name"), properties)); - properties.put("collector.backend_service", placeholderHelper.replacePlaceholders((String)properties.get("collector.backend_service"), properties)); + properties.put("agent.service_name", placeholderHelper.replacePlaceholders((String) properties.get("agent.service_name"), properties)); + properties.put("collector.backend_service", placeholderHelper.replacePlaceholders((String) properties.get("collector.backend_service"), properties)); ConfigInitializer.initialize(properties, Config.class); assertThat(Config.Agent.SERVICE_NAME, is("testAppFromSystemEnv")); assertThat(Config.Collector.BACKEND_SERVICE, is("localhost:11111")); diff --git a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/ContextManagerTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/ContextManagerTest.java index 6e048d890927..fc010ff425fa 100644 --- a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/ContextManagerTest.java +++ b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/ContextManagerTest.java @@ -16,42 +16,44 @@ * */ - package org.apache.skywalking.apm.agent.core.context; import com.google.protobuf.InvalidProtocolBufferException; import java.util.List; - import java.util.Objects; +import org.apache.skywalking.apm.agent.core.boot.ServiceManager; import org.apache.skywalking.apm.agent.core.conf.RemoteDownstreamConfig; import org.apache.skywalking.apm.agent.core.context.tag.Tags; +import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan; +import org.apache.skywalking.apm.agent.core.context.trace.AbstractTracingSpan; +import org.apache.skywalking.apm.agent.core.context.trace.LogDataEntity; import org.apache.skywalking.apm.agent.core.context.trace.SpanLayer; +import org.apache.skywalking.apm.agent.core.context.trace.TraceSegment; +import org.apache.skywalking.apm.agent.core.context.trace.TraceSegmentRef; import org.apache.skywalking.apm.agent.core.context.util.AbstractTracingSpanHelper; import org.apache.skywalking.apm.agent.core.context.util.SegmentHelper; +import org.apache.skywalking.apm.agent.core.context.util.SpanHelper; import org.apache.skywalking.apm.agent.core.context.util.TraceSegmentRefHelper; +import org.apache.skywalking.apm.agent.core.dictionary.DictionaryUtil; import org.apache.skywalking.apm.agent.core.test.tools.AgentServiceRule; +import org.apache.skywalking.apm.agent.core.test.tools.SegmentStorage; +import org.apache.skywalking.apm.agent.core.test.tools.SegmentStoragePoint; import org.apache.skywalking.apm.agent.core.test.tools.TracingSegmentRunner; import org.apache.skywalking.apm.network.common.KeyStringValuePair; +import org.apache.skywalking.apm.network.language.agent.SpanType; +import org.apache.skywalking.apm.network.language.agent.UpstreamSegment; import org.apache.skywalking.apm.network.language.agent.v2.Log; import org.apache.skywalking.apm.network.language.agent.v2.SegmentObject; import org.apache.skywalking.apm.network.language.agent.v2.SegmentReference; import org.apache.skywalking.apm.network.language.agent.v2.SpanObjectV2; +import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; import org.hamcrest.MatcherAssert; -import org.junit.*; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; import org.junit.runner.RunWith; -import org.apache.skywalking.apm.agent.core.boot.ServiceManager; -import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan; -import org.apache.skywalking.apm.agent.core.context.trace.AbstractTracingSpan; -import org.apache.skywalking.apm.agent.core.context.trace.LogDataEntity; -import org.apache.skywalking.apm.agent.core.context.trace.TraceSegment; -import org.apache.skywalking.apm.agent.core.context.trace.TraceSegmentRef; -import org.apache.skywalking.apm.agent.core.context.util.SpanHelper; -import org.apache.skywalking.apm.agent.core.dictionary.DictionaryUtil; -import org.apache.skywalking.apm.agent.core.test.tools.SegmentStorage; -import org.apache.skywalking.apm.agent.core.test.tools.SegmentStoragePoint; -import org.apache.skywalking.apm.network.language.agent.SpanType; -import org.apache.skywalking.apm.network.language.agent.UpstreamSegment; -import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/IgnoredTracerContextTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/IgnoredTracerContextTest.java index 48fca0821120..95462d257ccb 100644 --- a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/IgnoredTracerContextTest.java +++ b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/IgnoredTracerContextTest.java @@ -16,22 +16,24 @@ * */ - package org.apache.skywalking.apm.agent.core.context; import java.util.LinkedList; - +import org.apache.skywalking.apm.agent.core.boot.ServiceManager; +import org.apache.skywalking.apm.agent.core.conf.Config; import org.apache.skywalking.apm.agent.core.conf.RemoteDownstreamConfig; import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan; import org.apache.skywalking.apm.agent.core.context.trace.NoopSpan; import org.apache.skywalking.apm.agent.core.test.tools.AgentServiceRule; -import org.apache.skywalking.apm.agent.core.test.tools.TracingSegmentRunner; -import org.junit.*; -import org.junit.runner.RunWith; -import org.apache.skywalking.apm.agent.core.boot.ServiceManager; -import org.apache.skywalking.apm.agent.core.conf.Config; import org.apache.skywalking.apm.agent.core.test.tools.SegmentStorage; import org.apache.skywalking.apm.agent.core.test.tools.SegmentStoragePoint; +import org.apache.skywalking.apm.agent.core.test.tools.TracingSegmentRunner; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; import static junit.framework.TestCase.assertNull; import static org.hamcrest.CoreMatchers.is; diff --git a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/TracingContextTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/TracingContextTest.java index 9686324ca1cd..02fbaddb979f 100644 --- a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/TracingContextTest.java +++ b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/TracingContextTest.java @@ -20,8 +20,12 @@ import org.apache.skywalking.apm.agent.core.boot.ServiceManager; import org.apache.skywalking.apm.agent.core.conf.RemoteDownstreamConfig; -import org.apache.skywalking.apm.agent.core.context.trace.*; -import org.junit.*; +import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan; +import org.apache.skywalking.apm.agent.core.context.trace.TraceSegment; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; public class TracingContextTest { @BeforeClass @@ -40,7 +44,8 @@ public static void clear() { public void testSpanLimit() { final boolean[] dataReceived = {false}; TracingContextListener listener = new TracingContextListener() { - @Override public void afterFinished(TraceSegment traceSegment) { + @Override + public void afterFinished(TraceSegment traceSegment) { dataReceived[0] = true; } }; @@ -68,5 +73,4 @@ public void testSpanLimit() { } } - } diff --git a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/util/AbstractTracingSpanHelper.java b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/util/AbstractTracingSpanHelper.java index ae1a4e731ebd..c79c095b0094 100644 --- a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/util/AbstractTracingSpanHelper.java +++ b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/util/AbstractTracingSpanHelper.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.context.util; import java.util.Collections; diff --git a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/util/FieldGetter.java b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/util/FieldGetter.java index 2238666c29f9..43662180d5fa 100644 --- a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/util/FieldGetter.java +++ b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/util/FieldGetter.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.context.util; import java.lang.reflect.Field; @@ -26,13 +25,13 @@ public static T getValue(Object instance, String fieldName) throws IllegalAccessException, NoSuchFieldException { Field field = instance.getClass().getDeclaredField(fieldName); field.setAccessible(true); - return (T)field.get(instance); + return (T) field.get(instance); } public static T get2LevelParentFieldValue(Object instance, String fieldName) throws IllegalAccessException, NoSuchFieldException { Field field = instance.getClass().getSuperclass().getSuperclass().getDeclaredField(fieldName); field.setAccessible(true); - return (T)field.get(instance); + return (T) field.get(instance); } } diff --git a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/util/SegmentHelper.java b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/util/SegmentHelper.java index 338ba995c474..6bc57348f200 100644 --- a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/util/SegmentHelper.java +++ b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/util/SegmentHelper.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.context.util; import java.util.List; diff --git a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/util/SpanHelper.java b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/util/SpanHelper.java index 39d6828e697f..7a5bc68fac78 100644 --- a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/util/SpanHelper.java +++ b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/util/SpanHelper.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.context.util; import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan; diff --git a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/util/TraceSegmentRefHelper.java b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/util/TraceSegmentRefHelper.java index 653d1c3b7ae5..21b11b812620 100644 --- a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/util/TraceSegmentRefHelper.java +++ b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/util/TraceSegmentRefHelper.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.context.util; import org.apache.skywalking.apm.agent.core.context.trace.TraceSegmentRef; diff --git a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/dictionary/DictionaryUtilTests.java b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/dictionary/DictionaryUtilTests.java index 864288e1868f..bacdf67fac77 100644 --- a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/dictionary/DictionaryUtilTests.java +++ b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/dictionary/DictionaryUtilTests.java @@ -21,9 +21,6 @@ import org.junit.Assert; import org.junit.Test; -/** - * @author Alan Lau - */ public class DictionaryUtilTests { @Test diff --git a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/logging/core/FileWriterTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/logging/core/FileWriterTest.java index 32754192e6cd..3638772e238e 100755 --- a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/logging/core/FileWriterTest.java +++ b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/logging/core/FileWriterTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.logging.core; import org.junit.AfterClass; @@ -33,9 +32,6 @@ import static org.junit.Assert.assertEquals; -/** - * @author wusheng - */ public class FileWriterTest { @BeforeClass diff --git a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/logging/core/PatternLogResolverTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/logging/core/PatternLogResolverTest.java index 3cdb748255fe..a18475974cfa 100644 --- a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/logging/core/PatternLogResolverTest.java +++ b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/logging/core/PatternLogResolverTest.java @@ -16,15 +16,11 @@ * */ - package org.apache.skywalking.apm.agent.core.logging.core; import org.junit.Assert; import org.junit.Test; -/** - * @author alvin - */ public class PatternLogResolverTest { @Test diff --git a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/logging/core/PatternLoggerTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/logging/core/PatternLoggerTest.java index 842de0588c0f..933cbcaa1c9e 100644 --- a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/logging/core/PatternLoggerTest.java +++ b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/logging/core/PatternLoggerTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.logging.core; import com.google.common.collect.Lists; @@ -33,9 +32,6 @@ import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.times; -/** - * @author alvin - */ public class PatternLoggerTest { public static final String PATTERN = "%timestamp+0800 %level [%agent_name,,,] [%thread] %class:-1 %msg %throwable"; @@ -45,7 +41,6 @@ public static void initAndHoldOut() { Config.Agent.SERVICE_NAME = "testAppFromConfig"; } - @Test public void testLog() { final IWriter output = Mockito.mock(IWriter.class); @@ -73,8 +68,7 @@ protected void logger(LogLevel level, String message, Throwable e) { logger.error("hello world", new NullPointerException()); logger.error(new NullPointerException(), "hello {}", "world"); - Mockito.verify(output, times(9)) - .write(anyString()); + Mockito.verify(output, times(9)).write(anyString()); } @Test @@ -103,8 +97,7 @@ protected void logger(LogLevel level, String message, Throwable e) { logger.error("hello ///\\\\", new NullPointerException()); logger.error(new NullPointerException(), "hello {}", "&&&**%%"); - Mockito.verify(output, times(9)) - .write(anyString()); + Mockito.verify(output, times(9)).write(anyString()); } @Test @@ -142,5 +135,4 @@ protected void logger(LogLevel level, String message, Throwable e) { Assert.assertEquals(strings.get(1).split(Constants.LINE_SEPARATOR).length, 1); } - } diff --git a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/logging/core/SystemOutWriterTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/logging/core/SystemOutWriterTest.java index 3c154f7515a6..b2dfd312fd03 100644 --- a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/logging/core/SystemOutWriterTest.java +++ b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/logging/core/SystemOutWriterTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.logging.core; import org.junit.AfterClass; @@ -28,9 +27,6 @@ import static org.mockito.Matchers.anyString; -/** - * Created by wusheng on 2017/2/28. - */ public class SystemOutWriterTest { private static PrintStream OUT_REF; diff --git a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/logging/core/WriterFactoryTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/logging/core/WriterFactoryTest.java index aca5164c8fb8..d866d42e7307 100644 --- a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/logging/core/WriterFactoryTest.java +++ b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/logging/core/WriterFactoryTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.logging.core; import org.apache.skywalking.apm.agent.core.boot.AgentPackagePath; @@ -32,7 +31,10 @@ import static org.junit.Assert.assertTrue; @RunWith(PowerMockRunner.class) -@PrepareForTest(value = {SnifferConfigInitializer.class, AgentPackagePath.class}) +@PrepareForTest(value = { + SnifferConfigInitializer.class, + AgentPackagePath.class +}) public class WriterFactoryTest { @Test diff --git a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/AnnotationTypeNameMatchTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/AnnotationTypeNameMatchTest.java index ce8edd402cc9..b33745d608c0 100644 --- a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/AnnotationTypeNameMatchTest.java +++ b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/AnnotationTypeNameMatchTest.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.agent.core.plugin.bytebuddy; import net.bytebuddy.description.method.MethodDescription; @@ -22,10 +23,6 @@ import org.junit.Assert; import org.junit.Test; -/** - * @author AI - * 2019-08-15 - */ public class AnnotationTypeNameMatchTest { @Test diff --git a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/Inject.java b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/Inject.java index 29154d9047ef..e06b16952a7c 100644 --- a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/Inject.java +++ b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/Inject.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.agent.core.plugin.bytebuddy; import java.lang.annotation.Documented; @@ -23,11 +24,11 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -/** - * @author AI - * 2019-08-15 - */ -@Target({ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.FIELD}) +@Target({ + ElementType.METHOD, + ElementType.CONSTRUCTOR, + ElementType.FIELD +}) @Retention(RetentionPolicy.RUNTIME) @Documented public @interface Inject { diff --git a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/MethodInheritanceAnnotationMatcherTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/MethodInheritanceAnnotationMatcherTest.java index 6555d1cd4fcc..c90d694e0b62 100644 --- a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/MethodInheritanceAnnotationMatcherTest.java +++ b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/MethodInheritanceAnnotationMatcherTest.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.agent.core.plugin.bytebuddy; import net.bytebuddy.description.annotation.AnnotationSource; @@ -32,9 +33,6 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.skywalking.apm.agent.core.plugin.match.MethodInheritanceAnnotationMatcher.byMethodInheritanceAnnotationMatcher; -/** - * @author jialong - */ public class MethodInheritanceAnnotationMatcherTest { @Test diff --git a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/Person.java b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/Person.java index 22da48562fd2..f26b0a72ed4e 100644 --- a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/Person.java +++ b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/Person.java @@ -15,12 +15,9 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.agent.core.plugin.bytebuddy; -/** - * @author AI - * 2019-08-15 - */ public class Person { private int age; private String name; diff --git a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/ReturnTypeNameMatchTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/ReturnTypeNameMatchTest.java index e1cd0534bb76..ac827bf2ee1c 100644 --- a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/ReturnTypeNameMatchTest.java +++ b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/ReturnTypeNameMatchTest.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.agent.core.plugin.bytebuddy; import net.bytebuddy.description.method.MethodDescription; @@ -22,10 +23,6 @@ import org.junit.Assert; import org.junit.Test; -/** - * @author AI - * 2019-08-15 - */ public class ReturnTypeNameMatchTest { @Test diff --git a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/remote/GRPCChannelManagerTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/remote/GRPCChannelManagerTest.java index 374def0bf835..ba613fb209b1 100644 --- a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/remote/GRPCChannelManagerTest.java +++ b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/remote/GRPCChannelManagerTest.java @@ -23,8 +23,13 @@ import io.grpc.stub.StreamObserver; import java.net.InetSocketAddress; import org.apache.skywalking.apm.agent.core.conf.Config; -import org.apache.skywalking.apm.network.register.v2.*; -import org.junit.*; +import org.apache.skywalking.apm.network.register.v2.RegisterGrpc; +import org.apache.skywalking.apm.network.register.v2.Service; +import org.apache.skywalking.apm.network.register.v2.ServiceRegisterMapping; +import org.apache.skywalking.apm.network.register.v2.Services; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.BeforeClass; public class GRPCChannelManagerTest { @BeforeClass @@ -41,7 +46,8 @@ public static void clear() { public void testConnected() throws Throwable { GRPCChannelManager manager = new GRPCChannelManager(); manager.addChannelListener(new GRPCChannelListener() { - @Override public void statusChanged(GRPCChannelStatus status) { + @Override + public void statusChanged(GRPCChannelStatus status) { } }); @@ -50,7 +56,9 @@ public void testConnected() throws Throwable { RegisterGrpc.RegisterBlockingStub stub = RegisterGrpc.newBlockingStub(manager.getChannel()); try { - stub.doServiceRegister(Services.newBuilder().addServices(Service.newBuilder().setServiceName("abc")).build()); + stub.doServiceRegister(Services.newBuilder() + .addServices(Service.newBuilder().setServiceName("abc")) + .build()); } catch (Exception e) { e.printStackTrace(); } @@ -67,7 +75,9 @@ public void doServiceRegister(Services request, StreamObserver(); diff --git a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/test/tools/AgentServiceRule.java b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/test/tools/AgentServiceRule.java index bd2b368a7284..29b5aff8b3ba 100644 --- a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/test/tools/AgentServiceRule.java +++ b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/test/tools/AgentServiceRule.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.test.tools; import java.util.HashMap; diff --git a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/test/tools/SegmentStorage.java b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/test/tools/SegmentStorage.java index 6691a9a93571..a1ecf9b4f4d5 100644 --- a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/test/tools/SegmentStorage.java +++ b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/test/tools/SegmentStorage.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.test.tools; import java.util.LinkedList; diff --git a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/test/tools/SegmentStoragePoint.java b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/test/tools/SegmentStoragePoint.java index 43dc638f49d3..c4802df6016b 100644 --- a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/test/tools/SegmentStoragePoint.java +++ b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/test/tools/SegmentStoragePoint.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.test.tools; import java.lang.annotation.ElementType; diff --git a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/test/tools/TracingSegmentRunner.java b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/test/tools/TracingSegmentRunner.java index 198cf8503eb9..1b88070fda56 100644 --- a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/test/tools/TracingSegmentRunner.java +++ b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/test/tools/TracingSegmentRunner.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.core.test.tools; import java.lang.reflect.Field; @@ -54,9 +53,11 @@ protected Object createTest() throws Exception { return targetObject; } - @Override protected Statement withAfters(FrameworkMethod method, Object target, final Statement statement) { + @Override + protected Statement withAfters(FrameworkMethod method, Object target, final Statement statement) { return new Statement() { - @Override public void evaluate() throws Throwable { + @Override + public void evaluate() throws Throwable { if (field != null) { try { tracingData = new SegmentStorage(); diff --git a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/util/MethodUtilTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/util/MethodUtilTest.java index 87fa84d6b4fa..507cc47c16b4 100644 --- a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/util/MethodUtilTest.java +++ b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/util/MethodUtilTest.java @@ -23,15 +23,11 @@ import java.lang.reflect.Method; -/** - * @author zhaoyuguang - */ - public class MethodUtilTest { @Test public void testClassForName() throws NoSuchMethodException { Assert.assertTrue(MethodUtil.generateOperationName(MethodUtil.class.getMethod("generateOperationName", Method.class)) - .equals("org.apache.skywalking.apm.agent.core.util.MethodUtil.generateOperationName(java.lang.reflect.Method)")); + .equals("org.apache.skywalking.apm.agent.core.util.MethodUtil.generateOperationName(java.lang.reflect.Method)")); } } diff --git a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/util/PeerFormatTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/util/PeerFormatTest.java index dea8fd3622a1..4d964d86dc93 100644 --- a/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/util/PeerFormatTest.java +++ b/apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/util/PeerFormatTest.java @@ -22,10 +22,6 @@ import org.junit.Assert; import org.junit.Test; -/** - * @author zhaoyuguang - */ - public class PeerFormatTest { @Test diff --git a/apm-sniffer/apm-agent/pom.xml b/apm-sniffer/apm-agent/pom.xml index 8de003d16cb4..f1744c7ceea0 100644 --- a/apm-sniffer/apm-agent/pom.xml +++ b/apm-sniffer/apm-agent/pom.xml @@ -16,7 +16,8 @@ ~ --> - + 4.0.0 @@ -66,7 +67,8 @@ true true - + ${premain.class} ${can.redefine.classes} @@ -116,7 +118,7 @@ - + @@ -128,11 +130,14 @@ - - - - - + + + + + diff --git a/apm-sniffer/apm-agent/src/main/java/org/apache/skywalking/apm/agent/SkyWalkingAgent.java b/apm-sniffer/apm-agent/src/main/java/org/apache/skywalking/apm/agent/SkyWalkingAgent.java index e25256d5cb1c..abd98a5f12c0 100644 --- a/apm-sniffer/apm-agent/src/main/java/org/apache/skywalking/apm/agent/SkyWalkingAgent.java +++ b/apm-sniffer/apm-agent/src/main/java/org/apache/skywalking/apm/agent/SkyWalkingAgent.java @@ -50,8 +50,6 @@ /** * The main entrance of sky-walking agent, based on javaagent mechanism. - * - * @author wusheng */ public class SkyWalkingAgent { private static final ILog logger = LogManager.getLogger(SkyWalkingAgent.class); @@ -74,20 +72,17 @@ public static void premain(String agentArgs, Instrumentation instrumentation) th return; } - final ByteBuddy byteBuddy = new ByteBuddy() - .with(TypeValidation.of(Config.Agent.IS_OPEN_DEBUGGING_CLASS)); - - AgentBuilder agentBuilder = new AgentBuilder.Default(byteBuddy) - .ignore( - nameStartsWith("net.bytebuddy.") - .or(nameStartsWith("org.slf4j.")) - .or(nameStartsWith("org.groovy.")) - .or(nameContains("javassist")) - .or(nameContains(".asm.")) - .or(nameContains(".reflectasm.")) - .or(nameStartsWith("sun.reflect")) - .or(allSkyWalkingAgentExcludeToolkit()) - .or(ElementMatchers.isSynthetic())); + final ByteBuddy byteBuddy = new ByteBuddy().with(TypeValidation.of(Config.Agent.IS_OPEN_DEBUGGING_CLASS)); + + AgentBuilder agentBuilder = new AgentBuilder.Default(byteBuddy).ignore( + nameStartsWith("net.bytebuddy.").or(nameStartsWith("org.slf4j.")) + .or(nameStartsWith("org.groovy.")) + .or(nameContains("javassist")) + .or(nameContains(".asm.")) + .or(nameContains(".reflectasm.")) + .or(nameStartsWith("sun.reflect")) + .or(allSkyWalkingAgentExcludeToolkit()) + .or(ElementMatchers.isSynthetic())); JDK9ModuleExporter.EdgeClasses edgeClasses = new JDK9ModuleExporter.EdgeClasses(); try { @@ -104,12 +99,11 @@ public static void premain(String agentArgs, Instrumentation instrumentation) th return; } - agentBuilder - .type(pluginFinder.buildMatch()) - .transform(new Transformer(pluginFinder)) - .with(AgentBuilder.RedefinitionStrategy.RETRANSFORMATION) - .with(new Listener()) - .installOn(instrumentation); + agentBuilder.type(pluginFinder.buildMatch()) + .transform(new Transformer(pluginFinder)) + .with(AgentBuilder.RedefinitionStrategy.RETRANSFORMATION) + .with(new Listener()) + .installOn(instrumentation); try { ServiceManager.INSTANCE.boot(); @@ -117,7 +111,8 @@ public static void premain(String agentArgs, Instrumentation instrumentation) th logger.error(e, "Skywalking agent boot failure."); } - Runtime.getRuntime().addShutdownHook(new Thread(ServiceManager.INSTANCE::shutdown, "skywalking service shutdown thread")); + Runtime.getRuntime() + .addShutdownHook(new Thread(ServiceManager.INSTANCE::shutdown, "skywalking service shutdown thread")); } private static class Transformer implements AgentBuilder.Transformer { @@ -128,14 +123,17 @@ private static class Transformer implements AgentBuilder.Transformer { } @Override - public DynamicType.Builder transform(DynamicType.Builder builder, TypeDescription typeDescription, - ClassLoader classLoader, JavaModule module) { + public DynamicType.Builder transform(final DynamicType.Builder builder, + final TypeDescription typeDescription, + final ClassLoader classLoader, + final JavaModule module) { List pluginDefines = pluginFinder.find(typeDescription); if (pluginDefines.size() > 0) { DynamicType.Builder newBuilder = builder; EnhanceContext context = new EnhanceContext(); for (AbstractClassEnhancePluginDefine define : pluginDefines) { - DynamicType.Builder possibleNewBuilder = define.define(typeDescription, newBuilder, classLoader, context); + DynamicType.Builder possibleNewBuilder = define.define( + typeDescription, newBuilder, classLoader, context); if (possibleNewBuilder != null) { newBuilder = possibleNewBuilder; } @@ -163,8 +161,11 @@ public void onDiscovery(String typeName, ClassLoader classLoader, JavaModule mod } @Override - public void onTransformation(TypeDescription typeDescription, ClassLoader classLoader, JavaModule module, - boolean loaded, DynamicType dynamicType) { + public void onTransformation(final TypeDescription typeDescription, + final ClassLoader classLoader, + final JavaModule module, + final boolean loaded, + final DynamicType dynamicType) { if (logger.isDebugEnable()) { logger.debug("On Transformation class {}.", typeDescription.getName()); } @@ -173,14 +174,19 @@ public void onTransformation(TypeDescription typeDescription, ClassLoader classL } @Override - public void onIgnored(TypeDescription typeDescription, ClassLoader classLoader, JavaModule module, - boolean loaded) { + public void onIgnored(final TypeDescription typeDescription, + final ClassLoader classLoader, + final JavaModule module, + final boolean loaded) { } @Override - public void onError(String typeName, ClassLoader classLoader, JavaModule module, boolean loaded, - Throwable throwable) { + public void onError(final String typeName, + final ClassLoader classLoader, + final JavaModule module, + final boolean loaded, + final Throwable throwable) { logger.error("Enhance class " + typeName + " error.", throwable); } diff --git a/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/pom.xml index 279b1bcbc8e1..c938e4f1c7b1 100644 --- a/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-sdk-plugin org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/activemq/ActiveMQConsumerConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/activemq/ActiveMQConsumerConstructorInterceptor.java index 638bc03ff362..e2fe9e511cec 100644 --- a/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/activemq/ActiveMQConsumerConstructorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/activemq/ActiveMQConsumerConstructorInterceptor.java @@ -22,13 +22,10 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor; -/** - * @author withlin - */ public class ActiveMQConsumerConstructorInterceptor implements InstanceConstructorInterceptor { @Override public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { - ActiveMQSession session = (ActiveMQSession)allArguments[0]; + ActiveMQSession session = (ActiveMQSession) allArguments[0]; objInst.setSkyWalkingDynamicField(session.getConnection().getTransport().getRemoteAddress().split("//")[1]); } } diff --git a/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/activemq/ActiveMQConsumerInterceptor.java b/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/activemq/ActiveMQConsumerInterceptor.java index f4d37068b5bf..4818d0ec04fb 100644 --- a/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/activemq/ActiveMQConsumerInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/activemq/ActiveMQConsumerInterceptor.java @@ -31,9 +31,6 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; -/** - * @author withlin - */ public class ActiveMQConsumerInterceptor implements InstanceMethodsAroundInterceptor { public static final String OPERATE_NAME_PREFIX = "ActiveMQ/"; @@ -47,15 +44,22 @@ public class ActiveMQConsumerInterceptor implements InstanceMethodsAroundInterce public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { ContextCarrier contextCarrier = new ContextCarrier(); - String url = (String)objInst.getSkyWalkingDynamicField(); - MessageDispatch messageDispatch = (MessageDispatch)allArguments[0]; + String url = (String) objInst.getSkyWalkingDynamicField(); + MessageDispatch messageDispatch = (MessageDispatch) allArguments[0]; AbstractSpan activeSpan = null; - if (messageDispatch.getDestination().getDestinationType() == QUEUE_TYPE || messageDispatch.getDestination().getDestinationType() == TEMP_QUEUE_TYPE) { - activeSpan = ContextManager.createEntrySpan(OPERATE_NAME_PREFIX + "Queue/" + messageDispatch.getDestination().getPhysicalName() + CONSUMER_OPERATE_NAME_SUFFIX, null).start(System.currentTimeMillis()); + if (messageDispatch.getDestination().getDestinationType() == QUEUE_TYPE || messageDispatch.getDestination() + .getDestinationType() == TEMP_QUEUE_TYPE) { + activeSpan = ContextManager.createEntrySpan(OPERATE_NAME_PREFIX + "Queue/" + messageDispatch.getDestination() + .getPhysicalName() + CONSUMER_OPERATE_NAME_SUFFIX, null) + .start(System.currentTimeMillis()); Tags.MQ_BROKER.set(activeSpan, url); Tags.MQ_QUEUE.set(activeSpan, messageDispatch.getDestination().getPhysicalName()); - } else if (messageDispatch.getDestination().getDestinationType() == TOPIC_TYPE || messageDispatch.getDestination().getDestinationType() == TEMP_TOPIC_TYPE) { - activeSpan = ContextManager.createEntrySpan(OPERATE_NAME_PREFIX + "Topic/" + messageDispatch.getDestination().getPhysicalName() + CONSUMER_OPERATE_NAME_SUFFIX, null).start(System.currentTimeMillis()); + } else if (messageDispatch.getDestination() + .getDestinationType() == TOPIC_TYPE || messageDispatch.getDestination() + .getDestinationType() == TEMP_TOPIC_TYPE) { + activeSpan = ContextManager.createEntrySpan(OPERATE_NAME_PREFIX + "Topic/" + messageDispatch.getDestination() + .getPhysicalName() + CONSUMER_OPERATE_NAME_SUFFIX, null) + .start(System.currentTimeMillis()); Tags.MQ_BROKER.set(activeSpan, url); Tags.MQ_TOPIC.set(activeSpan, messageDispatch.getDestination().getPhysicalName()); } diff --git a/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/activemq/ActiveMQProducerConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/activemq/ActiveMQProducerConstructorInterceptor.java index 30b9e4cfb723..b1bc17173b70 100644 --- a/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/activemq/ActiveMQProducerConstructorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/activemq/ActiveMQProducerConstructorInterceptor.java @@ -22,13 +22,10 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor; -/** - * @author withlin - */ public class ActiveMQProducerConstructorInterceptor implements InstanceConstructorInterceptor { @Override public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { - ActiveMQSession session = (ActiveMQSession)allArguments[0]; + ActiveMQSession session = (ActiveMQSession) allArguments[0]; objInst.setSkyWalkingDynamicField(session.getConnection().getTransport().getRemoteAddress().split("//")[1]); } } diff --git a/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/activemq/ActiveMQProducerInterceptor.java b/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/activemq/ActiveMQProducerInterceptor.java index 37d1d00804d5..73d7e8082ae2 100644 --- a/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/activemq/ActiveMQProducerInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/activemq/ActiveMQProducerInterceptor.java @@ -33,9 +33,6 @@ import javax.jms.Message; import java.lang.reflect.Method; -/** - * @author withlin - */ public class ActiveMQProducerInterceptor implements InstanceMethodsAroundInterceptor { public static final String OPERATE_NAME_PREFIX = "ActiveMQ/"; public static final String PRODUCER_OPERATE_NAME_SUFFIX = "/Producer"; @@ -43,23 +40,24 @@ public class ActiveMQProducerInterceptor implements InstanceMethodsAroundInterce public static final byte TOPIC_TYPE = 2; public static final byte TEMP_TOPIC_TYPE = 6; public static final byte TEMP_QUEUE_TYPE = 5; - @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + @Override + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { ContextCarrier contextCarrier = new ContextCarrier(); ActiveMQDestination activeMQDestination = (ActiveMQDestination) allArguments[0]; - Message message = (Message) allArguments[1]; + Message message = (Message) allArguments[1]; String url = (String) objInst.getSkyWalkingDynamicField(); AbstractSpan activeSpan = null; if (activeMQDestination.getDestinationType() == QUEUE_TYPE || activeMQDestination.getDestinationType() == TEMP_QUEUE_TYPE) { activeSpan = ContextManager.createExitSpan(OPERATE_NAME_PREFIX + "Queue/" + activeMQDestination.getPhysicalName() + PRODUCER_OPERATE_NAME_SUFFIX, contextCarrier, url); - Tags.MQ_BROKER.set(activeSpan,url); - Tags.MQ_QUEUE.set(activeSpan,activeMQDestination.getPhysicalName()); + Tags.MQ_BROKER.set(activeSpan, url); + Tags.MQ_QUEUE.set(activeSpan, activeMQDestination.getPhysicalName()); } else if (activeMQDestination.getDestinationType() == TOPIC_TYPE || activeMQDestination.getDestinationType() == TEMP_TOPIC_TYPE) { activeSpan = ContextManager.createExitSpan(OPERATE_NAME_PREFIX + "Topic/" + activeMQDestination.getPhysicalName() + PRODUCER_OPERATE_NAME_SUFFIX, contextCarrier, url); Tags.MQ_BROKER.set(activeSpan, url); - Tags.MQ_TOPIC.set(activeSpan,activeMQDestination.getPhysicalName()); + Tags.MQ_TOPIC.set(activeSpan, activeMQDestination.getPhysicalName()); } SpanLayer.asMQ(activeSpan); activeSpan.setComponent(ComponentsDefine.ACTIVEMQ_PRODUCER); @@ -67,19 +65,21 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr while (next.hasNext()) { next = next.next(); - message.setStringProperty(next.getHeadKey(),next.getHeadValue()); + message.setStringProperty(next.getHeadKey(), next.getHeadValue()); } } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/activemq/define/ActiveMQConsumerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/activemq/define/ActiveMQConsumerInstrumentation.java index 21c4df269cf6..5cd6328a134f 100644 --- a/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/activemq/define/ActiveMQConsumerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/activemq/define/ActiveMQConsumerInstrumentation.java @@ -26,14 +26,12 @@ import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; import org.apache.skywalking.apm.agent.core.plugin.match.MultiClassNameMatch; - import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType; /** - * {@link ActiveMQConsumerInstrumentation} presents that skywalking intercepts {@link org.apache.activemq.ActiveMQMessageConsumer}. - * - * @author withlin + * {@link ActiveMQConsumerInstrumentation} presents that skywalking intercepts {@link + * org.apache.activemq.ActiveMQMessageConsumer}. */ public class ActiveMQConsumerInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { public static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.activemq.ActiveMQConsumerInterceptor"; @@ -41,18 +39,21 @@ public class ActiveMQConsumerInstrumentation extends ClassInstanceMethodsEnhance public static final String CONSTRUCTOR_INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.activemq.ActiveMQConsumerConstructorInterceptor"; public static final String ENHANCE_METHOD_DISPATCH = "dispatch"; public static final String CONSTRUCTOR_INTERCEPT_TYPE = "org.apache.activemq.ActiveMQSession"; + @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { - @Override public ElementMatcher getConstructorMatcher() { - return takesArgumentWithType(0,CONSTRUCTOR_INTERCEPT_TYPE); - } + @Override + public ElementMatcher getConstructorMatcher() { + return takesArgumentWithType(0, CONSTRUCTOR_INTERCEPT_TYPE); + } - @Override public String getConstructorInterceptor() { - return CONSTRUCTOR_INTERCEPTOR_CLASS; - } + @Override + public String getConstructorInterceptor() { + return CONSTRUCTOR_INTERCEPTOR_CLASS; } + } }; } @@ -60,19 +61,21 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named(ENHANCE_METHOD_DISPATCH); - } - + @Override + public ElementMatcher getMethodsMatcher() { + return named(ENHANCE_METHOD_DISPATCH); + } - @Override public String getMethodsInterceptor() { - return INTERCEPTOR_CLASS; - } + @Override + public String getMethodsInterceptor() { + return INTERCEPTOR_CLASS; + } - @Override public boolean isOverrideArgs() { - return false; - } + @Override + public boolean isOverrideArgs() { + return false; } + } }; } diff --git a/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/activemq/define/ActiveMQProducerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/activemq/define/ActiveMQProducerInstrumentation.java index ecf0f5d65386..b4453bf456ef 100644 --- a/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/activemq/define/ActiveMQProducerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/activemq/define/ActiveMQProducerInstrumentation.java @@ -26,14 +26,12 @@ import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; import org.apache.skywalking.apm.agent.core.plugin.match.MultiClassNameMatch; - import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType; /** - * {@link ActiveMQProducerInstrumentation} presents that skywalking intercepts {@link org.apache.activemq.ActiveMQMessageProducer}. - * - * @author withlin + * {@link ActiveMQProducerInstrumentation} presents that skywalking intercepts {@link + * org.apache.activemq.ActiveMQMessageProducer}. */ public class ActiveMQProducerInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { public static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.activemq.ActiveMQProducerInterceptor"; @@ -41,18 +39,21 @@ public class ActiveMQProducerInstrumentation extends ClassInstanceMethodsEnhance public static final String CONSTRUCTOR_INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.activemq.ActiveMQProducerConstructorInterceptor"; public static final String ENHANCE_METHOD = "send"; public static final String CONSTRUCTOR_INTERCEPT_TYPE = "org.apache.activemq.ActiveMQSession"; + @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { - @Override public ElementMatcher getConstructorMatcher() { - return takesArgumentWithType(0,CONSTRUCTOR_INTERCEPT_TYPE); - } + @Override + public ElementMatcher getConstructorMatcher() { + return takesArgumentWithType(0, CONSTRUCTOR_INTERCEPT_TYPE); + } - @Override public String getConstructorInterceptor() { - return CONSTRUCTOR_INTERCEPTOR_CLASS; - } + @Override + public String getConstructorInterceptor() { + return CONSTRUCTOR_INTERCEPTOR_CLASS; } + } }; } @@ -60,19 +61,22 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named(ENHANCE_METHOD).and(takesArgumentWithType(0,"javax.jms.Destination")).and(takesArgumentWithType(1,"javax.jms.Message")); - } - + @Override + public ElementMatcher getMethodsMatcher() { + return named(ENHANCE_METHOD).and(takesArgumentWithType(0, "javax.jms.Destination")) + .and(takesArgumentWithType(1, "javax.jms.Message")); + } - @Override public String getMethodsInterceptor() { - return INTERCEPTOR_CLASS; - } + @Override + public String getMethodsInterceptor() { + return INTERCEPTOR_CLASS; + } - @Override public boolean isOverrideArgs() { - return false; - } + @Override + public boolean isOverrideArgs() { + return false; } + } }; } diff --git a/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/activemq/ActiveMQConsumerAndProducerConstructorInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/activemq/ActiveMQConsumerAndProducerConstructorInterceptorTest.java index a0eba2b6c1ad..60537631c790 100644 --- a/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/activemq/ActiveMQConsumerAndProducerConstructorInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/activemq/ActiveMQConsumerAndProducerConstructorInterceptorTest.java @@ -41,7 +41,6 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; - public class ActiveMQConsumerAndProducerConstructorInterceptorTest { @Mock @@ -51,16 +50,15 @@ public class ActiveMQConsumerAndProducerConstructorInterceptorTest { private JMSStatsImpl jmsStats; - @Mock private ActiveMQSession activeMQSession; - private SessionId sessionId; + private SessionId sessionId; + public class TransportTest implements Transport { - public class TransportTest implements Transport { + private String remoteAddress; - private String remoteAddress; @Override public void oneway(Object o) throws IOException { @@ -171,24 +169,27 @@ public void stop() throws Exception { } } - public class TestConnection extends ActiveMQConnection { + public class TestConnection extends ActiveMQConnection { - public TestConnection(Transport transport, IdGenerator clientIdGenerator, IdGenerator connectionIdGenerator, JMSStatsImpl factoryStats) throws Exception { + public TestConnection(Transport transport, IdGenerator clientIdGenerator, IdGenerator connectionIdGenerator, + JMSStatsImpl factoryStats) throws Exception { super(transport, clientIdGenerator, connectionIdGenerator, factoryStats); } } - private class TestActiveMQSession extends ActiveMQSession { + private class TestActiveMQSession extends ActiveMQSession { - public TestActiveMQSession(ActiveMQConnection connection, SessionId sessionId, int acknowledgeMode, boolean asyncDispatch, boolean sessionAsyncDispatch) throws JMSException { + public TestActiveMQSession(ActiveMQConnection connection, SessionId sessionId, int acknowledgeMode, + boolean asyncDispatch, boolean sessionAsyncDispatch) throws JMSException { super(connection, sessionId, acknowledgeMode, asyncDispatch, sessionAsyncDispatch); } } - private ActiveMQConsumerConstructorInterceptor activeMQConsumerAndProducerConstructorInterceptor; + private ActiveMQConsumerConstructorInterceptor activeMQConsumerAndProducerConstructorInterceptor; private EnhancedInstance enhancedInstance = new EnhancedInstance() { private String test; + @Override public Object getSkyWalkingDynamicField() { return test; @@ -196,24 +197,25 @@ public Object getSkyWalkingDynamicField() { @Override public void setSkyWalkingDynamicField(Object value) { - test = (String)value; + test = (String) value; } }; + @Before public void setUp() throws Exception { - TransportTest transport = new TransportTest(); + TransportTest transport = new TransportTest(); transport.setRemoteAddress("tcp://127.0.0.1:61616"); - idGenerator = new IdGenerator("aaa"); + idGenerator = new IdGenerator("aaa"); jmsStats = new JMSStatsImpl(); - activeMQConnection = new TestConnection(transport,idGenerator,idGenerator,jmsStats); + activeMQConnection = new TestConnection(transport, idGenerator, idGenerator, jmsStats); sessionId = new SessionId(); - activeMQSession = new TestActiveMQSession(activeMQConnection,sessionId,1,true,true); + activeMQSession = new TestActiveMQSession(activeMQConnection, sessionId, 1, true, true); } @Test public void TestActiveMQConsumerAndProducerConstructorInterceptor() { activeMQConsumerAndProducerConstructorInterceptor = new ActiveMQConsumerConstructorInterceptor(); - activeMQConsumerAndProducerConstructorInterceptor.onConstruct(enhancedInstance,new Object[] {activeMQSession}); + activeMQConsumerAndProducerConstructorInterceptor.onConstruct(enhancedInstance, new Object[] {activeMQSession}); assertThat((String) enhancedInstance.getSkyWalkingDynamicField(), is("127.0.0.1:61616")); } } \ No newline at end of file diff --git a/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/activemq/ActiveMQConsumerInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/activemq/ActiveMQConsumerInterceptorTest.java index 66d2a6221ef3..b65f40bb1243 100644 --- a/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/activemq/ActiveMQConsumerInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/activemq/ActiveMQConsumerInterceptorTest.java @@ -18,6 +18,9 @@ package org.apache.skywalking.apm.plugin.activemq; +import java.io.IOException; +import java.util.List; +import javax.jms.JMSException; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.Message; import org.apache.activemq.command.MessageDispatch; @@ -29,20 +32,16 @@ import org.apache.skywalking.apm.agent.test.tools.SegmentStorage; import org.apache.skywalking.apm.agent.test.tools.SegmentStoragePoint; import org.apache.skywalking.apm.agent.test.tools.TracingSegmentRunner; -import org.junit.*; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.modules.junit4.PowerMockRunnerDelegate; -import javax.jms.JMSException; -import java.io.IOException; - -import java.util.List; import static org.hamcrest.CoreMatchers.is; -import org.junit.Before; -import org.junit.Test; - @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(TracingSegmentRunner.class) public class ActiveMQConsumerInterceptorTest { diff --git a/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/activemq/ActiveMQProducerInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/activemq/ActiveMQProducerInterceptorTest.java index 46387d650e1b..5efb85821234 100644 --- a/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/activemq/ActiveMQProducerInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/activemq/ActiveMQProducerInterceptorTest.java @@ -64,15 +64,11 @@ public class ActiveMQProducerInterceptorTest { private Class[] argumentType; - private MQDestination mqDestination; - private Message message; - - - private class MQDestination extends ActiveMQDestination { + private class MQDestination extends ActiveMQDestination { @Override protected String getQualifiedPrefix() { @@ -90,7 +86,7 @@ public byte getDataStructureType() { } } - public class Msg implements Message { + public class Msg implements Message { @Override public String getJMSMessageID() throws JMSException { @@ -329,14 +325,16 @@ public void setSkyWalkingDynamicField(Object value) { } }; - @Before public void setUp() { producerInterceptor = new ActiveMQProducerInterceptor(); mqDestination = new MQDestination(); mqDestination.setPhysicalName("test"); message = new Msg(); - arguments = new Object[] {mqDestination, message}; + arguments = new Object[] { + mqDestination, + message + }; argumentType = new Class[] {ActiveMQMessageProducer.class}; } diff --git a/apm-sniffer/apm-sdk-plugin/armeria-0.84.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/armeria-0.84.x-plugin/pom.xml index 6e38603feae5..e43f8bdc6383 100644 --- a/apm-sniffer/apm-sdk-plugin/armeria-0.84.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/armeria-0.84.x-plugin/pom.xml @@ -16,7 +16,8 @@ ~ limitations under the License. --> - + apm-sdk-plugin org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/armeria-0.84.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/Armeria084ClientInterceptor.java b/apm-sniffer/apm-sdk-plugin/armeria-0.84.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/Armeria084ClientInterceptor.java index c5fd74eef0c2..7df2bbbb65c6 100644 --- a/apm-sniffer/apm-sdk-plugin/armeria-0.84.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/Armeria084ClientInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/armeria-0.84.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/Armeria084ClientInterceptor.java @@ -36,18 +36,11 @@ import java.lang.reflect.Method; import java.net.URI; -/** - * @author kezhenxu94 - */ @SuppressWarnings("rawtypes") public class Armeria084ClientInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod( - final EnhancedInstance objInst, - final Method method, - final Object[] allArguments, - final Class[] argumentsTypes, - final MethodInterceptResult result) throws Throwable { + public void beforeMethod(final EnhancedInstance objInst, final Method method, final Object[] allArguments, + final Class[] argumentsTypes, final MethodInterceptResult result) throws Throwable { final UserClient userClient = (UserClient) objInst; final URI uri = userClient.uri(); @@ -78,12 +71,8 @@ public void beforeMethod( } @Override - public Object afterMethod( - final EnhancedInstance objInst, - final Method method, - final Object[] allArguments, - final Class[] argumentsTypes, - final Object ret) { + public Object afterMethod(final EnhancedInstance objInst, final Method method, final Object[] allArguments, + final Class[] argumentsTypes, final Object ret) { Object req = allArguments[5]; @@ -95,12 +84,8 @@ public Object afterMethod( } @Override - public void handleMethodException( - final EnhancedInstance objInst, - final Method method, - final Object[] allArguments, - final Class[] argumentsTypes, - final Throwable t) { + public void handleMethodException(final EnhancedInstance objInst, final Method method, final Object[] allArguments, + final Class[] argumentsTypes, final Throwable t) { if (ContextManager.isActive()) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/armeria-0.84.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/Armeria084ServerInterceptor.java b/apm-sniffer/apm-sdk-plugin/armeria-0.84.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/Armeria084ServerInterceptor.java index 650bfe531005..5ca24e709628 100644 --- a/apm-sniffer/apm-sdk-plugin/armeria-0.84.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/Armeria084ServerInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/armeria-0.84.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/Armeria084ServerInterceptor.java @@ -33,17 +33,10 @@ import java.lang.reflect.Method; -/** - * @author kezhenxu94 - */ public class Armeria084ServerInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod( - final EnhancedInstance objInst, - final Method method, - final Object[] allArguments, - final Class[] argumentsTypes, - final MethodInterceptResult result) throws Throwable { + public void beforeMethod(final EnhancedInstance objInst, final Method method, final Object[] allArguments, + final Class[] argumentsTypes, final MethodInterceptResult result) throws Throwable { DefaultHttpRequest httpRequest = (DefaultHttpRequest) allArguments[1]; HttpHeaders headers = httpRequest.headers(); @@ -63,12 +56,8 @@ public void beforeMethod( } @Override - public Object afterMethod( - final EnhancedInstance objInst, - final Method method, - final Object[] allArguments, - final Class[] argumentsTypes, - final Object ret) { + public Object afterMethod(final EnhancedInstance objInst, final Method method, final Object[] allArguments, + final Class[] argumentsTypes, final Object ret) { if (ContextManager.isActive()) { ContextManager.stopSpan(); } @@ -76,12 +65,8 @@ public Object afterMethod( } @Override - public void handleMethodException( - final EnhancedInstance objInst, - final Method method, - final Object[] allArguments, - final Class[] argumentsTypes, - final Throwable t) { + public void handleMethodException(final EnhancedInstance objInst, final Method method, final Object[] allArguments, + final Class[] argumentsTypes, final Throwable t) { if (ContextManager.isActive()) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/armeria-0.84.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/define/Armeria084ClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/armeria-0.84.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/define/Armeria084ClientInstrumentation.java index 6f815627d591..e3624328a926 100644 --- a/apm-sniffer/apm-sdk-plugin/armeria-0.84.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/define/Armeria084ClientInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/armeria-0.84.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/define/Armeria084ClientInstrumentation.java @@ -29,9 +29,6 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * @author kezhenxu94 - */ public class Armeria084ClientInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "com.linecorp.armeria.client.UserClient"; private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.armeria.Armeria084ClientInterceptor"; @@ -48,17 +45,16 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { - return named("execute") - .and(takesArguments(7)) - .and(takesArgument(0, named("io.netty.channel.EventLoop"))) - .and(takesArgument(1, named("com.linecorp.armeria.common.HttpMethod"))) - .and(takesArgument(2, named("java.lang.String"))) - .and(takesArgument(3, named("java.lang.String"))) - .and(takesArgument(4, named("java.lang.String"))); + return named("execute").and(takesArguments(7)) + .and(takesArgument(0, named("io.netty.channel.EventLoop"))) + .and(takesArgument(1, named("com.linecorp.armeria.common.HttpMethod"))) + .and(takesArgument(2, named("java.lang.String"))) + .and(takesArgument(3, named("java.lang.String"))) + .and(takesArgument(4, named("java.lang.String"))); } @Override @@ -81,7 +77,7 @@ public boolean isOverrideArgs() { */ @Override protected String[] witnessClasses() { - return new String[]{ + return new String[] { "com.linecorp.armeria.client.endpoint.dns.DnsEndpointGroup", "com.linecorp.armeria.common.ImmutableHttpHeaders" }; diff --git a/apm-sniffer/apm-sdk-plugin/armeria-0.84.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/define/Armeria084ServerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/armeria-0.84.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/define/Armeria084ServerInstrumentation.java index 63cd3481adbf..cb56098e3143 100644 --- a/apm-sniffer/apm-sdk-plugin/armeria-0.84.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/define/Armeria084ServerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/armeria-0.84.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/define/Armeria084ServerInstrumentation.java @@ -28,9 +28,6 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * @author kezhenxu94 - */ public class Armeria084ServerInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "com.linecorp.armeria.server.HttpServerHandler"; private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.armeria.Armeria084ServerInterceptor"; @@ -47,13 +44,12 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { - return named("handleRequest") - .and(takesArgument(0, named("io.netty.channel.ChannelHandlerContext"))) - .and(takesArgument(1, named("com.linecorp.armeria.server.DecodedHttpRequest"))); + return named("handleRequest").and(takesArgument(0, named("io.netty.channel.ChannelHandlerContext"))) + .and(takesArgument(1, named("com.linecorp.armeria.server.DecodedHttpRequest"))); } @Override @@ -76,7 +72,7 @@ public boolean isOverrideArgs() { */ @Override protected String[] witnessClasses() { - return new String[]{ + return new String[] { "com.linecorp.armeria.client.endpoint.dns.DnsEndpointGroup", "com.linecorp.armeria.common.ImmutableHttpHeaders" }; diff --git a/apm-sniffer/apm-sdk-plugin/armeria-0.85.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/armeria-0.85.x-plugin/pom.xml index 53f66adeecf4..c0a897168f6c 100644 --- a/apm-sniffer/apm-sdk-plugin/armeria-0.85.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/armeria-0.85.x-plugin/pom.xml @@ -16,7 +16,8 @@ ~ limitations under the License. --> - + apm-sdk-plugin org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/armeria-0.85.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/Armeria085ClientInterceptor.java b/apm-sniffer/apm-sdk-plugin/armeria-0.85.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/Armeria085ClientInterceptor.java index ab6f47c58f4d..1b352dddd42a 100644 --- a/apm-sniffer/apm-sdk-plugin/armeria-0.85.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/Armeria085ClientInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/armeria-0.85.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/Armeria085ClientInterceptor.java @@ -26,19 +26,12 @@ import java.lang.reflect.Method; import java.net.URI; -/** - * @author kezhenxu94 - */ @SuppressWarnings("rawtypes") public class Armeria085ClientInterceptor extends ArmeriaClientInterceptor { @Override - public void beforeMethod( - final EnhancedInstance objInst, - final Method method, - final Object[] allArguments, - final Class[] argumentsTypes, - final MethodInterceptResult result) throws Throwable { + public void beforeMethod(final EnhancedInstance objInst, final Method method, final Object[] allArguments, + final Class[] argumentsTypes, final MethodInterceptResult result) throws Throwable { final UserClient userClient = (UserClient) objInst; final URI uri = userClient.uri(); @@ -54,12 +47,8 @@ public void beforeMethod( } @Override - public Object afterMethod( - final EnhancedInstance objInst, - final Method method, - final Object[] allArguments, - final Class[] argumentsTypes, - final Object ret) { + public Object afterMethod(final EnhancedInstance objInst, final Method method, final Object[] allArguments, + final Class[] argumentsTypes, final Object ret) { Object req = allArguments[5]; diff --git a/apm-sniffer/apm-sdk-plugin/armeria-0.85.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/Armeria085ServerInterceptor.java b/apm-sniffer/apm-sdk-plugin/armeria-0.85.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/Armeria085ServerInterceptor.java index 3b6a6ab8bc34..f326cfba8546 100644 --- a/apm-sniffer/apm-sdk-plugin/armeria-0.85.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/Armeria085ServerInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/armeria-0.85.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/Armeria085ServerInterceptor.java @@ -33,17 +33,10 @@ import java.lang.reflect.Method; -/** - * @author kezhenxu94 - */ public class Armeria085ServerInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod( - final EnhancedInstance objInst, - final Method method, - final Object[] allArguments, - final Class[] argumentsTypes, - final MethodInterceptResult result) throws Throwable { + public void beforeMethod(final EnhancedInstance objInst, final Method method, final Object[] allArguments, + final Class[] argumentsTypes, final MethodInterceptResult result) throws Throwable { DefaultHttpRequest httpRequest = (DefaultHttpRequest) allArguments[1]; HttpHeaders headers = httpRequest.headers(); @@ -63,12 +56,8 @@ public void beforeMethod( } @Override - public Object afterMethod( - final EnhancedInstance objInst, - final Method method, - final Object[] allArguments, - final Class[] argumentsTypes, - final Object ret) { + public Object afterMethod(final EnhancedInstance objInst, final Method method, final Object[] allArguments, + final Class[] argumentsTypes, final Object ret) { if (ContextManager.isActive()) { ContextManager.stopSpan(); } @@ -76,12 +65,8 @@ public Object afterMethod( } @Override - public void handleMethodException( - final EnhancedInstance objInst, - final Method method, - final Object[] allArguments, - final Class[] argumentsTypes, - final Throwable t) { + public void handleMethodException(final EnhancedInstance objInst, final Method method, final Object[] allArguments, + final Class[] argumentsTypes, final Throwable t) { if (ContextManager.isActive()) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/armeria-0.85.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/Armeria086ClientInterceptor.java b/apm-sniffer/apm-sdk-plugin/armeria-0.85.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/Armeria086ClientInterceptor.java index 464d1dfec3ab..8c193ee6163b 100644 --- a/apm-sniffer/apm-sdk-plugin/armeria-0.85.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/Armeria086ClientInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/armeria-0.85.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/Armeria086ClientInterceptor.java @@ -26,19 +26,12 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; -/** - * @author kezhenxu94 - */ @SuppressWarnings("rawtypes") public class Armeria086ClientInterceptor extends ArmeriaClientInterceptor { @Override - public void beforeMethod( - final EnhancedInstance objInst, - final Method method, - final Object[] allArguments, - final Class[] argumentsTypes, - final MethodInterceptResult result) throws Throwable { + public void beforeMethod(final EnhancedInstance objInst, final Method method, final Object[] allArguments, + final Class[] argumentsTypes, final MethodInterceptResult result) throws Throwable { final UserClient userClient = (UserClient) objInst; final URI uri = userClient.uri(); @@ -54,12 +47,8 @@ public void beforeMethod( } @Override - public Object afterMethod( - final EnhancedInstance objInst, - final Method method, - final Object[] allArguments, - final Class[] argumentsTypes, - final Object ret) { + public Object afterMethod(final EnhancedInstance objInst, final Method method, final Object[] allArguments, + final Class[] argumentsTypes, final Object ret) { Object req = allArguments[6]; diff --git a/apm-sniffer/apm-sdk-plugin/armeria-0.85.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/ArmeriaClientInterceptor.java b/apm-sniffer/apm-sdk-plugin/armeria-0.85.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/ArmeriaClientInterceptor.java index 3a7f443e623a..65c85834a0c0 100644 --- a/apm-sniffer/apm-sdk-plugin/armeria-0.85.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/ArmeriaClientInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/armeria-0.85.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/ArmeriaClientInterceptor.java @@ -36,9 +36,6 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; -/** - * @author kezhenxu94 - */ public abstract class ArmeriaClientInterceptor implements InstanceMethodsAroundInterceptor { private static final String KEY_SAFE_CLOSEABLE = "SAFE_CLOSEABLE"; @@ -74,12 +71,8 @@ protected void afterMethod(final Object req) { } @Override - public void handleMethodException( - final EnhancedInstance objInst, - final Method method, - final Object[] allArguments, - final Class[] argumentsTypes, - final Throwable t) { + public void handleMethodException(final EnhancedInstance objInst, final Method method, final Object[] allArguments, + final Class[] argumentsTypes, final Throwable t) { if (ContextManager.isActive()) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/armeria-0.85.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/define/Armeria085ClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/armeria-0.85.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/define/Armeria085ClientInstrumentation.java index 73e85cb7b4bc..a415294e17b0 100644 --- a/apm-sniffer/apm-sdk-plugin/armeria-0.85.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/define/Armeria085ClientInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/armeria-0.85.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/define/Armeria085ClientInstrumentation.java @@ -29,9 +29,6 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * @author kezhenxu94 - */ public class Armeria085ClientInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "com.linecorp.armeria.client.UserClient"; private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.armeria.Armeria085ClientInterceptor"; @@ -48,17 +45,16 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { - return named("execute") - .and(takesArguments(7)) - .and(takesArgument(0, named("io.netty.channel.EventLoop"))) - .and(takesArgument(1, named("com.linecorp.armeria.common.HttpMethod"))) - .and(takesArgument(2, named("java.lang.String"))) - .and(takesArgument(3, named("java.lang.String"))) - .and(takesArgument(4, named("java.lang.String"))); + return named("execute").and(takesArguments(7)) + .and(takesArgument(0, named("io.netty.channel.EventLoop"))) + .and(takesArgument(1, named("com.linecorp.armeria.common.HttpMethod"))) + .and(takesArgument(2, named("java.lang.String"))) + .and(takesArgument(3, named("java.lang.String"))) + .and(takesArgument(4, named("java.lang.String"))); } @Override @@ -81,7 +77,7 @@ public boolean isOverrideArgs() { */ @Override protected String[] witnessClasses() { - return new String[]{ + return new String[] { "com.linecorp.armeria.common.AbstractHttpHeadersBuilder" }; } diff --git a/apm-sniffer/apm-sdk-plugin/armeria-0.85.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/define/Armeria085ServerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/armeria-0.85.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/define/Armeria085ServerInstrumentation.java index 62dcceb35031..e2f85f22881c 100644 --- a/apm-sniffer/apm-sdk-plugin/armeria-0.85.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/define/Armeria085ServerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/armeria-0.85.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/define/Armeria085ServerInstrumentation.java @@ -28,9 +28,6 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * @author kezhenxu94 - */ public class Armeria085ServerInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "com.linecorp.armeria.server.HttpServerHandler"; private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.armeria.Armeria085ServerInterceptor"; @@ -47,13 +44,12 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { - return named("handleRequest") - .and(takesArgument(0, named("io.netty.channel.ChannelHandlerContext"))) - .and(takesArgument(1, named("com.linecorp.armeria.server.DecodedHttpRequest"))); + return named("handleRequest").and(takesArgument(0, named("io.netty.channel.ChannelHandlerContext"))) + .and(takesArgument(1, named("com.linecorp.armeria.server.DecodedHttpRequest"))); } @Override @@ -76,7 +72,7 @@ public boolean isOverrideArgs() { */ @Override protected String[] witnessClasses() { - return new String[]{ + return new String[] { "com.linecorp.armeria.common.AbstractHttpHeadersBuilder" }; } diff --git a/apm-sniffer/apm-sdk-plugin/armeria-0.85.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/define/Armeria086ClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/armeria-0.85.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/define/Armeria086ClientInstrumentation.java index 50a5613825b4..018fe7fa24cb 100644 --- a/apm-sniffer/apm-sdk-plugin/armeria-0.85.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/define/Armeria086ClientInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/armeria-0.85.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/armeria/define/Armeria086ClientInstrumentation.java @@ -29,9 +29,6 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * @author kezhenxu94 - */ public class Armeria086ClientInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "com.linecorp.armeria.client.UserClient"; private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.armeria.Armeria086ClientInterceptor"; @@ -48,18 +45,17 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { - return named("execute") - .and(takesArguments(8)) - .and(takesArgument(0, named("io.netty.channel.EventLoop"))) - .and(takesArgument(1, named("com.linecorp.armeria.client.Endpoint"))) - .and(takesArgument(2, named("com.linecorp.armeria.common.HttpMethod"))) - .and(takesArgument(3, named("java.lang.String"))) - .and(takesArgument(4, named("java.lang.String"))) - .and(takesArgument(5, named("java.lang.String"))); + return named("execute").and(takesArguments(8)) + .and(takesArgument(0, named("io.netty.channel.EventLoop"))) + .and(takesArgument(1, named("com.linecorp.armeria.client.Endpoint"))) + .and(takesArgument(2, named("com.linecorp.armeria.common.HttpMethod"))) + .and(takesArgument(3, named("java.lang.String"))) + .and(takesArgument(4, named("java.lang.String"))) + .and(takesArgument(5, named("java.lang.String"))); } @Override @@ -82,7 +78,7 @@ public boolean isOverrideArgs() { */ @Override protected String[] witnessClasses() { - return new String[]{ + return new String[] { "com.linecorp.armeria.common.AbstractHttpHeadersBuilder" }; } diff --git a/apm-sniffer/apm-sdk-plugin/avro-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/avro-plugin/pom.xml index 632e25518da7..463b88479d84 100644 --- a/apm-sniffer/apm-sdk-plugin/avro-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/avro-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-sdk-plugin org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/AbstractRequestInterceptor.java b/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/AbstractRequestInterceptor.java index b30c6f77cb7b..347d7a146768 100644 --- a/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/AbstractRequestInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/AbstractRequestInterceptor.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.avro; import java.io.IOException; @@ -35,16 +36,14 @@ public abstract class AbstractRequestInterceptor implements InstanceConstructorI @Override public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { if (objInst.getSkyWalkingDynamicField() == null) { - Requestor requestor = (Requestor)objInst; + Requestor requestor = (Requestor) objInst; requestor.addRPCPlugin(new SWClientRPCPlugin()); - Protocol protocol = (Protocol)allArguments[0]; - Transceiver transceiver = (Transceiver)allArguments[1]; + Protocol protocol = (Protocol) allArguments[0]; + Transceiver transceiver = (Transceiver) allArguments[1]; try { - objInst.setSkyWalkingDynamicField(new AvroInstance( - protocol.getNamespace() + "." + protocol.getName() + ".", - transceiver.getRemoteName() - )); + objInst.setSkyWalkingDynamicField(new AvroInstance(protocol.getNamespace() + "." + protocol.getName() + ".", transceiver + .getRemoteName())); } catch (IOException e) { objInst.setSkyWalkingDynamicField(new AvroInstance("Undefined", "Undefined")); logger.error("Failed to get Avro Remote Client Information.", e); diff --git a/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/AvroInstance.java b/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/AvroInstance.java index 003894b644b0..fa1cde5a6c11 100644 --- a/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/AvroInstance.java +++ b/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/AvroInstance.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.avro; public class AvroInstance { diff --git a/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/GenericRequestorInterceptor.java b/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/GenericRequestorInterceptor.java index 2ec02390a8b7..30ed3f1f4cfe 100644 --- a/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/GenericRequestorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/GenericRequestorInterceptor.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.avro; import java.lang.reflect.Method; @@ -30,7 +31,7 @@ public class GenericRequestorInterceptor extends AbstractRequestInterceptor { @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - AvroInstance instance = (AvroInstance)objInst.getSkyWalkingDynamicField(); + AvroInstance instance = (AvroInstance) objInst.getSkyWalkingDynamicField(); AbstractSpan span = ContextManager.createExitSpan(instance.namespace + allArguments[0], instance.remotePeer); SpanLayer.asRPCFramework(span); diff --git a/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/ResponderInterceptor.java b/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/ResponderInterceptor.java index 9cc146b9c48b..503ef28bc807 100644 --- a/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/ResponderInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/ResponderInterceptor.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.avro; import java.lang.reflect.Method; @@ -30,7 +31,7 @@ public class ResponderInterceptor implements InstanceConstructorInterceptor, Ins @Override public void onConstruct(EnhancedInstance enhancedInstance, Object[] objects) { - Responder responder = (Responder)enhancedInstance; + Responder responder = (Responder) enhancedInstance; Protocol protocol = responder.getLocal(); String prefix = protocol.getNamespace() + "." + protocol.getName() + "."; responder.addRPCPlugin(new SWServerRPCPlugin(prefix)); diff --git a/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/SWClientRPCPlugin.java b/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/SWClientRPCPlugin.java index d06e3a4f1757..70d08db86691 100644 --- a/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/SWClientRPCPlugin.java +++ b/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/SWClientRPCPlugin.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.avro; import org.apache.avro.ipc.RPCContext; @@ -26,8 +27,7 @@ import java.nio.ByteBuffer; /** - * A SkyWalking tracing plugin for Avro Client. - * Inject CarrierItems into RPC's metadata from cross-process propagation. + * A SkyWalking tracing plugin for Avro Client. Inject CarrierItems into RPC's metadata from cross-process propagation. */ public class SWClientRPCPlugin extends RPCPlugin { diff --git a/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/SWServerRPCPlugin.java b/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/SWServerRPCPlugin.java index 016ec4245713..d4014ed3f6a5 100644 --- a/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/SWServerRPCPlugin.java +++ b/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/SWServerRPCPlugin.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.avro; import java.nio.ByteBuffer; @@ -30,8 +31,8 @@ import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; /** - * A SkyWalking tracing plugin for Avro Server. - * Extract the CarrierItems from RPC's metadata and inject them into ContextCarrier. + * A SkyWalking tracing plugin for Avro Server. Extract the CarrierItems from RPC's metadata and inject them into + * ContextCarrier. */ public class SWServerRPCPlugin extends RPCPlugin { private final String prefix; @@ -48,7 +49,7 @@ public void serverReceiveRequest(RPCContext context) { CarrierItem items = carrier.items(); while (items.hasNext()) { items = items.next(); - ByteBuffer buffer = (ByteBuffer)meta.get(new Utf8(items.getHeadKey())); + ByteBuffer buffer = (ByteBuffer) meta.get(new Utf8(items.getHeadKey())); items.setHeadValue(new String(buffer.array())); } diff --git a/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/SpecificRequestorInterceptor.java b/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/SpecificRequestorInterceptor.java index 41cf30c900bb..1a0348b176e5 100644 --- a/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/SpecificRequestorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/SpecificRequestorInterceptor.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.avro; import java.lang.reflect.Method; @@ -31,8 +32,8 @@ public class SpecificRequestorInterceptor extends AbstractRequestInterceptor imp @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - AvroInstance instance = (AvroInstance)objInst.getSkyWalkingDynamicField(); - Method invoke = (Method)allArguments[1]; + AvroInstance instance = (AvroInstance) objInst.getSkyWalkingDynamicField(); + Method invoke = (Method) allArguments[1]; AbstractSpan span = ContextManager.createExitSpan(instance.namespace + invoke.getName(), instance.remotePeer); SpanLayer.asRPCFramework(span); diff --git a/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/define/GenericRequestorInstrumentation.java b/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/define/GenericRequestorInstrumentation.java index 640438510fb4..dcf62993d273 100644 --- a/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/define/GenericRequestorInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/define/GenericRequestorInstrumentation.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.avro.define; import net.bytebuddy.description.method.MethodDescription; @@ -29,12 +30,12 @@ public class GenericRequestorInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "org.apache.avro.ipc.generic.GenericRequestor"; private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.avro.GenericRequestorInterceptor"; - + @Override protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); } - + @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[] { @@ -43,7 +44,7 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { public ElementMatcher getConstructorMatcher() { return ElementMatchers.any(); } - + @Override public String getConstructorInterceptor() { return INTERCEPTOR_CLASS; @@ -51,7 +52,7 @@ public String getConstructorInterceptor() { } }; } - + @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { diff --git a/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/define/ResponderInstrumentation.java b/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/define/ResponderInstrumentation.java index 8799e7fd22b5..a7b54f543989 100644 --- a/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/define/ResponderInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/define/ResponderInstrumentation.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.avro.define; import net.bytebuddy.description.method.MethodDescription; @@ -32,7 +33,7 @@ public class ResponderInstrumentation extends ClassInstanceMethodsEnhancePluginD @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { - return new ConstructorInterceptPoint[]{ + return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { @Override public ElementMatcher getConstructorMatcher() { diff --git a/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/define/SpecificRequestorInstrumentation.java b/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/define/SpecificRequestorInstrumentation.java index 1946e2f39da6..60ef4d687f59 100644 --- a/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/define/SpecificRequestorInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/avro-plugin/src/main/java/org/apache/skywalking/apm/plugin/avro/define/SpecificRequestorInstrumentation.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.avro.define; import net.bytebuddy.description.method.MethodDescription; @@ -27,12 +28,12 @@ import org.apache.skywalking.apm.agent.core.plugin.match.NameMatch; public class SpecificRequestorInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { - private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.avro.SpecificRequestorInterceptor"; + private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.avro.SpecificRequestorInterceptor"; private static final String ENHANCE_CLASS = "org.apache.avro.ipc.specific.SpecificRequestor"; @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { - return new ConstructorInterceptPoint[]{ + return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { @Override public ElementMatcher getConstructorMatcher() { @@ -49,7 +50,7 @@ public String getConstructorInterceptor() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { diff --git a/apm-sniffer/apm-sdk-plugin/avro-plugin/src/test/java/org/apache/skywalking/apm/plugin/avro/GenericRequestorInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/avro-plugin/src/test/java/org/apache/skywalking/apm/plugin/avro/GenericRequestorInterceptorTest.java index 2c95930353af..1defcc44d539 100644 --- a/apm-sniffer/apm-sdk-plugin/avro-plugin/src/test/java/org/apache/skywalking/apm/plugin/avro/GenericRequestorInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/avro-plugin/src/test/java/org/apache/skywalking/apm/plugin/avro/GenericRequestorInterceptorTest.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.avro; import java.io.IOException; @@ -92,11 +93,13 @@ public void cleanup() { public static class EnhanceInstance implements EnhancedInstance { - @Override public Object getSkyWalkingDynamicField() { + @Override + public Object getSkyWalkingDynamicField() { return new AvroInstance("example.proto.Greeter.", "localhost/127.0.0.1:9018"); } - @Override public void setSkyWalkingDynamicField(Object value) { + @Override + public void setSkyWalkingDynamicField(Object value) { } } diff --git a/apm-sniffer/apm-sdk-plugin/avro-plugin/src/test/java/org/apache/skywalking/apm/plugin/avro/SpecificRequestorInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/avro-plugin/src/test/java/org/apache/skywalking/apm/plugin/avro/SpecificRequestorInterceptorTest.java index e7b2e87b3b5c..24d5792b131f 100644 --- a/apm-sniffer/apm-sdk-plugin/avro-plugin/src/test/java/org/apache/skywalking/apm/plugin/avro/SpecificRequestorInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/avro-plugin/src/test/java/org/apache/skywalking/apm/plugin/avro/SpecificRequestorInterceptorTest.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.avro; import java.io.IOException; @@ -98,11 +99,13 @@ public void cleanup() { public static class EnhanceInstance implements EnhancedInstance { - @Override public Object getSkyWalkingDynamicField() { + @Override + public Object getSkyWalkingDynamicField() { return new AvroInstance("example.proto.Greeter.", "localhost/127.0.0.1:9018"); } - @Override public void setSkyWalkingDynamicField(Object value) { + @Override + public void setSkyWalkingDynamicField(Object value) { } } diff --git a/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/pom.xml index 0160b01a58f8..8bcfe1a944aa 100644 --- a/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-sdk-plugin org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/canal/CanalConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/canal/CanalConstructorInterceptor.java index b803ca072b93..6c9c063b9f7b 100644 --- a/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/canal/CanalConstructorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/canal/CanalConstructorInterceptor.java @@ -16,26 +16,21 @@ * */ - package org.apache.skywalking.apm.plugin.canal; import java.net.InetSocketAddress; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor; - -/** - * @author withlin - */ public class CanalConstructorInterceptor implements InstanceConstructorInterceptor { @Override public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { InetSocketAddress address = (InetSocketAddress) allArguments[0]; - String destination = allArguments[3].toString(); + String destination = allArguments[3].toString(); CanalEnhanceInfo canalEnhanceInfo = new CanalEnhanceInfo(); if (address != null) { String url = address.getAddress().toString() + ":" + address.getPort(); - canalEnhanceInfo.setUrl(url.replace('/',' ')); + canalEnhanceInfo.setUrl(url.replace('/', ' ')); } canalEnhanceInfo.setDestination(destination); objInst.setSkyWalkingDynamicField(canalEnhanceInfo); diff --git a/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/canal/CanalEnhanceInfo.java b/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/canal/CanalEnhanceInfo.java index 642ba382b16f..85bfc977bfa0 100644 --- a/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/canal/CanalEnhanceInfo.java +++ b/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/canal/CanalEnhanceInfo.java @@ -18,9 +18,6 @@ package org.apache.skywalking.apm.plugin.canal; -/** - * @author withlin - */ public class CanalEnhanceInfo { public String getUrl() { @@ -40,12 +37,14 @@ public CanalEnhanceInfo setDestination(String destination) { this.destination = destination; return this; } - /** - * canal-server address - */ + + /** + * canal-server address + */ private String url; - /** - * canal destination - */ + + /** + * canal destination + */ private String destination; } diff --git a/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/canal/CanalInterceptor.java b/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/canal/CanalInterceptor.java index 4c74a04b208b..de8173a801e0 100644 --- a/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/canal/CanalInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/canal/CanalInterceptor.java @@ -32,28 +32,25 @@ import java.net.InetSocketAddress; import java.util.List; -/** - * @author withlin - */ public class CanalInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - CanalEnhanceInfo canalEnhanceInfo = (CanalEnhanceInfo)objInst.getSkyWalkingDynamicField(); + CanalEnhanceInfo canalEnhanceInfo = (CanalEnhanceInfo) objInst.getSkyWalkingDynamicField(); SimpleCanalConnector connector = (SimpleCanalConnector) objInst; - String url = canalEnhanceInfo.getUrl(); + String url = canalEnhanceInfo.getUrl(); if (Objects.equals(url, "") || url == null) { - InetSocketAddress address = (InetSocketAddress)connector.getNextAddress(); + InetSocketAddress address = (InetSocketAddress) connector.getNextAddress(); String runningAddress = address.getAddress().toString() + ":" + address.getPort(); - runningAddress = runningAddress.replace('/',' '); + runningAddress = runningAddress.replace('/', ' '); url = runningAddress; - List socketAddressList = (List)ContextManager.getRuntimeContext().get("currentAddress"); + List socketAddressList = (List) ContextManager.getRuntimeContext() + .get("currentAddress"); if (socketAddressList != null && socketAddressList.size() > 0) { for (InetSocketAddress socketAddress : socketAddressList) { String currentAddress = socketAddress.getAddress().toString() + ":" + socketAddress.getPort(); - currentAddress = currentAddress.replace('/',' '); + currentAddress = currentAddress.replace('/', ' '); if (!currentAddress.equals(runningAddress)) { url = url + "," + currentAddress; } @@ -62,7 +59,8 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } String batchSize = allArguments[0].toString(); String destination = canalEnhanceInfo.getDestination(); - AbstractSpan activeSpan = ContextManager.createExitSpan("Canal/" + destination,url).start(System.currentTimeMillis()); + AbstractSpan activeSpan = ContextManager.createExitSpan("Canal/" + destination, url) + .start(System.currentTimeMillis()); activeSpan.setComponent(ComponentsDefine.CANAL); activeSpan.tag(Tags.ofKey("batchSize"), batchSize); activeSpan.tag(Tags.ofKey("destination"), destination); @@ -70,8 +68,7 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { ContextManager.stopSpan(); return ret; @@ -79,8 +76,7 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, - Object[] allArguments, + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/canal/ClusterNodeConstructInterceptor.java b/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/canal/ClusterNodeConstructInterceptor.java index 5d58492e32d5..39ece3adc0b4 100644 --- a/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/canal/ClusterNodeConstructInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/canal/ClusterNodeConstructInterceptor.java @@ -15,7 +15,7 @@ * limitations under the License. * */ - + package org.apache.skywalking.apm.plugin.canal; import com.alibaba.otter.canal.client.impl.ClusterNodeAccessStrategy; @@ -30,17 +30,13 @@ import java.util.ArrayList; import java.util.List; - -/** - * @author withlin - */ public class ClusterNodeConstructInterceptor implements InstanceConstructorInterceptor { @Override public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { String clusterPath = ZookeeperPathUtils.getDestinationClusterRoot(allArguments[0].toString()); - ZkClientx zkClientx = ((ClusterNodeAccessStrategy) objInst).getZkClient(); - ContextManager.getRuntimeContext().put("currentAddress",getCurrentAddress(zkClientx.getChildren(clusterPath))); + ZkClientx zkClientx = ((ClusterNodeAccessStrategy) objInst).getZkClient(); + ContextManager.getRuntimeContext().put("currentAddress", getCurrentAddress(zkClientx.getChildren(clusterPath))); } @@ -53,9 +49,8 @@ private List getCurrentAddress(List currentChilds) { } } - return addresses; + return addresses; } } - diff --git a/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/canal/define/CanalInstrumentation.java b/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/canal/define/CanalInstrumentation.java index 2e6e03331315..55e79641360c 100644 --- a/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/canal/define/CanalInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/canal/define/CanalInstrumentation.java @@ -29,10 +29,6 @@ import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; import org.apache.skywalking.apm.agent.core.plugin.match.MultiClassNameMatch; - -/** - * @author withlin - */ public class CanalInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { public static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.canal.CanalInterceptor"; public static final String ENHANCE_CLASS = "com.alibaba.otter.canal.client.impl.SimpleCanalConnector"; @@ -43,11 +39,13 @@ public class CanalInstrumentation extends ClassInstanceMethodsEnhancePluginDefin public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { - @Override public ElementMatcher getConstructorMatcher() { + @Override + public ElementMatcher getConstructorMatcher() { return takesArgument(4, int.class); } - @Override public String getConstructorInterceptor() { + @Override + public String getConstructorInterceptor() { return CONSTRUCTOR_INTERCEPTOR_CLASS; } } @@ -58,16 +56,18 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(ENHANCE_METHOD_DISPATCH); } - - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return INTERCEPTOR_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } diff --git a/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/canal/define/ClusterNodeInstrumentation.java b/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/canal/define/ClusterNodeInstrumentation.java index 3e7a475203f9..b49f54d7ea90 100644 --- a/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/canal/define/ClusterNodeInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/canal/define/ClusterNodeInstrumentation.java @@ -15,7 +15,7 @@ * limitations under the License. * */ - + package org.apache.skywalking.apm.plugin.canal.define; import net.bytebuddy.description.method.MethodDescription; @@ -28,10 +28,6 @@ import static net.bytebuddy.matcher.ElementMatchers.any; - -/** - * @author withlin - */ public class ClusterNodeInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { public static final String ENHANCE_CLASS = "com.alibaba.otter.canal.client.impl.ClusterNodeAccessStrategy"; public static final String CONSTRUCTOR_INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.canal.ClusterNodeConstructInterceptor"; @@ -40,11 +36,13 @@ public class ClusterNodeInstrumentation extends ClassInstanceMethodsEnhancePlugi public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { - @Override public ElementMatcher getConstructorMatcher() { + @Override + public ElementMatcher getConstructorMatcher() { return any(); } - @Override public String getConstructorInterceptor() { + @Override + public String getConstructorInterceptor() { return CONSTRUCTOR_INTERCEPTOR_CLASS; } } diff --git a/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/canal/CanalInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/canal/CanalInterceptorTest.java index c9c6fc333a21..f71a5d7f74ee 100644 --- a/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/canal/CanalInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/canal-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/canal/CanalInterceptorTest.java @@ -58,8 +58,7 @@ public class CanalInterceptorTest { private Class[] argumentType; - - private class CanalConnector extends SimpleCanalConnector implements EnhancedInstance { + private class CanalConnector extends SimpleCanalConnector implements EnhancedInstance { public CanalConnector(SocketAddress address, String username, String password, String destination) { super(address, username, password, destination); @@ -76,7 +75,6 @@ public void setSkyWalkingDynamicField(Object value) { } } - private EnhancedInstance enhancedInstance = new CanalConnector(new InetSocketAddress(AddressUtils.getHostIp(), 11111), "example", "", "") { @Override public Object getSkyWalkingDynamicField() { @@ -90,7 +88,6 @@ public Object getSkyWalkingDynamicField() { public void setSkyWalkingDynamicField(Object value) { } - }; @Before diff --git a/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/pom.xml index 790c890e3295..f1d1b276b0d8 100644 --- a/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/pom.xml @@ -16,7 +16,8 @@ ~ --> - + apm-sdk-plugin org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/ClusterConnectInterceptor.java b/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/ClusterConnectInterceptor.java index 552a087641db..88eb6f18203a 100644 --- a/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/ClusterConnectInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/ClusterConnectInterceptor.java @@ -26,17 +26,16 @@ import java.lang.reflect.Method; -/** - * @author stone.wlg - */ public class ClusterConnectInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { if (ret instanceof EnhancedInstance) { String keyspace = allArguments.length > 0 ? (String) allArguments[0] : null; ConnectionInfo connectionInfo = (ConnectionInfo) objInst.getSkyWalkingDynamicField(); @@ -47,7 +46,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { if (ContextManager.isActive()) { AbstractSpan span = ContextManager.activeSpan(); span.errorOccurred(); diff --git a/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/ClusterConstructorWithStateListenerArgInterceptor.java b/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/ClusterConstructorWithStateListenerArgInterceptor.java index 176f5b631dab..b7f264e6d195 100644 --- a/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/ClusterConstructorWithStateListenerArgInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/ClusterConstructorWithStateListenerArgInterceptor.java @@ -24,9 +24,6 @@ import java.net.InetSocketAddress; import java.util.List; -/** - * @author stone.wlg - */ public class ClusterConstructorWithStateListenerArgInterceptor implements InstanceConstructorInterceptor { @Override public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { @@ -41,8 +38,6 @@ public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { contactPoints = contactPoints.substring(0, contactPoints.length() - 1); } - objInst.setSkyWalkingDynamicField( - new ConnectionInfo(contactPoints) - ); + objInst.setSkyWalkingDynamicField(new ConnectionInfo(contactPoints)); } } diff --git a/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/ConnectionInfo.java b/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/ConnectionInfo.java index 1256d9ae1941..32862ae42bbf 100644 --- a/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/ConnectionInfo.java +++ b/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/ConnectionInfo.java @@ -18,9 +18,6 @@ package org.apache.skywalking.apm.plugin.cassandra.java.driver.v3; -/** - * @author stone.wlg - */ public class ConnectionInfo { private final String contactPoints; diff --git a/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/Constants.java b/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/Constants.java index f91562838c51..7da3ee07130b 100644 --- a/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/Constants.java +++ b/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/Constants.java @@ -18,9 +18,6 @@ package org.apache.skywalking.apm.plugin.cassandra.java.driver.v3; -/** - * @author stone.wlg - */ public class Constants { public static final String CASSANDRA_OP_PREFIX = "Cassandra/"; public static final String CASSANDRA_DB_TYPE = "cassandra"; diff --git a/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/DefaultResultSetFutureGetUninterruptiblyInterceptor.java b/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/DefaultResultSetFutureGetUninterruptiblyInterceptor.java index 16ccda52369a..b5fdaf0a0a7c 100644 --- a/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/DefaultResultSetFutureGetUninterruptiblyInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/DefaultResultSetFutureGetUninterruptiblyInterceptor.java @@ -29,13 +29,10 @@ import java.lang.reflect.Method; - -/** - * @author stone.wlg - */ public class DefaultResultSetFutureGetUninterruptiblyInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { AbstractSpan span = ContextManager.createLocalSpan(Constants.CASSANDRA_OP_PREFIX + method.getName()); span.setComponent(ComponentsDefine.CASSANDRA_JAVA_DRIVER); Tags.DB_TYPE.set(span, Constants.CASSANDRA_DB_TYPE); @@ -43,7 +40,8 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { if (ContextManager.isActive()) { ContextManager.stopSpan(); } @@ -51,7 +49,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { if (ContextManager.isActive()) { AbstractSpan span = ContextManager.activeSpan(); span.errorOccurred(); diff --git a/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/SessionManagerExecuteAndExecuteAsyncWithStatementArgInterceptor.java b/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/SessionManagerExecuteAndExecuteAsyncWithStatementArgInterceptor.java index 1224df3e98a5..8af5fc44eb1d 100644 --- a/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/SessionManagerExecuteAndExecuteAsyncWithStatementArgInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/SessionManagerExecuteAndExecuteAsyncWithStatementArgInterceptor.java @@ -31,22 +31,23 @@ import java.lang.reflect.Method; -/** - * @author stone.wlg - */ public class SessionManagerExecuteAndExecuteAsyncWithStatementArgInterceptor implements InstanceMethodsAroundInterceptor { @Override public final void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { ConnectionInfo connectionInfo = (ConnectionInfo) objInst.getSkyWalkingDynamicField(); if (connectionInfo == null) { return; } Statement statement = (Statement) allArguments[0]; - String remotePeer = statement.getHost() == null ? connectionInfo.getContactPoints() : (statement.getHost().getSocketAddress().getHostName() + ":" + statement.getHost().getSocketAddress().getPort()); + String remotePeer = statement.getHost() == null ? connectionInfo.getContactPoints() : (statement.getHost() + .getSocketAddress() + .getHostName() + ":" + statement + .getHost() + .getSocketAddress() + .getPort()); String keyspace = statement.getKeyspace() == null ? connectionInfo.getKeyspace() : statement.getKeyspace(); String query = statement.toString(); if (statement instanceof BoundStatement) { @@ -63,8 +64,7 @@ public final void beforeMethod(EnhancedInstance objInst, Method method, Object[] @Override public final Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, - Object ret) throws Throwable { + Class[] argumentsTypes, Object ret) throws Throwable { ConnectionInfo connectionInfo = (ConnectionInfo) objInst.getSkyWalkingDynamicField(); if (connectionInfo != null && ContextManager.isActive()) { ContextManager.stopSpan(); @@ -74,7 +74,7 @@ public final Object afterMethod(EnhancedInstance objInst, Method method, Object[ @Override public final void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { if (ContextManager.isActive()) { AbstractSpan span = ContextManager.activeSpan(); span.errorOccurred(); diff --git a/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/define/ClusterInstrumentation.java b/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/define/ClusterInstrumentation.java index 888f4c1e5942..a7afacfd6bbb 100644 --- a/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/define/ClusterInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/define/ClusterInstrumentation.java @@ -29,9 +29,6 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * @author stone.wlg - */ public class ClusterInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "com.datastax.driver.core.Cluster"; @@ -45,7 +42,7 @@ protected ClassMatch enhanceClass() { @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { - return new ConstructorInterceptPoint[]{ + return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { @Override public ElementMatcher getConstructorMatcher() { @@ -62,7 +59,7 @@ public String getConstructorInterceptor() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { diff --git a/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/define/DefaultResultSetFutureInstrumentation.java b/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/define/DefaultResultSetFutureInstrumentation.java index 5f41e14bf040..3fd96f54a3bb 100644 --- a/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/define/DefaultResultSetFutureInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/define/DefaultResultSetFutureInstrumentation.java @@ -28,10 +28,6 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; - -/** - * @author stone.wlg - */ public class DefaultResultSetFutureInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "com.datastax.driver.core.DefaultResultSetFuture"; @@ -49,7 +45,7 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { diff --git a/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/define/SessionManagerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/define/SessionManagerInstrumentation.java index 67dea73f9d8e..ddaa76b65021 100644 --- a/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/define/SessionManagerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/define/SessionManagerInstrumentation.java @@ -29,9 +29,6 @@ import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * @author stone.wlg - */ public class SessionManagerInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "com.datastax.driver.core.SessionManager"; @@ -49,12 +46,12 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { return named("execute").and(takesArgumentWithType(0, "com.datastax.driver.core.Statement")) - .or(named("executeAsync").and(takesArgumentWithType(0, "com.datastax.driver.core.Statement"))); + .or(named("executeAsync").and(takesArgumentWithType(0, "com.datastax.driver.core.Statement"))); } @Override diff --git a/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/ClusterConnectInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/ClusterConnectInterceptorTest.java index 6a8704d0394e..0a8dc9f1cd24 100644 --- a/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/ClusterConnectInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/ClusterConnectInterceptorTest.java @@ -29,9 +29,6 @@ import java.lang.reflect.Method; -/** - * @author stone.wlg - */ @RunWith(PowerMockRunner.class) public class ClusterConnectInterceptorTest { @@ -61,7 +58,7 @@ public void setUp() throws Exception { @Test public void afterMethod() throws Throwable { - EnhancedInstance ret = (EnhancedInstance) interceptor.afterMethod(enhancedInstance, method, new Object[]{"test"}, null, enhancedInstance); + EnhancedInstance ret = (EnhancedInstance) interceptor.afterMethod(enhancedInstance, method, new Object[] {"test"}, null, enhancedInstance); ConnectionInfo connectionInfo = (ConnectionInfo) ret.getSkyWalkingDynamicField(); Assert.assertThat(connectionInfo.getKeyspace(), Is.is("test")); } diff --git a/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/ClusterConstructorWithStateListenerArgInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/ClusterConstructorWithStateListenerArgInterceptorTest.java index 6f292cc1755e..23b83bffff0d 100644 --- a/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/ClusterConstructorWithStateListenerArgInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/ClusterConstructorWithStateListenerArgInterceptorTest.java @@ -31,9 +31,6 @@ import java.util.ArrayList; import java.util.List; -/** - * @author stone.wlg - */ @RunWith(PowerMockRunner.class) public class ClusterConstructorWithStateListenerArgInterceptorTest { @@ -67,7 +64,10 @@ public void setUp() throws Exception { @Test public void onConstruct() { - interceptor.onConstruct(enhancedInstance, new Object[]{"cluster-name", inetSocketAddresses}); + interceptor.onConstruct(enhancedInstance, new Object[] { + "cluster-name", + inetSocketAddresses + }); ConnectionInfo connectionInfo = (ConnectionInfo) enhancedInstance.getSkyWalkingDynamicField(); Assert.assertThat(connectionInfo.getContactPoints(), Is.is("172.20.0.2:9042")); } diff --git a/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/DefaultResultSetFutureGetUninterruptiblyInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/DefaultResultSetFutureGetUninterruptiblyInterceptorTest.java index 204537e31f78..8b4a3166516a 100644 --- a/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/DefaultResultSetFutureGetUninterruptiblyInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/DefaultResultSetFutureGetUninterruptiblyInterceptorTest.java @@ -18,12 +18,17 @@ package org.apache.skywalking.apm.plugin.cassandra.java.driver.v3; +import java.lang.reflect.Method; import org.apache.skywalking.apm.agent.core.context.trace.AbstractTracingSpan; import org.apache.skywalking.apm.agent.core.context.trace.SpanLayer; import org.apache.skywalking.apm.agent.core.context.trace.TraceSegment; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; import org.apache.skywalking.apm.agent.test.helper.SegmentHelper; -import org.apache.skywalking.apm.agent.test.tools.*; +import org.apache.skywalking.apm.agent.test.tools.AgentServiceRule; +import org.apache.skywalking.apm.agent.test.tools.SegmentStorage; +import org.apache.skywalking.apm.agent.test.tools.SegmentStoragePoint; +import org.apache.skywalking.apm.agent.test.tools.SpanAssert; +import org.apache.skywalking.apm.agent.test.tools.TracingSegmentRunner; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -32,15 +37,10 @@ import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.modules.junit4.PowerMockRunnerDelegate; -import java.lang.reflect.Method; - import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import static org.powermock.api.mockito.PowerMockito.when; -/** - * @author stone.wlg - */ @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(TracingSegmentRunner.class) public class DefaultResultSetFutureGetUninterruptiblyInterceptorTest { diff --git a/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/SessionManagerExecuteAndExecuteAsyncWithStatementArgInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/SessionManagerExecuteAndExecuteAsyncWithStatementArgInterceptorTest.java index 928c02af75fd..212ef9216506 100644 --- a/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/SessionManagerExecuteAndExecuteAsyncWithStatementArgInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/cassandra-java-driver-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/cassandra/java/driver/v3/SessionManagerExecuteAndExecuteAsyncWithStatementArgInterceptorTest.java @@ -19,12 +19,17 @@ package org.apache.skywalking.apm.plugin.cassandra.java.driver.v3; import com.datastax.driver.core.SimpleStatement; +import java.lang.reflect.Method; import org.apache.skywalking.apm.agent.core.context.trace.AbstractTracingSpan; import org.apache.skywalking.apm.agent.core.context.trace.SpanLayer; import org.apache.skywalking.apm.agent.core.context.trace.TraceSegment; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; import org.apache.skywalking.apm.agent.test.helper.SegmentHelper; -import org.apache.skywalking.apm.agent.test.tools.*; +import org.apache.skywalking.apm.agent.test.tools.AgentServiceRule; +import org.apache.skywalking.apm.agent.test.tools.SegmentStorage; +import org.apache.skywalking.apm.agent.test.tools.SegmentStoragePoint; +import org.apache.skywalking.apm.agent.test.tools.SpanAssert; +import org.apache.skywalking.apm.agent.test.tools.TracingSegmentRunner; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -33,15 +38,10 @@ import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.modules.junit4.PowerMockRunnerDelegate; -import java.lang.reflect.Method; - import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import static org.powermock.api.mockito.PowerMockito.when; -/** - * @author stone.wlg - */ @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(TracingSegmentRunner.class) public class SessionManagerExecuteAndExecuteAsyncWithStatementArgInterceptorTest { @@ -72,8 +72,8 @@ public void setUp() throws Exception { @Test public void testCreateExitSpan() throws Throwable { - interceptor.beforeMethod(objectInstance, method, new Object[]{new SimpleStatement("SELECT * FROM test")}, null, null); - interceptor.afterMethod(objectInstance, method, new Object[]{new SimpleStatement("SELECT * FROM test")}, null, null); + interceptor.beforeMethod(objectInstance, method, new Object[] {new SimpleStatement("SELECT * FROM test")}, null, null); + interceptor.afterMethod(objectInstance, method, new Object[] {new SimpleStatement("SELECT * FROM test")}, null, null); assertThat(segmentStorage.getTraceSegments().size(), is(1)); TraceSegment segment = segmentStorage.getTraceSegments().get(0); diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-conflict-patch/pom.xml b/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-conflict-patch/pom.xml index 9bcac252566a..8f0c814aa4ed 100644 --- a/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-conflict-patch/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-conflict-patch/pom.xml @@ -16,7 +16,8 @@ ~ limitations under the License. --> - + apm-sdk-plugin org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-conflict-patch/src/main/java/org/apache/skywalking/apm/plugin/asf/dubbo/patch/MakeWrapperInterceptor.java b/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-conflict-patch/src/main/java/org/apache/skywalking/apm/plugin/asf/dubbo/patch/MakeWrapperInterceptor.java index 5968de1a4513..2ad444773972 100644 --- a/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-conflict-patch/src/main/java/org/apache/skywalking/apm/plugin/asf/dubbo/patch/MakeWrapperInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-conflict-patch/src/main/java/org/apache/skywalking/apm/plugin/asf/dubbo/patch/MakeWrapperInterceptor.java @@ -44,13 +44,14 @@ public class MakeWrapperInterceptor implements StaticMethodsAroundInterceptor { @Override public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, MethodInterceptResult result) { - Class wrapperClass = (Class)allArguments[0]; + Class wrapperClass = (Class) allArguments[0]; if (EnhancedInstance.class.isAssignableFrom(wrapperClass)) { result.defineReturnValue(makeWrapper(wrapperClass)); } } - @Override public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + @Override + public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, Object ret) { return ret; } @@ -69,11 +70,21 @@ private static Wrapper makeWrapper(Class c) { StringBuilder c1 = new StringBuilder("public void setPropertyValue(Object o, String n, Object v){ "); StringBuilder c2 = new StringBuilder("public Object getPropertyValue(Object o, String n){ "); - StringBuilder c3 = new StringBuilder("public Object invokeMethod(Object o, String n, Class[] p, Object[] v) throws " + InvocationTargetException.class.getName() + "{ "); - - c1.append(name).append(" w; try{ w = ((").append(name).append(")$1); }catch(Throwable e){ throw new IllegalArgumentException(e); }"); - c2.append(name).append(" w; try{ w = ((").append(name).append(")$1); }catch(Throwable e){ throw new IllegalArgumentException(e); }"); - c3.append(name).append(" w; try{ w = ((").append(name).append(")$1); }catch(Throwable e){ throw new IllegalArgumentException(e); }"); + StringBuilder c3 = new StringBuilder("public Object invokeMethod(Object o, String n, Class[] p, Object[] v) throws " + InvocationTargetException.class + .getName() + "{ "); + + c1.append(name) + .append(" w; try{ w = ((") + .append(name) + .append(")$1); }catch(Throwable e){ throw new IllegalArgumentException(e); }"); + c2.append(name) + .append(" w; try{ w = ((") + .append(name) + .append(")$1); }catch(Throwable e){ throw new IllegalArgumentException(e); }"); + c3.append(name) + .append(" w; try{ w = ((") + .append(name) + .append(")$1); }catch(Throwable e){ throw new IllegalArgumentException(e); }"); Map> pts = new HashMap>(); // Map ms = new LinkedHashMap(); // @@ -87,7 +98,13 @@ private static Wrapper makeWrapper(Class c) { if (Modifier.isStatic(f.getModifiers()) || Modifier.isTransient(f.getModifiers())) continue; - c1.append(" if( $2.equals(\"").append(fn).append("\") ){ w.").append(fn).append("=").append(arg(ft, "$3")).append("; return; }"); + c1.append(" if( $2.equals(\"") + .append(fn) + .append("\") ){ w.") + .append(fn) + .append("=") + .append(arg(ft, "$3")) + .append("; return; }"); c2.append(" if( $2.equals(\"").append(fn).append("\") ){ return ($w)w.").append(fn).append("; }"); pts.put(fn, ft); } @@ -101,7 +118,8 @@ private static Wrapper makeWrapper(Class c) { for (Method m : methods) { // ignore Object's method // ignore EnhanceInstance's method - if (m.getDeclaringClass() == Object.class || "getSkyWalkingDynamicField".equals(m.getName()) || "setSkyWalkingDynamicField".equals(m.getName())) { + if (m.getDeclaringClass() == Object.class || "getSkyWalkingDynamicField".equals(m.getName()) || "setSkyWalkingDynamicField" + .equals(m.getName())) { continue; } @@ -120,8 +138,12 @@ private static Wrapper makeWrapper(Class c) { if (override) { if (len > 0) { for (int l = 0; l < len; l++) { - c3.append(" && ").append(" $3[").append(l).append("].getName().equals(\"") - .append(m.getParameterTypes()[l].getName()).append("\")"); + c3.append(" && ") + .append(" $3[") + .append(l) + .append("].getName().equals(\"") + .append(m.getParameterTypes()[l].getName()) + .append("\")"); } } } @@ -129,9 +151,18 @@ private static Wrapper makeWrapper(Class c) { c3.append(" ) { "); if (m.getReturnType() == Void.TYPE) - c3.append(" w.").append(mn).append('(').append(args(m.getParameterTypes(), "$4")).append(");").append(" return null;"); + c3.append(" w.") + .append(mn) + .append('(') + .append(args(m.getParameterTypes(), "$4")) + .append(");") + .append(" return null;"); else - c3.append(" return ($w)w.").append(mn).append('(').append(args(m.getParameterTypes(), "$4")).append(");"); + c3.append(" return ($w)w.") + .append(mn) + .append('(') + .append(args(m.getParameterTypes(), "$4")) + .append(");"); c3.append(" }"); @@ -146,30 +177,47 @@ private static Wrapper makeWrapper(Class c) { c3.append(" }"); } - c3.append(" throw new " + NoSuchMethodException.class.getName() + "(\"Not found method \\\"\"+$2+\"\\\" in class " + c.getName() + ".\"); }"); + c3.append(" throw new " + NoSuchMethodException.class.getName() + "(\"Not found method \\\"\"+$2+\"\\\" in class " + c + .getName() + ".\"); }"); // deal with get/set method. Matcher matcher; for (Map.Entry entry : ms.entrySet()) { String md = entry.getKey(); - Method method = (Method)entry.getValue(); + Method method = (Method) entry.getValue(); if ((matcher = ReflectUtils.GETTER_METHOD_DESC_PATTERN.matcher(md)).matches()) { String pn = propertyName(matcher.group(1)); - c2.append(" if( $2.equals(\"").append(pn).append("\") ){ return ($w)w.").append(method.getName()).append("(); }"); + c2.append(" if( $2.equals(\"") + .append(pn) + .append("\") ){ return ($w)w.") + .append(method.getName()) + .append("(); }"); pts.put(pn, method.getReturnType()); } else if ((matcher = ReflectUtils.IS_HAS_CAN_METHOD_DESC_PATTERN.matcher(md)).matches()) { String pn = propertyName(matcher.group(1)); - c2.append(" if( $2.equals(\"").append(pn).append("\") ){ return ($w)w.").append(method.getName()).append("(); }"); + c2.append(" if( $2.equals(\"") + .append(pn) + .append("\") ){ return ($w)w.") + .append(method.getName()) + .append("(); }"); pts.put(pn, method.getReturnType()); } else if ((matcher = ReflectUtils.SETTER_METHOD_DESC_PATTERN.matcher(md)).matches()) { Class pt = method.getParameterTypes()[0]; String pn = propertyName(matcher.group(1)); - c1.append(" if( $2.equals(\"").append(pn).append("\") ){ w.").append(method.getName()).append("(").append(arg(pt, "$3")).append("); return; }"); + c1.append(" if( $2.equals(\"") + .append(pn) + .append("\") ){ w.") + .append(method.getName()) + .append("(") + .append(arg(pt, "$3")) + .append("); return; }"); pts.put(pn, pt); } } - c1.append(" throw new " + NoSuchPropertyException.class.getName() + "(\"Not found property \\\"\"+$2+\"\\\" filed or setter method in class " + c.getName() + ".\"); }"); - c2.append(" throw new " + NoSuchPropertyException.class.getName() + "(\"Not found property \\\"\"+$2+\"\\\" filed or setter method in class " + c.getName() + ".\"); }"); + c1.append(" throw new " + NoSuchPropertyException.class.getName() + "(\"Not found property \\\"\"+$2+\"\\\" filed or setter method in class " + c + .getName() + ".\"); }"); + c2.append(" throw new " + NoSuchPropertyException.class.getName() + "(\"Not found property \\\"\"+$2+\"\\\" filed or setter method in class " + c + .getName() + ".\"); }"); // make class long id = WRAPPER_CLASS_COUNTER.getAndIncrement(); @@ -204,7 +252,7 @@ private static Wrapper makeWrapper(Class c) { int ix = 0; for (Method m : ms.values()) wc.getField("mts" + ix++).set(null, m.getParameterTypes()); - return (Wrapper)wc.newInstance(); + return (Wrapper) wc.newInstance(); } catch (RuntimeException e) { throw e; } catch (Throwable e) { @@ -239,7 +287,8 @@ private static boolean hasMethods(Method[] methods) { return false; } for (Method m : methods) { - if (m.getDeclaringClass() != Object.class && !"getSkyWalkingDynamicField".equals(m.getName()) && !"setSkyWalkingDynamicField".equals(m.getName())) { + if (m.getDeclaringClass() != Object.class && !"getSkyWalkingDynamicField".equals(m.getName()) && !"setSkyWalkingDynamicField" + .equals(m.getName())) { return true; } } diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-conflict-patch/src/main/java/org/apache/skywalking/apm/plugin/asf/dubbo/patch/WrapperInstrumentation.java b/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-conflict-patch/src/main/java/org/apache/skywalking/apm/plugin/asf/dubbo/patch/WrapperInstrumentation.java index d66fa23f615e..c1fce7153de1 100644 --- a/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-conflict-patch/src/main/java/org/apache/skywalking/apm/plugin/asf/dubbo/patch/WrapperInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-conflict-patch/src/main/java/org/apache/skywalking/apm/plugin/asf/dubbo/patch/WrapperInstrumentation.java @@ -27,33 +27,38 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; /** - * The dubbo conflict plugin resolver the problem about the wrapper class generated by Dubbo core cannot be compiled successfully. As we known, - * The wrapper class traverses all the methods. In usual, it works unless this - * class has been enhanced by Skywalking. The javasist cannot found the `EnhanceInstance` method when generate. - * - * The plugin excludes {@link org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance} - * methods to ensure the correct compilation of the code. + * The dubbo conflict plugin resolver the problem about the wrapper class generated by Dubbo core cannot be compiled + * successfully. As we known, The wrapper class traverses all the methods. In usual, it works unless this class has been + * enhanced by Skywalking. The javasist cannot found the `EnhanceInstance` method when generate. + *

+ * The plugin excludes {@link org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance} methods + * to ensure the correct compilation of the code. */ public class WrapperInstrumentation extends ClassStaticMethodsEnhancePluginDefine { - @Override public StaticMethodsInterceptPoint[] getStaticMethodsInterceptPoints() { + @Override + public StaticMethodsInterceptPoint[] getStaticMethodsInterceptPoints() { return new StaticMethodsInterceptPoint[] { new StaticMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named("makeWrapper"); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return "org.apache.skywalking.apm.plugin.asf.dubbo.patch.MakeWrapperInterceptor"; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName("org.apache.dubbo.common.bytecode.Wrapper"); } } diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/pom.xml index cbd85c40fbaa..77183f3223ca 100644 --- a/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/pom.xml @@ -16,7 +16,8 @@ ~ --> - + apm-sdk-plugin org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/asf/dubbo/DubboInterceptor.java b/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/asf/dubbo/DubboInterceptor.java index 41fce7007371..7c11b23a2369 100644 --- a/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/asf/dubbo/DubboInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/asf/dubbo/DubboInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.asf.dubbo; import org.apache.dubbo.common.URL; @@ -40,7 +39,6 @@ * {@link DubboInterceptor} define how to enhance class {@link org.apache.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. - * */ public class DubboInterceptor implements InstanceMethodsAroundInterceptor { /** @@ -51,10 +49,10 @@ public class DubboInterceptor implements InstanceMethodsAroundInterceptor { * {@link RpcContext#attachments}. current trace segment will ref if the serialize context data is not null. */ @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - Invoker invoker = (Invoker)allArguments[0]; - Invocation invocation = (Invocation)allArguments[1]; + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { + Invoker invoker = (Invoker) allArguments[0]; + Invocation invocation = (Invocation) allArguments[1]; RpcContext rpcContext = RpcContext.getContext(); boolean isConsumer = rpcContext.isConsumerSide(); URL requestURL = invoker.getUrl(); @@ -93,9 +91,9 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { - Result result = (Result)ret; + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { + Result result = (Result) ret; if (result != null && result.getException() != null) { dealException(result.getException()); } @@ -142,8 +140,7 @@ private String generateOperationName(URL requestURL, Invocation invocation) { } /** - * Format request url. - * e.g. dubbo://127.0.0.1:20880/org.apache.skywalking.apm.plugin.test.Test.test(String). + * Format request url. e.g. dubbo://127.0.0.1:20880/org.apache.skywalking.apm.plugin.test.Test.test(String). * * @return request url. */ diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/dubbo/ContextManagerExtendOverrideService.java b/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/dubbo/ContextManagerExtendOverrideService.java index 9a2cacc2ea6a..cde96edd4be9 100644 --- a/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/dubbo/ContextManagerExtendOverrideService.java +++ b/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/dubbo/ContextManagerExtendOverrideService.java @@ -21,9 +21,6 @@ import org.apache.skywalking.apm.agent.core.boot.OverrideImplementor; import org.apache.skywalking.apm.agent.core.context.ContextManagerExtendService; -/** - * @author wusheng - */ @OverrideImplementor(ContextManagerExtendService.class) public class ContextManagerExtendOverrideService extends ContextManagerExtendService { } diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/dubbo/DubboInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/dubbo/DubboInterceptorTest.java index 8161d9286967..d978eda643a4 100644 --- a/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/dubbo/DubboInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/dubbo/DubboInterceptorTest.java @@ -104,8 +104,14 @@ public void setUp() throws Exception { when(invocation.getArguments()).thenReturn(new Object[] {"abc"}); PowerMockito.when(RpcContext.getContext()).thenReturn(rpcContext); when(rpcContext.isConsumerSide()).thenReturn(true); - allArguments = new Object[] {invoker, invocation}; - argumentTypes = new Class[] {invoker.getClass(), invocation.getClass()}; + allArguments = new Object[] { + invoker, + invocation + }; + argumentTypes = new Class[] { + invoker.getClass(), + invocation.getClass() + }; Config.Agent.SERVICE_NAME = "DubboTestCases-APP"; } @@ -167,8 +173,7 @@ public void testProviderWithAttachment() throws Throwable { assertProvider(); } - private void assertConsumerTraceSegmentInErrorCase( - TraceSegment traceSegment) { + private void assertConsumerTraceSegmentInErrorCase(TraceSegment traceSegment) { List spans = SegmentHelper.getSpans(traceSegment); assertThat(spans.size(), is(1)); assertConsumerSpan(spans.get(0)); @@ -212,7 +217,8 @@ private void assertCommonsAttribute(AbstractTracingSpan span) { assertThat(tags.size(), is(1)); assertThat(SpanHelper.getLayer(span), CoreMatchers.is(SpanLayer.RPC_FRAMEWORK)); assertThat(SpanHelper.getComponentId(span), is(3)); - assertThat(tags.get(0).getValue(), is("dubbo://127.0.0.1:20880/org.apache.skywalking.apm.test.TestDubboService.test(String)")); + assertThat(tags.get(0) + .getValue(), is("dubbo://127.0.0.1:20880/org.apache.skywalking.apm.test.TestDubboService.test(String)")); assertThat(span.getOperationName(), is("org.apache.skywalking.apm.test.TestDubboService.test(String)")); } } diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/dubbo/PluginBootService.java b/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/dubbo/PluginBootService.java index b91e137c3cc9..1193b21caff4 100644 --- a/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/dubbo/PluginBootService.java +++ b/apm-sniffer/apm-sdk-plugin/dubbo-2.7.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/dubbo/PluginBootService.java @@ -20,23 +20,24 @@ import org.apache.skywalking.apm.agent.core.boot.BootService; -/** - * @author wusheng - */ public class PluginBootService implements BootService { - @Override public void prepare() throws Throwable { + @Override + public void prepare() throws Throwable { } - @Override public void boot() throws Throwable { + @Override + public void boot() throws Throwable { } - @Override public void onComplete() throws Throwable { + @Override + public void onComplete() throws Throwable { } - @Override public void shutdown() throws Throwable { + @Override + public void shutdown() throws Throwable { } } diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-conflict-patch/pom.xml b/apm-sniffer/apm-sdk-plugin/dubbo-conflict-patch/pom.xml index 17c475b55d78..97f26ba4af72 100644 --- a/apm-sniffer/apm-sdk-plugin/dubbo-conflict-patch/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/dubbo-conflict-patch/pom.xml @@ -16,7 +16,8 @@ ~ limitations under the License. --> - + apm-sdk-plugin org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-conflict-patch/src/main/java/org/apache/skywalking/apm/plugin/dubbo/patch/MakeWrapperInterceptor.java b/apm-sniffer/apm-sdk-plugin/dubbo-conflict-patch/src/main/java/org/apache/skywalking/apm/plugin/dubbo/patch/MakeWrapperInterceptor.java index fd1cdb27c63f..cb07ac34413d 100644 --- a/apm-sniffer/apm-sdk-plugin/dubbo-conflict-patch/src/main/java/org/apache/skywalking/apm/plugin/dubbo/patch/MakeWrapperInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/dubbo-conflict-patch/src/main/java/org/apache/skywalking/apm/plugin/dubbo/patch/MakeWrapperInterceptor.java @@ -37,9 +37,6 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.StaticMethodsAroundInterceptor; -/** - * @author Zhang Xin - */ public class MakeWrapperInterceptor implements StaticMethodsAroundInterceptor { private static final AtomicLong WRAPPER_CLASS_COUNTER = new AtomicLong(0); @@ -47,13 +44,14 @@ public class MakeWrapperInterceptor implements StaticMethodsAroundInterceptor { @Override public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, MethodInterceptResult result) { - Class wrapperClass = (Class)allArguments[0]; + Class wrapperClass = (Class) allArguments[0]; if (EnhancedInstance.class.isAssignableFrom(wrapperClass)) { result.defineReturnValue(makeWrapper(wrapperClass)); } } - @Override public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + @Override + public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, Object ret) { return ret; } @@ -72,11 +70,21 @@ private static Wrapper makeWrapper(Class c) { StringBuilder c1 = new StringBuilder("public void setPropertyValue(Object o, String n, Object v){ "); StringBuilder c2 = new StringBuilder("public Object getPropertyValue(Object o, String n){ "); - StringBuilder c3 = new StringBuilder("public Object invokeMethod(Object o, String n, Class[] p, Object[] v) throws " + InvocationTargetException.class.getName() + "{ "); - - c1.append(name).append(" w; try{ w = ((").append(name).append(")$1); }catch(Throwable e){ throw new IllegalArgumentException(e); }"); - c2.append(name).append(" w; try{ w = ((").append(name).append(")$1); }catch(Throwable e){ throw new IllegalArgumentException(e); }"); - c3.append(name).append(" w; try{ w = ((").append(name).append(")$1); }catch(Throwable e){ throw new IllegalArgumentException(e); }"); + StringBuilder c3 = new StringBuilder("public Object invokeMethod(Object o, String n, Class[] p, Object[] v) throws " + InvocationTargetException.class + .getName() + "{ "); + + c1.append(name) + .append(" w; try{ w = ((") + .append(name) + .append(")$1); }catch(Throwable e){ throw new IllegalArgumentException(e); }"); + c2.append(name) + .append(" w; try{ w = ((") + .append(name) + .append(")$1); }catch(Throwable e){ throw new IllegalArgumentException(e); }"); + c3.append(name) + .append(" w; try{ w = ((") + .append(name) + .append(")$1); }catch(Throwable e){ throw new IllegalArgumentException(e); }"); Map> pts = new HashMap>(); // Map ms = new LinkedHashMap(); // @@ -90,7 +98,13 @@ private static Wrapper makeWrapper(Class c) { if (Modifier.isStatic(f.getModifiers()) || Modifier.isTransient(f.getModifiers())) continue; - c1.append(" if( $2.equals(\"").append(fn).append("\") ){ w.").append(fn).append("=").append(arg(ft, "$3")).append("; return; }"); + c1.append(" if( $2.equals(\"") + .append(fn) + .append("\") ){ w.") + .append(fn) + .append("=") + .append(arg(ft, "$3")) + .append("; return; }"); c2.append(" if( $2.equals(\"").append(fn).append("\") ){ return ($w)w.").append(fn).append("; }"); pts.put(fn, ft); } @@ -104,7 +118,8 @@ private static Wrapper makeWrapper(Class c) { for (Method m : methods) { // ignore Object's method // ignore EnhanceInstance's method - if (m.getDeclaringClass() == Object.class || "getSkyWalkingDynamicField".equals(m.getName()) || "setSkyWalkingDynamicField".equals(m.getName())) { + if (m.getDeclaringClass() == Object.class || "getSkyWalkingDynamicField".equals(m.getName()) || "setSkyWalkingDynamicField" + .equals(m.getName())) { continue; } @@ -123,8 +138,12 @@ private static Wrapper makeWrapper(Class c) { if (override) { if (len > 0) { for (int l = 0; l < len; l++) { - c3.append(" && ").append(" $3[").append(l).append("].getName().equals(\"") - .append(m.getParameterTypes()[l].getName()).append("\")"); + c3.append(" && ") + .append(" $3[") + .append(l) + .append("].getName().equals(\"") + .append(m.getParameterTypes()[l].getName()) + .append("\")"); } } } @@ -132,9 +151,18 @@ private static Wrapper makeWrapper(Class c) { c3.append(" ) { "); if (m.getReturnType() == Void.TYPE) - c3.append(" w.").append(mn).append('(').append(args(m.getParameterTypes(), "$4")).append(");").append(" return null;"); + c3.append(" w.") + .append(mn) + .append('(') + .append(args(m.getParameterTypes(), "$4")) + .append(");") + .append(" return null;"); else - c3.append(" return ($w)w.").append(mn).append('(').append(args(m.getParameterTypes(), "$4")).append(");"); + c3.append(" return ($w)w.") + .append(mn) + .append('(') + .append(args(m.getParameterTypes(), "$4")) + .append(");"); c3.append(" }"); @@ -149,30 +177,47 @@ private static Wrapper makeWrapper(Class c) { c3.append(" }"); } - c3.append(" throw new " + NoSuchMethodException.class.getName() + "(\"Not found method \\\"\"+$2+\"\\\" in class " + c.getName() + ".\"); }"); + c3.append(" throw new " + NoSuchMethodException.class.getName() + "(\"Not found method \\\"\"+$2+\"\\\" in class " + c + .getName() + ".\"); }"); // deal with get/set method. Matcher matcher; for (Map.Entry entry : ms.entrySet()) { String md = entry.getKey(); - Method method = (Method)entry.getValue(); + Method method = (Method) entry.getValue(); if ((matcher = ReflectUtils.GETTER_METHOD_DESC_PATTERN.matcher(md)).matches()) { String pn = propertyName(matcher.group(1)); - c2.append(" if( $2.equals(\"").append(pn).append("\") ){ return ($w)w.").append(method.getName()).append("(); }"); + c2.append(" if( $2.equals(\"") + .append(pn) + .append("\") ){ return ($w)w.") + .append(method.getName()) + .append("(); }"); pts.put(pn, method.getReturnType()); } else if ((matcher = ReflectUtils.IS_HAS_CAN_METHOD_DESC_PATTERN.matcher(md)).matches()) { String pn = propertyName(matcher.group(1)); - c2.append(" if( $2.equals(\"").append(pn).append("\") ){ return ($w)w.").append(method.getName()).append("(); }"); + c2.append(" if( $2.equals(\"") + .append(pn) + .append("\") ){ return ($w)w.") + .append(method.getName()) + .append("(); }"); pts.put(pn, method.getReturnType()); } else if ((matcher = ReflectUtils.SETTER_METHOD_DESC_PATTERN.matcher(md)).matches()) { Class pt = method.getParameterTypes()[0]; String pn = propertyName(matcher.group(1)); - c1.append(" if( $2.equals(\"").append(pn).append("\") ){ w.").append(method.getName()).append("(").append(arg(pt, "$3")).append("); return; }"); + c1.append(" if( $2.equals(\"") + .append(pn) + .append("\") ){ w.") + .append(method.getName()) + .append("(") + .append(arg(pt, "$3")) + .append("); return; }"); pts.put(pn, pt); } } - c1.append(" throw new " + NoSuchPropertyException.class.getName() + "(\"Not found property \\\"\"+$2+\"\\\" filed or setter method in class " + c.getName() + ".\"); }"); - c2.append(" throw new " + NoSuchPropertyException.class.getName() + "(\"Not found property \\\"\"+$2+\"\\\" filed or setter method in class " + c.getName() + ".\"); }"); + c1.append(" throw new " + NoSuchPropertyException.class.getName() + "(\"Not found property \\\"\"+$2+\"\\\" filed or setter method in class " + c + .getName() + ".\"); }"); + c2.append(" throw new " + NoSuchPropertyException.class.getName() + "(\"Not found property \\\"\"+$2+\"\\\" filed or setter method in class " + c + .getName() + ".\"); }"); // make class long id = WRAPPER_CLASS_COUNTER.getAndIncrement(); @@ -207,7 +252,7 @@ private static Wrapper makeWrapper(Class c) { int ix = 0; for (Method m : ms.values()) wc.getField("mts" + ix++).set(null, m.getParameterTypes()); - return (Wrapper)wc.newInstance(); + return (Wrapper) wc.newInstance(); } catch (RuntimeException e) { throw e; } catch (Throwable e) { @@ -242,7 +287,8 @@ private static boolean hasMethods(Method[] methods) { return false; } for (Method m : methods) { - if (m.getDeclaringClass() != Object.class && !"getSkyWalkingDynamicField".equals(m.getName()) && !"setSkyWalkingDynamicField".equals(m.getName())) { + if (m.getDeclaringClass() != Object.class && !"getSkyWalkingDynamicField".equals(m.getName()) && !"setSkyWalkingDynamicField" + .equals(m.getName())) { return true; } } diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-conflict-patch/src/main/java/org/apache/skywalking/apm/plugin/dubbo/patch/WrapperInstrumentation.java b/apm-sniffer/apm-sdk-plugin/dubbo-conflict-patch/src/main/java/org/apache/skywalking/apm/plugin/dubbo/patch/WrapperInstrumentation.java index 4e1aaf9eda7a..1b0d49ff6774 100644 --- a/apm-sniffer/apm-sdk-plugin/dubbo-conflict-patch/src/main/java/org/apache/skywalking/apm/plugin/dubbo/patch/WrapperInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/dubbo-conflict-patch/src/main/java/org/apache/skywalking/apm/plugin/dubbo/patch/WrapperInstrumentation.java @@ -27,35 +27,38 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; /** - * The dubbo conflict plugin resolver the problem about the wrapper class generated by Dubbo core cannot be compiled successfully. As we known, - * The wrapper class traverses all the methods. In usual, it works unless this - * class has been enhanced by Skywalking. The javasist cannot found the `EnhanceInstance` method when generate. - * - * The plugin excludes {@link org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance} - * methods to ensure the correct compilation of the code. - * - * @author Zhang Xin + * The dubbo conflict plugin resolver the problem about the wrapper class generated by Dubbo core cannot be compiled + * successfully. As we known, The wrapper class traverses all the methods. In usual, it works unless this class has been + * enhanced by Skywalking. The javasist cannot found the `EnhanceInstance` method when generate. + *

+ * The plugin excludes {@link org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance} methods + * to ensure the correct compilation of the code. */ public class WrapperInstrumentation extends ClassStaticMethodsEnhancePluginDefine { - @Override public StaticMethodsInterceptPoint[] getStaticMethodsInterceptPoints() { + @Override + public StaticMethodsInterceptPoint[] getStaticMethodsInterceptPoints() { return new StaticMethodsInterceptPoint[] { new StaticMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named("makeWrapper"); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return "org.apache.skywalking.apm.plugin.dubbo.patch.MakeWrapperInterceptor"; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName("com.alibaba.dubbo.common.bytecode.Wrapper"); } } diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml index 41fd672b80c1..1a9a46dc9de1 100644 --- a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml @@ -16,7 +16,8 @@ ~ --> - + apm-sdk-plugin org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/main/java/org/apache/skywalking/apm/plugin/dubbo/DubboInterceptor.java b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/main/java/org/apache/skywalking/apm/plugin/dubbo/DubboInterceptor.java index 92147f7b05f6..15480f10638a 100644 --- a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/main/java/org/apache/skywalking/apm/plugin/dubbo/DubboInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/main/java/org/apache/skywalking/apm/plugin/dubbo/DubboInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.dubbo; import com.alibaba.dubbo.common.URL; @@ -40,8 +39,6 @@ * {@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. - * - * @author zhangxin */ public class DubboInterceptor implements InstanceMethodsAroundInterceptor { /** @@ -52,10 +49,10 @@ public class DubboInterceptor implements InstanceMethodsAroundInterceptor { * {@link RpcContext#attachments}. current trace segment will ref if the serialize context data is not null. */ @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - Invoker invoker = (Invoker)allArguments[0]; - Invocation invocation = (Invocation)allArguments[1]; + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { + Invoker invoker = (Invoker) allArguments[0]; + Invocation invocation = (Invocation) allArguments[1]; RpcContext rpcContext = RpcContext.getContext(); boolean isConsumer = rpcContext.isConsumerSide(); URL requestURL = invoker.getUrl(); @@ -94,9 +91,9 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { - Result result = (Result)ret; + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { + Result result = (Result) ret; if (result != null && result.getException() != null) { dealException(result.getException()); } @@ -143,8 +140,7 @@ private String generateOperationName(URL requestURL, Invocation invocation) { } /** - * Format request url. - * e.g. dubbo://127.0.0.1:20880/org.apache.skywalking.apm.plugin.test.Test.test(String). + * Format request url. e.g. dubbo://127.0.0.1:20880/org.apache.skywalking.apm.plugin.test.Test.test(String). * * @return request url. */ diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/test/java/org/apache/skywalking/apm/plugin/dubbo/ContextManagerExtendOverrideService.java b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/test/java/org/apache/skywalking/apm/plugin/dubbo/ContextManagerExtendOverrideService.java index 9a2cacc2ea6a..cde96edd4be9 100644 --- a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/test/java/org/apache/skywalking/apm/plugin/dubbo/ContextManagerExtendOverrideService.java +++ b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/test/java/org/apache/skywalking/apm/plugin/dubbo/ContextManagerExtendOverrideService.java @@ -21,9 +21,6 @@ import org.apache.skywalking.apm.agent.core.boot.OverrideImplementor; import org.apache.skywalking.apm.agent.core.context.ContextManagerExtendService; -/** - * @author wusheng - */ @OverrideImplementor(ContextManagerExtendService.class) public class ContextManagerExtendOverrideService extends ContextManagerExtendService { } diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/test/java/org/apache/skywalking/apm/plugin/dubbo/DubboInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/test/java/org/apache/skywalking/apm/plugin/dubbo/DubboInterceptorTest.java index 5159c83bb862..89b6da7c681e 100644 --- a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/test/java/org/apache/skywalking/apm/plugin/dubbo/DubboInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/test/java/org/apache/skywalking/apm/plugin/dubbo/DubboInterceptorTest.java @@ -103,8 +103,14 @@ public void setUp() throws Exception { when(invocation.getArguments()).thenReturn(new Object[] {"abc"}); PowerMockito.when(RpcContext.getContext()).thenReturn(rpcContext); when(rpcContext.isConsumerSide()).thenReturn(true); - allArguments = new Object[] {invoker, invocation}; - argumentTypes = new Class[] {invoker.getClass(), invocation.getClass()}; + allArguments = new Object[] { + invoker, + invocation + }; + argumentTypes = new Class[] { + invoker.getClass(), + invocation.getClass() + }; Config.Agent.SERVICE_NAME = "DubboTestCases-APP"; } @@ -166,8 +172,7 @@ public void testProviderWithAttachment() throws Throwable { assertProvider(); } - private void assertConsumerTraceSegmentInErrorCase( - TraceSegment traceSegment) { + private void assertConsumerTraceSegmentInErrorCase(TraceSegment traceSegment) { List spans = SegmentHelper.getSpans(traceSegment); assertThat(spans.size(), is(1)); assertConsumerSpan(spans.get(0)); @@ -211,7 +216,8 @@ private void assertCommonsAttribute(AbstractTracingSpan span) { assertThat(tags.size(), is(1)); assertThat(SpanHelper.getLayer(span), CoreMatchers.is(SpanLayer.RPC_FRAMEWORK)); assertThat(SpanHelper.getComponentId(span), is(3)); - assertThat(tags.get(0).getValue(), is("dubbo://127.0.0.1:20880/org.apache.skywalking.apm.test.TestDubboService.test(String)")); + assertThat(tags.get(0) + .getValue(), is("dubbo://127.0.0.1:20880/org.apache.skywalking.apm.test.TestDubboService.test(String)")); assertThat(span.getOperationName(), is("org.apache.skywalking.apm.test.TestDubboService.test(String)")); } } diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/test/java/org/apache/skywalking/apm/plugin/dubbo/PluginBootService.java b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/test/java/org/apache/skywalking/apm/plugin/dubbo/PluginBootService.java index b91e137c3cc9..1193b21caff4 100644 --- a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/test/java/org/apache/skywalking/apm/plugin/dubbo/PluginBootService.java +++ b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/test/java/org/apache/skywalking/apm/plugin/dubbo/PluginBootService.java @@ -20,23 +20,24 @@ import org.apache.skywalking.apm.agent.core.boot.BootService; -/** - * @author wusheng - */ public class PluginBootService implements BootService { - @Override public void prepare() throws Throwable { + @Override + public void prepare() throws Throwable { } - @Override public void boot() throws Throwable { + @Override + public void boot() throws Throwable { } - @Override public void onComplete() throws Throwable { + @Override + public void onComplete() throws Throwable { } - @Override public void shutdown() throws Throwable { + @Override + public void shutdown() throws Throwable { } } diff --git a/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/pom.xml index ec59f1923c66..8536dd7b5a5a 100644 --- a/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-sdk-plugin org.apache.skywalking @@ -46,5 +47,4 @@ - \ No newline at end of file diff --git a/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheConstructorInterceptor.java index 718d901550d4..1d4868aaf2e4 100644 --- a/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheConstructorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheConstructorInterceptor.java @@ -22,9 +22,6 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor; -/** - * @author MrPro - */ public class EhcacheConstructorInterceptor implements InstanceConstructorInterceptor { @Override public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { diff --git a/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheEnhanceInfo.java b/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheEnhanceInfo.java index b61caef2c64d..c021e81e0198 100644 --- a/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheEnhanceInfo.java +++ b/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheEnhanceInfo.java @@ -18,9 +18,6 @@ package org.apache.skywalking.apm.plugin.ehcache.v2; -/** - * @author MrPro - */ public class EhcacheEnhanceInfo { private String cacheName; diff --git a/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheLockInterceptor.java b/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheLockInterceptor.java index 73be48195ec5..ba36be7c9b53 100644 --- a/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheLockInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheLockInterceptor.java @@ -31,16 +31,15 @@ import static org.apache.skywalking.apm.plugin.ehcache.v2.define.EhcachePluginInstrumentation.LOCK_ENHANCE_METHOD_SUFFIX; -/** - * @author MrPro - */ public class EhcacheLockInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { EhcacheEnhanceInfo enhanceInfo = (EhcacheEnhanceInfo) objInst.getSkyWalkingDynamicField(); - String operateName = method.getName().substring(0, method.getName().length() - LOCK_ENHANCE_METHOD_SUFFIX.length()); + String operateName = method.getName() + .substring(0, method.getName().length() - LOCK_ENHANCE_METHOD_SUFFIX.length()); AbstractSpan span = ContextManager.createLocalSpan("Ehcache/" + operateName + "/" + enhanceInfo.getCacheName()); span.setComponent(ComponentsDefine.EHCACHE); @@ -53,13 +52,15 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheOperateAllInterceptor.java b/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheOperateAllInterceptor.java index eb478e42aef5..5dec441b4baf 100644 --- a/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheOperateAllInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheOperateAllInterceptor.java @@ -28,13 +28,11 @@ import java.lang.reflect.Method; -/** - * @author MrPro - */ public class EhcacheOperateAllInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { EhcacheEnhanceInfo enhanceInfo = (EhcacheEnhanceInfo) objInst.getSkyWalkingDynamicField(); AbstractSpan span = ContextManager.createLocalSpan("Ehcache/" + method.getName() + "/" + enhanceInfo.getCacheName()); @@ -43,13 +41,15 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheOperateElementInterceptor.java b/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheOperateElementInterceptor.java index e2ef5e4cd2fe..94ff4722850a 100644 --- a/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheOperateElementInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheOperateElementInterceptor.java @@ -30,13 +30,11 @@ import java.lang.reflect.Method; -/** - * @author MrPro - */ public class EhcacheOperateElementInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { EhcacheEnhanceInfo enhanceInfo = (EhcacheEnhanceInfo) objInst.getSkyWalkingDynamicField(); AbstractSpan span = ContextManager.createLocalSpan("Ehcache/" + method.getName() + "/" + enhanceInfo.getCacheName()); @@ -50,13 +48,15 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheOperateObjectInterceptor.java b/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheOperateObjectInterceptor.java index bfbdffa571fc..551ecb5ce133 100644 --- a/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheOperateObjectInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheOperateObjectInterceptor.java @@ -29,13 +29,11 @@ import java.lang.reflect.Method; -/** - * @author MrPro - */ public class EhcacheOperateObjectInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { EhcacheEnhanceInfo enhanceInfo = (EhcacheEnhanceInfo) objInst.getSkyWalkingDynamicField(); AbstractSpan span = ContextManager.createLocalSpan("Ehcache/" + method.getName() + "/" + enhanceInfo.getCacheName()); @@ -49,13 +47,15 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/define/EhcachePluginInstrumentation.java b/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/define/EhcachePluginInstrumentation.java index fb3baaf734b7..c8883cc46e86 100644 --- a/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/define/EhcachePluginInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/define/EhcachePluginInstrumentation.java @@ -25,14 +25,13 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; -import static net.bytebuddy.matcher.ElementMatchers.*; +import static net.bytebuddy.matcher.ElementMatchers.named; +import static net.bytebuddy.matcher.ElementMatchers.takesArgument; +import static net.bytebuddy.matcher.ElementMatchers.takesArguments; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; /** - * * {@link EhcachePluginInstrumentation} enhance @{@link net.sf.ehcache.Cache} - * - * @author MrPro */ public class EhcachePluginInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -62,7 +61,6 @@ public class EhcachePluginInstrumentation extends ClassInstanceMethodsEnhancePlu public static final String OPERATE_OBJECT_CACHE_INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.ehcache.v2.EhcacheOperateObjectInterceptor"; public static final String OPERATE_ALL_CACHE_INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.ehcache.v2.EhcacheOperateAllInterceptor"; - // lock and release public static final String LOCK_ENHANCE_METHOD_SUFFIX = "LockOnKey"; public static final String WRITE_LOCK_TRY_ENHANCE_METHOD = "tryWrite" + LOCK_ENHANCE_METHOD_SUFFIX; @@ -94,13 +92,13 @@ public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { - return named(GET_WITH_LOADER_CACHE_ENHANCE_METHOD) - .or(named(GET_CACHE_ENHANCE_METHOD).and(takesArgument(0, Object.class))) - .or(named(GET_QUIET_CACHE_ENHANCE_METHOD).and(takesArgument(0, Object.class))) - .or(named(REMOVE_CACHE_ENHANCE_METHOD).and(takesArguments(2)).and(takesArgument(0, Object.class))) - .or(named(REMOVE_AND_RETURN_ELEMENT_CACHE_ENHANCE_METHOD)) - .or(named(REMOVE_QUIET_CACHE_ENHANCE_METHOD)) - .or(named(REMOVE_WITH_WRITE_CACHE_INHANCE_METHOD)); + return named(GET_WITH_LOADER_CACHE_ENHANCE_METHOD).or(named(GET_CACHE_ENHANCE_METHOD).and(takesArgument(0, Object.class))) + .or(named(GET_QUIET_CACHE_ENHANCE_METHOD).and(takesArgument(0, Object.class))) + .or(named(REMOVE_CACHE_ENHANCE_METHOD).and(takesArguments(2)) + .and(takesArgument(0, Object.class))) + .or(named(REMOVE_AND_RETURN_ELEMENT_CACHE_ENHANCE_METHOD)) + .or(named(REMOVE_QUIET_CACHE_ENHANCE_METHOD)) + .or(named(REMOVE_WITH_WRITE_CACHE_INHANCE_METHOD)); } @Override @@ -117,12 +115,11 @@ public boolean isOverrideArgs() { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { - return named(PUT_WITH_WRITE_CACHE_ENHANCE_METHOD) - .or(named(PUT_QUITE_CACHE_ENHANCE_METHOD)) - .or(named(REMOVE_ELEMENT_CACHE_ENHANCE_METHOD)) - .or(named(REPLACE_CACHE_ENHANCE_METHOD)) - .or(named(PUT_IF_ABSENT_CACHE_ENHANCE_METHOD).and(takesArguments(2))) - .or(named(PUT_CACHE_ENHANCE_METHOD).and(takesArguments(2))); + return named(PUT_WITH_WRITE_CACHE_ENHANCE_METHOD).or(named(PUT_QUITE_CACHE_ENHANCE_METHOD)) + .or(named(REMOVE_ELEMENT_CACHE_ENHANCE_METHOD)) + .or(named(REPLACE_CACHE_ENHANCE_METHOD)) + .or(named(PUT_IF_ABSENT_CACHE_ENHANCE_METHOD).and(takesArguments(2))) + .or(named(PUT_CACHE_ENHANCE_METHOD).and(takesArguments(2))); } @Override @@ -139,11 +136,11 @@ public boolean isOverrideArgs() { @Override public ElementMatcher getMethodsMatcher() { return named(REMOVE_ALL_CACHE_INHANCE_METHOD).and(takesArguments(1).and(takesArgument(0, Boolean.TYPE))) - .or(named(REMOVE_ALL_CACHE_INHANCE_METHOD).and(takesArguments(2))) - .or(named(PUT_ALL_CACHE_ENHANCE_METHOD).and(takesArguments(2))) - .or(named(GET_ALL_WITH_LOADER_CACHE_ENHANCE_METHOD)) - .or(named(GET_ALL_CACHE_ENHANCE_METHOD)) - .or(named(LOAD_ALL_CACHE_ENHANCE_METHOD)); + .or(named(REMOVE_ALL_CACHE_INHANCE_METHOD).and(takesArguments(2))) + .or(named(PUT_ALL_CACHE_ENHANCE_METHOD).and(takesArguments(2))) + .or(named(GET_ALL_WITH_LOADER_CACHE_ENHANCE_METHOD)) + .or(named(GET_ALL_CACHE_ENHANCE_METHOD)) + .or(named(LOAD_ALL_CACHE_ENHANCE_METHOD)); } @Override @@ -159,10 +156,8 @@ public boolean isOverrideArgs() { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { - return named(READ_LOCK_RELEASE_ENHANCE_METHOD) - .or(named(READ_LOCK_TRY_ENHANCE_METHOD) - .or(named(WRITE_LOCK_RELEASE_ENHANCE_METHOD)) - .or(named(WRITE_LOCK_TRY_ENHANCE_METHOD))); + return named(READ_LOCK_RELEASE_ENHANCE_METHOD).or(named(READ_LOCK_TRY_ENHANCE_METHOD).or(named(WRITE_LOCK_RELEASE_ENHANCE_METHOD)) + .or(named(WRITE_LOCK_TRY_ENHANCE_METHOD))); } @Override diff --git a/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheInterceptorTest.java index 566261a2df1c..555dc4b35b8d 100644 --- a/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheInterceptorTest.java @@ -16,9 +16,10 @@ * */ - package org.apache.skywalking.apm.plugin.ehcache.v2; +import java.lang.reflect.Method; +import java.util.List; import net.sf.ehcache.Cache; import net.sf.ehcache.Element; import net.sf.ehcache.config.CacheConfiguration; @@ -37,15 +38,15 @@ import org.powermock.modules.junit4.PowerMockRunnerDelegate; import org.powermock.reflect.Whitebox; -import java.lang.reflect.Method; -import java.util.List; - -import static org.apache.skywalking.apm.plugin.ehcache.v2.define.EhcachePluginInstrumentation.*; +import static org.apache.skywalking.apm.plugin.ehcache.v2.define.EhcachePluginInstrumentation.GET_ALL_CACHE_ENHANCE_METHOD; +import static org.apache.skywalking.apm.plugin.ehcache.v2.define.EhcachePluginInstrumentation.GET_CACHE_ENHANCE_METHOD; +import static org.apache.skywalking.apm.plugin.ehcache.v2.define.EhcachePluginInstrumentation.PUT_CACHE_ENHANCE_METHOD; +import static org.apache.skywalking.apm.plugin.ehcache.v2.define.EhcachePluginInstrumentation.READ_LOCK_RELEASE_ENHANCE_METHOD; +import static org.apache.skywalking.apm.plugin.ehcache.v2.define.EhcachePluginInstrumentation.READ_LOCK_TRY_ENHANCE_METHOD; +import static org.apache.skywalking.apm.plugin.ehcache.v2.define.EhcachePluginInstrumentation.WRITE_LOCK_RELEASE_ENHANCE_METHOD; +import static org.apache.skywalking.apm.plugin.ehcache.v2.define.EhcachePluginInstrumentation.WRITE_LOCK_TRY_ENHANCE_METHOD; import static org.hamcrest.CoreMatchers.is; -/** - * @author MrPro - */ @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(TracingSegmentRunner.class) public class EhcacheInterceptorTest { @@ -102,7 +103,10 @@ public void setUp() throws NoSuchMethodException { operateObjectArguments = new Object[] {"dataKey"}; operateElementArguments = new Element[] {new Element("dataKey", 1)}; - tryLockArguments = new Object[] {"dataKey", 3000}; + tryLockArguments = new Object[] { + "dataKey", + 3000 + }; releaseLockArguments = new Object[] {"dataKey"}; putCacheMethod = Whitebox.getMethods(Cache.class, PUT_CACHE_ENHANCE_METHOD)[0]; @@ -151,7 +155,6 @@ public void assertGetAllSuccess() throws Throwable { Assert.assertThat(traceSegments.size(), is(1)); } - @Test public void assertLockSuccess() throws Throwable { lockInterceptor.beforeMethod(enhancedInstance, tryReadLockMethod, tryLockArguments, null, null); diff --git a/apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml index cde6d10bdc63..e791427919a0 100644 --- a/apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-sdk-plugin org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/esjob/JobExecutorInterceptor.java b/apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/esjob/JobExecutorInterceptor.java index d6f0a6f842bf..ab3cc9f3910f 100644 --- a/apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/esjob/JobExecutorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/esjob/JobExecutorInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.esjob; import com.dangdang.ddframe.job.api.ShardingContext; @@ -34,15 +33,13 @@ /** * {@link JobExecutorInterceptor} enhances {@link com.dangdang.ddframe.job.executor.AbstractElasticJobExecutor#process(ShardingContext)} * ,creating a local span that records job execution. - * - * @author gaohongtao */ public class JobExecutorInterceptor implements InstanceMethodsAroundInterceptor { @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - ShardingContexts shardingContexts = (ShardingContexts)allArguments[0]; - Integer item = (Integer)allArguments[1]; + ShardingContexts shardingContexts = (ShardingContexts) allArguments[0]; + Integer item = (Integer) allArguments[1]; ShardingContext shardingContext = new ShardingContext(shardingContexts, item); String operateName = shardingContext.getJobName(); if (!Strings.isNullOrEmpty(shardingContext.getShardingParameter())) { @@ -60,7 +57,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/esjob/define/JobExecutorInstrumentation.java b/apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/esjob/define/JobExecutorInstrumentation.java index 9cb6521f48be..b7e1013b1241 100644 --- a/apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/esjob/define/JobExecutorInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/esjob/define/JobExecutorInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.esjob.define; import net.bytebuddy.description.method.MethodDescription; @@ -31,8 +30,6 @@ /** * {@link JobExecutorInstrumentation} presents that skywalking intercepts {@link com.dangdang.ddframe.job.executor.AbstractElasticJobExecutor}. - * - * @author gaohongtao */ public class JobExecutorInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -40,30 +37,36 @@ public class JobExecutorInstrumentation extends ClassInstanceMethodsEnhancePlugi private static final String JOB_EXECUTOR_INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.esjob.JobExecutorInterceptor"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return takesArgumentWithType(2, "com.dangdang.ddframe.job.event.type.JobExecutionEvent"); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return JOB_EXECUTOR_INTERCEPTOR_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName(ENHANCE_CLASS); } } diff --git a/apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/esjob/JobExecutorInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/esjob/JobExecutorInterceptorTest.java index 44ea70a86fff..a565ceb0c0a5 100644 --- a/apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/esjob/JobExecutorInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/esjob/JobExecutorInterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.esjob; import com.dangdang.ddframe.job.executor.ShardingContexts; @@ -51,17 +50,20 @@ public class JobExecutorInterceptorTest { @Rule public AgentServiceRule serviceRule = new AgentServiceRule(); - + private JobExecutorInterceptor jobExecutorInterceptor; @Before public void setUp() throws SQLException { jobExecutorInterceptor = new JobExecutorInterceptor(); } - + @Test public void assertSuccess() throws Throwable { - jobExecutorInterceptor.beforeMethod(null, null, new Object[]{mockShardingContext("fooJob", 1), 1}, null, null); + jobExecutorInterceptor.beforeMethod(null, null, new Object[] { + mockShardingContext("fooJob", 1), + 1 + }, null, null); jobExecutorInterceptor.afterMethod(null, null, null, null, null); TraceSegment segment = segmentStorage.getTraceSegments().get(0); List spans = SegmentHelper.getSpans(segment); @@ -70,24 +72,36 @@ public void assertSuccess() throws Throwable { assertThat(spans.get(0).transform().getOperationName(), is("fooJob-test")); assertThat(spans.get(0).transform().getComponentId(), is(24)); assertThat(spans.get(0).transform().getTags(0).getKey(), is("sharding_context")); - assertThat(spans.get(0).transform().getTags(0).getValue(), is("ShardingContext(jobName=fooJob, taskId=fooJob1, shardingTotalCount=2, jobParameter=, shardingItem=1, shardingParameter=test)")); + assertThat(spans.get(0) + .transform() + .getTags(0) + .getValue(), is("ShardingContext(jobName=fooJob, taskId=fooJob1, shardingTotalCount=2, jobParameter=, shardingItem=1, shardingParameter=test)")); } @Test public void assertSuccessWithoutSharding() throws Throwable { - jobExecutorInterceptor.beforeMethod(null, null, new Object[]{mockShardingContext("fooJob", 0), 0}, null, null); + jobExecutorInterceptor.beforeMethod(null, null, new Object[] { + mockShardingContext("fooJob", 0), + 0 + }, null, null); jobExecutorInterceptor.afterMethod(null, null, null, null, null); TraceSegment segment = segmentStorage.getTraceSegments().get(0); List spans = SegmentHelper.getSpans(segment); assertNotNull(spans); assertThat(spans.size(), is(1)); assertThat(spans.get(0).transform().getOperationName(), is("fooJob")); - assertThat(spans.get(0).transform().getTags(0).getValue(), is("ShardingContext(jobName=fooJob, taskId=fooJob0, shardingTotalCount=1, jobParameter=, shardingItem=0, shardingParameter=null)")); + assertThat(spans.get(0) + .transform() + .getTags(0) + .getValue(), is("ShardingContext(jobName=fooJob, taskId=fooJob0, shardingTotalCount=1, jobParameter=, shardingItem=0, shardingParameter=null)")); } @Test public void assertError() throws Throwable { - jobExecutorInterceptor.beforeMethod(null, null, new Object[]{mockShardingContext("fooJob", 0), 0}, null, null); + jobExecutorInterceptor.beforeMethod(null, null, new Object[] { + mockShardingContext("fooJob", 0), + 0 + }, null, null); jobExecutorInterceptor.handleMethodException(null, null, null, null, new Exception("fooError")); jobExecutorInterceptor.afterMethod(null, null, null, null, null); TraceSegment segment = segmentStorage.getTraceSegments().get(0); @@ -97,7 +111,7 @@ public void assertError() throws Throwable { assertThat(spans.get(0).transform().getIsError(), is(true)); assertThat(spans.get(0).transform().getLogs(0).getDataList().size(), is(4)); } - + private ShardingContexts mockShardingContext(String jobName, int shardingItem) { Map shardingMap = new HashMap(1); if (shardingItem >= 1) { diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/pom.xml index 402b81188aa8..ce4a5450b4b6 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/pom.xml @@ -16,7 +16,8 @@ ~ limitations under the License. ~ --> - + apm-sdk-plugin org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/AddTransportAddressesInterceptor.java b/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/AddTransportAddressesInterceptor.java index 0d2d1e13a463..3f5cd0e7e88b 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/AddTransportAddressesInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/AddTransportAddressesInterceptor.java @@ -33,16 +33,17 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { - TransportAddressCache transportAddressCache = (TransportAddressCache)objInst.getSkyWalkingDynamicField(); + TransportAddressCache transportAddressCache = (TransportAddressCache) objInst.getSkyWalkingDynamicField(); if (transportAddressCache == null) { transportAddressCache = new TransportAddressCache(); } - transportAddressCache.addDiscoveryNode((TransportAddress[])allArguments[0]); + transportAddressCache.addDiscoveryNode((TransportAddress[]) allArguments[0]); objInst.setSkyWalkingDynamicField(transportAddressCache); return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { } diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/Constants.java b/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/Constants.java index 42a2136c51af..dad1fb8ad7e2 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/Constants.java +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/Constants.java @@ -21,9 +21,6 @@ import org.apache.skywalking.apm.agent.core.context.tag.AbstractTag; import org.apache.skywalking.apm.agent.core.context.tag.Tags; -/** - * @author oatiz. - */ class Constants { static final String DB_TYPE = "Elasticsearch"; diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/ElasticSearchEnhanceInfo.java b/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/ElasticSearchEnhanceInfo.java index 1d950dc7ed83..69c412c6874e 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/ElasticSearchEnhanceInfo.java +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/ElasticSearchEnhanceInfo.java @@ -20,9 +20,6 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; -/** - * @author oatiz. - */ public class ElasticSearchEnhanceInfo { /** * elasticsearch cluster name @@ -48,7 +45,7 @@ public class ElasticSearchEnhanceInfo { private EnhancedInstance transportAddressHolder; public String transportAddresses() { - return ((TransportAddressCache)transportAddressHolder.getSkyWalkingDynamicField()).transportAddress(); + return ((TransportAddressCache) transportAddressHolder.getSkyWalkingDynamicField()).transportAddress(); } public String getClusterName() { diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/PlainListenableActionFutureInterceptor.java b/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/PlainListenableActionFutureInterceptor.java index 016a2aba0b9d..91debe8ac363 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/PlainListenableActionFutureInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/PlainListenableActionFutureInterceptor.java @@ -18,6 +18,7 @@ package org.apache.skywalking.apm.plugin.elasticsearch.v5; +import java.lang.reflect.Method; import org.apache.skywalking.apm.agent.core.context.ContextManager; import org.apache.skywalking.apm.agent.core.context.tag.Tags; import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan; @@ -28,26 +29,26 @@ import org.elasticsearch.action.bulk.BulkResponse; import org.elasticsearch.action.search.SearchResponse; -import java.lang.reflect.Method; - -import static org.apache.skywalking.apm.plugin.elasticsearch.v5.Constants.*; +import static org.apache.skywalking.apm.plugin.elasticsearch.v5.Constants.BASE_FUTURE_METHOD; +import static org.apache.skywalking.apm.plugin.elasticsearch.v5.Constants.DB_TYPE; +import static org.apache.skywalking.apm.plugin.elasticsearch.v5.Constants.ELASTICSEARCH_DB_OP_PREFIX; +import static org.apache.skywalking.apm.plugin.elasticsearch.v5.Constants.ES_INGEST_TOOK_MILLIS; +import static org.apache.skywalking.apm.plugin.elasticsearch.v5.Constants.ES_TOOK_MILLIS; +import static org.apache.skywalking.apm.plugin.elasticsearch.v5.Constants.ES_TOTAL_HITS; -/** - * @author oatiz. - */ public class PlainListenableActionFutureInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { AbstractSpan span = ContextManager.createLocalSpan(ELASTICSEARCH_DB_OP_PREFIX + BASE_FUTURE_METHOD); span.setComponent(ComponentsDefine.TRANSPORT_CLIENT); Tags.DB_TYPE.set(span, DB_TYPE); } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { AbstractSpan span = ContextManager.activeSpan(); if (ret instanceof SearchResponse) { SearchResponse response = (SearchResponse) ret; @@ -64,7 +65,7 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/RemoveTransportAddressInterceptor.java b/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/RemoveTransportAddressInterceptor.java index 5c7835b0ea98..5489ad885808 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/RemoveTransportAddressInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/RemoveTransportAddressInterceptor.java @@ -33,16 +33,17 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { - TransportAddressCache transportAddressCache = (TransportAddressCache)objInst.getSkyWalkingDynamicField(); + TransportAddressCache transportAddressCache = (TransportAddressCache) objInst.getSkyWalkingDynamicField(); if (transportAddressCache == null) { transportAddressCache = new TransportAddressCache(); } - transportAddressCache.removeDiscoveryNode((TransportAddress)allArguments[0]); + transportAddressCache.removeDiscoveryNode((TransportAddress) allArguments[0]); objInst.setSkyWalkingDynamicField(transportAddressCache); return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { } diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/TransportActionNodeProxyInterceptor.java b/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/TransportActionNodeProxyInterceptor.java index adc431c61e00..59b3b3beb2f9 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/TransportActionNodeProxyInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/TransportActionNodeProxyInterceptor.java @@ -38,16 +38,14 @@ import static org.apache.skywalking.apm.plugin.elasticsearch.v5.Constants.ES_TYPE; import static org.apache.skywalking.apm.plugin.elasticsearch.v5.Util.wrapperNullStringValue; -/** - * @author oatiz. - */ public class TransportActionNodeProxyInterceptor implements InstanceConstructorInterceptor, InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { - ElasticSearchEnhanceInfo enhanceInfo = (ElasticSearchEnhanceInfo)((EnhancedInstance)objInst.getSkyWalkingDynamicField()).getSkyWalkingDynamicField(); + ElasticSearchEnhanceInfo enhanceInfo = (ElasticSearchEnhanceInfo) ((EnhancedInstance) objInst.getSkyWalkingDynamicField()) + .getSkyWalkingDynamicField(); String opType = allArguments[1].getClass().getSimpleName(); String operationName = ELASTICSEARCH_DB_OP_PREFIX + opType; AbstractSpan span = ContextManager.createExitSpan(operationName, enhanceInfo.transportAddresses()); @@ -57,15 +55,15 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr if (TRACE_DSL) { Tags.DB_STATEMENT.set(span, enhanceInfo.getSource()); } - span.tag(ES_NODE, ((DiscoveryNode)allArguments[0]).getAddress().toString()); + span.tag(ES_NODE, ((DiscoveryNode) allArguments[0]).getAddress().toString()); span.tag(ES_INDEX, wrapperNullStringValue(enhanceInfo.getIndices())); span.tag(ES_TYPE, wrapperNullStringValue(enhanceInfo.getTypes())); SpanLayer.asDB(span); } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } @@ -78,7 +76,7 @@ public void handleMethodException(EnhancedInstance objInst, Method method, Objec @Override public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { - EnhancedInstance actions = (EnhancedInstance)allArguments[1]; + EnhancedInstance actions = (EnhancedInstance) allArguments[1]; objInst.setSkyWalkingDynamicField(actions); } } diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/TransportProxyClientInterceptor.java b/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/TransportProxyClientInterceptor.java index 65130016d87e..c707af823779 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/TransportProxyClientInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/TransportProxyClientInterceptor.java @@ -35,20 +35,17 @@ import static org.apache.skywalking.apm.agent.core.conf.Config.Plugin.Elasticsearch.TRACE_DSL; -/** - * @author oatiz, zhang xin. - */ public class TransportProxyClientInterceptor implements InstanceConstructorInterceptor { private static final ILog logger = LogManager.getLogger(TransportProxyClientInterceptor.class); @Override public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { - Settings settings = (Settings)allArguments[0]; + Settings settings = (Settings) allArguments[0]; String clusterName = settings.get("cluster.name"); - EnhancedInstance nodeService = (EnhancedInstance)allArguments[2]; - List genericActions = (List)allArguments[3]; + EnhancedInstance nodeService = (EnhancedInstance) allArguments[2]; + List genericActions = (List) allArguments[3]; for (GenericAction action : genericActions) { if (action instanceof EnhancedInstance) { @@ -56,7 +53,7 @@ public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { elasticSearchEnhanceInfo.setClusterName(clusterName); parseRequestInfo(action, elasticSearchEnhanceInfo); elasticSearchEnhanceInfo.setTransportAddressHolder(nodeService); - ((EnhancedInstance)action).setSkyWalkingDynamicField(elasticSearchEnhanceInfo); + ((EnhancedInstance) action).setSkyWalkingDynamicField(elasticSearchEnhanceInfo); } } } @@ -89,7 +86,7 @@ private void parseRequestInfo(Object request, ElasticSearchEnhanceInfo enhanceIn } private void parseSearchRequest(Object request, ElasticSearchEnhanceInfo enhanceInfo) { - SearchRequest searchRequest = (SearchRequest)request; + SearchRequest searchRequest = (SearchRequest) request; enhanceInfo.setIndices(StringUtil.join(',', searchRequest.indices())); enhanceInfo.setTypes(StringUtil.join(',', searchRequest.types())); if (TRACE_DSL) { @@ -98,7 +95,7 @@ private void parseSearchRequest(Object request, ElasticSearchEnhanceInfo enhance } private void parseGetRequest(Object request, ElasticSearchEnhanceInfo enhanceInfo) { - GetRequest getRequest = (GetRequest)request; + GetRequest getRequest = (GetRequest) request; enhanceInfo.setIndices(StringUtil.join(',', getRequest.indices())); enhanceInfo.setTypes(getRequest.type()); if (TRACE_DSL) { @@ -107,7 +104,7 @@ private void parseGetRequest(Object request, ElasticSearchEnhanceInfo enhanceInf } private void parseIndexRequest(Object request, ElasticSearchEnhanceInfo enhanceInfo) { - IndexRequest indexRequest = (IndexRequest)request; + IndexRequest indexRequest = (IndexRequest) request; enhanceInfo.setIndices(StringUtil.join(',', indexRequest.indices())); enhanceInfo.setTypes(indexRequest.type()); if (TRACE_DSL) { @@ -116,7 +113,7 @@ private void parseIndexRequest(Object request, ElasticSearchEnhanceInfo enhanceI } private void parseUpdateRequest(Object request, ElasticSearchEnhanceInfo enhanceInfo) { - UpdateRequest updateRequest = (UpdateRequest)request; + UpdateRequest updateRequest = (UpdateRequest) request; enhanceInfo.setIndices(StringUtil.join(',', updateRequest.indices())); enhanceInfo.setTypes(updateRequest.type()); if (TRACE_DSL) { @@ -131,7 +128,7 @@ private void parseUpdateRequest(Object request, ElasticSearchEnhanceInfo enhance } private void parseDeleteRequest(Object request, ElasticSearchEnhanceInfo enhanceInfo) { - DeleteRequest deleteRequest = (DeleteRequest)request; + DeleteRequest deleteRequest = (DeleteRequest) request; enhanceInfo.setIndices(StringUtil.join(',', deleteRequest.indices())); enhanceInfo.setTypes(deleteRequest.type()); if (TRACE_DSL) { diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/Util.java b/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/Util.java index 293ed1a36f84..cf4fbcc9020e 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/Util.java +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/Util.java @@ -20,9 +20,6 @@ import static org.apache.skywalking.apm.util.StringUtil.isEmpty; -/** - * @author oatiz. - */ class Util { static String wrapperNullStringValue(String value) { diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/define/GenericActionInstrumentation.java b/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/define/GenericActionInstrumentation.java index da871300d49e..ec4a957bea2f 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/define/GenericActionInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/define/GenericActionInstrumentation.java @@ -29,29 +29,35 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.HierarchyMatch.byHierarchyMatch; public class GenericActionInstrumentation extends ClassEnhancePluginDefine { - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { - @Override public ElementMatcher getConstructorMatcher() { + @Override + public ElementMatcher getConstructorMatcher() { return any(); } - @Override public String getConstructorInterceptor() { + @Override + public String getConstructorInterceptor() { return "org.apache.skywalking.apm.plugin.elasticsearch.v5.GenericActionConstructorInterceptor"; } } }; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[0]; } - @Override public StaticMethodsInterceptPoint[] getStaticMethodsInterceptPoints() { + @Override + public StaticMethodsInterceptPoint[] getStaticMethodsInterceptPoints() { return new StaticMethodsInterceptPoint[0]; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byHierarchyMatch(new String[] {"org.elasticsearch.action.GenericAction"}); } } diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/define/PlainListenableActionFutureInstrumentation.java b/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/define/PlainListenableActionFutureInstrumentation.java index 1dcedceeb13b..a653f811acfe 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/define/PlainListenableActionFutureInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/define/PlainListenableActionFutureInstrumentation.java @@ -29,9 +29,6 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * @author oatiz. - */ public class PlainListenableActionFutureInstrumentation extends ClassEnhancePluginDefine { @Override @@ -41,7 +38,7 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/define/TransportActionNodeProxyInstrumentation.java b/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/define/TransportActionNodeProxyInstrumentation.java index 16baebf39b28..d98b45764b54 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/define/TransportActionNodeProxyInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/define/TransportActionNodeProxyInstrumentation.java @@ -30,9 +30,6 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * @author oatiz. - */ public class TransportActionNodeProxyInstrumentation extends ClassEnhancePluginDefine { public static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.elasticsearch.v5.TransportActionNodeProxyInterceptor"; @@ -40,13 +37,15 @@ public class TransportActionNodeProxyInstrumentation extends ClassEnhancePluginD @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { - return new ConstructorInterceptPoint[]{ + return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { - @Override public ElementMatcher getConstructorMatcher() { + @Override + public ElementMatcher getConstructorMatcher() { return any(); } - @Override public String getConstructorInterceptor() { + @Override + public String getConstructorInterceptor() { return INTERCEPTOR_CLASS; } } @@ -55,7 +54,7 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/define/TransportClientNodesServiceInstrumentation.java b/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/define/TransportClientNodesServiceInstrumentation.java index 676c58d2f3fa..df1027398ab8 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/define/TransportClientNodesServiceInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/define/TransportClientNodesServiceInstrumentation.java @@ -33,42 +33,51 @@ public class TransportClientNodesServiceInstrumentation extends ClassInstanceMet public static final String REMOVE_TRANSPORT_ADDRESS_INTERCEPTOR = "org.apache.skywalking.apm.plugin.elasticsearch.v5.RemoveTransportAddressInterceptor"; public static final String ENHANCE_CLASS = "org.elasticsearch.client.transport.TransportClientNodesService"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named("addTransportAddresses"); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return ADD_TRANSPORT_ADDRESSES_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named("removeTransportAddress"); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return REMOVE_TRANSPORT_ADDRESS_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName(ENHANCE_CLASS); } } diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/define/TransportProxyClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/define/TransportProxyClientInstrumentation.java index a0a0aaef185e..55e6e91f8aa9 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/define/TransportProxyClientInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/define/TransportProxyClientInstrumentation.java @@ -29,9 +29,6 @@ import static net.bytebuddy.matcher.ElementMatchers.any; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * @author oatiz. - */ public class TransportProxyClientInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "org.apache.skywalking.apm.plugin.elasticsearch.v5.TransportProxyClientInterceptor"; diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/pom.xml index c17ac3fec019..3a6aa2eaae11 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/pom.xml @@ -16,7 +16,8 @@ ~ limitations under the License. ~ --> - + apm-sdk-plugin org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/RemotePeerCache.java b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/RemotePeerCache.java index 92475fc9ddd2..e50873c88f24 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/RemotePeerCache.java +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/RemotePeerCache.java @@ -15,14 +15,12 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.elasticsearch.v6; /** - * - * Used for store ES connection related information, remotePeers will store the IP address and port, - * separated by commas when multiple connections are made. - * - * @author aderm + * Used for store ES connection related information, remotePeers will store the IP address and port, separated by commas + * when multiple connections are made. */ public class RemotePeerCache { diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/RestClientEnhanceInfo.java b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/RestClientEnhanceInfo.java index add8a2c11ff3..3c0f8ee94282 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/RestClientEnhanceInfo.java +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/RestClientEnhanceInfo.java @@ -15,13 +15,11 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.elasticsearch.v6; import org.apache.http.HttpHost; -/** - * @author aderm - */ public class RestClientEnhanceInfo { private RemotePeerCache remotePeerCache = new RemotePeerCache(); diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/define/IndicesClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/define/IndicesClientInstrumentation.java index 483d94e465b6..4abfa939cf42 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/define/IndicesClientInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/define/IndicesClientInstrumentation.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.elasticsearch.v6.define; import static net.bytebuddy.matcher.ElementMatchers.named; @@ -30,12 +31,10 @@ import org.apache.skywalking.apm.plugin.elasticsearch.v6.interceptor.Constants; /** - * - * {@link IndicesClientInstrumentation} enhance the create createAsync delete deleteAsync method without argument in + * {@link IndicesClientInstrumentation} enhance the create createAsync delete deleteAsync method without + * argument in * org.elasticsearch.client.IndicesClient by org.apache.skywalking.apm.plugin.elasticsearch.v6.interceptor.IndicesClientCreateMethodsInterceptor - * org.apache.skywalking.apm.plugin.elasticsearch.v6.interceptor.IndicesClientDeleteMethodsInterceptor - * - * @author aderm + * org.apache.skywalking.apm.plugin.elasticsearch.v6.interceptor.IndicesClientDeleteMethodsInterceptor */ public class IndicesClientInstrumentation extends ClassEnhancePluginDefine { diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/define/RestHighLevelClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/define/RestHighLevelClientInstrumentation.java index 6ca9e26c5e18..a6a05f1bbf56 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/define/RestHighLevelClientInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/define/RestHighLevelClientInstrumentation.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.elasticsearch.v6.define; import static net.bytebuddy.matcher.ElementMatchers.named; @@ -31,16 +32,17 @@ import org.apache.skywalking.apm.plugin.elasticsearch.v6.interceptor.Constants; /** - * * {@link RestHighLevelClientInstrumentation} enhance the constructor method without argument in * org.elasticsearch.client.RestHighLevelClient by org.apache.skywalking.apm.plugin.elasticsearch.v6.interceptor.RestHighLevelClientConInterceptor - * also enhance the performRequestAndParseEntity method in org.elasticsearch.client.RestHighLevelClient by org.apache.skywalking.apm.plugin.elasticsearch.v6.interceptor.IndicesClientCreateMethodsInterceptor, - * also enhance the get getAsync search searchAsync index indexAsync update updateAsync method in org.apache.skywalking.apm.plugin.elasticsearch.v6.interceptor.RestHighLevelClientGetMethodsInterceptor - * org.apache.skywalking.apm.plugin.elasticsearch.v6.interceptor.RestHighLevelClientSearchMethodsInterceptor org.apache.skywalking.apm.plugin.elasticsearch.v6.interceptor.RestHighLevelClientIndexMethodsInterceptor + * also enhance the performRequestAndParseEntity method in org.elasticsearch.client.RestHighLevelClient + * by org.apache.skywalking.apm.plugin.elasticsearch.v6.interceptor.IndicesClientCreateMethodsInterceptor, + * also enhance the get getAsync search searchAsync index indexAsync update updateAsync method in + * org.apache.skywalking.apm.plugin.elasticsearch.v6.interceptor.RestHighLevelClientGetMethodsInterceptor + * org.apache.skywalking.apm.plugin.elasticsearch.v6.interceptor.RestHighLevelClientSearchMethodsInterceptor + * org.apache.skywalking.apm.plugin.elasticsearch.v6.interceptor.RestHighLevelClientIndexMethodsInterceptor * org.apache.skywalking.apm.plugin.elasticsearch.v6.interceptor.RestHighLevelClientUpdateMethodsInterceptor, - * also enhance the indices method in org.elasticsearch.client.RestHighLevelClient by org.apache.skywalking.apm.plugin.elasticsearch.v6.interceptor.RestHighLevelClientIndicesMethodsInterceptor - * - * @author aderm + * also enhance the indices method in org.elasticsearch.client.RestHighLevelClient by + * org.apache.skywalking.apm.plugin.elasticsearch.v6.interceptor.RestHighLevelClientIndicesMethodsInterceptor */ public class RestHighLevelClientInstrumentation extends ClassEnhancePluginDefine { diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/Constants.java b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/Constants.java index 0eb5e3f9429a..583a52fbb58d 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/Constants.java +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/Constants.java @@ -15,11 +15,9 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.elasticsearch.v6.interceptor; -/** - * @author aderm - */ public class Constants { //interceptor class public static final String REST_HIGH_LEVEL_CLIENT_CON_INTERCEPTOR = "org.apache.skywalking.apm.plugin.elasticsearch.v6.interceptor.RestHighLevelClientConInterceptor"; diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/IndicesClientCreateMethodsInterceptor.java b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/IndicesClientCreateMethodsInterceptor.java index e6f1db567068..c48820f1de58 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/IndicesClientCreateMethodsInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/IndicesClientCreateMethodsInterceptor.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.elasticsearch.v6.interceptor; import static org.apache.skywalking.apm.agent.core.conf.Config.Plugin.Elasticsearch.TRACE_DSL; @@ -32,40 +33,32 @@ import org.apache.skywalking.apm.plugin.elasticsearch.v6.RestClientEnhanceInfo; import org.elasticsearch.client.indices.CreateIndexRequest; -/** - * @author aderm - */ public class IndicesClientCreateMethodsInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - CreateIndexRequest createIndexRequest = (CreateIndexRequest)(allArguments[0]); + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { + CreateIndexRequest createIndexRequest = (CreateIndexRequest) (allArguments[0]); - RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) (objInst - .getSkyWalkingDynamicField()); + RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) (objInst.getSkyWalkingDynamicField()); if (restClientEnhanceInfo != null) { - AbstractSpan span = ContextManager - .createExitSpan(Constants.CREATE_OPERATOR_NAME, - restClientEnhanceInfo.getPeers()); + AbstractSpan span = ContextManager.createExitSpan(Constants.CREATE_OPERATOR_NAME, restClientEnhanceInfo.getPeers()); span.setComponent(ComponentsDefine.REST_HIGH_LEVEL_CLIENT); Tags.DB_TYPE.set(span, DB_TYPE); Tags.DB_INSTANCE.set(span, createIndexRequest.index()); if (TRACE_DSL) { //Store es mapping parameters - Tags.DB_STATEMENT - .set(span, createIndexRequest.mappings().utf8ToString()); + Tags.DB_STATEMENT.set(span, createIndexRequest.mappings().utf8ToString()); } SpanLayer.asDB(span); } } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { - RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) (objInst - .getSkyWalkingDynamicField()); + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { + RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) (objInst.getSkyWalkingDynamicField()); if (restClientEnhanceInfo != null) { ContextManager.stopSpan(); } @@ -73,10 +66,9 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, - Object[] allArguments, Class[] argumentsTypes, Throwable t) { - RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) (objInst - .getSkyWalkingDynamicField()); + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { + RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) (objInst.getSkyWalkingDynamicField()); if (restClientEnhanceInfo != null) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/IndicesClientDeleteMethodsInterceptor.java b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/IndicesClientDeleteMethodsInterceptor.java index 31cb38881fba..6708ea661e2c 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/IndicesClientDeleteMethodsInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/IndicesClientDeleteMethodsInterceptor.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.elasticsearch.v6.interceptor; import static org.apache.skywalking.apm.plugin.elasticsearch.v6.interceptor.Constants.DB_TYPE; @@ -32,22 +33,16 @@ import org.apache.skywalking.apm.plugin.elasticsearch.v6.RestClientEnhanceInfo; import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest; -/** - * @author aderm - */ public class IndicesClientDeleteMethodsInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - DeleteIndexRequest deleteIndexRequest = (DeleteIndexRequest)(allArguments[0]); + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { + DeleteIndexRequest deleteIndexRequest = (DeleteIndexRequest) (allArguments[0]); - RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) (objInst - .getSkyWalkingDynamicField()); + RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) (objInst.getSkyWalkingDynamicField()); if (restClientEnhanceInfo != null) { - AbstractSpan span = ContextManager - .createExitSpan(Constants.DELETE_OPERATOR_NAME, - restClientEnhanceInfo.getPeers()); + AbstractSpan span = ContextManager.createExitSpan(Constants.DELETE_OPERATOR_NAME, restClientEnhanceInfo.getPeers()); span.setComponent(ComponentsDefine.REST_HIGH_LEVEL_CLIENT); Tags.DB_TYPE.set(span, DB_TYPE); @@ -57,10 +52,9 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { - RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) (objInst - .getSkyWalkingDynamicField()); + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { + RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) (objInst.getSkyWalkingDynamicField()); if (restClientEnhanceInfo != null) { ContextManager.stopSpan(); } @@ -68,10 +62,9 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, - Object[] allArguments, Class[] argumentsTypes, Throwable t) { - RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) (objInst - .getSkyWalkingDynamicField()); + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { + RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) (objInst.getSkyWalkingDynamicField()); if (restClientEnhanceInfo != null) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientConInterceptor.java b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientConInterceptor.java index a77644eef5b2..727e105598c9 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientConInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientConInterceptor.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.elasticsearch.v6.interceptor; import java.util.List; @@ -27,16 +28,13 @@ import org.elasticsearch.client.RestClient; import org.elasticsearch.client.RestClientBuilder; -/** - * @author aderm - */ public class RestHighLevelClientConInterceptor implements InstanceConstructorInterceptor { private static final ILog logger = LogManager.getLogger(RestHighLevelClientConInterceptor.class); @Override public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { - RestClientBuilder restClientBuilder = (RestClientBuilder)(allArguments[0]); + RestClientBuilder restClientBuilder = (RestClientBuilder) (allArguments[0]); RestClient restClient = restClientBuilder.build(); RestClientEnhanceInfo restClientEnhanceInfo = new RestClientEnhanceInfo(); diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientGetMethodsInterceptor.java b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientGetMethodsInterceptor.java index ed39f8e402de..a9df313ae6a7 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientGetMethodsInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientGetMethodsInterceptor.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.elasticsearch.v6.interceptor; import static org.apache.skywalking.apm.agent.core.conf.Config.Plugin.Elasticsearch.TRACE_DSL; @@ -32,18 +33,15 @@ import org.apache.skywalking.apm.plugin.elasticsearch.v6.RestClientEnhanceInfo; import org.elasticsearch.action.get.GetRequest; -/** - * @author aderm - */ public class RestHighLevelClientGetMethodsInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - GetRequest getRequest = (GetRequest)(allArguments[0]); + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { + GetRequest getRequest = (GetRequest) (allArguments[0]); - RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo)(objInst.getSkyWalkingDynamicField()); - AbstractSpan span = ContextManager - .createExitSpan(Constants.GET_OPERATOR_NAME, restClientEnhanceInfo.getPeers()); + RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) (objInst.getSkyWalkingDynamicField()); + AbstractSpan span = ContextManager.createExitSpan(Constants.GET_OPERATOR_NAME, restClientEnhanceInfo.getPeers()); span.setComponent(ComponentsDefine.REST_HIGH_LEVEL_CLIENT); Tags.DB_TYPE.set(span, DB_TYPE); @@ -56,15 +54,15 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, - Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientIndexMethodsInterceptor.java b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientIndexMethodsInterceptor.java index 880374b28157..b9fa8ef9c065 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientIndexMethodsInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientIndexMethodsInterceptor.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.elasticsearch.v6.interceptor; import static org.apache.skywalking.apm.agent.core.conf.Config.Plugin.Elasticsearch.TRACE_DSL; @@ -32,18 +33,15 @@ import org.apache.skywalking.apm.plugin.elasticsearch.v6.RestClientEnhanceInfo; import org.elasticsearch.action.index.IndexRequest; -/** - * @author aderm - */ public class RestHighLevelClientIndexMethodsInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - IndexRequest indexRequest = (IndexRequest)(allArguments[0]); + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { + IndexRequest indexRequest = (IndexRequest) (allArguments[0]); - RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo)(objInst.getSkyWalkingDynamicField()); - AbstractSpan span = ContextManager - .createExitSpan(Constants.INDEX_OPERATOR_NAME, restClientEnhanceInfo.getPeers()); + RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) (objInst.getSkyWalkingDynamicField()); + AbstractSpan span = ContextManager.createExitSpan(Constants.INDEX_OPERATOR_NAME, restClientEnhanceInfo.getPeers()); span.setComponent(ComponentsDefine.REST_HIGH_LEVEL_CLIENT); Tags.DB_TYPE.set(span, DB_TYPE); @@ -56,15 +54,15 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, - Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientIndicesMethodsInterceptor.java b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientIndicesMethodsInterceptor.java index 5a6c337052db..5206b564dffe 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientIndicesMethodsInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientIndicesMethodsInterceptor.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.elasticsearch.v6.interceptor; import java.lang.reflect.Method; @@ -23,30 +24,26 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; import org.apache.skywalking.apm.plugin.elasticsearch.v6.RestClientEnhanceInfo; -/** - * @author aderm - */ -public class RestHighLevelClientIndicesMethodsInterceptor implements - InstanceMethodsAroundInterceptor { +public class RestHighLevelClientIndicesMethodsInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { if (ret instanceof EnhancedInstance) { - ((EnhancedInstance)ret).setSkyWalkingDynamicField((RestClientEnhanceInfo)(objInst.getSkyWalkingDynamicField())); + ((EnhancedInstance) ret).setSkyWalkingDynamicField((RestClientEnhanceInfo) (objInst.getSkyWalkingDynamicField())); } return ret; } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, - Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { } } diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientSearchMethodsInterceptor.java b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientSearchMethodsInterceptor.java index d23ed43fb217..6d33ea5571d8 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientSearchMethodsInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientSearchMethodsInterceptor.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.elasticsearch.v6.interceptor; import static org.apache.skywalking.apm.agent.core.conf.Config.Plugin.Elasticsearch.TRACE_DSL; @@ -33,18 +34,15 @@ import org.apache.skywalking.apm.plugin.elasticsearch.v6.RestClientEnhanceInfo; import org.elasticsearch.action.search.SearchRequest; -/** - * @author aderm - */ public class RestHighLevelClientSearchMethodsInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - SearchRequest searchRequest = (SearchRequest)(allArguments[0]); + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { + SearchRequest searchRequest = (SearchRequest) (allArguments[0]); - RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo)(objInst.getSkyWalkingDynamicField()); - AbstractSpan span = ContextManager - .createExitSpan(Constants.SEARCH_OPERATOR_NAME, restClientEnhanceInfo.getPeers()); + RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) (objInst.getSkyWalkingDynamicField()); + AbstractSpan span = ContextManager.createExitSpan(Constants.SEARCH_OPERATOR_NAME, restClientEnhanceInfo.getPeers()); span.setComponent(ComponentsDefine.REST_HIGH_LEVEL_CLIENT); Tags.DB_TYPE.set(span, DB_TYPE); @@ -57,15 +55,15 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, - Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientUpdateMethodsInterceptor.java b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientUpdateMethodsInterceptor.java index 317be0b3dadc..c02599999911 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientUpdateMethodsInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientUpdateMethodsInterceptor.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.elasticsearch.v6.interceptor; import static org.apache.skywalking.apm.agent.core.conf.Config.Plugin.Elasticsearch.TRACE_DSL; @@ -32,18 +33,15 @@ import org.apache.skywalking.apm.plugin.elasticsearch.v6.RestClientEnhanceInfo; import org.elasticsearch.action.update.UpdateRequest; -/** - * @author aderm - */ public class RestHighLevelClientUpdateMethodsInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - UpdateRequest updateRequest = (UpdateRequest)(allArguments[0]); + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { + UpdateRequest updateRequest = (UpdateRequest) (allArguments[0]); - RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo)(objInst.getSkyWalkingDynamicField()); - AbstractSpan span = ContextManager - .createExitSpan(Constants.UPDATE_OPERATOR_NAME, restClientEnhanceInfo.getPeers()); + RestClientEnhanceInfo restClientEnhanceInfo = (RestClientEnhanceInfo) (objInst.getSkyWalkingDynamicField()); + AbstractSpan span = ContextManager.createExitSpan(Constants.UPDATE_OPERATOR_NAME, restClientEnhanceInfo.getPeers()); span.setComponent(ComponentsDefine.REST_HIGH_LEVEL_CLIENT); Tags.DB_TYPE.set(span, DB_TYPE); @@ -56,15 +54,15 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, - Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/IndicesClientCreateMethodsInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/IndicesClientCreateMethodsInterceptorTest.java index 267dc733a5c0..17e9e6c471ba 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/IndicesClientCreateMethodsInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/IndicesClientCreateMethodsInterceptorTest.java @@ -17,11 +17,6 @@ package org.apache.skywalking.apm.plugin.elasticsearch.v6.interceptor; -import static org.apache.skywalking.apm.agent.core.conf.Config.Plugin.Elasticsearch.TRACE_DSL; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.*; -import static org.powermock.api.mockito.PowerMockito.when; - import java.util.List; import org.apache.skywalking.apm.agent.core.context.trace.AbstractTracingSpan; import org.apache.skywalking.apm.agent.core.context.trace.ExitSpan; @@ -47,9 +42,10 @@ import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.modules.junit4.PowerMockRunnerDelegate; -/** - * @author aderm - */ +import static org.apache.skywalking.apm.agent.core.conf.Config.Plugin.Elasticsearch.TRACE_DSL; +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertThat; +import static org.powermock.api.mockito.PowerMockito.when; @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(TracingSegmentRunner.class) @@ -105,7 +101,7 @@ public void testMethodsAround() throws Throwable { private void assertCreateSpan(AbstractTracingSpan createSpan) { assertThat(createSpan instanceof ExitSpan, is(true)); - ExitSpan exitSpan = (ExitSpan)createSpan; + ExitSpan exitSpan = (ExitSpan) createSpan; assertThat(exitSpan.getOperationName(), is("Elasticsearch/CreateRequest")); assertThat(exitSpan.getPeer(), is("172.0.0.1:9200")); assertThat(SpanHelper.getComponentId(exitSpan), is(77)); diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/IndicesClientDeleteMethodsInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/IndicesClientDeleteMethodsInterceptorTest.java index 2428ca44c59b..8d1dbf4748db 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/IndicesClientDeleteMethodsInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/IndicesClientDeleteMethodsInterceptorTest.java @@ -17,10 +17,6 @@ package org.apache.skywalking.apm.plugin.elasticsearch.v6.interceptor; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.*; -import static org.powermock.api.mockito.PowerMockito.when; - import java.util.List; import org.apache.skywalking.apm.agent.core.context.trace.AbstractTracingSpan; import org.apache.skywalking.apm.agent.core.context.trace.ExitSpan; @@ -45,9 +41,10 @@ import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.modules.junit4.PowerMockRunnerDelegate; -/** - * @author aderm - */ +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertThat; +import static org.powermock.api.mockito.PowerMockito.when; + @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(TracingSegmentRunner.class) public class IndicesClientDeleteMethodsInterceptorTest { @@ -96,7 +93,7 @@ public void testMethodsAround() throws Throwable { private void assertDeleteSpan(AbstractTracingSpan deleteSpan) { assertThat(deleteSpan instanceof ExitSpan, is(true)); - ExitSpan exitSpan = (ExitSpan)deleteSpan; + ExitSpan exitSpan = (ExitSpan) deleteSpan; assertThat(exitSpan.getOperationName(), is("Elasticsearch/DeleteRequest")); assertThat(exitSpan.getPeer(), is("172.0.0.1:9200")); assertThat(SpanHelper.getComponentId(exitSpan), is(77)); diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientConInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientConInterceptorTest.java index 1a4902ed17d7..eda7e16d0fcc 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientConInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientConInterceptorTest.java @@ -17,10 +17,6 @@ package org.apache.skywalking.apm.plugin.elasticsearch.v6.interceptor; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.*; -import static org.powermock.api.mockito.PowerMockito.when; - import java.util.ArrayList; import java.util.List; import org.apache.http.HttpHost; @@ -38,12 +34,16 @@ import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.modules.junit4.PowerMockRunnerDelegate; -/** - * @author aderm - */ +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertThat; +import static org.powermock.api.mockito.PowerMockito.when; + @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(TracingSegmentRunner.class) -@PrepareForTest(value = {RestClientBuilder.class, HttpHost.class}) +@PrepareForTest(value = { + RestClientBuilder.class, + HttpHost.class +}) public class RestHighLevelClientConInterceptorTest { @Mock @@ -64,7 +64,7 @@ public void setUp() throws Exception { restHighLevelClientConInterceptor = new RestHighLevelClientConInterceptor(); when(restClientBuilder.build()).thenReturn(restClient); when(restClient.getNodes()).thenReturn(nodeList); - allArguments = new Object[]{restClientBuilder}; + allArguments = new Object[] {restClientBuilder}; } @Test @@ -72,6 +72,7 @@ public void testConstruct() throws Throwable { final EnhancedInstance objInst = new EnhancedInstance() { private Object object = null; + @Override public Object getSkyWalkingDynamicField() { return object; @@ -86,6 +87,6 @@ public void setSkyWalkingDynamicField(Object value) { restHighLevelClientConInterceptor.onConstruct(objInst, allArguments); assertThat(objInst.getSkyWalkingDynamicField() instanceof RestClientEnhanceInfo, is(true)); - assertThat(((RestClientEnhanceInfo)objInst.getSkyWalkingDynamicField()).getPeers(), is("127.0.0.1:9200,127.0.0.1:9300")); + assertThat(((RestClientEnhanceInfo) objInst.getSkyWalkingDynamicField()).getPeers(), is("127.0.0.1:9200,127.0.0.1:9300")); } } diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientGetMethodsInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientGetMethodsInterceptorTest.java index 3a253359591a..10d2ff86bc51 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientGetMethodsInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientGetMethodsInterceptorTest.java @@ -17,11 +17,6 @@ package org.apache.skywalking.apm.plugin.elasticsearch.v6.interceptor; -import static org.apache.skywalking.apm.agent.core.conf.Config.Plugin.Elasticsearch.TRACE_DSL; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.*; -import static org.powermock.api.mockito.PowerMockito.when; - import java.util.List; import org.apache.skywalking.apm.agent.core.context.trace.AbstractTracingSpan; import org.apache.skywalking.apm.agent.core.context.trace.ExitSpan; @@ -46,9 +41,11 @@ import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.modules.junit4.PowerMockRunnerDelegate; -/** - * @author aderm - */ +import static org.apache.skywalking.apm.agent.core.conf.Config.Plugin.Elasticsearch.TRACE_DSL; +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertThat; +import static org.powermock.api.mockito.PowerMockito.when; + @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(TracingSegmentRunner.class) public class RestHighLevelClientGetMethodsInterceptorTest { @@ -100,7 +97,7 @@ public void testMethodsAround() throws Throwable { private void assertGetSpan(AbstractTracingSpan getSpan) { assertThat(getSpan instanceof ExitSpan, is(true)); - ExitSpan exitSpan = (ExitSpan)getSpan; + ExitSpan exitSpan = (ExitSpan) getSpan; assertThat(exitSpan.getOperationName(), is("Elasticsearch/GetRequest")); assertThat(exitSpan.getPeer(), is("172.0.0.1:9200")); assertThat(SpanHelper.getComponentId(exitSpan), is(77)); diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientIndexMethodsInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientIndexMethodsInterceptorTest.java index d7c63d29a90c..3580fdb3f591 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientIndexMethodsInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientIndexMethodsInterceptorTest.java @@ -17,11 +17,6 @@ package org.apache.skywalking.apm.plugin.elasticsearch.v6.interceptor; -import static org.apache.skywalking.apm.agent.core.conf.Config.Plugin.Elasticsearch.TRACE_DSL; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.*; -import static org.powermock.api.mockito.PowerMockito.when; - import java.util.List; import org.apache.skywalking.apm.agent.core.context.trace.AbstractTracingSpan; import org.apache.skywalking.apm.agent.core.context.trace.ExitSpan; @@ -46,9 +41,11 @@ import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.modules.junit4.PowerMockRunnerDelegate; -/** - * @author aderm - */ +import static org.apache.skywalking.apm.agent.core.conf.Config.Plugin.Elasticsearch.TRACE_DSL; +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertThat; +import static org.powermock.api.mockito.PowerMockito.when; + @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(TracingSegmentRunner.class) public class RestHighLevelClientIndexMethodsInterceptorTest { @@ -100,7 +97,7 @@ public void testMethodsAround() throws Throwable { private void assertIndexSpan(AbstractTracingSpan getSpan) { assertThat(getSpan instanceof ExitSpan, is(true)); - ExitSpan exitSpan = (ExitSpan)getSpan; + ExitSpan exitSpan = (ExitSpan) getSpan; assertThat(exitSpan.getOperationName(), is("Elasticsearch/IndexRequest")); assertThat(exitSpan.getPeer(), is("172.0.0.1:9200")); assertThat(SpanHelper.getComponentId(exitSpan), is(77)); diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientSearchMethodsInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientSearchMethodsInterceptorTest.java index d387ab196a61..2969740b30f2 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientSearchMethodsInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientSearchMethodsInterceptorTest.java @@ -17,11 +17,6 @@ package org.apache.skywalking.apm.plugin.elasticsearch.v6.interceptor; -import static org.apache.skywalking.apm.agent.core.conf.Config.Plugin.Elasticsearch.TRACE_DSL; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.*; -import static org.powermock.api.mockito.PowerMockito.when; - import java.util.List; import org.apache.skywalking.apm.agent.core.context.trace.AbstractTracingSpan; import org.apache.skywalking.apm.agent.core.context.trace.ExitSpan; @@ -47,9 +42,11 @@ import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.modules.junit4.PowerMockRunnerDelegate; -/** - * @author aderm - */ +import static org.apache.skywalking.apm.agent.core.conf.Config.Plugin.Elasticsearch.TRACE_DSL; +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertThat; +import static org.powermock.api.mockito.PowerMockito.when; + @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(TracingSegmentRunner.class) @PrepareForTest(SearchRequest.class) @@ -102,7 +99,7 @@ public void testMethodsAround() throws Throwable { private void assertSearchSpan(AbstractTracingSpan getSpan) { assertThat(getSpan instanceof ExitSpan, is(true)); - ExitSpan exitSpan = (ExitSpan)getSpan; + ExitSpan exitSpan = (ExitSpan) getSpan; assertThat(exitSpan.getOperationName(), is("Elasticsearch/SearchRequest")); assertThat(exitSpan.getPeer(), is("172.0.0.1:9200")); assertThat(SpanHelper.getComponentId(exitSpan), is(77)); diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientUpdateMethodsInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientUpdateMethodsInterceptorTest.java index 6189429b93fe..e6424203eb07 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientUpdateMethodsInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientUpdateMethodsInterceptorTest.java @@ -17,11 +17,6 @@ package org.apache.skywalking.apm.plugin.elasticsearch.v6.interceptor; -import static org.apache.skywalking.apm.agent.core.conf.Config.Plugin.Elasticsearch.TRACE_DSL; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.*; -import static org.powermock.api.mockito.PowerMockito.when; - import java.util.List; import org.apache.skywalking.apm.agent.core.context.trace.AbstractTracingSpan; import org.apache.skywalking.apm.agent.core.context.trace.ExitSpan; @@ -46,9 +41,11 @@ import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.modules.junit4.PowerMockRunnerDelegate; -/** - * @author aderm - */ +import static org.apache.skywalking.apm.agent.core.conf.Config.Plugin.Elasticsearch.TRACE_DSL; +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertThat; +import static org.powermock.api.mockito.PowerMockito.when; + @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(TracingSegmentRunner.class) public class RestHighLevelClientUpdateMethodsInterceptorTest { @@ -100,7 +97,7 @@ public void testMethodsAround() throws Throwable { private void assertUpdateSpan(AbstractTracingSpan getSpan) { assertThat(getSpan instanceof ExitSpan, is(true)); - ExitSpan exitSpan = (ExitSpan)getSpan; + ExitSpan exitSpan = (ExitSpan) getSpan; assertThat(exitSpan.getOperationName(), is("Elasticsearch/UpdateRequest")); assertThat(exitSpan.getPeer(), is("172.0.0.1:9200")); assertThat(SpanHelper.getComponentId(exitSpan), is(77)); diff --git a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/pom.xml index 64befcd0d794..d5def2944934 100644 --- a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + org.apache.skywalking apm-sdk-plugin diff --git a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/feign/http/v9/DefaultHttpClientInterceptor.java b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/feign/http/v9/DefaultHttpClientInterceptor.java index e0cc50defd29..bb8788643e23 100644 --- a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/feign/http/v9/DefaultHttpClientInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/feign/http/v9/DefaultHttpClientInterceptor.java @@ -44,8 +44,6 @@ /** * {@link DefaultHttpClientInterceptor} intercept the default implementation of http calls by the Feign. - * - * @author peng-yongsheng */ public class DefaultHttpClientInterceptor implements InstanceMethodsAroundInterceptor { @@ -59,8 +57,8 @@ public class DefaultHttpClientInterceptor implements InstanceMethodsAroundInterc * @throws Throwable NoSuchFieldException or IllegalArgumentException */ @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { Request request = (Request) allArguments[0]; URL url = new URL(request.url()); ContextCarrier contextCarrier = new ContextCarrier(); @@ -112,8 +110,8 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr * @return origin ret */ @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) { Response response = (Response) ret; if (response != null) { int statusCode = response.status(); @@ -132,7 +130,7 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { AbstractSpan activeSpan = ContextManager.activeSpan(); activeSpan.log(t); activeSpan.errorOccurred(); diff --git a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/feign/http/v9/FeignResolvedURL.java b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/feign/http/v9/FeignResolvedURL.java index 0ff43590ab40..4683c0556f71 100644 --- a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/feign/http/v9/FeignResolvedURL.java +++ b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/feign/http/v9/FeignResolvedURL.java @@ -15,11 +15,11 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.feign.http.v9; /** * class for {@link PathVarInterceptor} intercept feign url resolved params in url . - * @author qiyang */ public class FeignResolvedURL { /** diff --git a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/feign/http/v9/PathVarInterceptor.java b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/feign/http/v9/PathVarInterceptor.java index 95f306e925b8..048fca93b285 100644 --- a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/feign/http/v9/PathVarInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/feign/http/v9/PathVarInterceptor.java @@ -27,41 +27,43 @@ /** * {@link PathVarInterceptor} intercept the Feign RequestTemplate args resolve ; - * - * @author qiyang */ public class PathVarInterceptor implements InstanceMethodsAroundInterceptor { static final ThreadLocal URL_CONTEXT = new ThreadLocal(); /** - * Get the {@link RequestTemplate#url()} before feign.ReflectiveFeign.BuildTemplateByResolvingArgs#resolve(Object[], RequestTemplate, Map) - * put it into the {@link PathVarInterceptor#URL_CONTEXT} + * Get the {@link RequestTemplate#url()} before feign.ReflectiveFeign.BuildTemplateByResolvingArgs#resolve(Object[], + * RequestTemplate, Map) put it into the {@link PathVarInterceptor#URL_CONTEXT} * * @param method intercept method * @param result change this result, if you want to truncate the method. */ - @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) { - RequestTemplate template = (RequestTemplate)allArguments[1]; + @Override + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) { + RequestTemplate template = (RequestTemplate) allArguments[1]; URL_CONTEXT.set(new FeignResolvedURL(template.url())); } /** - * Get the resolved {@link RequestTemplate#url()} after feign.ReflectiveFeign.BuildTemplateByResolvingArgs#resolve(Object[], RequestTemplate, Map) - * put it into the {@link PathVarInterceptor#URL_CONTEXT} + * Get the resolved {@link RequestTemplate#url()} after feign.ReflectiveFeign.BuildTemplateByResolvingArgs#resolve(Object[], + * RequestTemplate, Map) put it into the {@link PathVarInterceptor#URL_CONTEXT} + * * @param method intercept method - * @param ret the method's original return value. + * @param ret the method's original return value. * @return result without change */ - @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) { + @Override + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) { RequestTemplate resolvedTemplate = (RequestTemplate) ret; URL_CONTEXT.get().setUrl(resolvedTemplate.url()); return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { if (URL_CONTEXT.get() != null) { URL_CONTEXT.remove(); diff --git a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/feign/http/v9/define/DefaultHttpClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/feign/http/v9/define/DefaultHttpClientInstrumentation.java index 1c991abeb556..102b7aa3ef0a 100644 --- a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/feign/http/v9/define/DefaultHttpClientInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/feign/http/v9/define/DefaultHttpClientInstrumentation.java @@ -40,26 +40,32 @@ public class DefaultHttpClientInstrumentation extends ClassInstanceMethodsEnhanc */ private static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.feign.http.v9.DefaultHttpClientInterceptor"; - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName(ENHANCE_CLASS); } - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named("execute"); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } diff --git a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/feign/http/v9/define/PathVarInstrumentation.java b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/feign/http/v9/define/PathVarInstrumentation.java index 59b7a7b2dda4..4209f1ac5997 100644 --- a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/feign/http/v9/define/PathVarInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/feign/http/v9/define/PathVarInstrumentation.java @@ -40,26 +40,32 @@ public class PathVarInstrumentation extends ClassInstanceMethodsEnhancePluginDef */ private static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.feign.http.v9.PathVarInterceptor"; - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName(ENHANCE_CLASS); } - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named("resolve"); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } diff --git a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/feign/http/v9/DefaultHttpClientInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/feign/http/v9/DefaultHttpClientInterceptorTest.java index ab1c49f8e680..2bb7104209c6 100644 --- a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/feign/http/v9/DefaultHttpClientInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/feign/http/v9/DefaultHttpClientInterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.feign.http.v9; import feign.Request; @@ -58,9 +57,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -/** - * @author peng-yongsheng - */ @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(TracingSegmentRunner.class) @PrepareForTest({Response.class}) @@ -87,12 +83,18 @@ public class DefaultHttpClientInterceptorTest { @Before public void setUp() throws Exception { - PathVarInterceptor.URL_CONTEXT.set(new FeignResolvedURL("/test/{pathVar}","/test/var")); + PathVarInterceptor.URL_CONTEXT.set(new FeignResolvedURL("/test/{pathVar}", "/test/var")); Map> headers = new LinkedHashMap>(); request = Request.create("GET", "http://skywalking.org/test/var", headers, "Test".getBytes(), Charset.forName("UTF-8")); Request.Options options = new Request.Options(); - allArguments = new Object[] {request, options}; - argumentTypes = new Class[] {request.getClass(), options.getClass()}; + allArguments = new Object[] { + request, + options + }; + argumentTypes = new Class[] { + request.getClass(), + options.getClass() + }; defaultHttpClientInterceptor = new DefaultHttpClientInterceptor(); } @@ -115,7 +117,7 @@ public void testMethodsAround() throws Throwable { assertThat(tags.size(), is(2)); assertThat(tags.get(0).getValue(), is("GET")); assertThat(tags.get(1).getValue(), is("http://skywalking.org/test/var")); - assertThat(finishedSpan.getOperationName(),is("/test/{pathVar}")); + assertThat(finishedSpan.getOperationName(), is("/test/{pathVar}")); Assert.assertEquals(false, SpanHelper.getErrorOccurred(finishedSpan)); } @@ -140,7 +142,7 @@ public void testMethodsAroundError() throws Throwable { assertThat(tags.get(0).getValue(), is("GET")); assertThat(tags.get(1).getValue(), is("http://skywalking.org/test/var")); assertThat(tags.get(2).getValue(), is("404")); - assertThat(finishedSpan.getOperationName(),is("/test/{pathVar}")); + assertThat(finishedSpan.getOperationName(), is("/test/{pathVar}")); Assert.assertEquals(true, SpanHelper.getErrorOccurred(finishedSpan)); } @@ -179,7 +181,9 @@ public void testException() throws Throwable { LogDataEntity logDataEntity = SpanHelper.getLogs(finishedSpan).get(0); assertThat(logDataEntity.getLogs().size(), is(4)); assertThat(logDataEntity.getLogs().get(0).getValue(), CoreMatchers.is("error")); - assertThat(logDataEntity.getLogs().get(1).getValue(), CoreMatchers.is(NullPointerException.class.getName())); + assertThat(logDataEntity.getLogs() + .get(1) + .getValue(), CoreMatchers.is(NullPointerException.class.getName())); assertThat(logDataEntity.getLogs().get(2).getValue(), is("testException")); assertNotNull(logDataEntity.getLogs().get(3).getValue()); } diff --git a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/feign/http/v9/PathVarInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/feign/http/v9/PathVarInterceptorTest.java index 1e6f1d6cfc12..7c803c8aa317 100644 --- a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/feign/http/v9/PathVarInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/feign/http/v9/PathVarInterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.feign.http.v9; import feign.RequestTemplate; @@ -35,9 +34,6 @@ import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; -/** - * @author qiyang - */ @RunWith(PowerMockRunner.class) public class PathVarInterceptorTest { @@ -64,19 +60,27 @@ public void setUp() { resolvedTemplate.append("http://skywalking.org/value"); Map variables = new HashMap(); - variables.put("pathVar","value"); - allArguments = new Object[] {new Object[]{}, template,variables}; - argumentTypes = new Class[] {Object[].class, RequestTemplate.class,Map.class}; + variables.put("pathVar", "value"); + allArguments = new Object[] { + new Object[] {}, + template, + variables + }; + argumentTypes = new Class[] { + Object[].class, + RequestTemplate.class, + Map.class + }; pathVarInterceptor = new PathVarInterceptor(); } @Test public void testMethodsAround() throws Throwable { - pathVarInterceptor.beforeMethod(enhancedInstance,null,allArguments,argumentTypes,result); - pathVarInterceptor.afterMethod(enhancedInstance,null,allArguments,argumentTypes,resolvedTemplate); - assertThat(PathVarInterceptor.URL_CONTEXT.get().getOriginUrl(),is("http://skywalking.org/{pathVar}")); - assertThat(PathVarInterceptor.URL_CONTEXT.get().getUrl(),is("http://skywalking.org/value")); + pathVarInterceptor.beforeMethod(enhancedInstance, null, allArguments, argumentTypes, result); + pathVarInterceptor.afterMethod(enhancedInstance, null, allArguments, argumentTypes, resolvedTemplate); + assertThat(PathVarInterceptor.URL_CONTEXT.get().getOriginUrl(), is("http://skywalking.org/{pathVar}")); + assertThat(PathVarInterceptor.URL_CONTEXT.get().getUrl(), is("http://skywalking.org/value")); } @After diff --git a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml index 0f84bd707995..6bbdbe1c83e2 100644 --- a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + 4.0.0 org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/Constants.java b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/Constants.java index f46ce28ac7e9..532dffbe8821 100644 --- a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/Constants.java +++ b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/Constants.java @@ -20,8 +20,6 @@ /** * Constant variables - * - * @author zhang xin, wang zheng, kanro */ public class Constants { @@ -37,14 +35,14 @@ public class Constants { /** * Operation name for request message received on server or sent on client. - * + *

* Spans of this operations just be create with request stream calls. */ public static final String REQUEST_ON_MESSAGE_OPERATION_NAME = "/Request/onMessage"; /** * Operation name for client has completed request sending, there are no more incoming request. - * + *

* It should happen with half close state usually. */ public static final String REQUEST_ON_COMPLETE_OPERATION_NAME = "/Request/onComplete"; @@ -56,14 +54,14 @@ public class Constants { /** * Operation name for response message received on client or sent on server. - * + *

* Spans of this operations just be create with response stream calls. */ public static final String RESPONSE_ON_MESSAGE_OPERATION_NAME = "/Response/onMessage"; /** * Operation name for call closed with status and trailers. - * + *

* Exceptions will be logs here. */ public static final String RESPONSE_ON_CLOSE_OPERATION_NAME = "/Response/onClose"; diff --git a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/OperationNameFormatUtil.java b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/OperationNameFormatUtil.java index 245d6b3dc2a4..43e780710a7f 100644 --- a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/OperationNameFormatUtil.java +++ b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/OperationNameFormatUtil.java @@ -22,8 +22,6 @@ /** * Operation Name utility - * - * @author zhangxin */ public class OperationNameFormatUtil { diff --git a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/client/AbstractStubInterceptor.java b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/client/AbstractStubInterceptor.java index ebc2df0a8b20..4db22b05075a 100644 --- a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/client/AbstractStubInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/client/AbstractStubInterceptor.java @@ -29,8 +29,6 @@ /** * {@link AbstractStubInterceptor} add the interceptor for every ClientCall. - * - * @author zhang xin, kanro */ public class AbstractStubInterceptor implements InstanceMethodsAroundInterceptor, InstanceConstructorInterceptor { @Override @@ -41,17 +39,17 @@ public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { } @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { + Object ret) throws Throwable { return objInst.getSkyWalkingDynamicField(); } @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { } } diff --git a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/client/BlockingCallInterceptor.java b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/client/BlockingCallInterceptor.java index 890389f945e3..a55d9f33a67b 100644 --- a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/client/BlockingCallInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/client/BlockingCallInterceptor.java @@ -32,14 +32,11 @@ import static org.apache.skywalking.apm.plugin.grpc.v1.Constants.BLOCKING_CALL_EXIT_SPAN; import static org.apache.skywalking.apm.plugin.grpc.v1.OperationNameFormatUtil.formatOperationName; -/** - * @author zhang xin, kanro - */ public class BlockingCallInterceptor implements StaticMethodsAroundInterceptor { @Override public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, - MethodInterceptResult result) { + MethodInterceptResult result) { Channel channel = (Channel) allArguments[0]; MethodDescriptor methodDescriptor = (MethodDescriptor) allArguments[1]; final AbstractSpan span = ContextManager.createExitSpan(formatOperationName(methodDescriptor), channel.authority()); @@ -50,14 +47,14 @@ public void beforeMethod(Class clazz, Method method, Object[] allArguments, Clas @Override public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, - Object ret) { + Object ret) { ContextManager.stopSpan(); return ret; } @Override public void handleMethodException(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, - Throwable t) { + Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/client/ClientInterceptor.java b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/client/ClientInterceptor.java index 21f31d7b7b2a..5bbe6cc7164c 100644 --- a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/client/ClientInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/client/ClientInterceptor.java @@ -23,14 +23,11 @@ import io.grpc.ClientCall; import io.grpc.MethodDescriptor; -/** - * @author zhang xin, kanro - */ public class ClientInterceptor implements io.grpc.ClientInterceptor { @Override public ClientCall interceptCall(MethodDescriptor method, - CallOptions callOptions, Channel channel) { + CallOptions callOptions, Channel channel) { return new TracingClientCall<>(channel.newCall(method, callOptions), method, channel); } } diff --git a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/client/TracingClientCall.java b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/client/TracingClientCall.java index dde2198c2e88..908a58514c8f 100644 --- a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/client/TracingClientCall.java +++ b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/client/TracingClientCall.java @@ -18,7 +18,14 @@ package org.apache.skywalking.apm.plugin.grpc.v1.client; -import io.grpc.*; +import io.grpc.Channel; +import io.grpc.ClientCall; +import io.grpc.ForwardingClientCall; +import io.grpc.ForwardingClientCallListener; +import io.grpc.Metadata; +import io.grpc.MethodDescriptor; +import io.grpc.Status; +import javax.annotation.Nullable; import org.apache.skywalking.apm.agent.core.context.CarrierItem; import org.apache.skywalking.apm.agent.core.context.ContextCarrier; import org.apache.skywalking.apm.agent.core.context.ContextManager; @@ -29,15 +36,17 @@ import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; import org.apache.skywalking.apm.plugin.grpc.v1.OperationNameFormatUtil; -import javax.annotation.Nullable; - -import static org.apache.skywalking.apm.plugin.grpc.v1.Constants.*; +import static org.apache.skywalking.apm.plugin.grpc.v1.Constants.BLOCKING_CALL_EXIT_SPAN; +import static org.apache.skywalking.apm.plugin.grpc.v1.Constants.CLIENT; +import static org.apache.skywalking.apm.plugin.grpc.v1.Constants.REQUEST_ON_CANCEL_OPERATION_NAME; +import static org.apache.skywalking.apm.plugin.grpc.v1.Constants.REQUEST_ON_COMPLETE_OPERATION_NAME; +import static org.apache.skywalking.apm.plugin.grpc.v1.Constants.REQUEST_ON_MESSAGE_OPERATION_NAME; +import static org.apache.skywalking.apm.plugin.grpc.v1.Constants.RESPONSE_ON_CLOSE_OPERATION_NAME; +import static org.apache.skywalking.apm.plugin.grpc.v1.Constants.RESPONSE_ON_MESSAGE_OPERATION_NAME; import static org.apache.skywalking.apm.plugin.grpc.v1.OperationNameFormatUtil.formatOperationName; /** * Fully client tracing for gRPC servers. - * - * @author zhang xin, kanro */ class TracingClientCall extends ForwardingClientCall.SimpleForwardingClientCall { @@ -47,7 +56,8 @@ class TracingClientCall extends ForwardingClientCall.SimpleFo private final MethodDescriptor methodDescriptor; private ContextSnapshot snapshot; - TracingClientCall(ClientCall delegate, MethodDescriptor method, Channel channel) { + TracingClientCall(ClientCall delegate, MethodDescriptor method, + Channel channel) { super(delegate); this.methodDescriptor = method; @@ -58,7 +68,8 @@ class TracingClientCall extends ForwardingClientCall.SimpleFo @Override public void start(Listener responseListener, Metadata headers) { - final AbstractSpan blockingSpan = (AbstractSpan) ContextManager.getRuntimeContext().get(BLOCKING_CALL_EXIT_SPAN); + final AbstractSpan blockingSpan = (AbstractSpan) ContextManager.getRuntimeContext() + .get(BLOCKING_CALL_EXIT_SPAN); final ContextCarrier contextCarrier = new ContextCarrier(); // Avoid create ExitSpan repeatedly, ExitSpan of blocking calls will create by BlockingCallInterceptor. diff --git a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/define/AbstractServerImplBuilderInstrumentation.java b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/define/AbstractServerImplBuilderInstrumentation.java index d57b09ba3acc..e0823d9301fb 100644 --- a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/define/AbstractServerImplBuilderInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/define/AbstractServerImplBuilderInstrumentation.java @@ -36,29 +36,35 @@ public class AbstractServerImplBuilderInstrumentation extends ClassInstanceMetho public static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.grpc.v1.server.AbstractServerImplBuilderInterceptor"; public static final String ARGUMENT_TYPE = "io.grpc.ServerServiceDefinition"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(ENHANCE_METHOD).and(takesArgumentWithType(0, ARGUMENT_TYPE)); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return true; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName(ENHANCE_CLASS); } } diff --git a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/define/AbstractStubInstrumentation.java b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/define/AbstractStubInstrumentation.java index db34681d5bf2..4418c1e6965f 100644 --- a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/define/AbstractStubInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/define/AbstractStubInstrumentation.java @@ -39,36 +39,43 @@ public class AbstractStubInstrumentation extends ClassInstanceMethodsEnhancePlug public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { - @Override public ElementMatcher getConstructorMatcher() { + @Override + public ElementMatcher getConstructorMatcher() { return takesArguments(2); } - @Override public String getConstructorInterceptor() { + @Override + public String getConstructorInterceptor() { return INTERCEPT_CLASS; } } }; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(ENHANCE_METHOD); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName(ENHANCE_CLASS); } } diff --git a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/define/ClientCallsInstrumentation.java b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/define/ClientCallsInstrumentation.java index 99beb9c0eda5..5a9e9749d397 100644 --- a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/define/ClientCallsInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/define/ClientCallsInstrumentation.java @@ -28,32 +28,34 @@ import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * @author zhang xin - */ public class ClientCallsInstrumentation extends ClassStaticMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "io.grpc.stub.ClientCalls"; private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.grpc.v1.client.BlockingCallInterceptor"; - @Override public StaticMethodsInterceptPoint[] getStaticMethodsInterceptPoints() { + @Override + public StaticMethodsInterceptPoint[] getStaticMethodsInterceptPoints() { return new StaticMethodsInterceptPoint[] { new StaticMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named("blockingUnaryCall").and(takesArgumentWithType(1, "io.grpc.MethodDescriptor")); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return INTERCEPTOR_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName(ENHANCE_CLASS); } } diff --git a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/server/AbstractServerImplBuilderInterceptor.java b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/server/AbstractServerImplBuilderInterceptor.java index 251217cad65c..605c785bd6c3 100644 --- a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/server/AbstractServerImplBuilderInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/server/AbstractServerImplBuilderInterceptor.java @@ -28,27 +28,24 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; /** - * {@link AbstractServerImplBuilderInterceptor} add the {@link ServerInterceptor} interceptor for every - * ServerService. - * - * @author zhang xin + * {@link AbstractServerImplBuilderInterceptor} add the {@link ServerInterceptor} interceptor for every ServerService. */ public class AbstractServerImplBuilderInterceptor implements InstanceMethodsAroundInterceptor { @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) { + MethodInterceptResult result) { allArguments[0] = ServerInterceptors.intercept((ServerServiceDefinition) allArguments[0], new ServerInterceptor()); } @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) { + Object ret) { return ret; } @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { } } diff --git a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/server/ServerInterceptor.java b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/server/ServerInterceptor.java index 3113fca23f21..6b900d360479 100644 --- a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/server/ServerInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/server/ServerInterceptor.java @@ -30,12 +30,10 @@ import org.apache.skywalking.apm.plugin.grpc.v1.OperationNameFormatUtil; import org.apache.skywalking.apm.util.StringUtil; -/** - * @author zhang xin, wang zheng, kanro - */ public class ServerInterceptor implements io.grpc.ServerInterceptor { @Override - public ServerCall.Listener interceptCall(ServerCall call, Metadata headers, ServerCallHandler handler) { + public ServerCall.Listener interceptCall(ServerCall call, + Metadata headers, ServerCallHandler handler) { final ContextCarrier contextCarrier = new ContextCarrier(); CarrierItem next = contextCarrier.items(); while (next.hasNext()) { @@ -50,7 +48,8 @@ public ServerCall.Listener interceptCall(ServerCall span.setComponent(ComponentsDefine.GRPC); span.setLayer(SpanLayer.RPC_FRAMEWORK); try { - return new TracingServerCallListener<>(handler.startCall(new TracingServerCall<>(call, ContextManager.capture()), headers), call.getMethodDescriptor(), ContextManager.capture()); + return new TracingServerCallListener<>(handler.startCall(new TracingServerCall<>(call, ContextManager.capture()), headers), call + .getMethodDescriptor(), ContextManager.capture()); } finally { ContextManager.stopSpan(); } diff --git a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/server/TracingServerCall.java b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/server/TracingServerCall.java index 48572bf98b6c..946705cdfd8e 100644 --- a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/server/TracingServerCall.java +++ b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/server/TracingServerCall.java @@ -30,11 +30,10 @@ import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; import org.apache.skywalking.apm.plugin.grpc.v1.OperationNameFormatUtil; -import static org.apache.skywalking.apm.plugin.grpc.v1.Constants.*; +import static org.apache.skywalking.apm.plugin.grpc.v1.Constants.RESPONSE_ON_CLOSE_OPERATION_NAME; +import static org.apache.skywalking.apm.plugin.grpc.v1.Constants.RESPONSE_ON_MESSAGE_OPERATION_NAME; +import static org.apache.skywalking.apm.plugin.grpc.v1.Constants.SERVER; -/** - * @author wang zheng, kanro - */ public class TracingServerCall extends ForwardingServerCall.SimpleForwardingServerCall { private final String operationPrefix; diff --git a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/server/TracingServerCallListener.java b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/server/TracingServerCallListener.java index eaec5510b7e2..114b776bfd68 100644 --- a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/server/TracingServerCallListener.java +++ b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/grpc/v1/server/TracingServerCallListener.java @@ -28,11 +28,11 @@ import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; import org.apache.skywalking.apm.plugin.grpc.v1.OperationNameFormatUtil; -import static org.apache.skywalking.apm.plugin.grpc.v1.Constants.*; +import static org.apache.skywalking.apm.plugin.grpc.v1.Constants.REQUEST_ON_CANCEL_OPERATION_NAME; +import static org.apache.skywalking.apm.plugin.grpc.v1.Constants.REQUEST_ON_COMPLETE_OPERATION_NAME; +import static org.apache.skywalking.apm.plugin.grpc.v1.Constants.REQUEST_ON_MESSAGE_OPERATION_NAME; +import static org.apache.skywalking.apm.plugin.grpc.v1.Constants.SERVER; -/** - * @author wang zheng, kanro - */ public class TracingServerCallListener extends ForwardingServerCallListener.SimpleForwardingServerCallListener { private final ContextSnapshot contextSnapshot; @@ -40,7 +40,7 @@ public class TracingServerCallListener extends ForwardingServerCallList private final String operationPrefix; protected TracingServerCallListener(ServerCall.Listener delegate, MethodDescriptor descriptor, - ContextSnapshot contextSnapshot) { + ContextSnapshot contextSnapshot) { super(delegate); this.contextSnapshot = contextSnapshot; this.methodType = descriptor.getType(); diff --git a/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml index 4217375d0763..a622103ff2e6 100755 --- a/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml @@ -16,7 +16,8 @@ ~ --> - + apm-sdk-plugin org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/JdbcXAConnectionConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/JdbcXAConnectionConstructorInterceptor.java index 9aaf6b3705f8..fa61b8215f63 100644 --- a/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/JdbcXAConnectionConstructorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/JdbcXAConnectionConstructorInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.h2; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; @@ -24,15 +23,13 @@ import org.apache.skywalking.apm.plugin.jdbc.trace.ConnectionInfo; /** - * {@link JdbcXAConnectionConstructorInterceptor } store {@link ConnectionInfo} - * when the client new instance of {@link org.h2.jdbcx.JdbcXAConnection}. - * - * @author zhangxin + * {@link JdbcXAConnectionConstructorInterceptor } store {@link ConnectionInfo} when the client new instance of {@link + * org.h2.jdbcx.JdbcXAConnection}. */ public class JdbcXAConnectionConstructorInterceptor implements InstanceConstructorInterceptor { @Override public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { - objInst.setSkyWalkingDynamicField(((EnhancedInstance)allArguments[2]).getSkyWalkingDynamicField()); + objInst.setSkyWalkingDynamicField(((EnhancedInstance) allArguments[2]).getSkyWalkingDynamicField()); } } diff --git a/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/PooledJdbcConnectionConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/PooledJdbcConnectionConstructorInterceptor.java index 30121a13d100..3855a83390a3 100644 --- a/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/PooledJdbcConnectionConstructorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/PooledJdbcConnectionConstructorInterceptor.java @@ -16,18 +16,14 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.h2; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor; -/** - * @author zhangxin - */ public class PooledJdbcConnectionConstructorInterceptor implements InstanceConstructorInterceptor { @Override public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { - objInst.setSkyWalkingDynamicField(((EnhancedInstance)allArguments[0]).getSkyWalkingDynamicField()); + objInst.setSkyWalkingDynamicField(((EnhancedInstance) allArguments[0]).getSkyWalkingDynamicField()); } } diff --git a/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/AbstractConnectionInstrumentation.java b/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/AbstractConnectionInstrumentation.java index 8ac046498ffd..1b12fbc65eca 100644 --- a/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/AbstractConnectionInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/AbstractConnectionInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.h2.define; import net.bytebuddy.description.method.MethodDescription; @@ -31,98 +30,118 @@ /** * {@link AbstractConnectionInstrumentation} define how to enhance the following methods that the class which extend - * {@link java.sql.Connection}. - * + * {@link java.sql.Connection}. + *

* 1. Enhance prepareStatement by org.apache.skywalking.apm.plugin.jdbc.define.JDBCPrepareStatementInterceptor * 3. Enhance prepareCall by org.apache.skywalking.apm.plugin.jdbc.define.JDBCPrepareCallInterceptor * 4. Enhance createStatement by org.apache.skywalking.apm.plugin.jdbc.define.JDBCStatementInterceptor * 5. Enhance commit, rollback, close, releaseSavepoint by org.apache.skywalking.apm.plugin.jdbc.define.ConnectionServiceMethodInterceptor - * - * @author zhangxin */ public abstract class AbstractConnectionInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(Constants.PREPARE_STATEMENT_METHOD_NAME).and(takesArguments(1)); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return Constants.PREPARE_STATEMENT_INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(Constants.PREPARE_STATEMENT_METHOD_NAME).and(takesArguments(3)); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return Constants.PREPARE_STATEMENT_INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(Constants.PREPARE_STATEMENT_METHOD_NAME).and(takesArguments(4)); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return Constants.PREPARE_STATEMENT_INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(Constants.PREPARE_CALL_METHOD_NAME); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return Constants.PREPARE_CALL_INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(Constants.CREATE_STATEMENT_METHOD_NAME); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return Constants.CREATE_STATEMENT_INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named(Constants.COMMIT_METHOD_NAME).or(named(Constants.ROLLBACK_METHOD_NAME)).or(named(Constants.CLOSE_METHOD_NAME)).or(named(Constants.RELEASE_SAVE_POINT_METHOD_NAME)); + @Override + public ElementMatcher getMethodsMatcher() { + return named(Constants.COMMIT_METHOD_NAME).or(named(Constants.ROLLBACK_METHOD_NAME)) + .or(named(Constants.CLOSE_METHOD_NAME)) + .or(named(Constants.RELEASE_SAVE_POINT_METHOD_NAME)); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return Constants.SERVICE_METHOD_INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } diff --git a/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/DriverInstrumentation.java b/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/DriverInstrumentation.java index 3d4fafd3cb12..b00106ecdd9f 100644 --- a/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/DriverInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/DriverInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.h2.define; import org.apache.skywalking.apm.plugin.jdbc.define.AbstractDriverInstrumentation; @@ -26,8 +25,6 @@ /** * {@link DriverInstrumentation} presents that skywalking intercepts {@link org.h2.Driver}. - * - * @author zhangxin */ public class DriverInstrumentation extends AbstractDriverInstrumentation { private static final String CLASS_OF_INTERCEPT_H2_DRIVER = "org.h2.Driver"; diff --git a/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/JdbcConnectionInstrumentation.java b/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/JdbcConnectionInstrumentation.java index 0b778b266766..a592ea2e494d 100644 --- a/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/JdbcConnectionInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/JdbcConnectionInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.h2.define; import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; @@ -25,13 +24,12 @@ /** * {@link JdbcConnectionInstrumentation} presents that skywalking intercepts {@link org.h2.jdbc.JdbcConnection}. - * - * @author zhangxin */ public class JdbcConnectionInstrumentation extends AbstractConnectionInstrumentation { public static final String ENHANCE_CLASS = "org.h2.jdbc.JdbcConnection"; - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName(ENHANCE_CLASS); } } diff --git a/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/JdbcXAConnectionInstrumentation.java b/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/JdbcXAConnectionInstrumentation.java index c38aebd17844..5d8cfbeff674 100644 --- a/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/JdbcXAConnectionInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/JdbcXAConnectionInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.h2.define; import net.bytebuddy.description.method.MethodDescription; @@ -29,29 +28,31 @@ /** * {@link JdbcXAConnectionInstrumentation} presents that skywalking intercepts {@link org.h2.jdbcx.JdbcXAConnection}. - * - * @author zhangxin */ public class JdbcXAConnectionInstrumentation extends AbstractConnectionInstrumentation { public static final String ENHANCE_CLASS = "org.h2.jdbcx.JdbcXAConnection"; public static final String CONSTRUCTOR_INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.jdbc.jdbc.JdbcXAConnectionConstructorInterceptor"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { - @Override public ElementMatcher getConstructorMatcher() { + @Override + public ElementMatcher getConstructorMatcher() { return any(); } - @Override public String getConstructorInterceptor() { + @Override + public String getConstructorInterceptor() { return CONSTRUCTOR_INTERCEPT_CLASS; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName(ENHANCE_CLASS); } } diff --git a/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/PooledJdbcConnectionInstrumentation.java b/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/PooledJdbcConnectionInstrumentation.java index b9fb34d79017..0b995a406a50 100644 --- a/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/PooledJdbcConnectionInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/define/PooledJdbcConnectionInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.h2.define; import net.bytebuddy.description.method.MethodDescription; @@ -30,29 +29,31 @@ /** * {@link PooledJdbcConnectionInstrumentation} presents that skywalking intercepts {@link * org.h2.jdbcx.JdbcXAConnection}. - * - * @author zhangxin */ public class PooledJdbcConnectionInstrumentation extends AbstractConnectionInstrumentation { public static final String CONSTRUCTOR_INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.jdbc.h2.PooledJdbcConnectionConstructorInterceptor"; public static final String ENHANCE_CLASS = "org.h2.jdbcx.JdbcXAConnection$PooledJdbcConnection"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { - @Override public ElementMatcher getConstructorMatcher() { + @Override + public ElementMatcher getConstructorMatcher() { return any(); } - @Override public String getConstructorInterceptor() { + @Override + public String getConstructorInterceptor() { return CONSTRUCTOR_INTERCEPT_CLASS; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); } } diff --git a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/pom.xml index ececf0506022..73726f6028d6 100644 --- a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + 4.0.0 org.apache.skywalking @@ -44,7 +45,6 @@ ${apache-httpclient.version} provided - diff --git a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/HttpClientExecuteInterceptor.java b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/HttpClientExecuteInterceptor.java index 8707f7963363..a30781737ba4 100644 --- a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/HttpClientExecuteInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/HttpClientExecuteInterceptor.java @@ -38,14 +38,15 @@ public class HttpClientExecuteInterceptor implements InstanceMethodsAroundInterceptor { - @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + @Override + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { if (allArguments[0] == null || allArguments[1] == null) { // illegal args, can't trace. ignore. return; } - final HttpHost httpHost = (HttpHost)allArguments[0]; - HttpRequest httpRequest = (HttpRequest)allArguments[1]; + final HttpHost httpHost = (HttpHost) allArguments[0]; + HttpRequest httpRequest = (HttpRequest) allArguments[1]; final ContextCarrier contextCarrier = new ContextCarrier(); String remotePeer = httpHost.getHostName() + ":" + port(httpHost); @@ -56,7 +57,7 @@ public class HttpClientExecuteInterceptor implements InstanceMethodsAroundInterc AbstractSpan span = ContextManager.createExitSpan(operationName, contextCarrier, remotePeer); span.setComponent(ComponentsDefine.HTTPCLIENT); - Tags.URL.set(span, buildSpanValue(httpHost,uri)); + Tags.URL.set(span, buildSpanValue(httpHost, uri)); Tags.HTTP.METHOD.set(span, httpRequest.getRequestLine().getMethod()); SpanLayer.asHttp(span); @@ -67,14 +68,15 @@ public class HttpClientExecuteInterceptor implements InstanceMethodsAroundInterc } } - @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + @Override + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { if (allArguments[0] == null || allArguments[1] == null) { return ret; } if (ret != null) { - HttpResponse response = (HttpResponse)ret; + HttpResponse response = (HttpResponse) ret; StatusLine responseStatusLine = response.getStatusLine(); if (responseStatusLine != null) { int statusCode = responseStatusLine.getStatusCode(); @@ -90,8 +92,9 @@ public class HttpClientExecuteInterceptor implements InstanceMethodsAroundInterc return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { AbstractSpan activeSpan = ContextManager.activeSpan(); activeSpan.errorOccurred(); activeSpan.log(t); diff --git a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/define/AbstractHttpClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/define/AbstractHttpClientInstrumentation.java index 46e0c22a2d0a..0566d499fcef 100644 --- a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/define/AbstractHttpClientInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/define/AbstractHttpClientInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.httpClient.v4.define; import net.bytebuddy.description.method.MethodDescription; @@ -28,11 +27,8 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; /** - * {@link AbstractHttpClientInstrumentation} presents that skywalking intercepts - * AbstractHttpClient#doExecute - * by using {@link HttpClientInstrumentation#INTERCEPT_CLASS}. - * - * @author zhangxin + * {@link AbstractHttpClientInstrumentation} presents that skywalking intercepts AbstractHttpClient#doExecute by using + * {@link HttpClientInstrumentation#INTERCEPT_CLASS}. */ public class AbstractHttpClientInstrumentation extends HttpClientInstrumentation { @@ -44,8 +40,8 @@ public ClassMatch enhanceClass() { } /** - * version 4.2, intercept method: execute, intercept - * public final HttpResponse execute(HttpHost target, HttpRequest request, HttpContext context) + * version 4.2, intercept method: execute, intercept public final HttpResponse execute(HttpHost target, HttpRequest + * request, HttpContext context) */ @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { diff --git a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/define/DefaultRequestDirectorInstrumentation.java b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/define/DefaultRequestDirectorInstrumentation.java index 306e9acb5307..a66616c089cd 100644 --- a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/define/DefaultRequestDirectorInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/define/DefaultRequestDirectorInstrumentation.java @@ -34,9 +34,7 @@ public class DefaultRequestDirectorInstrumentation extends HttpClientInstrumenta private static final String ENHANCE_CLASS = "org.apache.http.impl.client.DefaultRequestDirector"; /** - * DefaultRequestDirector is default implement. - * usually use in version 4.0-4.2 - * since 4.3, this class is Deprecated. + * DefaultRequestDirector is default implement. usually use in version 4.0-4.2 since 4.3, this class is Deprecated. */ @Override public ClassMatch enhanceClass() { diff --git a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/define/InternalHttpClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/define/InternalHttpClientInstrumentation.java index a49761d1501b..db24095fd7b5 100644 --- a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/define/InternalHttpClientInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/define/InternalHttpClientInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.httpClient.v4.define; import net.bytebuddy.description.method.MethodDescription; @@ -28,11 +27,8 @@ import static net.bytebuddy.matcher.ElementMatchers.named; /** - * {@link AbstractHttpClientInstrumentation} presents that skywalking intercepts - * InternalHttpClient#doExecute - * by using {@link HttpClientInstrumentation#INTERCEPT_CLASS}. - * - * @author zhangxin + * {@link AbstractHttpClientInstrumentation} presents that skywalking intercepts InternalHttpClient#doExecute by using + * {@link HttpClientInstrumentation#INTERCEPT_CLASS}. */ public class InternalHttpClientInstrumentation extends HttpClientInstrumentation { diff --git a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/define/MinimalHttpClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/define/MinimalHttpClientInstrumentation.java index 7831c53339d6..d421653d7c1b 100644 --- a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/define/MinimalHttpClientInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpClient/v4/define/MinimalHttpClientInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.httpClient.v4.define; import net.bytebuddy.description.method.MethodDescription; @@ -28,11 +27,8 @@ import static net.bytebuddy.matcher.ElementMatchers.named; /** - * {@link AbstractHttpClientInstrumentation} presents that skywalking - * intercepts MinimalHttpClient#doExecute - * by using {@link HttpClientInstrumentation#INTERCEPT_CLASS}. - * - * @author zhangxin + * {@link AbstractHttpClientInstrumentation} presents that skywalking intercepts MinimalHttpClient#doExecute by using + * {@link HttpClientInstrumentation#INTERCEPT_CLASS}. */ public class MinimalHttpClientInstrumentation extends HttpClientInstrumentation { diff --git a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/httpClient/v4/HttpClientExecuteInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/httpClient/v4/HttpClientExecuteInterceptorTest.java index ecfe4aadf325..09b632347c38 100644 --- a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/httpClient/v4/HttpClientExecuteInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/httpClient/v4/HttpClientExecuteInterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.httpClient.v4; import java.util.List; @@ -113,8 +112,14 @@ public String getUri() { }); when(httpHost.getPort()).thenReturn(8080); - allArguments = new Object[] {httpHost, request}; - argumentsType = new Class[] {httpHost.getClass(), request.getClass()}; + allArguments = new Object[] { + httpHost, + request + }; + argumentsType = new Class[] { + httpHost.getClass(), + request.getClass() + }; } @Test @@ -204,7 +209,9 @@ private void assertHttpSpanErrorLog(List logs) { LogDataEntity logData = logs.get(0); Assert.assertThat(logData.getLogs().size(), is(4)); Assert.assertThat(logData.getLogs().get(0).getValue(), CoreMatchers.is("error")); - Assert.assertThat(logData.getLogs().get(1).getValue(), CoreMatchers.is(RuntimeException.class.getName())); + Assert.assertThat(logData.getLogs() + .get(1) + .getValue(), CoreMatchers.is(RuntimeException.class.getName())); Assert.assertThat(logData.getLogs().get(2).getValue(), is("testException")); assertNotNull(logData.getLogs().get(3).getValue()); } diff --git a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/pom.xml index 0929c2f8db61..e6aa8bf2c5ed 100644 --- a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + 4.0.0 org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/HttpAsyncClientInterceptor.java b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/HttpAsyncClientInterceptor.java index d35d9bb7e07f..5e5e5be1a9e8 100644 --- a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/HttpAsyncClientInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/HttpAsyncClientInterceptor.java @@ -32,14 +32,12 @@ /** * in main thread,hold the context in thread local so we can read in the same thread. - * - * @author lican */ public class HttpAsyncClientInterceptor implements InstanceMethodsAroundInterceptor { - @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { HttpAsyncResponseConsumer consumer = (HttpAsyncResponseConsumer) allArguments[1]; HttpContext context = (HttpContext) allArguments[2]; FutureCallback callback = (FutureCallback) allArguments[3]; @@ -49,12 +47,14 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { return ret; } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { } } diff --git a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/HttpAsyncRequestExecutorInterceptor.java b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/HttpAsyncRequestExecutorInterceptor.java index 47b976177efa..0df1d23fbef1 100644 --- a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/HttpAsyncRequestExecutorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/HttpAsyncRequestExecutorInterceptor.java @@ -40,13 +40,12 @@ /** * the actual point request begin fetch the request from thread local . - * @author lican */ public class HttpAsyncRequestExecutorInterceptor implements InstanceMethodsAroundInterceptor { - @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { HttpContext context = CONTEXT_LOCAL.get(); CONTEXT_LOCAL.remove(); if (context == null) { @@ -73,12 +72,14 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { return ret; } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { } } diff --git a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/SessionRequestCompleteInterceptor.java b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/SessionRequestCompleteInterceptor.java index 4862f54eef60..31f5030256c6 100644 --- a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/SessionRequestCompleteInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/SessionRequestCompleteInterceptor.java @@ -28,15 +28,14 @@ /** * request ready(completed) so we can start our local thread span; - * - * @author lican */ public class SessionRequestCompleteInterceptor implements InstanceMethodsAroundInterceptor { public static ThreadLocal CONTEXT_LOCAL = new ThreadLocal(); @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { Object[] array = (Object[]) objInst.getSkyWalkingDynamicField(); if (array == null || array.length == 0) { return; @@ -48,16 +47,17 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } CONTEXT_LOCAL.set((HttpContext) array[1]); - } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { return ret; } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { } } diff --git a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/SessionRequestConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/SessionRequestConstructorInterceptor.java index f1553f823b35..2cd33f60e0d2 100644 --- a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/SessionRequestConstructorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/SessionRequestConstructorInterceptor.java @@ -26,7 +26,6 @@ /** * hold the snapshot in SkyWalkingDynamicField - * @author lican */ public class SessionRequestConstructorInterceptor implements InstanceConstructorInterceptor { @Override @@ -37,7 +36,10 @@ public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { return; } ContextSnapshot snapshot = ContextManager.capture(); - objInst.setSkyWalkingDynamicField(new Object[]{snapshot, CONTEXT_LOCAL.get()}); + objInst.setSkyWalkingDynamicField(new Object[] { + snapshot, + CONTEXT_LOCAL.get() + }); } CONTEXT_LOCAL.remove(); } diff --git a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/SessionRequestFailInterceptor.java b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/SessionRequestFailInterceptor.java index 39541131c40a..085f4c04dcfe 100644 --- a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/SessionRequestFailInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/SessionRequestFailInterceptor.java @@ -27,26 +27,26 @@ /** * when request fail to ready we should remove thread local in case of memory leak; - * - * @author lican */ public class SessionRequestFailInterceptor implements InstanceMethodsAroundInterceptor { - @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { //this means actual request will not started. so the span has not been created,we cannot log the status. CONTEXT_LOCAL.remove(); objInst.setSkyWalkingDynamicField(null); } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { return ret; } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { } } diff --git a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/HttpAsyncClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/HttpAsyncClientInstrumentation.java index d929cc976233..744ce0effce4 100644 --- a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/HttpAsyncClientInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/HttpAsyncClientInstrumentation.java @@ -25,14 +25,16 @@ import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; import org.apache.skywalking.apm.agent.core.plugin.match.MultiClassNameMatch; -import static net.bytebuddy.matcher.ElementMatchers.*; +import static net.bytebuddy.matcher.ElementMatchers.named; +import static net.bytebuddy.matcher.ElementMatchers.takesArgument; +import static net.bytebuddy.matcher.ElementMatchers.takesArguments; /** - * {@link HttpAsyncClientInstrumentation} indicates that the execute method in both org.apache.http.impl.nio.client.MinimalHttpAsyncClient#execute(HttpAsyncRequestProducer, HttpAsyncResponseConsumer, HttpContext, FutureCallback) - * and InternalHttpAsyncClient#execute(HttpAsyncRequestProducer, HttpAsyncResponseConsumer, HttpContext, FutureCallback) can be instrumented for single request.pipeline is not support now for some - * complex situation.this is run in main thread. - * - * @author lican + * {@link HttpAsyncClientInstrumentation} indicates that the execute method in both + * org.apache.http.impl.nio.client.MinimalHttpAsyncClient#execute(HttpAsyncRequestProducer, HttpAsyncResponseConsumer, + * HttpContext, FutureCallback) and InternalHttpAsyncClient#execute(HttpAsyncRequestProducer, HttpAsyncResponseConsumer, + * HttpContext, FutureCallback) can be instrumented for single request.pipeline is not support now for some complex + * situation.this is run in main thread. */ public class HttpAsyncClientInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -49,23 +51,23 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{new InstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named(METHOD).and(takesArguments(4) - .and(takesArgument(0, named(FIRST_ARG_TYPE)))); - } + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named(METHOD).and(takesArguments(4).and(takesArgument(0, named(FIRST_ARG_TYPE)))); + } - @Override - public String getMethodsInterceptor() { - return INTERCEPTOR_CLASS; - } + @Override + public String getMethodsInterceptor() { + return INTERCEPTOR_CLASS; + } - @Override - public boolean isOverrideArgs() { - return true; + @Override + public boolean isOverrideArgs() { + return true; + } } - } }; } diff --git a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/HttpAsyncRequestExecutorInstrumentation.java b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/HttpAsyncRequestExecutorInstrumentation.java index f38458a50be1..22f8b00d0319 100644 --- a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/HttpAsyncRequestExecutorInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/HttpAsyncRequestExecutorInstrumentation.java @@ -29,8 +29,6 @@ /** * {@link HttpAsyncRequestExecutorInstrumentation} indicates the real request start location in method requestReady - * - * @author lican */ public class HttpAsyncRequestExecutorInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -45,22 +43,23 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{new InstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named(METHOD); - } + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named(METHOD); + } - @Override - public String getMethodsInterceptor() { - return INTERCEPTOR_CLASS; - } + @Override + public String getMethodsInterceptor() { + return INTERCEPTOR_CLASS; + } - @Override - public boolean isOverrideArgs() { - return false; + @Override + public boolean isOverrideArgs() { + return false; + } } - } }; } diff --git a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/SessionRequestInstrumentation.java b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/SessionRequestInstrumentation.java index 505199dc089d..a70d312c1391 100644 --- a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/SessionRequestInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/define/SessionRequestInstrumentation.java @@ -29,10 +29,9 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; /** - * this is a bridge for main thread and real request thread which mean hold the {@link org.apache.skywalking.apm.agent.core.context.ContextSnapshot} object to be continued - * in "completed" method.that is mean the request is ready to submit - * - * @author lican + * this is a bridge for main thread and real request thread which mean hold the {@link + * org.apache.skywalking.apm.agent.core.context.ContextSnapshot} object to be continued in "completed" method.that is + * mean the request is ready to submit */ public class SessionRequestInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -47,53 +46,56 @@ public class SessionRequestInstrumentation extends ClassInstanceMethodsEnhancePl @Override public 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_INTERCEPTOR_CLASS; + @Override + public String getConstructorInterceptor() { + return CONSTRUCTOR_INTERCEPTOR_CLASS; + } } - } }; } @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{new InstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named(COMPLETED_METHOD); - } + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named(COMPLETED_METHOD); + } - @Override - public String getMethodsInterceptor() { - return SUCCESS_INTERCEPTOR_CLASS; - } + @Override + public String getMethodsInterceptor() { + return SUCCESS_INTERCEPTOR_CLASS; + } - @Override - public boolean isOverrideArgs() { - return false; - } - },new InstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named(TIMEOUT_METHOD).or(named(FAILED_METHOD).or(named(CANCEL_METHOD))); - } + @Override + public boolean isOverrideArgs() { + return false; + } + }, + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named(TIMEOUT_METHOD).or(named(FAILED_METHOD).or(named(CANCEL_METHOD))); + } - @Override - public String getMethodsInterceptor() { - return FAIL_INTERCEPTOR_CLASS; - } + @Override + public String getMethodsInterceptor() { + return FAIL_INTERCEPTOR_CLASS; + } - @Override - public boolean isOverrideArgs() { - return false; + @Override + public boolean isOverrideArgs() { + return false; + } } - } }; } diff --git a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/wrapper/FutureCallbackWrapper.java b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/wrapper/FutureCallbackWrapper.java index 316009f87bad..597980d8fdb1 100644 --- a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/wrapper/FutureCallbackWrapper.java +++ b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/wrapper/FutureCallbackWrapper.java @@ -23,10 +23,9 @@ import static org.apache.skywalking.apm.plugin.httpasyncclient.v4.SessionRequestCompleteInterceptor.CONTEXT_LOCAL; /** - * a wrapper for {@link FutureCallback} so we can be notified when the hold response - * (when one or more request fails the pipeline mode may not callback though we haven't support pipeline) - * received whether it fails or completed or canceled. - * @author lican + * a wrapper for {@link FutureCallback} so we can be notified when the hold response (when one or more request fails the + * pipeline mode may not callback though we haven't support pipeline) received whether it fails or completed or + * canceled. */ public class FutureCallbackWrapper implements FutureCallback { diff --git a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/wrapper/HttpAsyncResponseConsumerWrapper.java b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/wrapper/HttpAsyncResponseConsumerWrapper.java index 5ff3b74026f0..c957b261e8ce 100644 --- a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/wrapper/HttpAsyncResponseConsumerWrapper.java +++ b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/wrapper/HttpAsyncResponseConsumerWrapper.java @@ -32,10 +32,8 @@ import static org.apache.skywalking.apm.plugin.httpasyncclient.v4.SessionRequestCompleteInterceptor.CONTEXT_LOCAL; /** - * a wrapper for {@link HttpAsyncResponseConsumer} so we can be notified when the - * current response(every response will callback the wrapper) received maybe completed or canceled,or failed. - * - * @author lican + * a wrapper for {@link HttpAsyncResponseConsumer} so we can be notified when the current response(every response will + * callback the wrapper) received maybe completed or canceled,or failed. */ public class HttpAsyncResponseConsumerWrapper implements HttpAsyncResponseConsumer { diff --git a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/HttpAsyncClientInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/HttpAsyncClientInterceptorTest.java index e5ff8bc305e9..fd262c427d83 100644 --- a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/HttpAsyncClientInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/httpasyncclient/v4/HttpAsyncClientInterceptorTest.java @@ -65,9 +65,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -/** - * @author lican - */ @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(TracingSegmentRunner.class) @PrepareForTest(HttpHost.class) @@ -211,8 +208,18 @@ public void testNoContext() throws Throwable { } private Thread baseTest() throws Throwable { - Object[] allArguments = new Object[] {producer, consumer, httpContext, callback}; - Class[] types = new Class[] {HttpAsyncRequestProducer.class, HttpAsyncResponseConsumer.class, HttpContext.class, FutureCallback.class}; + Object[] allArguments = new Object[] { + producer, + consumer, + httpContext, + callback + }; + Class[] types = new Class[] { + HttpAsyncRequestProducer.class, + HttpAsyncResponseConsumer.class, + HttpContext.class, + FutureCallback.class + }; httpAsyncClientInterceptor.beforeMethod(enhancedInstance, null, allArguments, types, null); Assert.assertEquals(CONTEXT_LOCAL.get(), httpContext); Assert.assertTrue(allArguments[1] instanceof HttpAsyncResponseConsumerWrapper); diff --git a/apm-sniffer/apm-sdk-plugin/httpclient-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpclient/v3/HttpClientExecuteInterceptor.java b/apm-sniffer/apm-sdk-plugin/httpclient-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpclient/v3/HttpClientExecuteInterceptor.java index 600fb83a9e48..aa86e533483f 100644 --- a/apm-sniffer/apm-sdk-plugin/httpclient-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpclient/v3/HttpClientExecuteInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/httpclient-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpclient/v3/HttpClientExecuteInterceptor.java @@ -36,18 +36,11 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; -/** - * @author kezhenxu94 - */ public class HttpClientExecuteInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod( - final EnhancedInstance objInst, - final Method method, - final Object[] allArguments, - final Class[] argumentsTypes, - final MethodInterceptResult result) throws Throwable { + public void beforeMethod(final EnhancedInstance objInst, final Method method, final Object[] allArguments, + final Class[] argumentsTypes, final MethodInterceptResult result) throws Throwable { final HttpClient client = (HttpClient) objInst; @@ -77,12 +70,8 @@ public void beforeMethod( } @Override - public Object afterMethod( - final EnhancedInstance objInst, - final Method method, - final Object[] allArguments, - final Class[] argumentsTypes, - final Object ret) { + public Object afterMethod(final EnhancedInstance objInst, final Method method, final Object[] allArguments, + final Class[] argumentsTypes, final Object ret) { if (ret != null) { final int statusCode = (Integer) ret; @@ -98,12 +87,8 @@ public Object afterMethod( } @Override - public void handleMethodException( - final EnhancedInstance objInst, - final Method method, - final Object[] allArguments, - final Class[] argumentsTypes, - final Throwable t) { + public void handleMethodException(final EnhancedInstance objInst, final Method method, final Object[] allArguments, + final Class[] argumentsTypes, final Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/httpclient-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpclient/v3/define/HttpClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/httpclient-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpclient/v3/define/HttpClientInstrumentation.java index 22bb50604a8c..74052b9cf092 100644 --- a/apm-sniffer/apm-sdk-plugin/httpclient-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpclient/v3/define/HttpClientInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/httpclient-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/httpclient/v3/define/HttpClientInstrumentation.java @@ -30,9 +30,6 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * @author kezhenxu94 - */ public class HttpClientInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "org.apache.commons.httpclient.HttpClient"; private static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.httpclient.v3.HttpClientExecuteInterceptor"; @@ -49,15 +46,14 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { - return named("executeMethod") - .and(takesArguments(3)) - .and(takesArgument(0, named("org.apache.commons.httpclient.HostConfiguration"))) - .and(takesArgument(1, named("org.apache.commons.httpclient.HttpMethod"))) - .and(takesArgument(2, named("org.apache.commons.httpclient.HttpState"))); + return named("executeMethod").and(takesArguments(3)) + .and(takesArgument(0, named("org.apache.commons.httpclient.HostConfiguration"))) + .and(takesArgument(1, named("org.apache.commons.httpclient.HttpMethod"))) + .and(takesArgument(2, named("org.apache.commons.httpclient.HttpState"))); } @Override diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/pom.xml index 40702d10c0c0..d87bef030ff8 100644 --- a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-sdk-plugin org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/EnhanceRequireObjectCache.java b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/EnhanceRequireObjectCache.java index 2be967edea5d..3486a5abd46e 100644 --- a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/EnhanceRequireObjectCache.java +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/EnhanceRequireObjectCache.java @@ -23,8 +23,6 @@ /** * {@link EnhanceRequireObjectCache} record the prefix operation name of span and {@link ContextSnapshot} object for * tracing. - * - * @author zhang xin */ public class EnhanceRequireObjectCache { private final String operationNamePrefix; diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandConstructorInterceptor.java index e6f8aeb31685..938221ca0270 100644 --- a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandConstructorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandConstructorInterceptor.java @@ -29,8 +29,6 @@ * {@link HystrixCommandConstructorInterceptor} get CommandKey or CollapserKey as the * operation name prefix of span when the constructor that the class hierarchy com.netflix.hystrix.HystrixCommand * invoked. - * - * @author zhang xin */ public class HystrixCommandConstructorInterceptor implements InstanceConstructorInterceptor { @@ -41,16 +39,16 @@ public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { String commandIdentify = ""; if (HystrixCommand.class.isAssignableFrom(objInst.getClass())) { - HystrixCommand hystrixCommand = (HystrixCommand)objInst; + HystrixCommand hystrixCommand = (HystrixCommand) objInst; commandIdentify = hystrixCommand.getCommandKey().name(); } else if (HystrixCollapser.class.isAssignableFrom(objInst.getClass())) { - HystrixCollapser hystrixCollapser = (HystrixCollapser)objInst; + HystrixCollapser hystrixCollapser = (HystrixCollapser) objInst; commandIdentify = hystrixCollapser.getCollapserKey().name(); } else if (HystrixObservableCollapser.class.isAssignableFrom(objInst.getClass())) { - HystrixObservableCollapser hystrixObservableCollapser = (HystrixObservableCollapser)objInst; + HystrixObservableCollapser hystrixObservableCollapser = (HystrixObservableCollapser) objInst; commandIdentify = hystrixObservableCollapser.getCollapserKey().name(); } else if (HystrixObservableCommand.class.isAssignableFrom(objInst.getClass())) { - HystrixObservableCommand hystrixObservableCommand = (HystrixObservableCommand)objInst; + HystrixObservableCommand hystrixObservableCommand = (HystrixObservableCommand) objInst; commandIdentify = hystrixObservableCommand.getCommandKey().name(); } diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandGetFallbackInterceptor.java b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandGetFallbackInterceptor.java index 2dd1f4f9c15e..7225f2a700ba 100644 --- a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandGetFallbackInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandGetFallbackInterceptor.java @@ -31,7 +31,7 @@ public class HystrixCommandGetFallbackInterceptor implements InstanceMethodsArou @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - EnhanceRequireObjectCache enhanceRequireObjectCache = (EnhanceRequireObjectCache)objInst.getSkyWalkingDynamicField(); + EnhanceRequireObjectCache enhanceRequireObjectCache = (EnhanceRequireObjectCache) objInst.getSkyWalkingDynamicField(); ContextSnapshot snapshot = enhanceRequireObjectCache.getContextSnapshot(); AbstractSpan activeSpan = ContextManager.createLocalSpan(enhanceRequireObjectCache.getOperationNamePrefix() + "/Fallback"); @@ -48,7 +48,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandRunInterceptor.java b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandRunInterceptor.java index 1595f81f3c2e..2c5f32422313 100644 --- a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandRunInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandRunInterceptor.java @@ -33,7 +33,7 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr MethodInterceptResult result) throws Throwable { // create a local span, and continued, The `execution method` running in other thread if the // hystrix strategy is `THREAD`. - EnhanceRequireObjectCache enhanceRequireObjectCache = (EnhanceRequireObjectCache)objInst.getSkyWalkingDynamicField(); + EnhanceRequireObjectCache enhanceRequireObjectCache = (EnhanceRequireObjectCache) objInst.getSkyWalkingDynamicField(); ContextSnapshot snapshot = enhanceRequireObjectCache.getContextSnapshot(); AbstractSpan activeSpan = ContextManager.createLocalSpan(enhanceRequireObjectCache.getOperationNamePrefix() + "/Execution"); @@ -52,7 +52,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixConcurrencyStrategyInterceptor.java b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixConcurrencyStrategyInterceptor.java index 70480addd07c..8971201816e8 100644 --- a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixConcurrencyStrategyInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixConcurrencyStrategyInterceptor.java @@ -40,7 +40,7 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { + Object ret) throws Throwable { SWHystrixPluginsWrapperCache wrapperCache = (SWHystrixPluginsWrapperCache) objInst.getSkyWalkingDynamicField(); if (wrapperCache == null || wrapperCache.getSwHystrixConcurrencyStrategyWrapper() == null) { synchronized (objInst) { @@ -65,24 +65,20 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA private void registerSWHystrixConcurrencyStrategyWrapper(SWHystrixConcurrencyStrategyWrapper wrapper) { // Copy from Spring Cloud Sleuth - HystrixCommandExecutionHook commandExecutionHook = HystrixPlugins - .getInstance().getCommandExecutionHook(); - HystrixEventNotifier eventNotifier = HystrixPlugins.getInstance() - .getEventNotifier(); - HystrixMetricsPublisher metricsPublisher = HystrixPlugins.getInstance() - .getMetricsPublisher(); - HystrixPropertiesStrategy propertiesStrategy = HystrixPlugins.getInstance() - .getPropertiesStrategy(); + HystrixCommandExecutionHook commandExecutionHook = HystrixPlugins.getInstance().getCommandExecutionHook(); + HystrixEventNotifier eventNotifier = HystrixPlugins.getInstance().getEventNotifier(); + HystrixMetricsPublisher metricsPublisher = HystrixPlugins.getInstance().getMetricsPublisher(); + HystrixPropertiesStrategy propertiesStrategy = HystrixPlugins.getInstance().getPropertiesStrategy(); HystrixPlugins.reset(); HystrixPlugins.getInstance().registerConcurrencyStrategy(wrapper); - HystrixPlugins.getInstance() - .registerCommandExecutionHook(commandExecutionHook); + HystrixPlugins.getInstance().registerCommandExecutionHook(commandExecutionHook); HystrixPlugins.getInstance().registerEventNotifier(eventNotifier); HystrixPlugins.getInstance().registerMetricsPublisher(metricsPublisher); HystrixPlugins.getInstance().registerPropertiesStrategy(propertiesStrategy); } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { } diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixPluginsInterceptor.java b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixPluginsInterceptor.java index ec3e8b9fb9d7..890b9e7a26e4 100644 --- a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixPluginsInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixPluginsInterceptor.java @@ -33,13 +33,9 @@ /** * {@link HystrixPluginsInterceptor} wrapper the {@link HystrixCommandExecutionHook} object by using {@link * SWExecutionHookWrapper} when the {@link HystrixPlugins#getCommandExecutionHook()} method invoked. - * - * @author zhang xin */ public class HystrixPluginsInterceptor implements InstanceMethodsAroundInterceptor { - - @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { @@ -84,7 +80,8 @@ private static void registerSWExecutionHookWrapper(SWExecutionHookWrapper wrappe HystrixPlugins.getInstance().registerPropertiesStrategy(propertiesStrategy); } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { } diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWExecutionHookWrapper.java b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWExecutionHookWrapper.java index fe7cb3c6d07d..9c8df3efd522 100644 --- a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWExecutionHookWrapper.java +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWExecutionHookWrapper.java @@ -27,8 +27,6 @@ /** * {@link SWExecutionHookWrapper} wrapper the HystrixCommandExecutionHook object for tracing. - * - * @author zhang xin */ public class SWExecutionHookWrapper extends HystrixCommandExecutionHook { private final HystrixCommandExecutionHook actual; @@ -44,8 +42,8 @@ public void onStart(HystrixInvokable commandInstance) { return; } - EnhancedInstance enhancedInstance = (EnhancedInstance)commandInstance; - EnhanceRequireObjectCache enhanceRequireObjectCache = (EnhanceRequireObjectCache)enhancedInstance.getSkyWalkingDynamicField(); + EnhancedInstance enhancedInstance = (EnhancedInstance) commandInstance; + EnhanceRequireObjectCache enhanceRequireObjectCache = (EnhanceRequireObjectCache) enhancedInstance.getSkyWalkingDynamicField(); if (ContextManager.isActive()) { enhanceRequireObjectCache.setContextSnapshot(ContextManager.capture()); } @@ -82,11 +80,13 @@ public void onFallbackSuccess(HystrixInvokable commandInstance) { actual.onFallbackSuccess(commandInstance); } - @Override public Exception onRunError(HystrixInvokable commandInstance, Exception e) { + @Override + public Exception onRunError(HystrixInvokable commandInstance, Exception e) { return actual.onRunError(commandInstance, e); } - @Override public Exception onRunError(HystrixCommand commandInstance, Exception e) { + @Override + public Exception onRunError(HystrixCommand commandInstance, Exception e) { return actual.onRunError(commandInstance, e); } @@ -96,31 +96,38 @@ public Exception onError(HystrixInvokable commandInstance, HystrixRuntime return actual.onError(commandInstance, failureType, e); } - @Override public void onSuccess(HystrixInvokable commandInstance) { + @Override + public void onSuccess(HystrixInvokable commandInstance) { actual.onSuccess(commandInstance); } - @Override public T onEmit(HystrixInvokable commandInstance, T value) { + @Override + public T onEmit(HystrixInvokable commandInstance, T value) { return actual.onEmit(commandInstance, value); } - @Override public T onExecutionEmit(HystrixInvokable commandInstance, T value) { + @Override + public T onExecutionEmit(HystrixInvokable commandInstance, T value) { return actual.onExecutionEmit(commandInstance, value); } - @Override public T onFallbackEmit(HystrixInvokable commandInstance, T value) { + @Override + public T onFallbackEmit(HystrixInvokable commandInstance, T value) { return actual.onFallbackEmit(commandInstance, value); } - @Override public void onCacheHit(HystrixInvokable commandInstance) { + @Override + public void onCacheHit(HystrixInvokable commandInstance) { actual.onCacheHit(commandInstance); } - @Override public void onThreadComplete(HystrixInvokable commandInstance) { + @Override + public void onThreadComplete(HystrixInvokable commandInstance) { actual.onThreadComplete(commandInstance); } - @Override public void onThreadStart(HystrixInvokable commandInstance) { + @Override + public void onThreadStart(HystrixInvokable commandInstance) { actual.onThreadStart(commandInstance); } @@ -130,65 +137,78 @@ public Exception onError(HystrixCommand commandInstance, HystrixRuntimeEx return actual.onError(commandInstance, failureType, e); } - @Override public Exception onFallbackError(HystrixCommand commandInstance, Exception e) { + @Override + public Exception onFallbackError(HystrixCommand commandInstance, Exception e) { return actual.onFallbackError(commandInstance, e); } - @Override public T onComplete(HystrixCommand commandInstance, T response) { + @Override + public T onComplete(HystrixCommand commandInstance, T response) { return actual.onComplete(commandInstance, response); } - @Override public T onComplete(HystrixInvokable commandInstance, T response) { + @Override + public T onComplete(HystrixInvokable commandInstance, T response) { return actual.onComplete(commandInstance, response); } - @Override public T onFallbackSuccess(HystrixCommand commandInstance, T fallbackResponse) { + @Override + public T onFallbackSuccess(HystrixCommand commandInstance, T fallbackResponse) { return actual.onFallbackSuccess(commandInstance, fallbackResponse); } - @Override public T onFallbackSuccess(HystrixInvokable commandInstance, T fallbackResponse) { + @Override + public T onFallbackSuccess(HystrixInvokable commandInstance, T fallbackResponse) { return actual.onFallbackSuccess(commandInstance, fallbackResponse); } - @Override public T onRunSuccess(HystrixCommand commandInstance, T response) { + @Override + public T onRunSuccess(HystrixCommand commandInstance, T response) { return actual.onRunSuccess(commandInstance, response); } - @Override public T onRunSuccess(HystrixInvokable commandInstance, T response) { + @Override + public T onRunSuccess(HystrixInvokable commandInstance, T response) { return actual.onRunSuccess(commandInstance, response); } - @Override public void onFallbackStart(HystrixCommand commandInstance) { + @Override + public void onFallbackStart(HystrixCommand commandInstance) { actual.onFallbackStart(commandInstance); } - @Override public void onRunStart(HystrixCommand commandInstance) { + @Override + public void onRunStart(HystrixCommand commandInstance) { actual.onRunStart(commandInstance); } - @Override public void onRunStart(HystrixInvokable commandInstance) { + @Override + public void onRunStart(HystrixInvokable commandInstance) { actual.onRunStart(commandInstance); } - @Override public void onStart(HystrixCommand commandInstance) { + @Override + public void onStart(HystrixCommand commandInstance) { if (!(commandInstance instanceof EnhancedInstance)) { actual.onStart(commandInstance); return; } - EnhancedInstance enhancedInstance = (EnhancedInstance)commandInstance; - EnhanceRequireObjectCache enhanceRequireObjectCache = (EnhanceRequireObjectCache)enhancedInstance.getSkyWalkingDynamicField(); + EnhancedInstance enhancedInstance = (EnhancedInstance) commandInstance; + EnhanceRequireObjectCache enhanceRequireObjectCache = (EnhanceRequireObjectCache) enhancedInstance.getSkyWalkingDynamicField(); if (ContextManager.isActive()) { enhanceRequireObjectCache.setContextSnapshot(ContextManager.capture()); } actual.onStart(commandInstance); } - @Override public void onThreadComplete(HystrixCommand commandInstance) { + @Override + public void onThreadComplete(HystrixCommand commandInstance) { actual.onThreadComplete(commandInstance); } - @Override public void onThreadStart(HystrixCommand commandInstance) { + @Override + public void onThreadStart(HystrixCommand commandInstance) { actual.onThreadStart(commandInstance); } } diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWHystrixConcurrencyStrategyWrapper.java b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWHystrixConcurrencyStrategyWrapper.java index 55888c16eb48..0c442dadd134 100644 --- a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWHystrixConcurrencyStrategyWrapper.java +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWHystrixConcurrencyStrategyWrapper.java @@ -29,16 +29,13 @@ public class SWHystrixConcurrencyStrategyWrapper extends HystrixConcurrencyStrat private final HystrixConcurrencyStrategy delegate; - public SWHystrixConcurrencyStrategyWrapper( - HystrixConcurrencyStrategy delegate) { + public SWHystrixConcurrencyStrategyWrapper(HystrixConcurrencyStrategy delegate) { this.delegate = delegate; } @Override public Callable wrapCallable(Callable callable) { - Callable delegateCallable = delegate != null - ? delegate.wrapCallable(callable) - : super.wrapCallable(callable); + Callable delegateCallable = delegate != null ? delegate.wrapCallable(callable) : super.wrapCallable(callable); return new WrappedCallable(ContextManager.getRuntimeContext().capture(), delegateCallable); } @@ -52,7 +49,8 @@ static class WrappedCallable implements Callable { this.target = target; } - @Override public T call() throws Exception { + @Override + public T call() throws Exception { try { ContextManager.getRuntimeContext().accept(contextSnapshot); return target.call(); diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWHystrixPluginsWrapperCache.java b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWHystrixPluginsWrapperCache.java index 5b702934f94a..727d1c731144 100644 --- a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWHystrixPluginsWrapperCache.java +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWHystrixPluginsWrapperCache.java @@ -19,10 +19,8 @@ package org.apache.skywalking.apm.plugin.hystrix.v1; /** - * {@link SWHystrixPluginsWrapperCache} record the {@link SWExecutionHookWrapper} and {@link SWHystrixConcurrencyStrategyWrapper} object for - * storing in EnhancedInstance#dynamicField together. - * - * @author chenpengfei + * {@link SWHystrixPluginsWrapperCache} record the {@link SWExecutionHookWrapper} and {@link + * SWHystrixConcurrencyStrategyWrapper} object for storing in EnhancedInstance#dynamicField together. */ public class SWHystrixPluginsWrapperCache { private volatile SWExecutionHookWrapper swExecutionHookWrapper; @@ -40,7 +38,8 @@ public SWHystrixConcurrencyStrategyWrapper getSwHystrixConcurrencyStrategyWrappe return swHystrixConcurrencyStrategyWrapper; } - public void setSwHystrixConcurrencyStrategyWrapper(SWHystrixConcurrencyStrategyWrapper swHystrixConcurrencyStrategyWrapper) { + public void setSwHystrixConcurrencyStrategyWrapper( + SWHystrixConcurrencyStrategyWrapper swHystrixConcurrencyStrategyWrapper) { this.swHystrixConcurrencyStrategyWrapper = swHystrixConcurrencyStrategyWrapper; } } diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixCommandInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixCommandInstrumentation.java index 1636498caf15..33d819e92f41 100644 --- a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixCommandInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixCommandInstrumentation.java @@ -34,52 +34,63 @@ public class HystrixCommandInstrumentation extends ClassInstanceMethodsEnhancePl public static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.hystrix.v1.HystrixCommandConstructorInterceptor"; public static final String ENHANCE_CLASS = "com.netflix.hystrix.HystrixCommand"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { - @Override public ElementMatcher getConstructorMatcher() { + @Override + public ElementMatcher getConstructorMatcher() { return any(); } - @Override public String getConstructorInterceptor() { + @Override + public String getConstructorInterceptor() { return INTERCEPT_CLASS; } } }; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named("run"); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return "org.apache.skywalking.apm.plugin.hystrix.v1.HystrixCommandRunInterceptor"; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named("getFallback"); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return "org.apache.skywalking.apm.plugin.hystrix.v1.HystrixCommandGetFallbackInterceptor"; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byHierarchyMatch(new String[] {ENHANCE_CLASS}); } diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixPluginsInstrumentation.java b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixPluginsInstrumentation.java index cafcc6f29dfa..37e82a5b6e7c 100644 --- a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixPluginsInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixPluginsInstrumentation.java @@ -45,28 +45,34 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(ENHANCE_METHOD); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(GET_CONCURRENCY_STRATEGY_METHOD); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return GET_CONCURRENCY_STRATEGY_INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixConcurrencyStrategyInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixConcurrencyStrategyInterceptorTest.java index aca2a9b3a474..02c24ab3c3ab 100644 --- a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixConcurrencyStrategyInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixConcurrencyStrategyInterceptorTest.java @@ -47,7 +47,8 @@ public Object getSkyWalkingDynamicField() { return cache; } - @Override public void setSkyWalkingDynamicField(Object cache) { + @Override + public void setSkyWalkingDynamicField(Object cache) { this.cache = (SWHystrixPluginsWrapperCache) cache; } }; @@ -61,7 +62,6 @@ public void testSWHystrixConcurrencyStrategyWrapperWillBeRegistered() throws Thr assertSame(wrapperResult, HystrixPlugins.getInstance().getConcurrencyStrategy()); } - @Test public void testInterceptorWithCustomHystrixConcurrencyStrategy() throws Throwable { Object wrapperResult = getConcurrencyStrategyByInterceptor(); @@ -81,7 +81,9 @@ public void testInterceptorWithCustomHystrixConcurrencyStrategy() throws Throwab } private HystrixConcurrencyStrategy getConcurrencyStrategyByInterceptor() throws Throwable { - return (HystrixConcurrencyStrategy) hystrixConcurrencyStrategyInterceptor.afterMethod(enhancedInstance, null, null, null, HystrixPlugins.getInstance().getConcurrencyStrategy()); + return (HystrixConcurrencyStrategy) hystrixConcurrencyStrategyInterceptor.afterMethod(enhancedInstance, null, null, null, HystrixPlugins + .getInstance() + .getConcurrencyStrategy()); } static class CustomConcurrencyStrategy extends HystrixConcurrencyStrategy { diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixPluginsInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixPluginsInterceptorTest.java index 1fe553d61237..9922d5e91ef3 100644 --- a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixPluginsInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixPluginsInterceptorTest.java @@ -46,7 +46,8 @@ public Object getSkyWalkingDynamicField() { return cache; } - @Override public void setSkyWalkingDynamicField(Object cache) { + @Override + public void setSkyWalkingDynamicField(Object cache) { this.cache = (SWHystrixPluginsWrapperCache) cache; } }; @@ -60,7 +61,6 @@ public void testSWExecutionHookWrapperWillBeRegistered() throws Throwable { assertSame(wrapperResult, HystrixPlugins.getInstance().getCommandExecutionHook()); } - @Test public void testInterceptorWithCustomHystrixCommandExecutionHook() throws Throwable { Object wrapperResult = getCommandExecutionHookByInterceptor(); @@ -80,7 +80,9 @@ public void testInterceptorWithCustomHystrixCommandExecutionHook() throws Throwa } private HystrixCommandExecutionHook getCommandExecutionHookByInterceptor() throws Throwable { - return (HystrixCommandExecutionHook) hystrixPluginsInterceptor.afterMethod(enhancedInstance, null, null, null, HystrixPlugins.getInstance().getCommandExecutionHook()); + return (HystrixCommandExecutionHook) hystrixPluginsInterceptor.afterMethod(enhancedInstance, null, null, null, HystrixPlugins + .getInstance() + .getCommandExecutionHook()); } static class CustomHystrixCommandExecutionHook extends HystrixCommandExecutionHook { diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml b/apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml index 9d636816774c..b515b23a6464 100755 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml @@ -16,7 +16,8 @@ ~ --> - + apm-sdk-plugin org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/ConnectionServiceMethodInterceptor.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/ConnectionServiceMethodInterceptor.java index ef6a2ccabb54..d5b93ccf04c3 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/ConnectionServiceMethodInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/ConnectionServiceMethodInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc; import java.lang.reflect.Method; @@ -30,23 +29,18 @@ import org.apache.skywalking.apm.plugin.jdbc.trace.ConnectionInfo; /** - * {@link ConnectionServiceMethodInterceptor} create an exit span when the following methods execute: - * 1. close - * 2. rollback - * 3. releaseSavepoint - * 4. commit - * - * @author zhangxin + * {@link ConnectionServiceMethodInterceptor} create an exit span when the following methods execute: 1. close 2. + * rollback 3. releaseSavepoint 4. commit */ public class ConnectionServiceMethodInterceptor implements InstanceMethodsAroundInterceptor { @Override public final void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { - ConnectionInfo connectInfo = (ConnectionInfo)objInst.getSkyWalkingDynamicField(); + Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + ConnectionInfo connectInfo = (ConnectionInfo) objInst.getSkyWalkingDynamicField(); if (connectInfo != null) { - AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBI/Connection/" + method.getName(), connectInfo.getDatabasePeer()); + AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBI/Connection/" + method.getName(), connectInfo + .getDatabasePeer()); Tags.DB_TYPE.set(span, "sql"); Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName()); Tags.DB_STATEMENT.set(span, ""); @@ -57,16 +51,16 @@ public final void beforeMethod(EnhancedInstance objInst, Method method, Object[] @Override public final Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, - Object ret) throws Throwable { - ConnectionInfo connectInfo = (ConnectionInfo)objInst.getSkyWalkingDynamicField(); + Class[] argumentsTypes, Object ret) throws Throwable { + ConnectionInfo connectInfo = (ConnectionInfo) objInst.getSkyWalkingDynamicField(); if (connectInfo != null) { ContextManager.stopSpan(); } return ret; } - @Override public final void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public final void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/JDBCDriverInterceptor.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/JDBCDriverInterceptor.java index 1ffe7b98ac8b..a0cba0f786ea 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/JDBCDriverInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/JDBCDriverInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc; import java.lang.reflect.Method; @@ -29,26 +28,27 @@ /** * {@link JDBCDriverInterceptor} set ConnectionInfo to {@link Connection} object when {@link * java.sql.Driver} to create connection, instead of the {@link Connection} instance. - * - * @author zhangxin */ public class JDBCDriverInterceptor implements InstanceMethodsAroundInterceptor { - @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + @Override + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { } - @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + @Override + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { if (ret != null && ret instanceof EnhancedInstance) { - ((EnhancedInstance)ret).setSkyWalkingDynamicField(URLParser.parser((String)allArguments[0])); + ((EnhancedInstance) ret).setSkyWalkingDynamicField(URLParser.parser((String) allArguments[0])); } return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { } diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/JDBCPrepareCallInterceptor.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/JDBCPrepareCallInterceptor.java index 814b0ca078b1..172ac4ac04fb 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/JDBCPrepareCallInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/JDBCPrepareCallInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc; import java.lang.reflect.Method; @@ -31,8 +30,6 @@ /** * {@link JDBCPrepareCallInterceptor} return {@link SWCallableStatement} instance that wrapper the real CallStatement * instance when the client call prepareCall method. - * - * @author zhangxin */ public class JDBCPrepareCallInterceptor implements InstanceMethodsAroundInterceptor { @Override @@ -47,10 +44,11 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA if (objInst.getSkyWalkingDynamicField() == null) { return ret; } - return new SWCallableStatement((Connection)objInst, (CallableStatement)ret, (ConnectionInfo)objInst.getSkyWalkingDynamicField(), (String)allArguments[0]); + return new SWCallableStatement((Connection) objInst, (CallableStatement) ret, (ConnectionInfo) objInst.getSkyWalkingDynamicField(), (String) allArguments[0]); } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { } diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/JDBCPrepareStatementInterceptor.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/JDBCPrepareStatementInterceptor.java index 12372d1e2862..89e839f49334 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/JDBCPrepareStatementInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/JDBCPrepareStatementInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc; import java.lang.reflect.Method; @@ -31,8 +30,6 @@ /** * {@link JDBCPrepareStatementInterceptor} return {@link SWPreparedStatement} instance that wrapper the real * PreparedStatement instance when the client call prepareStatement method. - * - * @author zhangxin */ public class JDBCPrepareStatementInterceptor implements InstanceMethodsAroundInterceptor { @Override @@ -47,10 +44,11 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA if (objInst.getSkyWalkingDynamicField() == null) { return ret; } - return new SWPreparedStatement((Connection)objInst, (PreparedStatement)ret, (ConnectionInfo)objInst.getSkyWalkingDynamicField(), (String)allArguments[0]); + return new SWPreparedStatement((Connection) objInst, (PreparedStatement) ret, (ConnectionInfo) objInst.getSkyWalkingDynamicField(), (String) allArguments[0]); } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { } diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/JDBCPreparedStatementIgnorableSetterInterceptor.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/JDBCPreparedStatementIgnorableSetterInterceptor.java index 9294ad67f5a3..ed20408df55f 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/JDBCPreparedStatementIgnorableSetterInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/JDBCPreparedStatementIgnorableSetterInterceptor.java @@ -26,33 +26,23 @@ import java.lang.reflect.Method; -/** - * @author kezhenxu94 - */ public class JDBCPreparedStatementIgnorableSetterInterceptor implements InstanceMethodsAroundInterceptor { @Override public final void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { final StatementEnhanceInfos statementEnhanceInfos = (StatementEnhanceInfos) objInst.getSkyWalkingDynamicField(); final int index = (Integer) allArguments[0]; statementEnhanceInfos.setParameter(index, Constants.SQL_PARAMETER_PLACEHOLDER); } @Override - public final Object afterMethod(EnhancedInstance objInst, - Method method, - Object[] allArguments, - Class[] argumentsTypes, - Object ret) throws Throwable { + public final Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Object ret) throws Throwable { return ret; } @Override - public final void handleMethodException(EnhancedInstance objInst, - Method method, - Object[] allArguments, - Class[] argumentsTypes, - Throwable t) { + public final void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { } } diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/JDBCPreparedStatementNullSetterInstanceMethodsInterceptPoint.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/JDBCPreparedStatementNullSetterInstanceMethodsInterceptPoint.java index 04e619e39946..80c8af13bfc6 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/JDBCPreparedStatementNullSetterInstanceMethodsInterceptPoint.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/JDBCPreparedStatementNullSetterInstanceMethodsInterceptPoint.java @@ -25,9 +25,6 @@ import static net.bytebuddy.matcher.ElementMatchers.named; -/** - * @author kezhenxu94 - */ public final class JDBCPreparedStatementNullSetterInstanceMethodsInterceptPoint implements InstanceMethodsInterceptPoint { @Override public ElementMatcher getMethodsMatcher() { diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/JDBCPreparedStatementNullSetterInterceptor.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/JDBCPreparedStatementNullSetterInterceptor.java index fe721f63f75c..2d90e66442ce 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/JDBCPreparedStatementNullSetterInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/JDBCPreparedStatementNullSetterInterceptor.java @@ -25,33 +25,23 @@ import java.lang.reflect.Method; -/** - * @author kezhenxu94 - */ public class JDBCPreparedStatementNullSetterInterceptor implements InstanceMethodsAroundInterceptor { @Override public final void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { final StatementEnhanceInfos statementEnhanceInfos = (StatementEnhanceInfos) objInst.getSkyWalkingDynamicField(); final int index = (Integer) allArguments[0]; statementEnhanceInfos.setParameter(index, "NULL"); } @Override - public final Object afterMethod(EnhancedInstance objInst, - Method method, - Object[] allArguments, - Class[] argumentsTypes, - Object ret) throws Throwable { + public final Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Object ret) throws Throwable { return ret; } @Override - public final void handleMethodException(EnhancedInstance objInst, - Method method, - Object[] allArguments, - Class[] argumentsTypes, - Throwable t) { + public final void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { } } diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/JDBCPreparedStatementSetterInterceptor.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/JDBCPreparedStatementSetterInterceptor.java index 2fce63283c71..3ab0f6d920de 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/JDBCPreparedStatementSetterInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/JDBCPreparedStatementSetterInterceptor.java @@ -25,14 +25,10 @@ import java.lang.reflect.Method; -/** - * @author kezhenxu94 - */ public class JDBCPreparedStatementSetterInterceptor implements InstanceMethodsAroundInterceptor { @Override public final void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { final StatementEnhanceInfos statementEnhanceInfos = (StatementEnhanceInfos) objInst.getSkyWalkingDynamicField(); final int index = (Integer) allArguments[0]; final Object parameter = allArguments[1]; @@ -40,19 +36,13 @@ public final void beforeMethod(EnhancedInstance objInst, Method method, Object[] } @Override - public final Object afterMethod(EnhancedInstance objInst, - Method method, - Object[] allArguments, - Class[] argumentsTypes, - Object ret) throws Throwable { + public final Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Object ret) throws Throwable { return ret; } @Override - public final void handleMethodException(EnhancedInstance objInst, - Method method, - Object[] allArguments, - Class[] argumentsTypes, - Throwable t) { + public final void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { } } diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/JDBCStatementInterceptor.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/JDBCStatementInterceptor.java index 6cb99d5b4e90..ea54b29ce61a 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/JDBCStatementInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/JDBCStatementInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc; import java.lang.reflect.Method; @@ -30,8 +29,6 @@ /** * {@link JDBCStatementInterceptor} return {@link SWStatement} instance that wrapper the real Statement instance when * the client call createStatement method. - * - * @author zhangxin */ public class JDBCStatementInterceptor implements InstanceMethodsAroundInterceptor { @Override @@ -46,10 +43,11 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA if (objInst.getSkyWalkingDynamicField() == null) { return ret; } - return new SWStatement((Connection)objInst, (java.sql.Statement)ret, (ConnectionInfo)objInst.getSkyWalkingDynamicField()); + return new SWStatement((Connection) objInst, (java.sql.Statement) ret, (ConnectionInfo) objInst.getSkyWalkingDynamicField()); } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { } diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/PSSetterDefinitionOfJDBCInstrumentation.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/PSSetterDefinitionOfJDBCInstrumentation.java index 7415254bedbd..bdb890a9eb05 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/PSSetterDefinitionOfJDBCInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/PSSetterDefinitionOfJDBCInstrumentation.java @@ -31,9 +31,6 @@ import static org.apache.skywalking.apm.plugin.jdbc.define.Constants.PS_IGNORABLE_SETTERS; import static org.apache.skywalking.apm.plugin.jdbc.define.Constants.PS_SETTERS; -/** - * @author kezhenxu94 - */ public class PSSetterDefinitionOfJDBCInstrumentation implements InstanceMethodsInterceptPoint { private final boolean ignorable; @@ -57,9 +54,7 @@ public ElementMatcher getMethodsMatcher() { @Override public String getMethodsInterceptor() { - return ignorable - ? Constants.PREPARED_STATEMENT_IGNORABLE_SETTER_METHODS_INTERCEPTOR - : Constants.PREPARED_STATEMENT_SETTER_METHODS_INTERCEPTOR; + return ignorable ? Constants.PREPARED_STATEMENT_IGNORABLE_SETTER_METHODS_INTERCEPTOR : Constants.PREPARED_STATEMENT_SETTER_METHODS_INTERCEPTOR; } @Override diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/AbstractURLParser.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/AbstractURLParser.java index 62ae314eaa61..6d81ba98817f 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/AbstractURLParser.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/AbstractURLParser.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.connectionurl.parser; public abstract class AbstractURLParser implements ConnectionURLParser { diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/ConnectionURLParser.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/ConnectionURLParser.java index 1cae213d2e5a..65cd38dbff87 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/ConnectionURLParser.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/ConnectionURLParser.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.connectionurl.parser; import org.apache.skywalking.apm.plugin.jdbc.trace.ConnectionInfo; diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/H2URLParser.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/H2URLParser.java index 8ad4f6390aeb..88734b067277 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/H2URLParser.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/H2URLParser.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.connectionurl.parser; import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; @@ -24,12 +23,9 @@ /** * {@link H2URLParser} presents that skywalking how to parse the connection url of H2 database. - * - * {@link H2URLParser} check the connection url if contains "file" or "mem". if yes. the database - * name substring the connection url from the index after "file" index or the "mem" index to the - * index of first charset ";". - * - * @author zhangxin + *

+ * {@link H2URLParser} check the connection url if contains "file" or "mem". if yes. the database name substring the + * connection url from the index after "file" index or the "mem" index to the index of first charset ";". */ public class H2URLParser extends AbstractURLParser { @@ -99,7 +95,10 @@ private int[] fetchDatabaseNameRangeIndexFromURLForH2FileMode() { } 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; } @@ -118,7 +117,10 @@ private int[] fetchDatabaseNameRangeIndexFromURLForH2MemMode() { } 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/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/MysqlURLParser.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/MysqlURLParser.java index 57050487e584..7b86ea71e8b1 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/MysqlURLParser.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/MysqlURLParser.java @@ -23,8 +23,6 @@ /** * {@link MysqlURLParser} parse connection url of mysql. - * - * @author zhangxin */ public class MysqlURLParser extends AbstractURLParser { @@ -93,9 +91,11 @@ public ConnectionInfo parse() { } else { String[] hostAndPort = hostSegment[0].split(":"); if (hostAndPort.length != 1) { - return new ConnectionInfo(ComponentsDefine.MYSQL_JDBC_DRIVER, DB_TYPE, hostAndPort[0], Integer.valueOf(hostAndPort[1]), fetchDatabaseNameFromURL(location.endIndex())); + return new ConnectionInfo(ComponentsDefine.MYSQL_JDBC_DRIVER, DB_TYPE, hostAndPort[0], Integer.valueOf(hostAndPort[1]), fetchDatabaseNameFromURL(location + .endIndex())); } else { - return new ConnectionInfo(ComponentsDefine.MYSQL_JDBC_DRIVER, DB_TYPE, hostAndPort[0], DEFAULT_PORT, fetchDatabaseNameFromURL(location.endIndex())); + return new ConnectionInfo(ComponentsDefine.MYSQL_JDBC_DRIVER, DB_TYPE, hostAndPort[0], DEFAULT_PORT, fetchDatabaseNameFromURL(location + .endIndex())); } } } diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/OracleURLParser.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/OracleURLParser.java index 44775e11b539..470cf6e5bcba 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/OracleURLParser.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/OracleURLParser.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.connectionurl.parser; import java.util.ArrayList; @@ -27,12 +26,9 @@ /** * {@link OracleURLParser} presents that how to parse oracle connection url. - * - * Note: {@link OracleURLParser} can parse the commons connection url. the commons - * connection url is of the form: jdbc:oracle:(drivertype):@(database),the other - * the form of connection url cannot be parsed success. - * - * @author zhangxin + *

+ * Note: {@link OracleURLParser} can parse the commons connection url. the commons connection url is of the form: + * jdbc:oracle:(drivertype):@(database),the other the form of connection url cannot be parsed success. */ public class OracleURLParser extends AbstractURLParser { @@ -138,7 +134,10 @@ private String[] splitDatabaseAddress(String address) { String[] hostSegment = address.split(":"); if (hostSegment.length == 1 && super.fetchDatabaseNameFromURL().contains("/")) { String[] portAndDatabaseName = super.fetchDatabaseNameFromURL().split("/"); - return new String[]{hostSegment[0], portAndDatabaseName[0]}; + return new String[] { + hostSegment[0], + portAndDatabaseName[0] + }; } else { return hostSegment; } diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/PostgreSQLURLParser.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/PostgreSQLURLParser.java index db60c6c7bfbb..e7ab769e29a9 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/PostgreSQLURLParser.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/PostgreSQLURLParser.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.connectionurl.parser; import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; @@ -24,8 +23,6 @@ /** * {@link PostgreSQLURLParser} parse connection url of mysql. - * - * @author zhangxin */ public class PostgreSQLURLParser extends AbstractURLParser { diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/URLLocation.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/URLLocation.java index 343f04831405..c78ba77b5a8a 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/URLLocation.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/URLLocation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.connectionurl.parser; public class URLLocation { diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/URLParser.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/URLParser.java index b9781213a3b6..905806588a0d 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/URLParser.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/URLParser.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.connectionurl.parser; import org.apache.skywalking.apm.plugin.jdbc.trace.ConnectionInfo; @@ -24,8 +23,6 @@ /** * {@link URLParser#parser(String)} support parse the connection url, such as Mysql, Oracle, H2 Database. But there are * some url cannot be parsed, such as Oracle connection url with multiple host. - * - * @author zhangxin */ public class URLParser { diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/define/AbstractDriverInstrumentation.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/define/AbstractDriverInstrumentation.java index 84b5efc181db..51489e9691cb 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/define/AbstractDriverInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/define/AbstractDriverInstrumentation.java @@ -49,7 +49,8 @@ public String getMethodsInterceptor() { return DRIVER_INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/define/Constants.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/define/Constants.java index 03902cf2e14c..d363f0f96d68 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/define/Constants.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/define/Constants.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.define; import java.util.Arrays; @@ -46,38 +45,8 @@ public class Constants { public static final String RELEASE_SAVE_POINT_METHOD_NAME = "releaseSavepoint"; public static final String SQL_PARAMETER_PLACEHOLDER = "?"; - public static final Set PS_SETTERS = new HashSet(Arrays.asList( - "setArray", - "setBigDecimal", - "setBoolean", - "setByte", - "setDate", - "setDouble", - "setFloat", - "setInt", - "setLong", - "setNString", - "setObject", - "setRowId", - "setShort", - "setString", - "setTime", - "setTimestamp", - "setURL" - )); - public static final Set PS_IGNORABLE_SETTERS = new HashSet(Arrays.asList( - "setAsciiStream", - "setBinaryStream", - "setBlob", - "setBytes", - "setCharacterStream", - "setClob", - "setNCharacterStream", - "setNClob", - "setRef", - "setSQLXML", - "setUnicodeStream" - )); + public static final Set PS_SETTERS = new HashSet(Arrays.asList("setArray", "setBigDecimal", "setBoolean", "setByte", "setDate", "setDouble", "setFloat", "setInt", "setLong", "setNString", "setObject", "setRowId", "setShort", "setString", "setTime", "setTimestamp", "setURL")); + public static final Set PS_IGNORABLE_SETTERS = new HashSet(Arrays.asList("setAsciiStream", "setBinaryStream", "setBlob", "setBytes", "setCharacterStream", "setClob", "setNCharacterStream", "setNClob", "setRef", "setSQLXML", "setUnicodeStream")); public static final String PREPARED_STATEMENT_SETTER_METHODS_INTERCEPTOR = "org.apache.skywalking.apm.plugin.jdbc.JDBCPreparedStatementSetterInterceptor"; public static final String PREPARED_STATEMENT_NULL_SETTER_METHODS_INTERCEPTOR = "org.apache.skywalking.apm.plugin.jdbc.JDBCPreparedStatementNullSetterInterceptor"; diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/define/StatementEnhanceInfos.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/define/StatementEnhanceInfos.java index 5c4a0a195f87..c3898c9c58d1 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/define/StatementEnhanceInfos.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/define/StatementEnhanceInfos.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.define; import java.util.Arrays; @@ -25,8 +24,6 @@ /** * {@link StatementEnhanceInfos} contain the {@link ConnectionInfo} and * sql for trace mysql. - * - * @author zhangxin */ public class StatementEnhanceInfos { private ConnectionInfo connectionInfo; diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/trace/CallableStatementTracing.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/trace/CallableStatementTracing.java index f9face33dc35..fc68f7d2476c 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/trace/CallableStatementTracing.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/trace/CallableStatementTracing.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.trace; import java.sql.SQLException; @@ -28,15 +27,13 @@ /** * {@link CallableStatementTracing} create an exit span when the client call the method in the class that extend {@link * java.sql.CallableStatement}. - * - * @author zhangxin */ public class CallableStatementTracing { - public static R execute(java.sql.CallableStatement realStatement, - ConnectionInfo connectInfo, String method, String sql, Executable exec) - throws SQLException { - AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBI/CallableStatement/" + method, connectInfo.getDatabasePeer()); + public static R execute(java.sql.CallableStatement realStatement, ConnectionInfo connectInfo, String method, + String sql, Executable exec) throws SQLException { + AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBI/CallableStatement/" + method, connectInfo + .getDatabasePeer()); try { Tags.DB_TYPE.set(span, "sql"); SpanLayer.asDB(span); @@ -54,7 +51,6 @@ public static R execute(java.sql.CallableStatement realStatement, } public interface Executable { - R exe(java.sql.CallableStatement realConnection, String sql) - throws SQLException; + R exe(java.sql.CallableStatement realConnection, String sql) throws SQLException; } } diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/trace/ConnectionInfo.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/trace/ConnectionInfo.java index bed5f6ba9ed4..d7f2f14a0fab 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/trace/ConnectionInfo.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/trace/ConnectionInfo.java @@ -23,8 +23,6 @@ /** * {@link ConnectionInfo} stored the jdbc connection info, the connection info contains db type, host, port, database * name. - * - * @author zhangxin */ public class ConnectionInfo { /** diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/trace/PreparedStatementTracing.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/trace/PreparedStatementTracing.java index e5358290147d..51bdf7ceb68a 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/trace/PreparedStatementTracing.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/trace/PreparedStatementTracing.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.trace; import java.sql.SQLException; @@ -28,15 +27,13 @@ /** * {@link PreparedStatementTracing} create an exit span when the client call the method in the class that extend {@link * java.sql.PreparedStatement}. - * - * @author zhangxin */ public class PreparedStatementTracing { - public static R execute(java.sql.PreparedStatement realStatement, - ConnectionInfo connectInfo, String method, String sql, Executable exec) - throws SQLException { - final AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBI/PreparedStatement/" + method, connectInfo.getDatabasePeer()); + public static R execute(java.sql.PreparedStatement realStatement, ConnectionInfo connectInfo, String method, + String sql, Executable exec) throws SQLException { + final AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBI/PreparedStatement/" + method, connectInfo + .getDatabasePeer()); try { Tags.DB_TYPE.set(span, "sql"); Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName()); @@ -55,7 +52,6 @@ public static R execute(java.sql.PreparedStatement realStatement, } public interface Executable { - R exe(java.sql.PreparedStatement realConnection, String sql) - throws SQLException; + R exe(java.sql.PreparedStatement realConnection, String sql) throws SQLException; } } diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/trace/SWCallableStatement.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/trace/SWCallableStatement.java index c1aa4bc0cb69..cd8d2ed06a0f 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/trace/SWCallableStatement.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/trace/SWCallableStatement.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.trace; import java.io.InputStream; @@ -45,23 +44,11 @@ /** * {@link SWCallableStatement} wrapper the {@link CallableStatement} created by client. and it will interceptor the - * following methods for trace. - * 1. {@link #execute()} - * 2. {@link #execute(String)} - * 3. {@link #execute(String, int[])} - * 4. {@link #execute(String, String[])} - * 5. {@link #execute(String, int)} - * 6. {@link #executeQuery()} - * 7. {@link #executeQuery(String)} - * 8. {@link #executeUpdate()} - * 9. {@link #executeUpdate(String)} - * 10. {@link #executeUpdate(String, int[])} - * 11. {@link #executeUpdate(String, String[])} - * 12. {@link #executeUpdate(String, int)} - * 13. {@link #addBatch()} - * 14. {@link #addBatch(String)} ()} - * - * @author zhangxin + * following methods for trace. 1. {@link #execute()} 2. {@link #execute(String)} 3. {@link #execute(String, int[])} 4. + * {@link #execute(String, String[])} 5. {@link #execute(String, int)} 6. {@link #executeQuery()} 7. {@link + * #executeQuery(String)} 8. {@link #executeUpdate()} 9. {@link #executeUpdate(String)} 10. {@link + * #executeUpdate(String, int[])} 11. {@link #executeUpdate(String, String[])} 12. {@link #executeUpdate(String, int)} + * 13. {@link #addBatch()} 14. {@link #addBatch(String)} ()} */ public class SWCallableStatement implements CallableStatement { private Connection realConnection; @@ -69,8 +56,7 @@ public class SWCallableStatement implements CallableStatement { private ConnectionInfo connectInfo; private String sql; - public SWCallableStatement(Connection realConnection, - CallableStatement realStatement, ConnectionInfo connectInfo, + public SWCallableStatement(Connection realConnection, CallableStatement realStatement, ConnectionInfo connectInfo, String sql) { this.realConnection = realConnection; this.realStatement = realStatement; @@ -79,25 +65,19 @@ public SWCallableStatement(Connection realConnection, } 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(); - } - }); + return CallableStatementTracing.execute(realStatement, connectInfo, "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(); - } - }); + return CallableStatementTracing.execute(realStatement, connectInfo, "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 { @@ -132,8 +112,7 @@ public void setDouble(int parameterIndex, double x) throws SQLException { realStatement.setDouble(parameterIndex, x); } - public void setBigDecimal(int parameterIndex, BigDecimal x) - throws SQLException { + public void setBigDecimal(int parameterIndex, BigDecimal x) throws SQLException { realStatement.setBigDecimal(parameterIndex, x); } @@ -153,24 +132,20 @@ public void setTime(int parameterIndex, Time x) throws SQLException { realStatement.setTime(parameterIndex, x); } - public void setTimestamp(int parameterIndex, Timestamp x) - throws SQLException { + public void setTimestamp(int parameterIndex, Timestamp x) throws SQLException { realStatement.setTimestamp(parameterIndex, x); } - public void setAsciiStream(int parameterIndex, InputStream x, int length) - throws SQLException { + public void setAsciiStream(int parameterIndex, InputStream x, int length) throws SQLException { realStatement.setAsciiStream(parameterIndex, x, length); } @Deprecated - public void setUnicodeStream(int parameterIndex, InputStream x, int length) - throws SQLException { + public void setUnicodeStream(int parameterIndex, InputStream x, int length) throws SQLException { realStatement.setUnicodeStream(parameterIndex, x, length); } - public void setBinaryStream(int parameterIndex, InputStream x, int length) - throws SQLException { + public void setBinaryStream(int parameterIndex, InputStream x, int length) throws SQLException { realStatement.setBinaryStream(parameterIndex, x, length); } @@ -178,8 +153,7 @@ public void clearParameters() throws SQLException { realStatement.clearParameters(); } - public void setObject(int parameterIndex, Object x, int targetSqlType) - throws SQLException { + public void setObject(int parameterIndex, Object x, int targetSqlType) throws SQLException { realStatement.setObject(parameterIndex, x, targetSqlType); } @@ -188,22 +162,18 @@ public void setObject(int parameterIndex, Object x) throws SQLException { } 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(); - } - }); + return CallableStatementTracing.execute(realStatement, connectInfo, "execute", sql, new CallableStatementTracing.Executable() { + public Boolean exe(CallableStatement realStatement, String sql) throws SQLException { + return realStatement.execute(); + } + }); } public void addBatch() throws SQLException { realStatement.addBatch(); } - public void setCharacterStream(int parameterIndex, Reader reader, int length) - throws SQLException { + public void setCharacterStream(int parameterIndex, Reader reader, int length) throws SQLException { realStatement.setCharacterStream(parameterIndex, reader, length); } @@ -227,23 +197,19 @@ public ResultSetMetaData getMetaData() throws SQLException { return realStatement.getMetaData(); } - public void setDate(int parameterIndex, Date x, Calendar cal) - throws SQLException { + public void setDate(int parameterIndex, Date x, Calendar cal) throws SQLException { realStatement.setDate(parameterIndex, x, cal); } - public void setTime(int parameterIndex, Time x, Calendar cal) - throws SQLException { + public void setTime(int parameterIndex, Time x, Calendar cal) throws SQLException { realStatement.setTime(parameterIndex, x, cal); } - public void setTimestamp(int parameterIndex, Timestamp x, Calendar cal) - throws SQLException { + public void setTimestamp(int parameterIndex, Timestamp x, Calendar cal) throws SQLException { realStatement.setTimestamp(parameterIndex, x, cal); } - public void setNull(int parameterIndex, int sqlType, String typeName) - throws SQLException { + public void setNull(int parameterIndex, int sqlType, String typeName) throws SQLException { realStatement.setNull(parameterIndex, sqlType, typeName); } @@ -259,13 +225,11 @@ public void setRowId(int parameterIndex, RowId x) throws SQLException { realStatement.setRowId(parameterIndex, x); } - public void setNString(int parameterIndex, String value) - throws SQLException { + public void setNString(int parameterIndex, String value) throws SQLException { realStatement.setNString(parameterIndex, value); } - public void setNCharacterStream(int parameterIndex, Reader value, - long length) throws SQLException { + public void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException { realStatement.setNCharacterStream(parameterIndex, value, length); } @@ -273,64 +237,51 @@ public void setNClob(int parameterIndex, NClob value) throws SQLException { realStatement.setNClob(parameterIndex, value); } - public void setClob(int parameterIndex, Reader reader, long length) - throws SQLException { + public void setClob(int parameterIndex, Reader reader, long length) throws SQLException { realStatement.setClob(parameterIndex, reader, length); } - public void setBlob(int parameterIndex, InputStream inputStream, long length) - throws SQLException { + public void setBlob(int parameterIndex, InputStream inputStream, long length) throws SQLException { realStatement.setBlob(parameterIndex, inputStream, length); } - public void setNClob(int parameterIndex, Reader reader, long length) - throws SQLException { + public void setNClob(int parameterIndex, Reader reader, long length) throws SQLException { realStatement.setNClob(parameterIndex, reader, length); } - public void setSQLXML(int parameterIndex, SQLXML xmlObject) - throws SQLException { + public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException { realStatement.setSQLXML(parameterIndex, xmlObject); } - public void setObject(int parameterIndex, Object x, int targetSqlType, - int scaleOrLength) throws SQLException { - realStatement - .setObject(parameterIndex, x, targetSqlType, scaleOrLength); + public void setObject(int parameterIndex, Object x, int targetSqlType, int scaleOrLength) throws SQLException { + realStatement.setObject(parameterIndex, x, targetSqlType, scaleOrLength); } - public void setAsciiStream(int parameterIndex, InputStream x, long length) - throws SQLException { + public void setAsciiStream(int parameterIndex, InputStream x, long length) throws SQLException { realStatement.setAsciiStream(parameterIndex, x, length); } - public void setBinaryStream(int parameterIndex, InputStream x, long length) - throws SQLException { + public void setBinaryStream(int parameterIndex, InputStream x, long length) throws SQLException { realStatement.setBinaryStream(parameterIndex, x, length); } - public void setCharacterStream(int parameterIndex, Reader reader, - long length) throws SQLException { + public void setCharacterStream(int parameterIndex, Reader reader, long length) throws SQLException { realStatement.setCharacterStream(parameterIndex, reader, length); } - public void setAsciiStream(int parameterIndex, InputStream x) - throws SQLException { + public void setAsciiStream(int parameterIndex, InputStream x) throws SQLException { realStatement.setAsciiStream(parameterIndex, x); } - public void setBinaryStream(int parameterIndex, InputStream x) - throws SQLException { + public void setBinaryStream(int parameterIndex, InputStream x) throws SQLException { realStatement.setBinaryStream(parameterIndex, x); } - public void setCharacterStream(int parameterIndex, Reader reader) - throws SQLException { + public void setCharacterStream(int parameterIndex, Reader reader) throws SQLException { realStatement.setCharacterStream(parameterIndex, reader); } - public void setNCharacterStream(int parameterIndex, Reader value) - throws SQLException { + public void setNCharacterStream(int parameterIndex, Reader value) throws SQLException { realStatement.setNCharacterStream(parameterIndex, value); } @@ -338,8 +289,7 @@ public void setClob(int parameterIndex, Reader reader) throws SQLException { realStatement.setClob(parameterIndex, reader); } - public void setBlob(int parameterIndex, InputStream inputStream) - throws SQLException { + public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException { realStatement.setBlob(parameterIndex, inputStream); } @@ -348,25 +298,19 @@ public void setNClob(int parameterIndex, Reader reader) throws SQLException { } 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); - } - }); + return CallableStatementTracing.execute(realStatement, connectInfo, "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); - } - }); + return CallableStatementTracing.execute(realStatement, connectInfo, "executeUpdate", sql, new CallableStatementTracing.Executable() { + public Integer exe(CallableStatement realStatement, String sql) throws SQLException { + return realStatement.executeUpdate(sql); + } + }); } public void close() throws SQLException { @@ -418,14 +362,11 @@ public void setCursorName(String name) throws SQLException { } 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); - } - }); + return CallableStatementTracing.execute(realStatement, connectInfo, "execute", sql, new CallableStatementTracing.Executable() { + public Boolean exe(CallableStatement realStatement, String sql) throws SQLException { + return realStatement.execute(sql); + } + }); } public ResultSet getResultSet() throws SQLException { @@ -473,14 +414,11 @@ public void clearBatch() throws SQLException { } 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(); - } - }); + return CallableStatementTracing.execute(realStatement, connectInfo, "executeBatch", "", new CallableStatementTracing.Executable() { + public int[] exe(CallableStatement realStatement, String sql) throws SQLException { + return realStatement.executeBatch(); + } + }); } public Connection getConnection() throws SQLException { @@ -495,75 +433,52 @@ public ResultSet getGeneratedKeys() throws SQLException { return realStatement.getGeneratedKeys(); } - public int executeUpdate(String sql, final int autoGeneratedKeys) - 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); - } - }); - } - - public int executeUpdate(String sql, final int[] columnIndexes) - 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); - } - }); - } - - public int executeUpdate(String sql, final String[] columnNames) - 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); - } - }); - } - - public boolean execute(String sql, final int autoGeneratedKeys) - 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); - } - }); + public int executeUpdate(String sql, final int autoGeneratedKeys) 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); + } + }); + } + + public int executeUpdate(String sql, final int[] columnIndexes) 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); + } + }); + } + + public int executeUpdate(String sql, final String[] columnNames) 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); + } + }); + } + + public boolean execute(String sql, final int autoGeneratedKeys) 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); + } + }); } 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); - } - }); - } - - public boolean execute(String sql, final String[] columnNames) - 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); - } - }); + return CallableStatementTracing.execute(realStatement, connectInfo, "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 { + return CallableStatementTracing.execute(realStatement, connectInfo, "execute", sql, new CallableStatementTracing.Executable() { + public Boolean exe(CallableStatement realStatement, String sql) throws SQLException { + return realStatement.execute(sql, columnNames); + } + }); } public int getResultSetHoldability() throws SQLException { @@ -598,13 +513,11 @@ public boolean isWrapperFor(Class iface) throws SQLException { return realStatement.isWrapperFor(iface); } - public void registerOutParameter(int parameterIndex, int sqlType) - throws SQLException { + public void registerOutParameter(int parameterIndex, int sqlType) throws SQLException { realStatement.registerOutParameter(parameterIndex, sqlType); } - public void registerOutParameter(int parameterIndex, int sqlType, int scale) - throws SQLException { + public void registerOutParameter(int parameterIndex, int sqlType, int scale) throws SQLException { realStatement.registerOutParameter(parameterIndex, sqlType, scale); } @@ -645,8 +558,7 @@ public double getDouble(int parameterIndex) throws SQLException { } @Deprecated - public BigDecimal getBigDecimal(int parameterIndex, int scale) - throws SQLException { + public BigDecimal getBigDecimal(int parameterIndex, int scale) throws SQLException { return realStatement.getBigDecimal(parameterIndex, scale); } @@ -674,8 +586,7 @@ public BigDecimal getBigDecimal(int parameterIndex) throws SQLException { return realStatement.getBigDecimal(parameterIndex); } - public Object getObject(int parameterIndex, Map> map) - throws SQLException { + public Object getObject(int parameterIndex, Map> map) throws SQLException { return realStatement.getObject(parameterIndex, map); } @@ -703,28 +614,23 @@ public Time getTime(int parameterIndex, Calendar cal) throws SQLException { return realStatement.getTime(parameterIndex, cal); } - public Timestamp getTimestamp(int parameterIndex, Calendar cal) - throws SQLException { + public Timestamp getTimestamp(int parameterIndex, Calendar cal) throws SQLException { return realStatement.getTimestamp(parameterIndex, cal); } - public void registerOutParameter(int parameterIndex, int sqlType, - String typeName) throws SQLException { + public void registerOutParameter(int parameterIndex, int sqlType, String typeName) throws SQLException { realStatement.registerOutParameter(parameterIndex, sqlType, typeName); } - public void registerOutParameter(String parameterName, int sqlType) - throws SQLException { + public void registerOutParameter(String parameterName, int sqlType) throws SQLException { realStatement.registerOutParameter(parameterName, sqlType); } - public void registerOutParameter(String parameterName, int sqlType, - int scale) throws SQLException { + public void registerOutParameter(String parameterName, int sqlType, int scale) throws SQLException { realStatement.registerOutParameter(parameterName, sqlType, scale); } - public void registerOutParameter(String parameterName, int sqlType, - String typeName) throws SQLException { + public void registerOutParameter(String parameterName, int sqlType, String typeName) throws SQLException { realStatement.registerOutParameter(parameterName, sqlType, typeName); } @@ -768,8 +674,7 @@ public void setDouble(String parameterName, double x) throws SQLException { realStatement.setDouble(parameterName, x); } - public void setBigDecimal(String parameterName, BigDecimal x) - throws SQLException { + public void setBigDecimal(String parameterName, BigDecimal x) throws SQLException { realStatement.setBigDecimal(parameterName, x); } @@ -789,28 +694,23 @@ public void setTime(String parameterName, Time x) throws SQLException { realStatement.setTime(parameterName, x); } - public void setTimestamp(String parameterName, Timestamp x) - throws SQLException { + public void setTimestamp(String parameterName, Timestamp x) throws SQLException { realStatement.setTimestamp(parameterName, x); } - public void setAsciiStream(String parameterName, InputStream x, int length) - throws SQLException { + public void setAsciiStream(String parameterName, InputStream x, int length) throws SQLException { realStatement.setAsciiStream(parameterName, x, length); } - public void setBinaryStream(String parameterName, InputStream x, int length) - throws SQLException { + public void setBinaryStream(String parameterName, InputStream x, int length) throws SQLException { realStatement.setBinaryStream(parameterName, x, length); } - public void setObject(String parameterName, Object x, int targetSqlType, - int scale) throws SQLException { + public void setObject(String parameterName, Object x, int targetSqlType, int scale) throws SQLException { realStatement.setObject(parameterName, x, targetSqlType, scale); } - public void setObject(String parameterName, Object x, int targetSqlType) - throws SQLException { + public void setObject(String parameterName, Object x, int targetSqlType) throws SQLException { realStatement.setObject(parameterName, x, targetSqlType); } @@ -818,28 +718,23 @@ public void setObject(String parameterName, Object x) throws SQLException { realStatement.setObject(parameterName, x); } - public void setCharacterStream(String parameterName, Reader reader, - int length) throws SQLException { + public void setCharacterStream(String parameterName, Reader reader, int length) throws SQLException { realStatement.setCharacterStream(parameterName, reader, length); } - public void setDate(String parameterName, Date x, Calendar cal) - throws SQLException { + public void setDate(String parameterName, Date x, Calendar cal) throws SQLException { realStatement.setDate(parameterName, x, cal); } - public void setTime(String parameterName, Time x, Calendar cal) - throws SQLException { + public void setTime(String parameterName, Time x, Calendar cal) throws SQLException { realStatement.setTime(parameterName, x, cal); } - public void setTimestamp(String parameterName, Timestamp x, Calendar cal) - throws SQLException { + public void setTimestamp(String parameterName, Timestamp x, Calendar cal) throws SQLException { realStatement.setTimestamp(parameterName, x, cal); } - public void setNull(String parameterName, int sqlType, String typeName) - throws SQLException { + public void setNull(String parameterName, int sqlType, String typeName) throws SQLException { realStatement.setNull(parameterName, sqlType, typeName); } @@ -899,8 +794,7 @@ public BigDecimal getBigDecimal(String parameterName) throws SQLException { return realStatement.getBigDecimal(parameterName); } - public Object getObject(String parameterName, Map> map) - throws SQLException { + public Object getObject(String parameterName, Map> map) throws SQLException { return realStatement.getObject(parameterName, map); } @@ -928,8 +822,7 @@ public Time getTime(String parameterName, Calendar cal) throws SQLException { return realStatement.getTime(parameterName, cal); } - public Timestamp getTimestamp(String parameterName, Calendar cal) - throws SQLException { + public Timestamp getTimestamp(String parameterName, Calendar cal) throws SQLException { return realStatement.getTimestamp(parameterName, cal); } @@ -949,13 +842,11 @@ public void setRowId(String parameterName, RowId x) throws SQLException { realStatement.setRowId(parameterName, x); } - public void setNString(String parameterName, String value) - throws SQLException { + public void setNString(String parameterName, String value) throws SQLException { realStatement.setNString(parameterName, value); } - public void setNCharacterStream(String parameterName, Reader value, - long length) throws SQLException { + public void setNCharacterStream(String parameterName, Reader value, long length) throws SQLException { realStatement.setNCharacterStream(parameterName, value, length); } @@ -963,18 +854,15 @@ public void setNClob(String parameterName, NClob value) throws SQLException { realStatement.setNClob(parameterName, value); } - public void setClob(String parameterName, Reader reader, long length) - throws SQLException { + public void setClob(String parameterName, Reader reader, long length) throws SQLException { realStatement.setClob(parameterName, reader, length); } - public void setBlob(String parameterName, InputStream inputStream, - long length) throws SQLException { + public void setBlob(String parameterName, InputStream inputStream, long length) throws SQLException { realStatement.setBlob(parameterName, inputStream, length); } - public void setNClob(String parameterName, Reader reader, long length) - throws SQLException { + public void setNClob(String parameterName, Reader reader, long length) throws SQLException { realStatement.setNClob(parameterName, reader, length); } @@ -986,8 +874,7 @@ public NClob getNClob(String parameterName) throws SQLException { return realStatement.getNClob(parameterName); } - public void setSQLXML(String parameterName, SQLXML xmlObject) - throws SQLException { + public void setSQLXML(String parameterName, SQLXML xmlObject) throws SQLException { realStatement.setSQLXML(parameterName, xmlObject); } @@ -1031,63 +918,51 @@ public void setClob(String parameterName, Clob x) throws SQLException { realStatement.setClob(parameterName, x); } - public void setAsciiStream(String parameterName, InputStream x, long length) - throws SQLException { + public void setAsciiStream(String parameterName, InputStream x, long length) throws SQLException { realStatement.setAsciiStream(parameterName, x, length); } - public void setBinaryStream(String parameterName, InputStream x, long length) - throws SQLException { + public void setBinaryStream(String parameterName, InputStream x, long length) throws SQLException { realStatement.setBinaryStream(parameterName, x, length); } - public void setCharacterStream(String parameterName, Reader reader, - long length) throws SQLException { + public void setCharacterStream(String parameterName, Reader reader, long length) throws SQLException { realStatement.setCharacterStream(parameterName, reader, length); } - public void setAsciiStream(String parameterName, InputStream x) - throws SQLException { + public void setAsciiStream(String parameterName, InputStream x) throws SQLException { realStatement.setAsciiStream(parameterName, x); } - public void setBinaryStream(String parameterName, InputStream x) - throws SQLException { + public void setBinaryStream(String parameterName, InputStream x) throws SQLException { realStatement.setBinaryStream(parameterName, x); } - public void setCharacterStream(String parameterName, Reader reader) - throws SQLException { + public void setCharacterStream(String parameterName, Reader reader) throws SQLException { realStatement.setCharacterStream(parameterName, reader); } - public void setNCharacterStream(String parameterName, Reader value) - throws SQLException { + public void setNCharacterStream(String parameterName, Reader value) throws SQLException { realStatement.setNCharacterStream(parameterName, value); } - public void setClob(String parameterName, Reader reader) - throws SQLException { + public void setClob(String parameterName, Reader reader) throws SQLException { realStatement.setClob(parameterName, reader); } - public void setBlob(String parameterName, InputStream inputStream) - throws SQLException { + public void setBlob(String parameterName, InputStream inputStream) throws SQLException { realStatement.setBlob(parameterName, inputStream); } - public void setNClob(String parameterName, Reader reader) - throws SQLException { + public void setNClob(String parameterName, Reader reader) throws SQLException { realStatement.setNClob(parameterName, reader); } - public T getObject(int parameterIndex, Class type) - throws SQLException { + public T getObject(int parameterIndex, Class type) throws SQLException { return realStatement.getObject(parameterIndex, type); } - public T getObject(String parameterName, Class type) - throws SQLException { + public T getObject(String parameterName, Class type) throws SQLException { return realStatement.getObject(parameterName, type); } diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/trace/SWPreparedStatement.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/trace/SWPreparedStatement.java index 6b779a3bb337..05e6463362d0 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/trace/SWPreparedStatement.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/trace/SWPreparedStatement.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.trace; import java.io.InputStream; @@ -44,23 +43,11 @@ /** * {@link SWPreparedStatement} wrapper the {@link PreparedStatement} created by client. and it will interceptor the - * following methods for trace. - * 1. {@link #execute()} - * 2. {@link #execute(String)} - * 3. {@link #execute(String, int[])} - * 4. {@link #execute(String, String[])} - * 5. {@link #execute(String, int)} - * 6. {@link #executeQuery()} - * 7. {@link #executeQuery(String)} - * 8. {@link #executeUpdate()} - * 9. {@link #executeUpdate(String)} - * 10. {@link #executeUpdate(String, int[])} - * 11. {@link #executeUpdate(String, String[])} - * 12. {@link #executeUpdate(String, int)} - * 13. {@link #addBatch()} - * 14. {@link #addBatch(String)} ()} - * - * @author zhangxin + * following methods for trace. 1. {@link #execute()} 2. {@link #execute(String)} 3. {@link #execute(String, int[])} 4. + * {@link #execute(String, String[])} 5. {@link #execute(String, int)} 6. {@link #executeQuery()} 7. {@link + * #executeQuery(String)} 8. {@link #executeUpdate()} 9. {@link #executeUpdate(String)} 10. {@link + * #executeUpdate(String, int[])} 11. {@link #executeUpdate(String, String[])} 12. {@link #executeUpdate(String, int)} + * 13. {@link #addBatch()} 14. {@link #addBatch(String)} ()} */ public class SWPreparedStatement implements PreparedStatement { private Connection realConnection; @@ -68,8 +55,7 @@ public class SWPreparedStatement implements PreparedStatement { private ConnectionInfo connectInfo; private String sql; - public SWPreparedStatement(Connection realConnection, - PreparedStatement realStatement, ConnectionInfo connectInfo, + public SWPreparedStatement(Connection realConnection, PreparedStatement realStatement, ConnectionInfo connectInfo, String sql) { this.realConnection = realConnection; this.realStatement = realStatement; @@ -79,8 +65,7 @@ public SWPreparedStatement(Connection realConnection, 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 { + public ResultSet exe(PreparedStatement realStatement, String sql) throws SQLException { return realStatement.executeQuery(sql); } }); @@ -88,8 +73,7 @@ public ResultSet exe(PreparedStatement realStatement, String sql) 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 { + public Integer exe(PreparedStatement realStatement, String sql) throws SQLException { return realStatement.executeUpdate(sql); } }); @@ -145,8 +129,7 @@ public void setCursorName(String name) throws SQLException { 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 { + public Boolean exe(PreparedStatement realStatement, String sql) throws SQLException { return realStatement.execute(sql); } }); @@ -198,8 +181,7 @@ public void clearBatch() throws SQLException { public int[] executeBatch() throws SQLException { return PreparedStatementTracing.execute(realStatement, connectInfo, "executeBatch", "", new PreparedStatementTracing.Executable() { - public int[] exe(PreparedStatement realStatement, String sql) - throws SQLException { + public int[] exe(PreparedStatement realStatement, String sql) throws SQLException { return realStatement.executeBatch(); } }); @@ -217,41 +199,33 @@ public ResultSet getGeneratedKeys() throws SQLException { return realStatement.getGeneratedKeys(); } - public int executeUpdate(String sql, final int autoGeneratedKeys) - throws SQLException { + public int executeUpdate(String sql, final int autoGeneratedKeys) throws SQLException { return PreparedStatementTracing.execute(realStatement, connectInfo, "executeUpdate", sql, new PreparedStatementTracing.Executable() { - public Integer exe(PreparedStatement realStatement, String sql) - throws SQLException { + public Integer exe(PreparedStatement realStatement, String sql) throws SQLException { return realStatement.executeUpdate(sql, autoGeneratedKeys); } }); } - public int executeUpdate(String sql, final int[] columnIndexes) - throws SQLException { + public int executeUpdate(String sql, final int[] columnIndexes) throws SQLException { return PreparedStatementTracing.execute(realStatement, connectInfo, "executeUpdate", sql, new PreparedStatementTracing.Executable() { - public Integer exe(PreparedStatement realStatement, String sql) - throws SQLException { + public Integer exe(PreparedStatement realStatement, String sql) throws SQLException { return realStatement.executeUpdate(sql, columnIndexes); } }); } - public int executeUpdate(String sql, final String[] columnNames) - throws SQLException { + public int executeUpdate(String sql, final String[] columnNames) throws SQLException { return PreparedStatementTracing.execute(realStatement, connectInfo, "executeUpdate", sql, new PreparedStatementTracing.Executable() { - public Integer exe(PreparedStatement realStatement, String sql) - throws SQLException { + public Integer exe(PreparedStatement realStatement, String sql) throws SQLException { return realStatement.executeUpdate(sql, columnNames); } }); } - public boolean execute(String sql, final int autoGeneratedKeys) - throws SQLException { + public boolean execute(String sql, final int autoGeneratedKeys) throws SQLException { return PreparedStatementTracing.execute(realStatement, connectInfo, "execute", sql, new PreparedStatementTracing.Executable() { - public Boolean exe(PreparedStatement realStatement, String sql) - throws SQLException { + public Boolean exe(PreparedStatement realStatement, String sql) throws SQLException { return realStatement.execute(sql, autoGeneratedKeys); } }); @@ -259,18 +233,15 @@ public Boolean exe(PreparedStatement realStatement, String sql) 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 { + public Boolean exe(PreparedStatement realStatement, String sql) throws SQLException { return realStatement.execute(sql, columnIndexes); } }); } - public boolean execute(String sql, final String[] columnNames) - throws SQLException { + public boolean execute(String sql, final String[] columnNames) throws SQLException { return PreparedStatementTracing.execute(realStatement, connectInfo, "execute", sql, new PreparedStatementTracing.Executable() { - public Boolean exe(PreparedStatement realStatement, String sql) - throws SQLException { + public Boolean exe(PreparedStatement realStatement, String sql) throws SQLException { return realStatement.execute(sql, columnNames); } }); @@ -310,8 +281,7 @@ public boolean isWrapperFor(Class iface) throws SQLException { public ResultSet executeQuery() throws SQLException { return PreparedStatementTracing.execute(realStatement, connectInfo, "executeQuery", sql, new PreparedStatementTracing.Executable() { - public ResultSet exe(PreparedStatement realStatement, String sql) - throws SQLException { + public ResultSet exe(PreparedStatement realStatement, String sql) throws SQLException { return realStatement.executeQuery(); } }); @@ -319,8 +289,7 @@ public ResultSet exe(PreparedStatement realStatement, String sql) public int executeUpdate() throws SQLException { return PreparedStatementTracing.execute(realStatement, connectInfo, "executeUpdate", sql, new PreparedStatementTracing.Executable() { - public Integer exe(PreparedStatement realStatement, String sql) - throws SQLException { + public Integer exe(PreparedStatement realStatement, String sql) throws SQLException { return realStatement.executeUpdate(); } }); @@ -358,8 +327,7 @@ public void setDouble(int parameterIndex, double x) throws SQLException { realStatement.setDouble(parameterIndex, x); } - public void setBigDecimal(int parameterIndex, BigDecimal x) - throws SQLException { + public void setBigDecimal(int parameterIndex, BigDecimal x) throws SQLException { realStatement.setBigDecimal(parameterIndex, x); } @@ -379,24 +347,20 @@ public void setTime(int parameterIndex, Time x) throws SQLException { realStatement.setTime(parameterIndex, x); } - public void setTimestamp(int parameterIndex, Timestamp x) - throws SQLException { + public void setTimestamp(int parameterIndex, Timestamp x) throws SQLException { realStatement.setTimestamp(parameterIndex, x); } - public void setAsciiStream(int parameterIndex, InputStream x, int length) - throws SQLException { + public void setAsciiStream(int parameterIndex, InputStream x, int length) throws SQLException { realStatement.setAsciiStream(parameterIndex, x, length); } @Deprecated - public void setUnicodeStream(int parameterIndex, InputStream x, int length) - throws SQLException { + public void setUnicodeStream(int parameterIndex, InputStream x, int length) throws SQLException { realStatement.setUnicodeStream(parameterIndex, x, length); } - public void setBinaryStream(int parameterIndex, InputStream x, int length) - throws SQLException { + public void setBinaryStream(int parameterIndex, InputStream x, int length) throws SQLException { realStatement.setBinaryStream(parameterIndex, x, length); } @@ -404,8 +368,7 @@ public void clearParameters() throws SQLException { realStatement.clearParameters(); } - public void setObject(int parameterIndex, Object x, int targetSqlType) - throws SQLException { + public void setObject(int parameterIndex, Object x, int targetSqlType) throws SQLException { realStatement.setObject(parameterIndex, x, targetSqlType); } @@ -415,8 +378,7 @@ public void setObject(int parameterIndex, Object x) throws SQLException { public boolean execute() throws SQLException { return PreparedStatementTracing.execute(realStatement, connectInfo, "execute", sql, new PreparedStatementTracing.Executable() { - public Boolean exe(PreparedStatement realStatement, String sql) - throws SQLException { + public Boolean exe(PreparedStatement realStatement, String sql) throws SQLException { return realStatement.execute(); } }); @@ -426,8 +388,7 @@ public void addBatch() throws SQLException { realStatement.addBatch(); } - public void setCharacterStream(int parameterIndex, Reader reader, int length) - throws SQLException { + public void setCharacterStream(int parameterIndex, Reader reader, int length) throws SQLException { realStatement.setCharacterStream(parameterIndex, reader, length); } @@ -451,23 +412,19 @@ public ResultSetMetaData getMetaData() throws SQLException { return realStatement.getMetaData(); } - public void setDate(int parameterIndex, Date x, Calendar cal) - throws SQLException { + public void setDate(int parameterIndex, Date x, Calendar cal) throws SQLException { realStatement.setDate(parameterIndex, x, cal); } - public void setTime(int parameterIndex, Time x, Calendar cal) - throws SQLException { + public void setTime(int parameterIndex, Time x, Calendar cal) throws SQLException { realStatement.setTime(parameterIndex, x, cal); } - public void setTimestamp(int parameterIndex, Timestamp x, Calendar cal) - throws SQLException { + public void setTimestamp(int parameterIndex, Timestamp x, Calendar cal) throws SQLException { realStatement.setTimestamp(parameterIndex, x, cal); } - public void setNull(int parameterIndex, int sqlType, String typeName) - throws SQLException { + public void setNull(int parameterIndex, int sqlType, String typeName) throws SQLException { realStatement.setNull(parameterIndex, sqlType, typeName); } @@ -483,13 +440,11 @@ public void setRowId(int parameterIndex, RowId x) throws SQLException { realStatement.setRowId(parameterIndex, x); } - public void setNString(int parameterIndex, String value) - throws SQLException { + public void setNString(int parameterIndex, String value) throws SQLException { realStatement.setNString(parameterIndex, value); } - public void setNCharacterStream(int parameterIndex, Reader value, - long length) throws SQLException { + public void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException { realStatement.setNCharacterStream(parameterIndex, value, length); } @@ -497,63 +452,51 @@ public void setNClob(int parameterIndex, NClob value) throws SQLException { realStatement.setNClob(parameterIndex, value); } - public void setClob(int parameterIndex, Reader reader, long length) - throws SQLException { + public void setClob(int parameterIndex, Reader reader, long length) throws SQLException { realStatement.setClob(parameterIndex, reader, length); } - public void setBlob(int parameterIndex, InputStream inputStream, long length) - throws SQLException { + public void setBlob(int parameterIndex, InputStream inputStream, long length) throws SQLException { realStatement.setBlob(parameterIndex, inputStream, length); } - public void setNClob(int parameterIndex, Reader reader, long length) - throws SQLException { + public void setNClob(int parameterIndex, Reader reader, long length) throws SQLException { realStatement.setNClob(parameterIndex, reader, length); } - public void setSQLXML(int parameterIndex, SQLXML xmlObject) - throws SQLException { + public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException { realStatement.setSQLXML(parameterIndex, xmlObject); } - public void setObject(int parameterIndex, Object x, int targetSqlType, - int scaleOrLength) throws SQLException { + public void setObject(int parameterIndex, Object x, int targetSqlType, int scaleOrLength) throws SQLException { realStatement.setObject(parameterIndex, x, targetSqlType, scaleOrLength); } - public void setAsciiStream(int parameterIndex, InputStream x, long length) - throws SQLException { + public void setAsciiStream(int parameterIndex, InputStream x, long length) throws SQLException { realStatement.setAsciiStream(parameterIndex, x, length); } - public void setBinaryStream(int parameterIndex, InputStream x, long length) - throws SQLException { + public void setBinaryStream(int parameterIndex, InputStream x, long length) throws SQLException { realStatement.setBinaryStream(parameterIndex, x, length); } - public void setCharacterStream(int parameterIndex, Reader reader, - long length) throws SQLException { + public void setCharacterStream(int parameterIndex, Reader reader, long length) throws SQLException { realStatement.setCharacterStream(parameterIndex, reader, length); } - public void setAsciiStream(int parameterIndex, InputStream x) - throws SQLException { + public void setAsciiStream(int parameterIndex, InputStream x) throws SQLException { realStatement.setAsciiStream(parameterIndex, x); } - public void setBinaryStream(int parameterIndex, InputStream x) - throws SQLException { + public void setBinaryStream(int parameterIndex, InputStream x) throws SQLException { realStatement.setBinaryStream(parameterIndex, x); } - public void setCharacterStream(int parameterIndex, Reader reader) - throws SQLException { + public void setCharacterStream(int parameterIndex, Reader reader) throws SQLException { realStatement.setCharacterStream(parameterIndex, reader); } - public void setNCharacterStream(int parameterIndex, Reader value) - throws SQLException { + public void setNCharacterStream(int parameterIndex, Reader value) throws SQLException { realStatement.setNCharacterStream(parameterIndex, value); } @@ -561,8 +504,7 @@ public void setClob(int parameterIndex, Reader reader) throws SQLException { realStatement.setClob(parameterIndex, reader); } - public void setBlob(int parameterIndex, InputStream inputStream) - throws SQLException { + public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException { realStatement.setBlob(parameterIndex, inputStream); } diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/trace/SWStatement.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/trace/SWStatement.java index 8e2da7f7d473..63472a136718 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/trace/SWStatement.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/trace/SWStatement.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.trace; import java.sql.Connection; @@ -25,20 +24,11 @@ import java.sql.SQLWarning; /** - * {@link SWStatement} wrapper the {@link java.sql.Statement} created by client. and it will interceptor the - * following methods for trace. - * 1. {@link #execute(String)} - * 2. {@link #execute(String, int[])} - * 3. {@link #execute(String, String[])} - * 4. {@link #execute(String, int)} - * 5. {@link #executeQuery(String)} - * 6. {@link #executeUpdate(String)} - * 7. {@link #executeUpdate(String, int[])} - * 8. {@link #executeUpdate(String, String[])} - * 9. {@link #executeUpdate(String, int)} - * 10. {@link #addBatch(String)} ()} - * - * @author zhangxin + * {@link SWStatement} wrapper the {@link java.sql.Statement} created by client. and it will interceptor the following + * methods for trace. 1. {@link #execute(String)} 2. {@link #execute(String, int[])} 3. {@link #execute(String, + * String[])} 4. {@link #execute(String, int)} 5. {@link #executeQuery(String)} 6. {@link #executeUpdate(String)} 7. + * {@link #executeUpdate(String, int[])} 8. {@link #executeUpdate(String, String[])} 9. {@link #executeUpdate(String, + * int)} 10. {@link #addBatch(String)} ()} */ public class SWStatement implements java.sql.Statement { @@ -62,8 +52,7 @@ public boolean isWrapperFor(Class iface) throws SQLException { 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 { + public ResultSet exe(java.sql.Statement realStatement, String sql) throws SQLException { return realStatement.executeQuery(sql); } }); @@ -71,8 +60,7 @@ public ResultSet exe(java.sql.Statement realStatement, String sql) 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 { + public Integer exe(java.sql.Statement realStatement, String sql) throws SQLException { return realStatement.executeUpdate(sql); } }); @@ -128,8 +116,7 @@ public void setCursorName(String name) throws SQLException { 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 { + public Boolean exe(java.sql.Statement realStatement, String sql) throws SQLException { return realStatement.execute(sql); } }); @@ -181,8 +168,7 @@ public void clearBatch() throws SQLException { 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 { + public int[] exe(java.sql.Statement realStatement, String sql) throws SQLException { return realStatement.executeBatch(); } }); @@ -200,41 +186,33 @@ public ResultSet getGeneratedKeys() throws SQLException { return realStatement.getGeneratedKeys(); } - public int executeUpdate(String sql, final int autoGeneratedKeys) - throws SQLException { + public int executeUpdate(String sql, final int autoGeneratedKeys) throws SQLException { return StatementTracing.execute(realStatement, connectInfo, "executeUpdate", sql, new StatementTracing.Executable() { - public Integer exe(java.sql.Statement realStatement, String sql) - throws SQLException { + public Integer exe(java.sql.Statement realStatement, String sql) throws SQLException { return realStatement.executeUpdate(sql, autoGeneratedKeys); } }); } - public int executeUpdate(String sql, final int[] columnIndexes) - throws SQLException { + public int executeUpdate(String sql, final int[] columnIndexes) throws SQLException { return StatementTracing.execute(realStatement, connectInfo, "executeUpdate", sql, new StatementTracing.Executable() { - public Integer exe(java.sql.Statement realStatement, String sql) - throws SQLException { + public Integer exe(java.sql.Statement realStatement, String sql) throws SQLException { return realStatement.executeUpdate(sql, columnIndexes); } }); } - public int executeUpdate(String sql, final String[] columnNames) - throws SQLException { + public int executeUpdate(String sql, final String[] columnNames) throws SQLException { return StatementTracing.execute(realStatement, connectInfo, "executeUpdate", sql, new StatementTracing.Executable() { - public Integer exe(java.sql.Statement realStatement, String sql) - throws SQLException { + public Integer exe(java.sql.Statement realStatement, String sql) throws SQLException { return realStatement.executeUpdate(sql, columnNames); } }); } - public boolean execute(String sql, final int autoGeneratedKeys) - throws SQLException { + public boolean execute(String sql, final int autoGeneratedKeys) throws SQLException { return StatementTracing.execute(realStatement, connectInfo, "execute", sql, new StatementTracing.Executable() { - public Boolean exe(java.sql.Statement realStatement, String sql) - throws SQLException { + public Boolean exe(java.sql.Statement realStatement, String sql) throws SQLException { return realStatement.execute(sql, autoGeneratedKeys); } }); @@ -242,18 +220,15 @@ public Boolean exe(java.sql.Statement realStatement, String sql) 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 { + public Boolean exe(java.sql.Statement realStatement, String sql) throws SQLException { return realStatement.execute(sql, columnIndexes); } }); } - public boolean execute(String sql, final String[] columnNames) - throws SQLException { + public boolean execute(String sql, final String[] columnNames) throws SQLException { return StatementTracing.execute(realStatement, connectInfo, "execute", sql, new StatementTracing.Executable() { - public Boolean exe(java.sql.Statement realStatement, String sql) - throws SQLException { + public Boolean exe(java.sql.Statement realStatement, String sql) throws SQLException { return realStatement.execute(sql, columnNames); } }); diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/trace/StatementTracing.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/trace/StatementTracing.java index 33e792be42ab..e0ca48fd791f 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/trace/StatementTracing.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/trace/StatementTracing.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.trace; import java.sql.SQLException; @@ -28,15 +27,13 @@ /** * {@link PreparedStatementTracing} create an exit span when the client call the method in the class that extend {@link * java.sql.Statement}. - * - * @author zhangxin */ public class StatementTracing { - public static R execute(java.sql.Statement realStatement, - ConnectionInfo connectInfo, String method, String sql, Executable exec) - throws SQLException { + public static R execute(java.sql.Statement realStatement, ConnectionInfo connectInfo, String method, String sql, + Executable exec) throws SQLException { try { - AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBI/Statement/" + method, connectInfo.getDatabasePeer()); + AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBI/Statement/" + method, connectInfo + .getDatabasePeer()); Tags.DB_TYPE.set(span, "sql"); Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName()); Tags.DB_STATEMENT.set(span, sql); @@ -54,7 +51,6 @@ public static R execute(java.sql.Statement realStatement, } public interface Executable { - R exe(java.sql.Statement realStatement, String sql) - throws SQLException; + R exe(java.sql.Statement realStatement, String sql) throws SQLException; } } diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/AbstractStatementTest.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/AbstractStatementTest.java index eec25867539c..279a3d30fe06 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/AbstractStatementTest.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/AbstractStatementTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc; import java.sql.SQLException; diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/ConnectionTracing.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/ConnectionTracing.java index 2185e90f2cf4..bac9888c84a9 100755 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/ConnectionTracing.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/ConnectionTracing.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc; import java.sql.SQLException; @@ -28,10 +27,10 @@ public class ConnectionTracing { - public static R execute(java.sql.Connection realConnection, - ConnectionInfo connectInfo, String method, String sql, Executable exec) - throws SQLException { - AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBI/Connection/" + method, connectInfo.getDatabasePeer()); + public static R execute(java.sql.Connection realConnection, ConnectionInfo connectInfo, String method, + String sql, Executable exec) throws SQLException { + AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBI/Connection/" + method, connectInfo + .getDatabasePeer()); try { Tags.DB_TYPE.set(span, "sql"); Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName()); @@ -49,7 +48,6 @@ public static R execute(java.sql.Connection realConnection, } public interface Executable { - R exe(java.sql.Connection realConnection, String sql) - throws SQLException; + R exe(java.sql.Connection realConnection, String sql) throws SQLException; } } diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SWCallableStatementTest.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SWCallableStatementTest.java index 7bcae2ab8f06..31dd18f156fe 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SWCallableStatementTest.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SWCallableStatementTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc; import com.mysql.cj.api.jdbc.JdbcConnection; @@ -112,7 +111,10 @@ 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 { @@ -125,11 +127,7 @@ public void setUp() throws Exception { @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 = ?"); + 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 = ?"); callableStatement.clearParameters(); callableStatement.setAsciiStream(1, inputStream); callableStatement.setAsciiStream(2, inputStream, 10); @@ -137,14 +135,14 @@ public void testSetParam() throws SQLException, MalformedURLException { 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); @@ -251,14 +249,14 @@ public void testSetParam() throws SQLException, MalformedURLException { 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); @@ -521,7 +519,10 @@ public void testInsertWithAutoGeneratedKey() throws SQLException { @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).close(); @@ -535,7 +536,10 @@ public void testInsertWithIntColumnIndexes() throws SQLException { @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).close(); @@ -648,7 +652,7 @@ public void testUpdateWithStringColumnIndexes() throws SQLException { @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(); @@ -688,7 +692,7 @@ public void testMultiHostWithException() throws SQLException { 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/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SWConnection.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SWConnection.java index 234fd5abaf6c..bc5819dfb9b9 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SWConnection.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SWConnection.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc; import java.sql.Array; @@ -62,18 +61,15 @@ public boolean isWrapperFor(Class iface) throws SQLException { } public Statement createStatement() throws SQLException { - return new SWStatement(this, realConnection.createStatement(), - this.connectInfo); + return new SWStatement(this, realConnection.createStatement(), this.connectInfo); } public PreparedStatement prepareStatement(String sql) throws SQLException { - return new SWPreparedStatement(this, - realConnection.prepareStatement(sql), this.connectInfo, sql); + return new SWPreparedStatement(this, realConnection.prepareStatement(sql), this.connectInfo, sql); } public CallableStatement prepareCall(String sql) throws SQLException { - return new SWCallableStatement(this, realConnection.prepareCall(sql), - this.connectInfo, sql); + return new SWCallableStatement(this, realConnection.prepareCall(sql), this.connectInfo, sql); } public String nativeSQL(String sql) throws SQLException { @@ -89,36 +85,30 @@ public boolean getAutoCommit() throws SQLException { } 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; - } - }); + ConnectionTracing.execute(realConnection, connectInfo, "commit", "", 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; - } - }); + ConnectionTracing.execute(realConnection, connectInfo, "rollback", "", 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; - } - }); + ConnectionTracing.execute(realConnection, connectInfo, "close", "", new ConnectionTracing.Executable() { + public String exe(java.sql.Connection realConnection, String sql) throws SQLException { + realConnection.close(); + return null; + } + }); } public boolean isClosed() throws SQLException { @@ -161,23 +151,17 @@ public void clearWarnings() throws SQLException { realConnection.clearWarnings(); } - public Statement createStatement(int resultSetType, int resultSetConcurrency) - throws SQLException { - return new SWStatement(this, realConnection.createStatement( - resultSetType, resultSetConcurrency), this.connectInfo); + public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException { + return new SWStatement(this, realConnection.createStatement(resultSetType, resultSetConcurrency), this.connectInfo); } public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency) throws SQLException { - return new SWPreparedStatement(this, realConnection.prepareStatement( - sql, resultSetType, resultSetConcurrency), this.connectInfo, - sql); + return new SWPreparedStatement(this, realConnection.prepareStatement(sql, resultSetType, resultSetConcurrency), this.connectInfo, sql); } - public CallableStatement prepareCall(String sql, int resultSetType, - int resultSetConcurrency) throws SQLException { - return new SWCallableStatement(this, realConnection.prepareCall(sql, - resultSetType, resultSetConcurrency), this.connectInfo, sql); + public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency) throws SQLException { + return new SWCallableStatement(this, realConnection.prepareCall(sql, resultSetType, resultSetConcurrency), this.connectInfo, sql); } public Map> getTypeMap() throws SQLException { @@ -205,67 +189,48 @@ public Savepoint setSavepoint(String name) throws SQLException { } 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; - } - }); + 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; + } + }); } 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; - } - }); + 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; + } + }); } - public Statement createStatement(int resultSetType, - int resultSetConcurrency, int resultSetHoldability) - throws SQLException { - return new SWStatement(this, realConnection.createStatement( - resultSetType, resultSetConcurrency, resultSetHoldability), - this.connectInfo); + public Statement createStatement(int resultSetType, int resultSetConcurrency, + int resultSetHoldability) throws SQLException { + return new SWStatement(this, realConnection.createStatement(resultSetType, resultSetConcurrency, resultSetHoldability), this.connectInfo); } - public PreparedStatement prepareStatement(String sql, int resultSetType, - int resultSetConcurrency, int resultSetHoldability) - throws SQLException { - return new SWPreparedStatement(this, - realConnection.prepareStatement(sql, resultSetType, - resultSetConcurrency, resultSetHoldability), - this.connectInfo, sql); + public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency, + int resultSetHoldability) throws SQLException { + return new SWPreparedStatement(this, realConnection.prepareStatement(sql, resultSetType, resultSetConcurrency, resultSetHoldability), this.connectInfo, sql); } - public CallableStatement prepareCall(String sql, int resultSetType, - int resultSetConcurrency, int resultSetHoldability) - throws SQLException { - return new SWCallableStatement(this, realConnection.prepareCall(sql, - resultSetType, resultSetConcurrency, resultSetHoldability), this.connectInfo, sql); + public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency, + int resultSetHoldability) throws SQLException { + return new SWCallableStatement(this, realConnection.prepareCall(sql, resultSetType, resultSetConcurrency, resultSetHoldability), this.connectInfo, sql); } - public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) - throws SQLException { - return new SWPreparedStatement(this, realConnection.prepareStatement( - sql, autoGeneratedKeys), this.connectInfo, sql); + public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException { + return new SWPreparedStatement(this, realConnection.prepareStatement(sql, autoGeneratedKeys), this.connectInfo, sql); } - public PreparedStatement prepareStatement(String sql, int[] columnIndexes) - throws SQLException { - return new SWPreparedStatement(this, realConnection.prepareStatement( - sql, columnIndexes), this.connectInfo, sql); + public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException { + return new SWPreparedStatement(this, realConnection.prepareStatement(sql, columnIndexes), this.connectInfo, sql); } - public PreparedStatement prepareStatement(String sql, String[] columnNames) - throws SQLException { - return new SWPreparedStatement(this, realConnection.prepareStatement( - sql, columnNames), this.connectInfo, sql); + public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException { + return new SWPreparedStatement(this, realConnection.prepareStatement(sql, columnNames), this.connectInfo, sql); } public Clob createClob() throws SQLException { @@ -288,13 +253,11 @@ public boolean isValid(int timeout) throws SQLException { return realConnection.isValid(timeout); } - public void setClientInfo(String name, String value) - throws SQLClientInfoException { + public void setClientInfo(String name, String value) throws SQLClientInfoException { realConnection.setClientInfo(name, value); } - public void setClientInfo(Properties properties) - throws SQLClientInfoException { + public void setClientInfo(Properties properties) throws SQLClientInfoException { realConnection.setClientInfo(properties); } @@ -306,13 +269,11 @@ public Properties getClientInfo() throws SQLException { return realConnection.getClientInfo(); } - public Array createArrayOf(String typeName, Object[] elements) - throws SQLException { + public Array createArrayOf(String typeName, Object[] elements) throws SQLException { return realConnection.createArrayOf(typeName, elements); } - public Struct createStruct(String typeName, Object[] attributes) - throws SQLException { + public Struct createStruct(String typeName, Object[] attributes) throws SQLException { return realConnection.createStruct(typeName, attributes); } @@ -328,8 +289,7 @@ public void abort(Executor executor) throws SQLException { realConnection.abort(executor); } - public void setNetworkTimeout(Executor executor, int milliseconds) - throws SQLException { + public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException { realConnection.setNetworkTimeout(executor, milliseconds); } diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SWConnectionTest.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SWConnectionTest.java index 32056f929d8a..58cd0beef665 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SWConnectionTest.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SWConnectionTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc; import com.mysql.cj.api.jdbc.JdbcConnection; diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SWStatementTest.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SWStatementTest.java index ea534236093d..3b246e65e2af 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SWStatementTest.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SWStatementTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc; import com.mysql.cj.api.jdbc.JdbcConnection; diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SwPreparedStatementTest.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SwPreparedStatementTest.java index 2bea98f5d910..78ff7b5dcfeb 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SwPreparedStatementTest.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SwPreparedStatementTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc; import com.mysql.cj.api.jdbc.JdbcConnection; @@ -110,7 +109,10 @@ 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 { @@ -125,11 +127,7 @@ public void setUp() throws Exception { @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 = ?"); + 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 = ?"); preparedStatement.clearParameters(); preparedStatement.setAsciiStream(1, inputStream); preparedStatement.setAsciiStream(2, inputStream, 10); @@ -137,14 +135,14 @@ public void testSetParam() throws SQLException, MalformedURLException { 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); @@ -366,7 +364,10 @@ public void testInsertWithAutoGeneratedKey() throws SQLException { @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).close(); @@ -380,7 +381,10 @@ public void testInsertWithIntColumnIndexes() throws SQLException { @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).close(); @@ -491,7 +495,7 @@ public void testUpdateWithStringColumnIndexes() throws SQLException { @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(); @@ -531,8 +535,11 @@ public void testMultiHostWithException() throws SQLException { 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(); diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/URLParserTest.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/URLParserTest.java index bcf8b995dc0d..50b9f5035874 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/URLParserTest.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/URLParserTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.connectionurl.parser; import org.junit.Test; diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/pom.xml index b0de61c3eb22..bdc6e3f7dcbc 100644 --- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + 4.0.0 org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithHostAndPortArgInterceptor.java b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithHostAndPortArgInterceptor.java index 7c517c024dd1..bd8bde43f80d 100644 --- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithHostAndPortArgInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithHostAndPortArgInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jedis.v2; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; @@ -27,7 +26,7 @@ public class JedisClusterConstructorWithHostAndPortArgInterceptor implements Ins @Override public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { - HostAndPort hostAndPort = (HostAndPort)allArguments[0]; + HostAndPort hostAndPort = (HostAndPort) allArguments[0]; objInst.setSkyWalkingDynamicField(hostAndPort.getHost() + ":" + hostAndPort.getPort()); } } diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithListHostAndPortArgInterceptor.java b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithListHostAndPortArgInterceptor.java index f4f436777042..3ed626a583a3 100644 --- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithListHostAndPortArgInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithListHostAndPortArgInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jedis.v2; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; @@ -31,7 +30,7 @@ public class JedisClusterConstructorWithListHostAndPortArgInterceptor implements @Override public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { StringBuilder redisConnInfo = new StringBuilder(); - Set hostAndPorts = (Set)allArguments[0]; + Set hostAndPorts = (Set) allArguments[0]; for (HostAndPort hostAndPort : hostAndPorts) { redisConnInfo.append(hostAndPort.toString()).append(";"); } diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithShardInfoArgInterceptor.java b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithShardInfoArgInterceptor.java index 212bcf6ea021..b7f54d2d3392 100644 --- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithShardInfoArgInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithShardInfoArgInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jedis.v2; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; @@ -28,7 +27,7 @@ public class JedisConstructorWithShardInfoArgInterceptor implements InstanceCons @Override public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { String redisConnInfo; - JedisShardInfo shardInfo = (JedisShardInfo)allArguments[0]; + JedisShardInfo shardInfo = (JedisShardInfo) allArguments[0]; redisConnInfo = shardInfo.getHost() + ":" + shardInfo.getPort(); objInst.setSkyWalkingDynamicField(redisConnInfo); } diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithStringArgInterceptor.java b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithStringArgInterceptor.java index 4ffdb149d546..9d00b13c3645 100644 --- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithStringArgInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithStringArgInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jedis.v2; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; @@ -26,7 +25,7 @@ public class JedisConstructorWithStringArgInterceptor implements InstanceConstru @Override public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { - String host = (String)allArguments[0]; + String host = (String) allArguments[0]; String port = "6379"; if (allArguments.length > 1) { port = String.valueOf(allArguments[1]); diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithUriArgInterceptor.java b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithUriArgInterceptor.java index 5211859d8236..a44cab86c814 100644 --- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithUriArgInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithUriArgInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jedis.v2; import java.net.URI; @@ -27,7 +26,7 @@ public class JedisConstructorWithUriArgInterceptor implements InstanceConstructo @Override public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { - URI uri = (URI)allArguments[0]; + URI uri = (URI) allArguments[0]; objInst.setSkyWalkingDynamicField(uri.getHost() + ":" + uri.getPort()); } } diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisMethodInterceptor.java b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisMethodInterceptor.java index f154b12a66fa..6152127bfd06 100644 --- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisMethodInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisMethodInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jedis.v2; import java.lang.reflect.Method; @@ -33,8 +32,8 @@ public class JedisMethodInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { String peer = String.valueOf(objInst.getSkyWalkingDynamicField()); AbstractSpan span = ContextManager.createExitSpan("Jedis/" + method.getName(), peer); span.setComponent(ComponentsDefine.JEDIS); @@ -49,8 +48,8 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/RedisMethodMatch.java b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/RedisMethodMatch.java index 126f4fe0e565..dbf5b040f2ea 100644 --- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/RedisMethodMatch.java +++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/RedisMethodMatch.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jedis.v2; import net.bytebuddy.description.method.MethodDescription; @@ -28,58 +27,183 @@ public enum RedisMethodMatch { INSTANCE; private ElementMatcher.Junction getIntersectionalMethodMacher() { - return named("zcount").or(named("sunionstore")).or(named("zunionstore")) - .or(named("del")).or(named("zinterstore")).or(named("echo")) - .or(named("hscan")).or(named("psubscribe")).or(named("type")) - .or(named("sinterstore")).or(named("setex")).or(named("zlexcount")) - .or(named("brpoplpush")).or(named("bitcount")).or(named("llen")) - .or(named("zscan")).or(named("lpushx")).or(named("bitpos")) - .or(named("setnx")).or(named("hvals")).or(named("evalsha")) - .or(named("substr")).or(named("geodist")).or(named("zrangeByLex")) - .or(named("geoadd")).or(named("expire")).or(named("bitop")) - .or(named("zrangeByScore")).or(named("smove")).or(named("lset")) - .or(named("decrBy")).or(named("pttl")).or(named("scan")) - .or(named("zrank")).or(named("blpop")).or(named("rpoplpush")) - .or(named("zremrangeByLex")).or(named("get")).or(named("lpop")) - .or(named("persist")).or(named("scriptExists")).or(named("georadius")) - .or(named("set")).or(named("srandmember")).or(named("incr")).or(named("setbit")) - .or(named("hexists")).or(named("expireAt")).or(named("pexpire")).or(named("zcard")) - .or(named("bitfield")).or(named("zrevrangeByLex")).or(named("sinter")).or(named("srem")) - .or(named("getrange")).or(named("rename")).or(named("zrevrank")).or(named("exists")) - .or(named("setrange")).or(named("zremrangeByRank")).or(named("sadd")).or(named("sdiff")) - .or(named("zrevrange")).or(named("getbit")).or(named("scard")).or(named("sdiffstore")) - .or(named("zrevrangeByScore")).or(named("zincrby")).or(named("rpushx")).or(named("psetex")) - .or(named("zrevrangeWithScores")).or(named("strlen")).or(named("hdel")).or(named("zremrangeByScore")) - .or(named("geohash")).or(named("brpop")).or(named("lrem")).or(named("hlen")).or(named("decr")) - .or(named("scriptLoad")).or(named("lpush")).or(named("lindex")).or(named("zrange")).or(named("incrBy")) - .or(named("getSet")).or(named("ltrim")).or(named("incrByFloat")).or(named("rpop")).or(named("sort")) - .or(named("zrevrangeByScoreWithScores")).or(named("pfadd")).or(named("eval")).or(named("linsert")) - .or(named("pfcount")).or(named("hkeys")).or(named("hsetnx")).or(named("hincrBy")).or(named("hgetAll")) - .or(named("hset")).or(named("spop")).or(named("zrangeWithScores")).or(named("hincrByFloat")) - .or(named("hmset")).or(named("renamenx")).or(named("zrem")).or(named("msetnx")).or(named("hmget")) - .or(named("sunion")).or(named("hget")).or(named("zadd")).or(named("move")).or(named("subscribe")) - .or(named("geopos")).or(named("mset")).or(named("zrangeByScoreWithScores")).or(named("zscore")) - .or(named("pexpireAt")).or(named("georadiusByMember")).or(named("ttl")).or(named("lrange")) - .or(named("smembers")).or(named("pfmerge")).or(named("rpush")).or(named("publish")) - .or(named("mget")).or(named("sscan")).or(named("append")).or(named("sismember")); + return named("zcount").or(named("sunionstore")) + .or(named("zunionstore")) + .or(named("del")) + .or(named("zinterstore")) + .or(named("echo")) + .or(named("hscan")) + .or(named("psubscribe")) + .or(named("type")) + .or(named("sinterstore")) + .or(named("setex")) + .or(named("zlexcount")) + .or(named("brpoplpush")) + .or(named("bitcount")) + .or(named("llen")) + .or(named("zscan")) + .or(named("lpushx")) + .or(named("bitpos")) + .or(named("setnx")) + .or(named("hvals")) + .or(named("evalsha")) + .or(named("substr")) + .or(named("geodist")) + .or(named("zrangeByLex")) + .or(named("geoadd")) + .or(named("expire")) + .or(named("bitop")) + .or(named("zrangeByScore")) + .or(named("smove")) + .or(named("lset")) + .or(named("decrBy")) + .or(named("pttl")) + .or(named("scan")) + .or(named("zrank")) + .or(named("blpop")) + .or(named("rpoplpush")) + .or(named("zremrangeByLex")) + .or(named("get")) + .or(named("lpop")) + .or(named("persist")) + .or(named("scriptExists")) + .or(named("georadius")) + .or(named("set")) + .or(named("srandmember")) + .or(named("incr")) + .or(named("setbit")) + .or(named("hexists")) + .or(named("expireAt")) + .or(named("pexpire")) + .or(named("zcard")) + .or(named("bitfield")) + .or(named("zrevrangeByLex")) + .or(named("sinter")) + .or(named("srem")) + .or(named("getrange")) + .or(named("rename")) + .or(named("zrevrank")) + .or(named("exists")) + .or(named("setrange")) + .or(named("zremrangeByRank")) + .or(named("sadd")) + .or(named("sdiff")) + .or(named("zrevrange")) + .or(named("getbit")) + .or(named("scard")) + .or(named("sdiffstore")) + .or(named("zrevrangeByScore")) + .or(named("zincrby")) + .or(named("rpushx")) + .or(named("psetex")) + .or(named("zrevrangeWithScores")) + .or(named("strlen")) + .or(named("hdel")) + .or(named("zremrangeByScore")) + .or(named("geohash")) + .or(named("brpop")) + .or(named("lrem")) + .or(named("hlen")) + .or(named("decr")) + .or(named("scriptLoad")) + .or(named("lpush")) + .or(named("lindex")) + .or(named("zrange")) + .or(named("incrBy")) + .or(named("getSet")) + .or(named("ltrim")) + .or(named("incrByFloat")) + .or(named("rpop")) + .or(named("sort")) + .or(named("zrevrangeByScoreWithScores")) + .or(named("pfadd")) + .or(named("eval")) + .or(named("linsert")) + .or(named("pfcount")) + .or(named("hkeys")) + .or(named("hsetnx")) + .or(named("hincrBy")) + .or(named("hgetAll")) + .or(named("hset")) + .or(named("spop")) + .or(named("zrangeWithScores")) + .or(named("hincrByFloat")) + .or(named("hmset")) + .or(named("renamenx")) + .or(named("zrem")) + .or(named("msetnx")) + .or(named("hmget")) + .or(named("sunion")) + .or(named("hget")) + .or(named("zadd")) + .or(named("move")) + .or(named("subscribe")) + .or(named("geopos")) + .or(named("mset")) + .or(named("zrangeByScoreWithScores")) + .or(named("zscore")) + .or(named("pexpireAt")) + .or(named("georadiusByMember")) + .or(named("ttl")) + .or(named("lrange")) + .or(named("smembers")) + .or(named("pfmerge")) + .or(named("rpush")) + .or(named("publish")) + .or(named("mget")) + .or(named("sscan")) + .or(named("append")) + .or(named("sismember")); } public ElementMatcher getJedisMethodMatcher() { - return getIntersectionalMethodMacher().or(named("sentinelMasters")).or(named("clusterReplicate")).or(named("readonly")) - .or(named("randomKey")).or(named("clusterInfo")).or(named("pubsubNumSub")) - .or(named("sentinelSlaves")).or(named("clusterSetSlotImporting")).or(named("clusterSlaves")) - .or(named("clusterFailover")).or(named("clusterSetSlotMigrating")).or(named("watch")) - .or(named("clientKill")).or(named("clusterKeySlot")).or(named("clusterCountKeysInSlot")) - .or(named("sentinelGetMasterAddrByName")).or(named("objectRefcount")).or(named("clusterMeet")) - .or(named("sentinelSet")).or(named("clusterSetSlotNode")).or(named("clusterAddSlots")) - .or(named("pubsubNumPat")).or(named("slowlogGet")).or(named("sentinelReset")).or(named("clusterNodes")) - .or(named("sentinelMonitor")).or(named("configGet")).or(named("objectIdletime")) - .or(named("pubsubChannels")).or(named("getParams")).or(named("sentinelRemove")) - .or(named("migrate")).or(named("clusterForget")).or(named("asking")).or(named("keys")) - .or(named("clientSetname")).or(named("clusterSaveConfig")).or(named("configSet")) - .or(named("dump")).or(named("clusterFlushSlots")).or(named("clusterGetKeysInSlot")) - .or(named("clusterReset")).or(named("restore")).or(named("clusterDelSlots")) - .or(named("sentinelFailover")).or(named("clusterSetSlotStable")).or(named("objectEncoding")); + return getIntersectionalMethodMacher().or(named("sentinelMasters")) + .or(named("clusterReplicate")) + .or(named("readonly")) + .or(named("randomKey")) + .or(named("clusterInfo")) + .or(named("pubsubNumSub")) + .or(named("sentinelSlaves")) + .or(named("clusterSetSlotImporting")) + .or(named("clusterSlaves")) + .or(named("clusterFailover")) + .or(named("clusterSetSlotMigrating")) + .or(named("watch")) + .or(named("clientKill")) + .or(named("clusterKeySlot")) + .or(named("clusterCountKeysInSlot")) + .or(named("sentinelGetMasterAddrByName")) + .or(named("objectRefcount")) + .or(named("clusterMeet")) + .or(named("sentinelSet")) + .or(named("clusterSetSlotNode")) + .or(named("clusterAddSlots")) + .or(named("pubsubNumPat")) + .or(named("slowlogGet")) + .or(named("sentinelReset")) + .or(named("clusterNodes")) + .or(named("sentinelMonitor")) + .or(named("configGet")) + .or(named("objectIdletime")) + .or(named("pubsubChannels")) + .or(named("getParams")) + .or(named("sentinelRemove")) + .or(named("migrate")) + .or(named("clusterForget")) + .or(named("asking")) + .or(named("keys")) + .or(named("clientSetname")) + .or(named("clusterSaveConfig")) + .or(named("configSet")) + .or(named("dump")) + .or(named("clusterFlushSlots")) + .or(named("clusterGetKeysInSlot")) + .or(named("clusterReset")) + .or(named("restore")) + .or(named("clusterDelSlots")) + .or(named("sentinelFailover")) + .or(named("clusterSetSlotStable")) + .or(named("objectEncoding")); } public ElementMatcher getJedisClusterMethodMatcher() { diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/define/JedisClusterInstrumentation.java b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/define/JedisClusterInstrumentation.java index 54d050238a5c..1cf3aaef181c 100644 --- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/define/JedisClusterInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/define/JedisClusterInstrumentation.java @@ -86,7 +86,8 @@ public String getMethodsInterceptor() { return METHOD_INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/define/JedisInstrumentation.java b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/define/JedisInstrumentation.java index 8f41fe4b6bf5..d83794ee8fcf 100644 --- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/define/JedisInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/define/JedisInstrumentation.java @@ -74,7 +74,7 @@ public String getConstructorInterceptor() { }, new ConstructorInterceptPoint() { @Override - public ElementMatcher getConstructorMatcher() { + public ElementMatcher getConstructorMatcher() { return takesArgumentWithType(0, JEDIS_SHARD_INFO_ARG_TYPE_NAME); } @@ -111,7 +111,8 @@ public String getMethodsInterceptor() { return JEDIS_METHOD_INTERCET_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithHostAndPortArgInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithHostAndPortArgInterceptorTest.java index 49ffc1f527fd..8104d65d1b10 100644 --- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithHostAndPortArgInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithHostAndPortArgInterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jedis.v2; import org.junit.After; diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithListHostAndPortArgInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithListHostAndPortArgInterceptorTest.java index b0abfe5a050f..39ba56f32e89 100644 --- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithListHostAndPortArgInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisClusterConstructorWithListHostAndPortArgInterceptorTest.java @@ -58,7 +58,7 @@ public void tearDown() throws Exception { @Test public void onConstruct() throws Exception { - interceptor.onConstruct(enhancedInstance, new Object[]{hostAndPortSet}); + interceptor.onConstruct(enhancedInstance, new Object[] {hostAndPortSet}); verify(enhancedInstance).setSkyWalkingDynamicField("127.0.0.1:6379;127.0.0.1:16379;"); } @@ -82,7 +82,7 @@ public void setSkyWalkingDynamicField(Object value) { this.v = value; } }; - interceptor.onConstruct(enhancedInstance, new Object[]{hostAndPortSet}); + interceptor.onConstruct(enhancedInstance, new Object[] {hostAndPortSet}); Assert.assertTrue(enhancedInstance.getSkyWalkingDynamicField().toString().length() == 200); } diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithShardInfoArgInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithShardInfoArgInterceptorTest.java index 371bf750c49f..8aab71561ce3 100644 --- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithShardInfoArgInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithShardInfoArgInterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jedis.v2; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithStringArgInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithStringArgInterceptorTest.java index f645b7c66616..cf8570727836 100644 --- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithStringArgInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithStringArgInterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jedis.v2; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; @@ -50,7 +49,10 @@ public void onConstruct() throws Exception { @Test public void onConstructWithPort() { - interceptor.onConstruct(enhancedInstance, new Object[] {"127.0.0.1", 16379}); + interceptor.onConstruct(enhancedInstance, new Object[] { + "127.0.0.1", + 16379 + }); verify(enhancedInstance).setSkyWalkingDynamicField("127.0.0.1:16379"); } diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithUriArgInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithUriArgInterceptorTest.java index d22c7b290b7d..f6c009c82cf8 100644 --- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithUriArgInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisConstructorWithUriArgInterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jedis.v2; import java.net.URI; diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisMethodInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisMethodInterceptorTest.java index 4ec98658098d..ffa9517fb672 100644 --- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisMethodInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisMethodInterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jedis.v2; import java.lang.reflect.Method; @@ -70,8 +69,14 @@ public class JedisMethodInterceptorTest { @Before public void setUp() throws Exception { - allArgument = new Object[] {"OperationKey", "OperationValue"}; - argumentType = new Class[] {String.class, String.class}; + allArgument = new Object[] { + "OperationKey", + "OperationValue" + }; + argumentType = new Class[] { + String.class, + String.class + }; interceptor = new JedisMethodInterceptor(); when(enhancedInstance.getSkyWalkingDynamicField()).thenReturn("127.0.0.1:6379"); @@ -120,7 +125,9 @@ private void assertLogData(List logDataEntities) { LogDataEntity logData = logDataEntities.get(0); Assert.assertThat(logData.getLogs().size(), is(4)); Assert.assertThat(logData.getLogs().get(0).getValue(), CoreMatchers.is("error")); - Assert.assertThat(logData.getLogs().get(1).getValue(), CoreMatchers.is(RuntimeException.class.getName())); + Assert.assertThat(logData.getLogs() + .get(1) + .getValue(), CoreMatchers.is(RuntimeException.class.getName())); Assert.assertNull(logData.getLogs().get(2).getValue()); assertNotNull(logData.getLogs().get(3).getValue()); } diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/pom.xml index 59b71bb99734..77ebb0fcfcb7 100644 --- a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/pom.xml @@ -16,7 +16,8 @@ ~ --> - + jetty-plugins org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v90/client/SyncHttpRequestSendInterceptor.java b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v90/client/SyncHttpRequestSendInterceptor.java index 0313bf401415..049e1326285e 100644 --- a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v90/client/SyncHttpRequestSendInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v90/client/SyncHttpRequestSendInterceptor.java @@ -38,9 +38,11 @@ public class SyncHttpRequestSendInterceptor implements InstanceMethodsAroundInte @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - HttpRequest request = (HttpRequest)objInst; + HttpRequest request = (HttpRequest) objInst; ContextCarrier contextCarrier = new ContextCarrier(); - AbstractSpan span = ContextManager.createExitSpan(request.getURI().getPath(), contextCarrier, request.getHost() + ":" + request.getPort()); + AbstractSpan span = ContextManager.createExitSpan(request.getURI() + .getPath(), contextCarrier, request.getHost() + ":" + request + .getPort()); span.setComponent(ComponentsDefine.JETTY_CLIENT); Tags.HTTP.METHOD.set(span, getHttpMethod(request)); @@ -62,7 +64,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v90/client/define/HttpRequestInstrumentation.java b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v90/client/define/HttpRequestInstrumentation.java index 6fac67fe20f1..cadaf0b0707e 100644 --- a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v90/client/define/HttpRequestInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v90/client/define/HttpRequestInstrumentation.java @@ -34,8 +34,6 @@ * org.eclipse.jetty.client.HttpRequest by org.apache.skywalking.apm.plugin.jetty.client.SyncHttpRequestSendInterceptor * and enhance the send with org.eclipse.jetty.client.api.Response$CompleteListener parameter * by org.apache.skywalking.apm.plugin.jetty.client.AsyncHttpRequestSendInterceptor - * - * @author zhangxin */ public class HttpRequestInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -43,34 +41,41 @@ public class HttpRequestInstrumentation extends ClassInstanceMethodsEnhancePlugi private static final String ENHANCE_CLASS_NAME = "send"; public static final String SYNC_SEND_INTERCEPTOR = "org.apache.skywalking.apm.plugin.jetty.v90.client.SyncHttpRequestSendV90Interceptor"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { //sync call interceptor point - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(ENHANCE_CLASS_NAME).and(takesArguments(0)); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return SYNC_SEND_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); } - @Override protected String[] witnessClasses() { + @Override + protected String[] witnessClasses() { return new String[] {"org.eclipse.jetty.client.api.ProxyConfiguration"}; } } diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/src/test/java/org/apache/skywalking/apm/plugin/jetty/v90/client/SyncHttpRequestSendInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/src/test/java/org/apache/skywalking/apm/plugin/jetty/v90/client/SyncHttpRequestSendInterceptorTest.java index 0af3cc61147c..78f5977c0f1b 100644 --- a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/src/test/java/org/apache/skywalking/apm/plugin/jetty/v90/client/SyncHttpRequestSendInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/src/test/java/org/apache/skywalking/apm/plugin/jetty/v90/client/SyncHttpRequestSendInterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jetty.v90.client; import java.net.URI; @@ -69,8 +68,14 @@ public class SyncHttpRequestSendInterceptorTest { @Before public void setUp() throws Exception { enhancedInstance = new MockHttpRequest(httpClient, uri); - allArguments = new Object[] {"OperationKey", "OperationValue"}; - argumentTypes = new Class[] {String.class, String.class}; + allArguments = new Object[] { + "OperationKey", + "OperationValue" + }; + argumentTypes = new Class[] { + String.class, + String.class + }; interceptor = new SyncHttpRequestSendInterceptor(); allArguments = new Object[] {callBackEnhanceInstance}; @@ -122,19 +127,23 @@ public MockHttpRequest(HttpClient httpClient, URI uri) { super(httpClient, uri); } - @Override public Object getSkyWalkingDynamicField() { + @Override + public Object getSkyWalkingDynamicField() { return null; } - @Override public void setSkyWalkingDynamicField(Object value) { + @Override + public void setSkyWalkingDynamicField(Object value) { } - @Override public HttpMethod getMethod() { + @Override + public HttpMethod getMethod() { return HttpMethod.GET; } - @Override public URI getURI() { + @Override + public URI getURI() { return uri; } } diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/pom.xml index 0c90d36ff397..615853e8adfd 100644 --- a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/pom.xml @@ -16,7 +16,8 @@ ~ --> - + jetty-plugins org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/client/SyncHttpRequestSendInterceptor.java b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/client/SyncHttpRequestSendInterceptor.java index 49ac74e9e739..0e0f86a632e7 100644 --- a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/client/SyncHttpRequestSendInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/client/SyncHttpRequestSendInterceptor.java @@ -37,9 +37,11 @@ public class SyncHttpRequestSendInterceptor implements InstanceMethodsAroundInte @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - HttpRequest request = (HttpRequest)objInst; + HttpRequest request = (HttpRequest) objInst; ContextCarrier contextCarrier = new ContextCarrier(); - AbstractSpan span = ContextManager.createExitSpan(request.getURI().getPath(), contextCarrier, request.getHost() + ":" + request.getPort()); + AbstractSpan span = ContextManager.createExitSpan(request.getURI() + .getPath(), contextCarrier, request.getHost() + ":" + request + .getPort()); span.setComponent(ComponentsDefine.JETTY_CLIENT); Tags.HTTP.METHOD.set(span, getHttpMethod(request)); @@ -61,7 +63,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/client/define/HttpRequestInstrumentation.java b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/client/define/HttpRequestInstrumentation.java index d1596be503bb..cb20e10828dd 100644 --- a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/client/define/HttpRequestInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/client/define/HttpRequestInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jetty.v9.client.define; import net.bytebuddy.description.method.MethodDescription; @@ -35,8 +34,6 @@ * org.eclipse.jetty.client.HttpRequest by org.apache.skywalking.apm.plugin.jetty.client.SyncHttpRequestSendInterceptor * and enhance the send with org.eclipse.jetty.client.api.Response$CompleteListener parameter * by org.apache.skywalking.apm.plugin.jetty.client.AsyncHttpRequestSendInterceptor - * - * @author zhangxin */ public class HttpRequestInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -44,34 +41,41 @@ public class HttpRequestInstrumentation extends ClassInstanceMethodsEnhancePlugi private static final String ENHANCE_CLASS_NAME = "send"; public static final String SYNC_SEND_INTERCEPTOR = "org.apache.skywalking.apm.plugin.jetty.v9.client.SyncHttpRequestSendInterceptor"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { //sync call interceptor point - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(ENHANCE_CLASS_NAME).and(takesArguments(0)); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return SYNC_SEND_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); } - @Override protected String[] witnessClasses() { + @Override + protected String[] witnessClasses() { return new String[] {"org.eclipse.jetty.client.AbstractHttpClientTransport"}; } } diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jetty/v9/client/SyncHttpRequestSendInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jetty/v9/client/SyncHttpRequestSendInterceptorTest.java index 13788e2bbdd4..ded7e3d58d0f 100644 --- a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jetty/v9/client/SyncHttpRequestSendInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jetty/v9/client/SyncHttpRequestSendInterceptorTest.java @@ -67,8 +67,14 @@ public class SyncHttpRequestSendInterceptorTest { @Before public void setUp() throws Exception { enhancedInstance = new MockHttpRequest(httpClient, uri); - allArguments = new Object[] {"OperationKey", "OperationValue"}; - argumentTypes = new Class[] {String.class, String.class}; + allArguments = new Object[] { + "OperationKey", + "OperationValue" + }; + argumentTypes = new Class[] { + String.class, + String.class + }; interceptor = new SyncHttpRequestSendInterceptor(); allArguments = new Object[] {callBackEnhanceInstance}; @@ -120,19 +126,23 @@ public MockHttpRequest(HttpClient httpClient, URI uri) { super(httpClient, uri); } - @Override public Object getSkyWalkingDynamicField() { + @Override + public Object getSkyWalkingDynamicField() { return null; } - @Override public void setSkyWalkingDynamicField(Object value) { + @Override + public void setSkyWalkingDynamicField(Object value) { } - @Override public String getMethod() { + @Override + public String getMethod() { return "GET"; } - @Override public URI getURI() { + @Override + public URI getURI() { return uri; } } diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/pom.xml index 1479a4771029..c2be0a9ac8fd 100644 --- a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/pom.xml @@ -16,7 +16,8 @@ ~ --> - + jetty-plugins org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/server/ForwardInterceptor.java b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/server/ForwardInterceptor.java index ea2e425b6934..669fae17708c 100644 --- a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/server/ForwardInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/server/ForwardInterceptor.java @@ -37,7 +37,7 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr if (ContextManager.isActive()) { AbstractSpan abstractTracingSpan = ContextManager.activeSpan(); Map eventMap = new HashMap(); - eventMap.put("forward-url", (String)objInst.getSkyWalkingDynamicField()); + eventMap.put("forward-url", (String) objInst.getSkyWalkingDynamicField()); abstractTracingSpan.log(System.currentTimeMillis(), eventMap); ContextManager.getRuntimeContext().put(Constants.FORWARD_REQUEST_FLAG, true); } @@ -49,12 +49,14 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { } - @Override public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { + @Override + public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { objInst.setSkyWalkingDynamicField(allArguments[2]); } } diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/server/HandleInterceptor.java b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/server/HandleInterceptor.java index 40e62ca4cbd1..cc5d2c05497e 100644 --- a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/server/HandleInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/server/HandleInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jetty.v9.server; import java.lang.reflect.Method; @@ -48,7 +47,7 @@ public class HandleInterceptor implements InstanceMethodsAroundInterceptor { @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - HttpChannel httpChannel = (HttpChannel)objInst; + HttpChannel httpChannel = (HttpChannel) objInst; HttpServletRequest servletRequest = httpChannel.getRequest(); ContextCarrier contextCarrier = new ContextCarrier(); @@ -69,7 +68,7 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { - HttpChannel httpChannel = (HttpChannel)objInst; + HttpChannel httpChannel = (HttpChannel) objInst; HttpServletResponse servletResponse = httpChannel.getResponse(); AbstractSpan span = ContextManager.activeSpan(); if (IS_SERVLET_GET_STATUS_METHOD_EXIST && servletResponse.getStatus() >= 400) { @@ -81,7 +80,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/server/define/DispatcherInstrumentation.java b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/server/define/DispatcherInstrumentation.java index 5aafe78e40cf..309d7eff1265 100644 --- a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/server/define/DispatcherInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/server/define/DispatcherInstrumentation.java @@ -35,39 +35,47 @@ public class DispatcherInstrumentation extends ClassInstanceMethodsEnhancePlugin private static final String ENHANCE_CLASS = "org.eclipse.jetty.server.Dispatcher"; public static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.jetty.v9.server.ForwardInterceptor"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { - @Override public ElementMatcher getConstructorMatcher() { + @Override + public ElementMatcher getConstructorMatcher() { return takesArgumentWithType(2, "java.lang.String"); } - @Override public String getConstructorInterceptor() { + @Override + public String getConstructorInterceptor() { return INTERCEPT_CLASS; } } }; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named("forward"); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName(ENHANCE_CLASS); } } diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/server/define/JettyInstrumentation.java b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/server/define/JettyInstrumentation.java index dd238599d05c..439128a89c16 100644 --- a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/server/define/JettyInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jetty/v9/server/define/JettyInstrumentation.java @@ -31,8 +31,6 @@ /** * {@link JettyInstrumentation} enhance the handle method in org.eclipse.jetty.server.handler.HandlerList * by HandleInterceptor - * - * @author zhangxin */ public class JettyInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -40,29 +38,35 @@ public class JettyInstrumentation extends ClassInstanceMethodsEnhancePluginDefin private static final String ENHANCE_METHOD = "handle"; private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.jetty.v9.server.HandleInterceptor"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(ENHANCE_METHOD); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return INTERCEPTOR_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); } } diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jetty/v9/server/HandleInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jetty/v9/server/HandleInterceptorTest.java index b69d65f0ffd7..f2f7393dddab 100644 --- a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jetty/v9/server/HandleInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jetty/v9/server/HandleInterceptorTest.java @@ -153,17 +153,18 @@ private void assertHttpSpan(AbstractTracingSpan span) { public static class MockService extends HttpChannel implements EnhancedInstance { - public MockService(Connector connector, - HttpConfiguration configuration, EndPoint endPoint, + public MockService(Connector connector, HttpConfiguration configuration, EndPoint endPoint, HttpTransport transport, HttpInput input) { super(connector, configuration, endPoint, transport, input); } - @Override public Object getSkyWalkingDynamicField() { + @Override + public Object getSkyWalkingDynamicField() { return null; } - @Override public void setSkyWalkingDynamicField(Object value) { + @Override + public void setSkyWalkingDynamicField(Object value) { } } diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml index fb2e615d992d..21d0139e6969 100644 --- a/apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/kafka-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/kafka-plugin/pom.xml index 5a1d8223e022..86e432577ed5 100644 --- a/apm-sniffer/apm-sdk-plugin/kafka-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/kafka-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-sdk-plugin org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/CallbackAdapter.java b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/CallbackAdapter.java index f4a8142795d5..ac94208c873a 100644 --- a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/CallbackAdapter.java +++ b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/CallbackAdapter.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.kafka; import org.apache.kafka.clients.producer.Callback; @@ -23,7 +24,6 @@ /** * implements Callback and EnhancedInstance, for transformation kafkaTemplate.buildCallback - * @author stalary */ public class CallbackAdapter implements Callback, EnhancedInstance { diff --git a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/CallbackCache.java b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/CallbackCache.java index 6e48f8356ddf..2ad1d031f467 100644 --- a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/CallbackCache.java +++ b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/CallbackCache.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.kafka; import org.apache.kafka.clients.producer.Callback; @@ -22,7 +23,6 @@ /** * cache Callback and ContextSnapshot - * @author stalary */ public class CallbackCache { @@ -48,9 +48,6 @@ public void setSnapshot(ContextSnapshot snapshot) { @Override public String toString() { - return "CallbackCache{" + - "callback=" + callback + - ", snapshot=" + snapshot + - '}'; + return "CallbackCache{" + "callback=" + callback + ", snapshot=" + snapshot + '}'; } } \ No newline at end of file diff --git a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/CallbackConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/CallbackConstructorInterceptor.java index 9fb123abb767..613860ce0838 100644 --- a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/CallbackConstructorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/CallbackConstructorInterceptor.java @@ -24,7 +24,6 @@ /** * intercept Callback set cache - * @author stalary **/ public class CallbackConstructorInterceptor implements InstanceConstructorInterceptor { diff --git a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/CallbackInterceptor.java b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/CallbackInterceptor.java index 68b41d9d038e..d834c4950c08 100644 --- a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/CallbackInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/CallbackInterceptor.java @@ -31,13 +31,13 @@ import java.lang.reflect.Method; /** - * @author zhang xin, stalary + * **/ public class CallbackInterceptor implements InstanceMethodsAroundInterceptor { @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { CallbackCache cache = (CallbackCache) objInst.getSkyWalkingDynamicField(); if (null != cache) { ContextSnapshot snapshot = getSnapshot(cache); @@ -51,7 +51,7 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { + Object ret) throws Throwable { CallbackCache cache = (CallbackCache) objInst.getSkyWalkingDynamicField(); if (null != cache) { ContextSnapshot snapshot = getSnapshot(cache); @@ -68,7 +68,7 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/ConsumerConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/ConsumerConstructorInterceptor.java index 35124a3864d6..d0fa9e8bea56 100644 --- a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/ConsumerConstructorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/ConsumerConstructorInterceptor.java @@ -23,12 +23,13 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor; /** - * @author zhang xin, stalary + * **/ public class ConsumerConstructorInterceptor implements InstanceConstructorInterceptor { - @Override public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { - ConsumerConfig config = (ConsumerConfig)allArguments[0]; + @Override + public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { + ConsumerConfig config = (ConsumerConfig) allArguments[0]; // set the bootstrap server address ConsumerEnhanceRequiredInfo requiredInfo = new ConsumerEnhanceRequiredInfo(); requiredInfo.setBrokerServers(config.getList("bootstrap.servers")); diff --git a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/ConsumerEnhanceRequiredInfo.java b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/ConsumerEnhanceRequiredInfo.java index 88556232bcab..792d413ad514 100644 --- a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/ConsumerEnhanceRequiredInfo.java +++ b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/ConsumerEnhanceRequiredInfo.java @@ -29,7 +29,7 @@ public class ConsumerEnhanceRequiredInfo { private long startTime; public void setBrokerServers(List brokerServers) { - this.brokerServers = StringUtil.join(';', brokerServers.toArray(new String[0])); + this.brokerServers = StringUtil.join(';', brokerServers.toArray(new String[0])); } public void setTopics(Collection topics) { diff --git a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/KafkaConsumerInterceptor.java b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/KafkaConsumerInterceptor.java index 99753c847e88..21904abe70b8 100644 --- a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/KafkaConsumerInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/KafkaConsumerInterceptor.java @@ -36,9 +36,6 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; -/** - * @author zhang xin, stalary - */ public class KafkaConsumerInterceptor implements InstanceMethodsAroundInterceptor { public static final String OPERATE_NAME_PREFIX = "Kafka/"; @@ -47,20 +44,21 @@ public class KafkaConsumerInterceptor implements InstanceMethodsAroundIntercepto @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - ConsumerEnhanceRequiredInfo requiredInfo = (ConsumerEnhanceRequiredInfo)objInst.getSkyWalkingDynamicField(); + ConsumerEnhanceRequiredInfo requiredInfo = (ConsumerEnhanceRequiredInfo) objInst.getSkyWalkingDynamicField(); requiredInfo.setStartTime(System.currentTimeMillis()); } @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { - Map>> records = (Map>>)ret; + Map>> records = (Map>>) ret; // // The entry span will only be created when the consumer received at least one message. // if (records.size() > 0) { - ConsumerEnhanceRequiredInfo requiredInfo = (ConsumerEnhanceRequiredInfo)objInst.getSkyWalkingDynamicField(); - AbstractSpan activeSpan = ContextManager.createEntrySpan(OPERATE_NAME_PREFIX + requiredInfo.getTopics() + CONSUMER_OPERATE_NAME + requiredInfo.getGroupId(), null).start(requiredInfo.getStartTime()); + ConsumerEnhanceRequiredInfo requiredInfo = (ConsumerEnhanceRequiredInfo) objInst.getSkyWalkingDynamicField(); + AbstractSpan activeSpan = ContextManager.createEntrySpan(OPERATE_NAME_PREFIX + requiredInfo.getTopics() + CONSUMER_OPERATE_NAME + requiredInfo + .getGroupId(), null).start(requiredInfo.getStartTime()); activeSpan.setComponent(ComponentsDefine.KAFKA_CONSUMER); SpanLayer.asMQ(activeSpan); @@ -87,7 +85,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/KafkaProducerInterceptor.java b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/KafkaProducerInterceptor.java index 5cc5abcde9c3..5f2260d2f1d1 100644 --- a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/KafkaProducerInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/KafkaProducerInterceptor.java @@ -33,9 +33,6 @@ import java.lang.reflect.Method; -/** - * @author zhang xin, stalary - */ public class KafkaProducerInterceptor implements InstanceMethodsAroundInterceptor { public static final String OPERATE_NAME_PREFIX = "Kafka/"; @@ -43,13 +40,14 @@ public class KafkaProducerInterceptor implements InstanceMethodsAroundIntercepto @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { ContextCarrier contextCarrier = new ContextCarrier(); ProducerRecord record = (ProducerRecord) allArguments[0]; String topicName = record.topic(); - AbstractSpan activeSpan = ContextManager.createExitSpan(OPERATE_NAME_PREFIX + topicName + PRODUCER_OPERATE_NAME_SUFFIX, contextCarrier, (String) objInst.getSkyWalkingDynamicField()); + AbstractSpan activeSpan = ContextManager.createExitSpan(OPERATE_NAME_PREFIX + topicName + PRODUCER_OPERATE_NAME_SUFFIX, contextCarrier, (String) objInst + .getSkyWalkingDynamicField()); Tags.MQ_BROKER.set(activeSpan, (String) objInst.getSkyWalkingDynamicField()); Tags.MQ_TOPIC.set(activeSpan, topicName); @@ -74,14 +72,14 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { } } diff --git a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/KafkaTemplateCallbackInterceptor.java b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/KafkaTemplateCallbackInterceptor.java index a23b83a042df..99fea5572b62 100644 --- a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/KafkaTemplateCallbackInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/KafkaTemplateCallbackInterceptor.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.kafka; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; @@ -25,21 +26,23 @@ /** * transformation kafkaTemplate.buildCallback - * @author stalary */ public class KafkaTemplateCallbackInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { return new CallbackAdapter((org.apache.kafka.clients.producer.Callback) ret, objInst); } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { } } \ No newline at end of file diff --git a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/ProducerConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/ProducerConstructorInterceptor.java index c9c0d517baa0..a17ea9702cdd 100644 --- a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/ProducerConstructorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/ProducerConstructorInterceptor.java @@ -28,6 +28,7 @@ public class ProducerConstructorInterceptor implements InstanceConstructorInterc @Override public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { ProducerConfig config = (ProducerConfig) allArguments[0]; - objInst.setSkyWalkingDynamicField(StringUtil.join(';', config.getList("bootstrap.servers").toArray(new String[0]))); + objInst.setSkyWalkingDynamicField(StringUtil.join(';', config.getList("bootstrap.servers") + .toArray(new String[0]))); } } diff --git a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/ProducerConstructorMapInterceptor.java b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/ProducerConstructorMapInterceptor.java index c9c0f541f46e..a6925f3aea71 100644 --- a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/ProducerConstructorMapInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/ProducerConstructorMapInterceptor.java @@ -24,9 +24,6 @@ import java.util.Map; -/** - * @author stalary - */ public class ProducerConstructorMapInterceptor implements InstanceConstructorInterceptor { @Override diff --git a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/SubscribeMethodInterceptor.java b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/SubscribeMethodInterceptor.java index 0453a5ed1d6c..ab944bd35668 100644 --- a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/SubscribeMethodInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/SubscribeMethodInterceptor.java @@ -29,8 +29,8 @@ public class SubscribeMethodInterceptor implements InstanceMethodsAroundIntercep @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - ConsumerEnhanceRequiredInfo requiredInfo = (ConsumerEnhanceRequiredInfo)objInst.getSkyWalkingDynamicField(); - requiredInfo.setTopics((Collection)allArguments[0]); + ConsumerEnhanceRequiredInfo requiredInfo = (ConsumerEnhanceRequiredInfo) objInst.getSkyWalkingDynamicField(); + requiredInfo.setTopics((Collection) allArguments[0]); objInst.setSkyWalkingDynamicField(requiredInfo); } @@ -41,7 +41,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/AbstractKafkaInstrumentation.java b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/AbstractKafkaInstrumentation.java index cf867118d953..968564c7e836 100644 --- a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/AbstractKafkaInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/AbstractKafkaInstrumentation.java @@ -22,7 +22,8 @@ public abstract class AbstractKafkaInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { - @Override protected String[] witnessClasses() { - return new String[]{"org.apache.kafka.clients.ApiVersions"}; + @Override + protected String[] witnessClasses() { + return new String[] {"org.apache.kafka.clients.ApiVersions"}; } } diff --git a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/AbstractKafkaTemplateInstrumentation.java b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/AbstractKafkaTemplateInstrumentation.java index 8f797d0d7737..386af0b13434 100644 --- a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/AbstractKafkaTemplateInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/AbstractKafkaTemplateInstrumentation.java @@ -22,11 +22,11 @@ /** * Compatible with KafkaTemplate - * @author stalary */ public abstract class AbstractKafkaTemplateInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { - @Override protected String[] witnessClasses() { - return new String[]{"org.springframework.kafka.core.KafkaTemplate"}; + @Override + protected String[] witnessClasses() { + return new String[] {"org.springframework.kafka.core.KafkaTemplate"}; } } diff --git a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/CallbackInstrumentation.java b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/CallbackInstrumentation.java index 7bf7b401499a..f4353a586ab3 100644 --- a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/CallbackInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/CallbackInstrumentation.java @@ -33,29 +33,35 @@ public class CallbackInstrumentation extends AbstractKafkaInstrumentation { public static final String ENHANCE_METHOD = "onCompletion"; public static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.kafka.CallbackInterceptor"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(ENHANCE_METHOD); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return INTERCEPTOR_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byHierarchyMatch(new String[] {ENHANCE_CLASS}); } } diff --git a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/KafkaConsumerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/KafkaConsumerInstrumentation.java index cfc9471c3ba3..4d9e8ce8cfea 100644 --- a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/KafkaConsumerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/KafkaConsumerInstrumentation.java @@ -37,8 +37,6 @@ * 3. Extract all the Trace Context by iterate all ConsumerRecord * 4. Stop the entry span when pollOnce method finished. * - * - * @author zhang xin,stalary */ public class KafkaConsumerInstrumentation extends AbstractKafkaInstrumentation { @@ -52,52 +50,63 @@ public class KafkaConsumerInstrumentation extends AbstractKafkaInstrumentation { public static final String SUBSCRIBE_INTERCEPT_TYPE = "org.apache.kafka.clients.consumer.ConsumerRebalanceListener"; public static final String SUBSCRIBE_INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.kafka.SubscribeMethodInterceptor"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { - @Override public ElementMatcher getConstructorMatcher() { + @Override + public ElementMatcher getConstructorMatcher() { return takesArgumentWithType(0, CONSTRUCTOR_INTERCEPT_TYPE); } - @Override public String getConstructorInterceptor() { + @Override + public String getConstructorInterceptor() { return CONSTRUCTOR_INTERCEPTOR_CLASS; } } }; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(ENHANCE_METHOD).or(named(ENHANCE_COMPATIBLE_METHOD)); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return INTERCEPTOR_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(SUBSCRIBE_METHOD).and(takesArgumentWithType(1, SUBSCRIBE_INTERCEPT_TYPE)); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return SUBSCRIBE_INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName(ENHANCE_CLASS); } } diff --git a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/KafkaProducerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/KafkaProducerInstrumentation.java index 9fe0d3b6df11..a984df9236ef 100644 --- a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/KafkaProducerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/KafkaProducerInstrumentation.java @@ -38,8 +38,6 @@ * 3. Inject the context to {@link org.apache.kafka.clients.producer.ProducerRecord#headers} * 3. Stop the exit span when send method finished. * - * - * @author zhang xin, stalary */ public class KafkaProducerInstrumentation extends AbstractKafkaInstrumentation { @@ -51,7 +49,7 @@ public class KafkaProducerInstrumentation extends AbstractKafkaInstrumentation { @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { - return new ConstructorInterceptPoint[]{ + return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { @Override public ElementMatcher getConstructorMatcher() { @@ -68,7 +66,7 @@ public String getConstructorInterceptor() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { diff --git a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/KafkaProducerMapInstrumentation.java b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/KafkaProducerMapInstrumentation.java index 8888c80ad29a..9a29ed891020 100644 --- a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/KafkaProducerMapInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/KafkaProducerMapInstrumentation.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.kafka.define; import net.bytebuddy.description.method.MethodDescription; @@ -28,7 +29,6 @@ /** * after version 2.1.0 use Map to config - * @author stalary */ public class KafkaProducerMapInstrumentation extends AbstractKafkaInstrumentation { @@ -38,7 +38,7 @@ public class KafkaProducerMapInstrumentation extends AbstractKafkaInstrumentatio @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { - return new ConstructorInterceptPoint[]{ + return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { @Override public ElementMatcher getConstructorMatcher() { diff --git a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/KafkaTemplateCallbackInstrumentation.java b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/KafkaTemplateCallbackInstrumentation.java index e8481dd6db5f..cbdb25dafd76 100644 --- a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/KafkaTemplateCallbackInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/KafkaTemplateCallbackInstrumentation.java @@ -29,7 +29,6 @@ /** * InterceptorCallback wrapped CallbackAdapter, need intercept - * @author stalary */ public class KafkaTemplateCallbackInstrumentation extends AbstractKafkaTemplateInstrumentation { @@ -39,7 +38,7 @@ public class KafkaTemplateCallbackInstrumentation extends AbstractKafkaTemplateI @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { - return new ConstructorInterceptPoint[]{ + return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { @Override public ElementMatcher getConstructorMatcher() { diff --git a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/KafkaTemplateInstrumentation.java b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/KafkaTemplateInstrumentation.java index 9b480a11ccbd..b3752d33d640 100644 --- a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/KafkaTemplateInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/KafkaTemplateInstrumentation.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.kafka.define; import net.bytebuddy.description.method.MethodDescription; @@ -28,8 +29,6 @@ /** * intercept kafkaTemplate.buildCallback translation callback - * - * @author stalary */ public class KafkaTemplateInstrumentation extends AbstractKafkaTemplateInstrumentation { @@ -37,7 +36,6 @@ public class KafkaTemplateInstrumentation extends AbstractKafkaTemplateInstrumen private static final String ENHANCE_METHOD = "buildCallback"; private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.kafka.KafkaTemplateCallbackInterceptor"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; @@ -45,7 +43,7 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { diff --git a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/CallbackInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/CallbackInterceptorTest.java index 818a52ab47d7..1dcb160cce1a 100644 --- a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/CallbackInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/CallbackInterceptorTest.java @@ -18,6 +18,7 @@ package org.apache.skywalking.apm.plugin.kafka; +import java.util.List; import org.apache.kafka.clients.producer.RecordMetadata; import org.apache.skywalking.apm.agent.core.context.MockContextSnapshot; import org.apache.skywalking.apm.agent.core.context.trace.AbstractTracingSpan; @@ -26,7 +27,12 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; import org.apache.skywalking.apm.agent.test.helper.SegmentHelper; import org.apache.skywalking.apm.agent.test.helper.SpanHelper; -import org.apache.skywalking.apm.agent.test.tools.*; +import org.apache.skywalking.apm.agent.test.tools.AgentServiceRule; +import org.apache.skywalking.apm.agent.test.tools.SegmentRefAssert; +import org.apache.skywalking.apm.agent.test.tools.SegmentStorage; +import org.apache.skywalking.apm.agent.test.tools.SegmentStoragePoint; +import org.apache.skywalking.apm.agent.test.tools.SpanAssert; +import org.apache.skywalking.apm.agent.test.tools.TracingSegmentRunner; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -36,8 +42,6 @@ import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.modules.junit4.PowerMockRunnerDelegate; -import java.util.List; - import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertThat; @@ -62,13 +66,15 @@ public class CallbackInterceptorTest { private Class[] argumentTypes; private EnhancedInstance callBackInstance = new EnhancedInstance() { - @Override public Object getSkyWalkingDynamicField() { + @Override + public Object getSkyWalkingDynamicField() { CallbackCache cache = new CallbackCache(); cache.setSnapshot(MockContextSnapshot.INSTANCE.mockContextSnapshot()); return cache; } - @Override public void setSkyWalkingDynamicField(Object value) { + @Override + public void setSkyWalkingDynamicField(Object value) { } }; @@ -78,14 +84,17 @@ public void setUp() { callbackInterceptor = new CallbackInterceptor(); arguments = new Object[] { - recordMetadata, null + recordMetadata, + null }; argumentsWithException = new Object[] { - recordMetadata, new RuntimeException() + recordMetadata, + new RuntimeException() }; argumentTypes = new Class[] { - RecordMetadata.class, Exception.class + RecordMetadata.class, + Exception.class }; } diff --git a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/ConsumerConstructorInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/ConsumerConstructorInterceptorTest.java index dff640094dcc..d6c2b4317765 100644 --- a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/ConsumerConstructorInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/ConsumerConstructorInterceptorTest.java @@ -45,12 +45,14 @@ public class ConsumerConstructorInterceptorTest { private EnhancedInstance enhancedInstance = new EnhancedInstance() { private ConsumerEnhanceRequiredInfo consumerEnhanceRequiredInfo; - @Override public Object getSkyWalkingDynamicField() { + @Override + public Object getSkyWalkingDynamicField() { return consumerEnhanceRequiredInfo; } - @Override public void setSkyWalkingDynamicField(Object value) { - consumerEnhanceRequiredInfo = (ConsumerEnhanceRequiredInfo)value; + @Override + public void setSkyWalkingDynamicField(Object value) { + consumerEnhanceRequiredInfo = (ConsumerEnhanceRequiredInfo) value; } }; @@ -67,7 +69,7 @@ public void setUp() { @Test public void testOnConsumer() { constructorInterceptor.onConstruct(enhancedInstance, new Object[] {consumerConfig}); - ConsumerEnhanceRequiredInfo consumerEnhanceRequiredInfo = (ConsumerEnhanceRequiredInfo)enhancedInstance.getSkyWalkingDynamicField(); + ConsumerEnhanceRequiredInfo consumerEnhanceRequiredInfo = (ConsumerEnhanceRequiredInfo) enhancedInstance.getSkyWalkingDynamicField(); assertThat(consumerEnhanceRequiredInfo.getBrokerServers(), is("localhost:9092;localhost:19092")); } diff --git a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/KafkaConsumerInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/KafkaConsumerInterceptorTest.java index 30511654b3a9..d04905a9c8de 100644 --- a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/KafkaConsumerInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/KafkaConsumerInterceptorTest.java @@ -18,6 +18,10 @@ package org.apache.skywalking.apm.plugin.kafka; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.common.TopicPartition; import org.apache.skywalking.apm.agent.core.context.SW6CarrierItem; @@ -28,7 +32,11 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; import org.apache.skywalking.apm.agent.test.helper.SegmentHelper; import org.apache.skywalking.apm.agent.test.helper.SegmentRefHelper; -import org.apache.skywalking.apm.agent.test.tools.*; +import org.apache.skywalking.apm.agent.test.tools.AgentServiceRule; +import org.apache.skywalking.apm.agent.test.tools.SegmentStorage; +import org.apache.skywalking.apm.agent.test.tools.SegmentStoragePoint; +import org.apache.skywalking.apm.agent.test.tools.SpanAssert; +import org.apache.skywalking.apm.agent.test.tools.TracingSegmentRunner; import org.hamcrest.MatcherAssert; import org.junit.Before; import org.junit.Rule; @@ -37,11 +45,6 @@ import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.modules.junit4.PowerMockRunnerDelegate; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import static org.apache.skywalking.apm.network.trace.component.ComponentsDefine.KAFKA_CONSUMER; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -61,12 +64,14 @@ public class KafkaConsumerInterceptorTest { private KafkaConsumerInterceptor consumerInterceptor; private EnhancedInstance consumerInstance = new EnhancedInstance() { - @Override public Object getSkyWalkingDynamicField() { + @Override + public Object getSkyWalkingDynamicField() { return consumerEnhanceRequiredInfo; } - @Override public void setSkyWalkingDynamicField(Object value) { - consumerEnhanceRequiredInfo = (ConsumerEnhanceRequiredInfo)value; + @Override + public void setSkyWalkingDynamicField(Object value) { + consumerEnhanceRequiredInfo = (ConsumerEnhanceRequiredInfo) value; } }; @@ -91,7 +96,9 @@ public void setUp() { TopicPartition topicPartition = new TopicPartition("test", 1); List records = new ArrayList(); ConsumerRecord consumerRecord = new ConsumerRecord("test", 1, 0, "1", "1"); - consumerRecord.headers().add(SW6CarrierItem.HEADER_NAME, "1-MC4wLjA=-MS4yMzQuMTEx-3-1-1-IzE5Mi4xNjguMS44OjE4MDAy-Iy9wb3J0YWwv-I3Rlc3RFbnRyeVNwYW4=".getBytes()); + consumerRecord.headers() + .add(SW6CarrierItem.HEADER_NAME, "1-MC4wLjA=-MS4yMzQuMTEx-3-1-1-IzE5Mi4xNjguMS44OjE4MDAy-Iy9wb3J0YWwv-I3Rlc3RFbnRyeVNwYW4=" + .getBytes()); records.add(consumerRecord); messages.put(topicPartition, records); } diff --git a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/KafkaProducerInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/KafkaProducerInterceptorTest.java index 4dbde023e7fd..753d74910725 100644 --- a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/KafkaProducerInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/KafkaProducerInterceptorTest.java @@ -18,13 +18,18 @@ package org.apache.skywalking.apm.plugin.kafka; +import java.util.List; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.skywalking.apm.agent.core.context.trace.AbstractTracingSpan; import org.apache.skywalking.apm.agent.core.context.trace.SpanLayer; import org.apache.skywalking.apm.agent.core.context.trace.TraceSegment; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; import org.apache.skywalking.apm.agent.test.helper.SegmentHelper; -import org.apache.skywalking.apm.agent.test.tools.*; +import org.apache.skywalking.apm.agent.test.tools.AgentServiceRule; +import org.apache.skywalking.apm.agent.test.tools.SegmentStorage; +import org.apache.skywalking.apm.agent.test.tools.SegmentStoragePoint; +import org.apache.skywalking.apm.agent.test.tools.SpanAssert; +import org.apache.skywalking.apm.agent.test.tools.TracingSegmentRunner; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -32,8 +37,6 @@ import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.modules.junit4.PowerMockRunnerDelegate; -import java.util.List; - import static org.apache.skywalking.apm.network.trace.component.ComponentsDefine.KAFKA_PRODUCER; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; @@ -53,11 +56,13 @@ public class KafkaProducerInterceptorTest { private Class[] argumentType; private EnhancedInstance kafkaProducerInstance = new EnhancedInstance() { - @Override public Object getSkyWalkingDynamicField() { + @Override + public Object getSkyWalkingDynamicField() { return "localhost:9092"; } - @Override public void setSkyWalkingDynamicField(Object value) { + @Override + public void setSkyWalkingDynamicField(Object value) { } }; @@ -70,11 +75,13 @@ public MockProducerMessage() { super("test", "key1", ""); } - @Override public Object getSkyWalkingDynamicField() { + @Override + public Object getSkyWalkingDynamicField() { return "test"; } - @Override public void setSkyWalkingDynamicField(Object value) { + @Override + public void setSkyWalkingDynamicField(Object value) { } } @@ -83,7 +90,10 @@ public MockProducerMessage() { public void setUp() { producerInterceptor = new KafkaProducerInterceptor(); - arguments = new Object[] {messageInstance, null}; + arguments = new Object[] { + messageInstance, + null + }; argumentType = new Class[] {ProducerRecord.class}; } diff --git a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/ProducerConstructorInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/ProducerConstructorInterceptorTest.java index cdc3b02b00e7..c1f195ef894e 100644 --- a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/ProducerConstructorInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/ProducerConstructorInterceptorTest.java @@ -44,12 +44,14 @@ public class ProducerConstructorInterceptorTest { private EnhancedInstance enhancedInstance = new EnhancedInstance() { private String brokerServers; - @Override public Object getSkyWalkingDynamicField() { + @Override + public Object getSkyWalkingDynamicField() { return brokerServers; } - @Override public void setSkyWalkingDynamicField(Object value) { - brokerServers = (String)value; + @Override + public void setSkyWalkingDynamicField(Object value) { + brokerServers = (String) value; } }; diff --git a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/SubscribeMethodInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/SubscribeMethodInterceptorTest.java index a4336d982050..da7c952db708 100644 --- a/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/SubscribeMethodInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/kafka-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/SubscribeMethodInterceptorTest.java @@ -43,12 +43,14 @@ public class SubscribeMethodInterceptorTest { private EnhancedInstance enhancedInstance = new EnhancedInstance() { ConsumerEnhanceRequiredInfo consumerEnhanceRequiredInfo = new ConsumerEnhanceRequiredInfo(); - @Override public Object getSkyWalkingDynamicField() { + @Override + public Object getSkyWalkingDynamicField() { return consumerEnhanceRequiredInfo; } - @Override public void setSkyWalkingDynamicField(Object value) { - this.consumerEnhanceRequiredInfo = (ConsumerEnhanceRequiredInfo)value; + @Override + public void setSkyWalkingDynamicField(Object value) { + this.consumerEnhanceRequiredInfo = (ConsumerEnhanceRequiredInfo) value; } }; @@ -62,7 +64,7 @@ public void setUp() { @Test public void testOnConsumer() throws Throwable { constructorInterceptor.beforeMethod(enhancedInstance, null, new Object[] {mockTopics}, new Class[] {Collection.class}, null); - ConsumerEnhanceRequiredInfo requiredInfo = (ConsumerEnhanceRequiredInfo)enhancedInstance.getSkyWalkingDynamicField(); + ConsumerEnhanceRequiredInfo requiredInfo = (ConsumerEnhanceRequiredInfo) enhancedInstance.getSkyWalkingDynamicField(); assertThat(requiredInfo.getTopics(), is("test;test-1")); } } \ No newline at end of file diff --git a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/pom.xml index a232f387bda3..39fbae6c518c 100644 --- a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + 4.0.0 org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/AbstractRedisClientInterceptor.java b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/AbstractRedisClientInterceptor.java index e9f0fec8b91e..1eee931214a7 100644 --- a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/AbstractRedisClientInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/AbstractRedisClientInterceptor.java @@ -25,14 +25,11 @@ import java.lang.reflect.Method; -/** - * @author zhaoyuguang - */ public class AbstractRedisClientInterceptor implements InstanceMethodsAroundInterceptor { @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { EnhancedInstance clientOptions = (EnhancedInstance) allArguments[0]; if (clientOptions == null) { return; @@ -45,13 +42,13 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { return ret; } @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { } } diff --git a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/AsyncCommandMethodInterceptor.java b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/AsyncCommandMethodInterceptor.java index 1684318b2c39..715244373a4f 100644 --- a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/AsyncCommandMethodInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/AsyncCommandMethodInterceptor.java @@ -30,15 +30,12 @@ import java.util.function.BiConsumer; import java.util.function.Consumer; -/** - * @author zhaoyuguang - */ public class AsyncCommandMethodInterceptor implements InstanceMethodsAroundInterceptor { @Override @SuppressWarnings("unchecked") public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { AsyncCommand asyncCommand = (AsyncCommand) objInst; String operationName = "Lettuce/" + asyncCommand.getType().name(); AbstractSpan span = ContextManager.createLocalSpan(operationName + "/onComplete"); @@ -51,15 +48,15 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/ClientOptionsConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/ClientOptionsConstructorInterceptor.java index 7918e2c7b1cd..198054c15a0b 100644 --- a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/ClientOptionsConstructorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/ClientOptionsConstructorInterceptor.java @@ -16,18 +16,14 @@ * */ - package org.apache.skywalking.apm.plugin.lettuce.v5; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor; /** - * ClientOptions is the link between RedisChannelWriter and AbstractRedisClient. - * to enhance ClientOptions for bring peer(the cluster configuration information) - * in AbstractRedisClient to RedisChannelWriter. - * - * @author zhaoyuguang + * ClientOptions is the link between RedisChannelWriter and AbstractRedisClient. to enhance ClientOptions for bring + * peer(the cluster configuration information) in AbstractRedisClient to RedisChannelWriter. */ public class ClientOptionsConstructorInterceptor implements InstanceConstructorInterceptor { diff --git a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/RedisChannelWriterInterceptor.java b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/RedisChannelWriterInterceptor.java index b44715d72e6b..46215bd4b4e3 100644 --- a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/RedisChannelWriterInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/RedisChannelWriterInterceptor.java @@ -32,14 +32,11 @@ import java.lang.reflect.Method; import java.util.Collection; -/** - * @author zhaoyuguang - */ public class RedisChannelWriterInterceptor implements InstanceMethodsAroundInterceptor, InstanceConstructorInterceptor { @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { String peer = (String) objInst.getSkyWalkingDynamicField(); StringBuilder dbStatement = new StringBuilder(); @@ -51,8 +48,7 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr operationName = operationName + command; dbStatement.append(command); } else if (allArguments[0] instanceof Collection) { - @SuppressWarnings("unchecked") - Collection redisCommands = (Collection) allArguments[0]; + @SuppressWarnings("unchecked") Collection redisCommands = (Collection) allArguments[0]; operationName = operationName + "BATCH_WRITE"; for (RedisCommand redisCommand : redisCommands) { dbStatement.append(redisCommand.getType().name()).append(";"); @@ -67,15 +63,15 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { AbstractSpan span = ContextManager.activeSpan(); span.errorOccurred(); span.log(t); diff --git a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/RedisClientConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/RedisClientConstructorInterceptor.java index 21ecb146b4ab..003faa66f075 100644 --- a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/RedisClientConstructorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/RedisClientConstructorInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.lettuce.v5; import io.lettuce.core.RedisClient; @@ -24,9 +23,6 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor; -/** - * @author zhaoyuguang - */ public class RedisClientConstructorInterceptor implements InstanceConstructorInterceptor { @Override diff --git a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/RedisClusterClientConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/RedisClusterClientConstructorInterceptor.java index 035b06b49d40..1185c12e19dd 100644 --- a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/RedisClusterClientConstructorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/RedisClusterClientConstructorInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.lettuce.v5; import io.lettuce.core.RedisURI; @@ -25,15 +24,11 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor; import org.apache.skywalking.apm.agent.core.context.util.PeerFormat; -/** - * @author zhaoyuguang - */ public class RedisClusterClientConstructorInterceptor implements InstanceConstructorInterceptor { @Override public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { - @SuppressWarnings("unchecked") - Iterable redisURIs = (Iterable) allArguments[1]; + @SuppressWarnings("unchecked") Iterable redisURIs = (Iterable) allArguments[1]; RedisClusterClient redisClusterClient = (RedisClusterClient) objInst; StringBuilder peer = new StringBuilder(); for (RedisURI redisURI : redisURIs) { diff --git a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/SWBiConsumer.java b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/SWBiConsumer.java index 216cc415f916..e44ceae15101 100644 --- a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/SWBiConsumer.java +++ b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/SWBiConsumer.java @@ -25,9 +25,6 @@ import java.util.function.BiConsumer; -/** - * @author zhaoyuguang - */ public class SWBiConsumer implements BiConsumer { private BiConsumer biConsumer; diff --git a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/SWConsumer.java b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/SWConsumer.java index dbb27e0a7bac..b6d778578b50 100644 --- a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/SWConsumer.java +++ b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/SWConsumer.java @@ -25,9 +25,6 @@ import java.util.function.Consumer; -/** - * @author zhaoyuguang - */ public class SWConsumer implements Consumer { private Consumer consumer; diff --git a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/define/AbstractRedisClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/define/AbstractRedisClientInstrumentation.java index 86560bca2b2d..2c96bcb22619 100644 --- a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/define/AbstractRedisClientInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/define/AbstractRedisClientInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.lettuce.v5.define; import net.bytebuddy.description.method.MethodDescription; @@ -30,9 +29,6 @@ import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * @author zhaoyuguang - */ public class AbstractRedisClientInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "io.lettuce.core.AbstractRedisClient"; @@ -48,15 +44,18 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named("setOptions").and(takesArgumentWithType(0, "io.lettuce.core.ClientOptions")); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return ABSTRACT_REDIS_CLIENT_CONSTRUCTOR_INTERCEPTOR_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } diff --git a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/define/AsyncCommandInstrumentation.java b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/define/AsyncCommandInstrumentation.java index 8fef30c80406..eddfabee5cda 100644 --- a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/define/AsyncCommandInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/define/AsyncCommandInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.lettuce.v5.define; import net.bytebuddy.description.method.MethodDescription; @@ -30,9 +29,6 @@ import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * @author zhaoyuguang - */ public class AsyncCommandInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "io.lettuce.core.protocol.AsyncCommand"; @@ -46,12 +42,12 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { - return (named("onComplete").and(takesArgumentWithType(0,"java.util.function.Consumer"))) - .or(named("onComplete").and(takesArgumentWithType(0,"java.util.function.BiConsumer"))); + return (named("onComplete").and(takesArgumentWithType(0, "java.util.function.Consumer"))).or(named("onComplete") + .and(takesArgumentWithType(0, "java.util.function.BiConsumer"))); } @Override diff --git a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/define/ClientOptionsInstrumentation.java b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/define/ClientOptionsInstrumentation.java index d53d6877ed81..968c113e6551 100644 --- a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/define/ClientOptionsInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/define/ClientOptionsInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.lettuce.v5.define; import net.bytebuddy.description.method.MethodDescription; @@ -29,9 +28,6 @@ import static net.bytebuddy.matcher.ElementMatchers.any; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * @author zhaoyuguang - */ public class ClientOptionsInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "io.lettuce.core.ClientOptions"; @@ -40,7 +36,7 @@ public class ClientOptionsInstrumentation extends ClassInstanceMethodsEnhancePlu @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { - return new ConstructorInterceptPoint[]{ + return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { @Override public ElementMatcher getConstructorMatcher() { diff --git a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/define/RedisChannelWriterInstrumentation.java b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/define/RedisChannelWriterInstrumentation.java index 3fdc3c4d4b87..7828d2c6b3a2 100644 --- a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/define/RedisChannelWriterInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/define/RedisChannelWriterInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.lettuce.v5.define; import net.bytebuddy.description.method.MethodDescription; @@ -32,8 +31,6 @@ /** * The writeAndFlush method is used in versions lower than 5.0.2.RELEASE - * - * @author zhaoyuguang */ public class RedisChannelWriterInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -60,7 +57,7 @@ public String getConstructorInterceptor() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { diff --git a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/define/RedisClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/define/RedisClientInstrumentation.java index 42149a6d6c7d..c025c6f3edae 100644 --- a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/define/RedisClientInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/define/RedisClientInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.lettuce.v5.define; import net.bytebuddy.description.method.MethodDescription; @@ -29,9 +28,6 @@ import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * @author zhaoyuguang - */ public class RedisClientInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "io.lettuce.core.RedisClient"; @@ -40,7 +36,7 @@ public class RedisClientInstrumentation extends ClassInstanceMethodsEnhancePlugi @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { - return new ConstructorInterceptPoint[]{ + return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { @Override public ElementMatcher getConstructorMatcher() { diff --git a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/define/RedisClusterClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/define/RedisClusterClientInstrumentation.java index 83a687194f9c..77811e841802 100644 --- a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/define/RedisClusterClientInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/define/RedisClusterClientInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.lettuce.v5.define; import net.bytebuddy.description.method.MethodDescription; @@ -29,9 +28,6 @@ import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * @author zhaoyuguang - */ public class RedisClusterClientInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "io.lettuce.core.cluster.RedisClusterClient"; @@ -40,7 +36,7 @@ public class RedisClusterClientInstrumentation extends ClassInstanceMethodsEnhan @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { - return new ConstructorInterceptPoint[]{ + return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { @Override public ElementMatcher getConstructorMatcher() { diff --git a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/lettuce/v5/RedisChannelWriterInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/lettuce/v5/RedisChannelWriterInterceptorTest.java index 4ee94ca62654..6cb512d2b70b 100644 --- a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/lettuce/v5/RedisChannelWriterInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/lettuce/v5/RedisChannelWriterInterceptorTest.java @@ -52,9 +52,6 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -/** - * @author zhaoyuguang - */ @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(TracingSegmentRunner.class) public class RedisChannelWriterInterceptorTest { @@ -86,7 +83,10 @@ public void setSkyWalkingDynamicField(Object value) { } } - @SuppressWarnings({"rawtypes", "unchecked"}) + @SuppressWarnings({ + "rawtypes", + "unchecked" + }) @Before public void setUp() throws Exception { mockRedisChannelWriterInstance = new MockInstance(); @@ -95,12 +95,11 @@ public void setUp() throws Exception { interceptor = new RedisChannelWriterInterceptor(); } - @Test public void testInterceptor() throws Throwable { - interceptor.onConstruct(mockRedisChannelWriterInstance, new Object[]{mockClientOptionsInstance}); + interceptor.onConstruct(mockRedisChannelWriterInstance, new Object[] {mockClientOptionsInstance}); RedisCommand redisCommand = new Command(CommandType.SET, null); - interceptor.beforeMethod(mockRedisChannelWriterInstance, null, new Object[]{redisCommand}, null, null); + interceptor.beforeMethod(mockRedisChannelWriterInstance, null, new Object[] {redisCommand}, null, null); interceptor.afterMethod(mockRedisChannelWriterInstance, null, null, null, null); MatcherAssert.assertThat((String) mockRedisChannelWriterInstance.getSkyWalkingDynamicField(), Is.is("127.0.0.1:6379;127.0.0.1:6378;")); TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0); @@ -114,7 +113,6 @@ public void testInterceptor() throws Throwable { assertThat(SpanHelper.getLayer(spans.get(0)), CoreMatchers.is(SpanLayer.CACHE)); } - @Test public void testOnHugeClusterConsumerConfig() { List redisURIs = new ArrayList<>(100); @@ -123,7 +121,10 @@ public void testOnHugeClusterConsumerConfig() { } MockRedisClusterClient mockRedisClusterClient = new MockRedisClusterClient(); MockRedisClusterClientConstructorInterceptor constructorInterceptor = new MockRedisClusterClientConstructorInterceptor(); - constructorInterceptor.onConstruct(mockRedisClusterClient, new Object[]{null, redisURIs}); + constructorInterceptor.onConstruct(mockRedisClusterClient, new Object[] { + null, + redisURIs + }); assertThat(mockRedisClusterClient.getOptions().getSkyWalkingDynamicField().toString().length(), Is.is(200)); } } diff --git a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/lettuce/v5/mock/MockRedisClusterClient.java b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/lettuce/v5/mock/MockRedisClusterClient.java index 21b1bcadd7c5..b0f584e58b07 100644 --- a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/lettuce/v5/mock/MockRedisClusterClient.java +++ b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/lettuce/v5/mock/MockRedisClusterClient.java @@ -20,10 +20,6 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; -/** - * @author zhaoyuguang - */ - public class MockRedisClusterClient implements EnhancedInstance { private Object ms; diff --git a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/lettuce/v5/mock/MockRedisClusterClientConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/lettuce/v5/mock/MockRedisClusterClientConstructorInterceptor.java index a9502f073ff8..1e807afa8636 100644 --- a/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/lettuce/v5/mock/MockRedisClusterClientConstructorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/lettuce/v5/mock/MockRedisClusterClientConstructorInterceptor.java @@ -23,16 +23,11 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor; import org.apache.skywalking.apm.agent.core.context.util.PeerFormat; -/** - * @author zhaoyuguang - */ - public class MockRedisClusterClientConstructorInterceptor implements InstanceConstructorInterceptor { @Override public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { - @SuppressWarnings("unchecked") - Iterable redisURIs = (Iterable) allArguments[1]; + @SuppressWarnings("unchecked") Iterable redisURIs = (Iterable) allArguments[1]; MockRedisClusterClient redisClusterClient = (MockRedisClusterClient) objInst; StringBuilder peer = new StringBuilder(); for (RedisURI redisURI : redisURIs) { diff --git a/apm-sniffer/apm-sdk-plugin/light4j-plugins/light4j-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/light4j-plugins/light4j-plugin/pom.xml index 571636f100ba..0a8b339a5907 100644 --- a/apm-sniffer/apm-sdk-plugin/light4j-plugins/light4j-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/light4j-plugins/light4j-plugin/pom.xml @@ -16,7 +16,8 @@ ~ --> - + light4j-plugins org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/light4j-plugins/light4j-plugin/src/main/java/org/apache/skywalking/apm/plugin/light4j/HandleRequestInterceptor.java b/apm-sniffer/apm-sdk-plugin/light4j-plugins/light4j-plugin/src/main/java/org/apache/skywalking/apm/plugin/light4j/HandleRequestInterceptor.java index b1c7d374cf60..4dc241703bf9 100644 --- a/apm-sniffer/apm-sdk-plugin/light4j-plugins/light4j-plugin/src/main/java/org/apache/skywalking/apm/plugin/light4j/HandleRequestInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/light4j-plugins/light4j-plugin/src/main/java/org/apache/skywalking/apm/plugin/light4j/HandleRequestInterceptor.java @@ -40,23 +40,21 @@ import java.lang.reflect.Method; /** - * {@link HandleRequestInterceptor} creates an entry span before the execution of - * {@link com.networknt.exception.ExceptionHandler#handleRequest(HttpServerExchange)} in the I/O thread. - * + * {@link HandleRequestInterceptor} creates an entry span before the execution of {@link + * com.networknt.exception.ExceptionHandler#handleRequest(HttpServerExchange)} in the I/O thread. + *

* If the {@link Config.Plugin.Light4J#TRACE_HANDLER_CHAIN} flag is set, additionally a local span is produced for each - * {@link com.networknt.handler.MiddlewareHandler} and business handler before their respective - * {@link com.networknt.handler.LightHttpHandler#handleRequest(HttpServerExchange)} method executes. - * Since {@link com.networknt.handler.LightHttpHandler} is implemented by various middleware and business handlers and - * the Light4J framework delegates to these in succession, a chain of - * {@link org.apache.skywalking.apm.agent.core.context.trace.LocalSpan}s will be produced. - * - * @author tsuilouis + * {@link com.networknt.handler.MiddlewareHandler} and business handler before their respective {@link + * com.networknt.handler.LightHttpHandler#handleRequest(HttpServerExchange)} method executes. Since {@link + * com.networknt.handler.LightHttpHandler} is implemented by various middleware and business handlers and the Light4J + * framework delegates to these in succession, a chain of {@link org.apache.skywalking.apm.agent.core.context.trace.LocalSpan}s + * will be produced. */ public class HandleRequestInterceptor implements InstanceMethodsAroundInterceptor { @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) { + MethodInterceptResult result) { if (isExceptionHandler(objInst)) { HttpServerExchange exchange = (HttpServerExchange) allArguments[0]; @@ -90,31 +88,27 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr String operationName = objInst.getClass().getName() + "." + method.getName(); ContextSnapshot snapshot = (ContextSnapshot) objInst.getSkyWalkingDynamicField(); - ContextManager.createLocalSpan(operationName) - .setComponent(ComponentsDefine.LIGHT_4J); + ContextManager.createLocalSpan(operationName).setComponent(ComponentsDefine.LIGHT_4J); ContextManager.continued(snapshot); } - } else if (Config.Plugin.Light4J.TRACE_HANDLER_CHAIN && - (isMiddlewareHandler(objInst) || isBusinessHandler(objInst))) { + } else if (Config.Plugin.Light4J.TRACE_HANDLER_CHAIN && (isMiddlewareHandler(objInst) || isBusinessHandler(objInst))) { String operationName = objInst.getClass().getName() + "." + method.getName(); - ContextManager.createLocalSpan(operationName) - .setComponent(ComponentsDefine.LIGHT_4J); + ContextManager.createLocalSpan(operationName).setComponent(ComponentsDefine.LIGHT_4J); } } @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) { + Object ret) { if (isExceptionHandler(objInst)) { HttpServerExchange exchange = (HttpServerExchange) allArguments[0]; if (Config.Plugin.Light4J.TRACE_HANDLER_CHAIN && !exchange.isInIoThread()) { ContextManager.stopSpan(); } - } else if (Config.Plugin.Light4J.TRACE_HANDLER_CHAIN && - (isMiddlewareHandler(objInst) || isBusinessHandler(objInst))) { + } else if (Config.Plugin.Light4J.TRACE_HANDLER_CHAIN && (isMiddlewareHandler(objInst) || isBusinessHandler(objInst))) { ContextManager.stopSpan(); } return ret; @@ -122,13 +116,13 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, - Throwable t) { + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } private boolean isBusinessHandler(EnhancedInstance objInst) { - return !objInst.getClass().getInterfaces()[0].equals(MiddlewareHandler.class) && !objInst.getClass().equals(OrchestrationHandler.class); + return !objInst.getClass().getInterfaces()[0].equals(MiddlewareHandler.class) && !objInst.getClass() + .equals(OrchestrationHandler.class); } private boolean isMiddlewareHandler(EnhancedInstance objInst) { diff --git a/apm-sniffer/apm-sdk-plugin/light4j-plugins/light4j-plugin/src/main/java/org/apache/skywalking/apm/plugin/light4j/define/LightInstrumentation.java b/apm-sniffer/apm-sdk-plugin/light4j-plugins/light4j-plugin/src/main/java/org/apache/skywalking/apm/plugin/light4j/define/LightInstrumentation.java index 3f2101f64587..98572866016c 100644 --- a/apm-sniffer/apm-sdk-plugin/light4j-plugins/light4j-plugin/src/main/java/org/apache/skywalking/apm/plugin/light4j/define/LightInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/light4j-plugins/light4j-plugin/src/main/java/org/apache/skywalking/apm/plugin/light4j/define/LightInstrumentation.java @@ -28,10 +28,8 @@ import org.apache.skywalking.apm.agent.core.plugin.match.HierarchyMatch; /** - * This instrumentation is applied to the handleRequest method of {@link com.networknt.handler.LightHttpHandler} - * using {@link org.apache.skywalking.apm.plugin.light4j.HandleRequestInterceptor}. - * - * @author tsuilouis + * This instrumentation is applied to the handleRequest method of {@link com.networknt.handler.LightHttpHandler} using + * {@link org.apache.skywalking.apm.plugin.light4j.HandleRequestInterceptor}. */ public class LightInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { diff --git a/apm-sniffer/apm-sdk-plugin/light4j-plugins/light4j-plugin/src/test/java/org/apache/skywalking/apm/plugin/light4j/HandleRequestInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/light4j-plugins/light4j-plugin/src/test/java/org/apache/skywalking/apm/plugin/light4j/HandleRequestInterceptorTest.java index 43d641847811..aeb225ed0f42 100644 --- a/apm-sniffer/apm-sdk-plugin/light4j-plugins/light4j-plugin/src/test/java/org/apache/skywalking/apm/plugin/light4j/HandleRequestInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/light4j-plugins/light4j-plugin/src/test/java/org/apache/skywalking/apm/plugin/light4j/HandleRequestInterceptorTest.java @@ -20,9 +20,13 @@ import com.networknt.exception.ExceptionHandler; import io.undertow.server.HttpServerExchange; +import java.lang.reflect.Method; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; -import org.apache.skywalking.apm.agent.test.tools.*; +import org.apache.skywalking.apm.agent.test.tools.AgentServiceRule; +import org.apache.skywalking.apm.agent.test.tools.SegmentStorage; +import org.apache.skywalking.apm.agent.test.tools.SegmentStoragePoint; +import org.apache.skywalking.apm.agent.test.tools.TracingSegmentRunner; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -31,14 +35,9 @@ import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.modules.junit4.PowerMockRunnerDelegate; -import java.lang.reflect.Method; - import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; -/** - * @author tsuilouis - */ @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(TracingSegmentRunner.class) public class HandleRequestInterceptorTest { diff --git a/apm-sniffer/apm-sdk-plugin/light4j-plugins/pom.xml b/apm-sniffer/apm-sdk-plugin/light4j-plugins/pom.xml index 99b8372283de..2566a79b4bc5 100644 --- a/apm-sniffer/apm-sdk-plugin/light4j-plugins/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/light4j-plugins/pom.xml @@ -17,7 +17,8 @@ ~ --> - + 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/pom.xml index 822871053221..33eb6ea2f082 100644 --- a/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-sdk-plugin org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v2/MongoDBCollectionMethodInterceptor.java b/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v2/MongoDBCollectionMethodInterceptor.java index adae529fe6f4..a13a43f1cfe2 100644 --- a/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v2/MongoDBCollectionMethodInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v2/MongoDBCollectionMethodInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.mongodb.v2; import com.mongodb.AggregationOutput; @@ -37,20 +36,17 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; -/** - * @author liyuntao - */ - public class MongoDBCollectionMethodInterceptor implements InstanceMethodsAroundInterceptor, InstanceConstructorInterceptor { private static final String DB_TYPE = "MongoDB"; private static final String MONGO_DB_OP_PREFIX = "MongoDB/"; - @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + @Override + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { - String remotePeer = (String)objInst.getSkyWalkingDynamicField(); + String remotePeer = (String) objInst.getSkyWalkingDynamicField(); String operation = method.getName(); AbstractSpan span = ContextManager.createExitSpan(MONGO_DB_OP_PREFIX + operation, new ContextCarrier(), remotePeer); span.setComponent(ComponentsDefine.MONGO_DRIVER); @@ -59,15 +55,16 @@ public class MongoDBCollectionMethodInterceptor implements InstanceMethodsAround } - @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + @Override + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { AbstractSpan activeSpan = ContextManager.activeSpan(); CommandResult cresult = null; if (ret instanceof WriteResult) { - WriteResult wresult = (WriteResult)ret; + WriteResult wresult = (WriteResult) ret; cresult = wresult.getCachedLastError(); } else if (ret instanceof AggregationOutput) { - AggregationOutput aresult = (AggregationOutput)ret; + AggregationOutput aresult = (AggregationOutput) ret; cresult = aresult.getCommandResult(); } if (null != cresult && !cresult.ok()) { @@ -77,7 +74,8 @@ public class MongoDBCollectionMethodInterceptor implements InstanceMethodsAround return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { AbstractSpan activeSpan = ContextManager.activeSpan(); activeSpan.errorOccurred(); @@ -87,7 +85,7 @@ public class MongoDBCollectionMethodInterceptor implements InstanceMethodsAround @Override public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { List servers = null; - DB db = (DB)allArguments[0]; + DB db = (DB) allArguments[0]; servers = db.getMongo().getAllAddress(); StringBuilder peers = new StringBuilder(); for (ServerAddress address : servers) { diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v2/define/InterceptPoint.java b/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v2/define/InterceptPoint.java index b90f2bc92e28..33eb7b3dd4db 100644 --- a/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v2/define/InterceptPoint.java +++ b/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v2/define/InterceptPoint.java @@ -16,14 +16,10 @@ * */ - package org.apache.skywalking.apm.plugin.mongodb.v2.define; import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; -/** - * @author liyuntao - */ public abstract class InterceptPoint implements InstanceMethodsInterceptPoint { private static final String MONGDB_METHOD_INTERCET_CLASS = "org.apache.skywalking.apm.plugin.mongodb.v2.MongoDBCollectionMethodInterceptor"; diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v2/define/MongoDBCollectionImplInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v2/define/MongoDBCollectionImplInstrumentation.java index 888849c4bf94..a3c70a112d13 100644 --- a/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v2/define/MongoDBCollectionImplInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v2/define/MongoDBCollectionImplInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.mongodb.v2.define; import net.bytebuddy.description.method.MethodDescription; @@ -33,16 +32,8 @@ /** * {@link MongoDBCollectionImplInstrumentation} define that the MongoDB Java Driver 2.13.x-2.14.x plugin intercepts the - * following methods in the com.mongodb.DBCollectionImpl class: - * 1. find - * 2. insert - * 3. insertImpl - * 4. update - * 5. updateImpl - * 6. remove - * 7. createIndex - * - * @author liyuntao + * following methods in the com.mongodb.DBCollectionImpl class: 1. find 2. insert 3. insertImpl 4. update 5. updateImpl + * 6. remove 7. createIndex */ public class MongoDBCollectionImplInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -120,7 +111,7 @@ public ElementMatcher getMethodsMatcher() { }, - }; + }; } @Override diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v2/define/MongoDBCollectionInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v2/define/MongoDBCollectionInstrumentation.java index 7ece6ac11398..20787f900408 100644 --- a/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v2/define/MongoDBCollectionInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v2/define/MongoDBCollectionInstrumentation.java @@ -33,19 +33,9 @@ /** * {@link MongoDBCollectionInstrumentation} define that the MongoDB Java Driver 2.13.x-2.14.x plugin intercepts the - * following methods in the {@link com.mongodb.DBCollection}class: - * 1. aggregate - * 2. findAndModify - * 3. getCount - * - * 4. drop - * 5. dropIndexes - * 6. rename - * 7. group - * 8. distinct - * 9. mapReduce - * - * @author liyuntao + * following methods in the {@link com.mongodb.DBCollection}class: 1. aggregate 2. findAndModify 3. getCount + *

+ * 4. drop 5. dropIndexes 6. rename 7. group 8. distinct 9. mapReduce */ public class MongoDBCollectionInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -152,7 +142,7 @@ public ElementMatcher getMethodsMatcher() { } }, - }; + }; } @Override diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/mongodb/v2/MongoDBCollectionMethodInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/mongodb/v2/MongoDBCollectionMethodInterceptorTest.java index 40bf3559055a..49f352f1e370 100644 --- a/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/mongodb/v2/MongoDBCollectionMethodInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/mongodb/v2/MongoDBCollectionMethodInterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.mongodb.v2; import com.mongodb.DBCollection; @@ -69,7 +68,10 @@ public class MongoDBCollectionMethodInterceptorTest { private Object[] arguments = new Object[3]; private Class[] argumentTypes; - @SuppressWarnings({"rawtypes", "unchecked"}) + @SuppressWarnings({ + "rawtypes", + "unchecked" + }) @Before public void setUp() throws Exception { diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/pom.xml index 1d7c84ad245f..0044355bc37c 100644 --- a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/pom.xml @@ -16,7 +16,8 @@ ~ --> - + 4.0.0 apm-sdk-plugin diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/define/v30/MongoDBInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/define/v30/MongoDBInstrumentation.java index 7b0ac2395168..acad2730eae3 100644 --- a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/define/v30/MongoDBInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/define/v30/MongoDBInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.mongodb.v3.define.v30; import net.bytebuddy.description.method.MethodDescription; @@ -32,12 +31,11 @@ import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType; /** - * Enhance {@code com.mongodb.Mongo} instance, and intercept {@code com.mongodb.Mongo#execute(...)} method, - * this method is a unified entrance of execute mongo command. + * Enhance {@code com.mongodb.Mongo} instance, and intercept {@code com.mongodb.Mongo#execute(...)} method, this method + * is a unified entrance of execute mongo command. *

* support: 3.0.x~3.5.x * - * @author scolia * @see MongoDBInterceptor */ @SuppressWarnings({"Duplicates"}) @@ -52,7 +50,7 @@ public class MongoDBInstrumentation extends ClassInstanceMethodsEnhancePluginDef @Override protected String[] witnessClasses() { // this class only exist in version: 3.0.x~3.5.x - return new String[]{WITNESS_CLASS}; + return new String[] {WITNESS_CLASS}; } @Override @@ -60,43 +58,43 @@ protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); } - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { - return new ConstructorInterceptPoint[]{new ConstructorInterceptPoint() { - @Override - public ElementMatcher getConstructorMatcher() { - return takesArgumentWithType(0, "com.mongodb.connection.Cluster"); + return new ConstructorInterceptPoint[] { + new ConstructorInterceptPoint() { + @Override + public ElementMatcher getConstructorMatcher() { + return takesArgumentWithType(0, "com.mongodb.connection.Cluster"); + } + + @Override + public String getConstructorInterceptor() { + return INTERCEPTOR_CLASS; + } } - - @Override - public String getConstructorInterceptor() { - return INTERCEPTOR_CLASS; - } - } }; } @Override public 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 INTERCEPTOR_CLASS; + } + + @Override + public boolean isOverrideArgs() { + return false; + } } - - @Override - public String getMethodsInterceptor() { - return INTERCEPTOR_CLASS; - } - - @Override - public boolean isOverrideArgs() { - return false; - } - } }; } - } diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/define/v36/MongoDBInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/define/v36/MongoDBInstrumentation.java index 46bcac80f060..02aeab617293 100644 --- a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/define/v36/MongoDBInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/define/v36/MongoDBInstrumentation.java @@ -30,11 +30,10 @@ import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType; /** - * Enhance {@code com.mongodb.Mongo} instance, and intercept {@code com.mongodb.Mongo#createOperationExecutor(...)} method + * Enhance {@code com.mongodb.Mongo} instance, and intercept {@code com.mongodb.Mongo#createOperationExecutor(...)} + * method *

* support: 3.6.x - * - * @author dengliming */ public class MongoDBInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -46,7 +45,7 @@ public class MongoDBInstrumentation extends ClassInstanceMethodsEnhancePluginDef @Override protected String[] witnessClasses() { // this class only exist in version: 3.6.x or higher - return new String[]{WITNESS_CLASS}; + return new String[] {WITNESS_CLASS}; } @Override @@ -56,38 +55,40 @@ protected ClassMatch enhanceClass() { @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { - return new ConstructorInterceptPoint[]{new ConstructorInterceptPoint() { - @Override - public ElementMatcher getConstructorMatcher() { - return takesArgumentWithType(0, "com.mongodb.connection.Cluster"); - } + return new ConstructorInterceptPoint[] { + new ConstructorInterceptPoint() { + @Override + public ElementMatcher getConstructorMatcher() { + return takesArgumentWithType(0, "com.mongodb.connection.Cluster"); + } - @Override - public String getConstructorInterceptor() { - return INTERCEPTOR_CLASS; + @Override + public String getConstructorInterceptor() { + return INTERCEPTOR_CLASS; + } } - } }; } @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{new InstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return ElementMatchers.named(METHOD_NAME); - } + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return ElementMatchers.named(METHOD_NAME); + } - @Override - public String getMethodsInterceptor() { - return INTERCEPTOR_CLASS; - } + @Override + public String getMethodsInterceptor() { + return INTERCEPTOR_CLASS; + } - @Override - public boolean isOverrideArgs() { - return false; + @Override + public boolean isOverrideArgs() { + return false; + } } - } }; } } diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/define/v36/MongoDBOperationExecutorInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/define/v36/MongoDBOperationExecutorInstrumentation.java index d198db5cc041..90f31081b3a6 100644 --- a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/define/v36/MongoDBOperationExecutorInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/define/v36/MongoDBOperationExecutorInstrumentation.java @@ -29,10 +29,8 @@ /** * intercepts the following methods that the class which implements {@code com.mongodb.OperationExecutor} - * + *

* support: 3.6.x - * - * @author dengliming */ public class MongoDBOperationExecutorInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -42,7 +40,7 @@ public class MongoDBOperationExecutorInstrumentation extends ClassInstanceMethod @Override protected ClassMatch enhanceClass() { - return HierarchyMatch.byHierarchyMatch(new String[]{ENHANCE_CLASS}); + return HierarchyMatch.byHierarchyMatch(new String[] {ENHANCE_CLASS}); } @Override @@ -52,24 +50,25 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{new InstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return ElementMatchers + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return ElementMatchers // 3.6.x .named(METHOD_NAME); - } + } - @Override - public String getMethodsInterceptor() { - return INTERCEPTOR_CLASS; - } + @Override + public String getMethodsInterceptor() { + return INTERCEPTOR_CLASS; + } - @Override - public boolean isOverrideArgs() { - return false; + @Override + public boolean isOverrideArgs() { + return false; + } } - } }; } } diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/define/v37/MongoDBClientDelegateInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/define/v37/MongoDBClientDelegateInstrumentation.java index df74c59ba678..f08057e8571f 100644 --- a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/define/v37/MongoDBClientDelegateInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/define/v37/MongoDBClientDelegateInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.mongodb.v3.define.v37; import net.bytebuddy.description.method.MethodDescription; @@ -32,14 +31,13 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; /** - * Enhance {@code com.mongodb.client.internal.MongoClientDelegate} instance, and intercept - * {@code com.mongodb.client.internal.MongoClientDelegate#getOperationExecutor()}, this is the only way to - * get OperationExecutor which is unified entrance of execute mongo command. we can mark OperationExecutor - * which connection belongs to. + * Enhance {@code com.mongodb.client.internal.MongoClientDelegate} instance, and intercept {@code + * com.mongodb.client.internal.MongoClientDelegate#getOperationExecutor()}, this is the only way to get + * OperationExecutor which is unified entrance of execute mongo command. we can mark OperationExecutor which connection + * belongs to. *

* support: 3.7.x or higher * - * @author scolia * @see MongoDBOperationExecutorInstrumentation * @see MongoDBClientDelegateInterceptor */ @@ -51,7 +49,7 @@ public class MongoDBClientDelegateInstrumentation extends ClassInstanceMethodsEn @Override protected String[] witnessClasses() { - return new String[]{ENHANCE_CLASS}; + return new String[] {ENHANCE_CLASS}; } @Override @@ -61,40 +59,41 @@ protected ClassMatch enhanceClass() { @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { - return new ConstructorInterceptPoint[]{new ConstructorInterceptPoint() { - @Override - public ElementMatcher getConstructorMatcher() { - return takesArgumentWithType(0, "com.mongodb.connection.Cluster"); - } - - @Override - public String getConstructorInterceptor() { - return INTERCEPTOR_CLASS; + return new ConstructorInterceptPoint[] { + new ConstructorInterceptPoint() { + @Override + public ElementMatcher getConstructorMatcher() { + return takesArgumentWithType(0, "com.mongodb.connection.Cluster"); + } + + @Override + public String getConstructorInterceptor() { + return INTERCEPTOR_CLASS; + } } - } }; } @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{new InstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named("getOperationExecutor"); - } - - @Override - public String getMethodsInterceptor() { - return INTERCEPTOR_CLASS; - } - - @Override - public boolean isOverrideArgs() { - return false; + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named("getOperationExecutor"); + } + + @Override + public String getMethodsInterceptor() { + return INTERCEPTOR_CLASS; + } + + @Override + public boolean isOverrideArgs() { + return false; + } } - } }; } - } diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/define/v37/MongoDBOperationExecutorInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/define/v37/MongoDBOperationExecutorInstrumentation.java index 4eaadd3154ec..d690413cc34c 100644 --- a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/define/v37/MongoDBOperationExecutorInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/define/v37/MongoDBOperationExecutorInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.mongodb.v3.define.v37; import net.bytebuddy.description.method.MethodDescription; @@ -31,13 +30,12 @@ import org.apache.skywalking.apm.plugin.mongodb.v3.interceptor.v37.MongoDBOperationExecutorInterceptor; /** - * {@code com.mongodb.client.internal.OperationExecutor} which is unified entrance of execute mongo command. - * so we can intercept {@code com.mongodb.client.internal.OperationExecutor#execute(...)} method - * to known which command will be execute. + * {@code com.mongodb.client.internal.OperationExecutor} which is unified entrance of execute mongo command. so we can + * intercept {@code com.mongodb.client.internal.OperationExecutor#execute(...)} method to known which command will be + * execute. *

* support: 3.7.x * - * @author scolia * @see MongoDBOperationExecutorInterceptor */ @SuppressWarnings({"Duplicates"}) @@ -55,7 +53,7 @@ public class MongoDBOperationExecutorInstrumentation extends ClassInstanceMethod @Override protected String[] witnessClasses() { - return new String[]{WITNESS_CLASS}; + return new String[] {WITNESS_CLASS}; } @Override @@ -70,27 +68,27 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{new InstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return ElementMatchers + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return ElementMatchers // 3.7.x - .named(METHOD_NAME).and(ArgumentTypeNameMatch.takesArgumentWithType(1, ARGUMENT_TYPE)) - .or(ElementMatchers.named(METHOD_NAME) - .and(ArgumentTypeNameMatch.takesArgumentWithType(2, ARGUMENT_TYPE)) - ); - } + .named(METHOD_NAME) + .and(ArgumentTypeNameMatch.takesArgumentWithType(1, ARGUMENT_TYPE)) + .or(ElementMatchers.named(METHOD_NAME).and(ArgumentTypeNameMatch.takesArgumentWithType(2, ARGUMENT_TYPE))); + } - @Override - public String getMethodsInterceptor() { - return INTERCEPTOR_CLASS; - } + @Override + public String getMethodsInterceptor() { + return INTERCEPTOR_CLASS; + } - @Override - public boolean isOverrideArgs() { - return false; + @Override + public boolean isOverrideArgs() { + return false; + } } - } }; } } diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/define/v38/MongoDBOperationExecutorInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/define/v38/MongoDBOperationExecutorInstrumentation.java index 20fa9033e6c9..a518b7cef2f2 100644 --- a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/define/v38/MongoDBOperationExecutorInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/define/v38/MongoDBOperationExecutorInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.mongodb.v3.define.v38; import net.bytebuddy.description.method.MethodDescription; @@ -33,8 +32,6 @@ * same whit {@link org.apache.skywalking.apm.plugin.mongodb.v3.define.v37.MongoDBOperationExecutorInstrumentation} *

* support: 3.8.x or higher - * - * @author scolia */ public class MongoDBOperationExecutorInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -50,7 +47,7 @@ public class MongoDBOperationExecutorInstrumentation extends ClassInstanceMethod @Override protected String[] witnessClasses() { - return new String[]{WITNESS_CLASS}; + return new String[] {WITNESS_CLASS}; } @Override @@ -65,27 +62,27 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{new InstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return ElementMatchers + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return ElementMatchers // 3.8.x~3.11.x - .named(METHOD_NAME).and(ArgumentTypeNameMatch.takesArgumentWithType(2, ARGUMENT_TYPE)) - .or(ElementMatchers.named(METHOD_NAME) - .and(ArgumentTypeNameMatch.takesArgumentWithType(3, ARGUMENT_TYPE)) - ); - } + .named(METHOD_NAME) + .and(ArgumentTypeNameMatch.takesArgumentWithType(2, ARGUMENT_TYPE)) + .or(ElementMatchers.named(METHOD_NAME).and(ArgumentTypeNameMatch.takesArgumentWithType(3, ARGUMENT_TYPE))); + } - @Override - public String getMethodsInterceptor() { - return INTERCEPTOR_CLASS; - } + @Override + public String getMethodsInterceptor() { + return INTERCEPTOR_CLASS; + } - @Override - public boolean isOverrideArgs() { - return false; + @Override + public boolean isOverrideArgs() { + return false; + } } - } }; } } diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/interceptor/v30/MongoDBInterceptor.java b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/interceptor/v30/MongoDBInterceptor.java index cca7b99221d7..afeac7bc05d4 100644 --- a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/interceptor/v30/MongoDBInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/interceptor/v30/MongoDBInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.mongodb.v3.interceptor.v30; import com.mongodb.connection.Cluster; @@ -34,15 +33,15 @@ import java.lang.reflect.Method; /** - * Intercept method of {@code com.mongodb.Mongo#execute(ReadOperation, ReadPreference)} or - * {@code com.mongodb.Mongo#execute(WriteOperation)}. record the MongoDB host, operation name and the key of the - * operation. + * Intercept method of {@code com.mongodb.Mongo#execute(ReadOperation, ReadPreference)} or {@code + * com.mongodb.Mongo#execute(WriteOperation)}. record the MongoDB host, operation name and the key of the operation. *

* only supported: 3.0.x-3.5.x - * - * @author scolia */ -@SuppressWarnings({"deprecation", "Duplicates"}) +@SuppressWarnings({ + "deprecation", + "Duplicates" +}) public class MongoDBInterceptor implements InstanceMethodsAroundInterceptor, InstanceConstructorInterceptor { private static final ILog logger = LogManager.getLogger(MongoDBInterceptor.class); @@ -54,10 +53,9 @@ public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { objInst.setSkyWalkingDynamicField(peers); } - @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) { String executeMethod = allArguments[0].getClass().getSimpleName(); String remotePeer = (String) objInst.getSkyWalkingDynamicField(); if (logger.isDebugEnable()) { @@ -67,15 +65,15 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) { ContextManager.stopSpan(); return ret; } @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { AbstractSpan activeSpan = ContextManager.activeSpan(); activeSpan.errorOccurred(); activeSpan.log(t); diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/interceptor/v37/MongoDBClientDelegateInterceptor.java b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/interceptor/v37/MongoDBClientDelegateInterceptor.java index aba5a887b512..cfc901e6941a 100644 --- a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/interceptor/v37/MongoDBClientDelegateInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/interceptor/v37/MongoDBClientDelegateInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.mongodb.v3.interceptor.v37; import com.mongodb.connection.Cluster; @@ -30,9 +29,6 @@ import java.lang.reflect.Method; -/** - * @author scolia - */ @SuppressWarnings("Duplicates") public class MongoDBClientDelegateInterceptor implements InstanceConstructorInterceptor, InstanceMethodsAroundInterceptor { @@ -47,14 +43,14 @@ public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { } @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) { // do nothing } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) { if (ret instanceof EnhancedInstance) { // pass remotePeer to OperationExecutor, which will be wrapper as EnhancedInstance // @see: org.apache.skywalking.apm.plugin.mongodb.v3.define.v37.MongoDBOperationExecutorInstrumentation @@ -69,7 +65,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { // do nothing } } diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/interceptor/v37/MongoDBOperationExecutorInterceptor.java b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/interceptor/v37/MongoDBOperationExecutorInterceptor.java index 3eeee4128381..cf3e402d0dbf 100644 --- a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/interceptor/v37/MongoDBOperationExecutorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/interceptor/v37/MongoDBOperationExecutorInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.mongodb.v3.interceptor.v37; import org.apache.skywalking.apm.agent.core.context.ContextManager; @@ -30,9 +29,6 @@ import java.lang.reflect.Method; -/** - * @author scolia - */ @SuppressWarnings("Duplicates") public class MongoDBOperationExecutorInterceptor implements InstanceMethodsAroundInterceptor { @@ -40,7 +36,7 @@ public class MongoDBOperationExecutorInterceptor implements InstanceMethodsAroun @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) { + MethodInterceptResult result) { String executeMethod = allArguments[0].getClass().getSimpleName(); // OperationExecutor has be mark it's remotePeer // @see: MongoDBClientDelegateInterceptor.afterMethod @@ -53,18 +49,17 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) { + Object ret) { ContextManager.stopSpan(); return ret; } @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { AbstractSpan activeSpan = ContextManager.activeSpan(); activeSpan.errorOccurred(); activeSpan.log(t); } - } diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/support/MongoConstants.java b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/support/MongoConstants.java index 6230be9bc09d..c354615e92b7 100644 --- a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/support/MongoConstants.java +++ b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/support/MongoConstants.java @@ -16,12 +16,8 @@ * */ - package org.apache.skywalking.apm.plugin.mongodb.v3.support; -/** - * @author scolia - */ public class MongoConstants { private MongoConstants() { diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/support/MongoOperationHelper.java b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/support/MongoOperationHelper.java index ca1d41ebc8e7..71c2eb876aee 100644 --- a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/support/MongoOperationHelper.java +++ b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/support/MongoOperationHelper.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.mongodb.v3.support; import com.mongodb.bulk.DeleteRequest; @@ -45,13 +44,12 @@ import java.util.List; -/** - * @author scolia - */ -@SuppressWarnings({"deprecation", "Duplicates"}) +@SuppressWarnings({ + "deprecation", + "Duplicates" +}) public class MongoOperationHelper { - private MongoOperationHelper() { } diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/support/MongoRemotePeerHelper.java b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/support/MongoRemotePeerHelper.java index 8f73d4e4501c..1fbeac03e677 100644 --- a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/support/MongoRemotePeerHelper.java +++ b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/support/MongoRemotePeerHelper.java @@ -16,23 +16,18 @@ * */ - package org.apache.skywalking.apm.plugin.mongodb.v3.support; import com.mongodb.ServerAddress; import com.mongodb.connection.Cluster; import com.mongodb.connection.ServerDescription; -/** - * @author scolia - */ @SuppressWarnings("deprecation") public class MongoRemotePeerHelper { private MongoRemotePeerHelper() { } - public static String getRemotePeer(Cluster cluster) { StringBuilder peersBuilder = new StringBuilder(); for (ServerDescription description : cluster.getDescription().getAll()) { diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/support/MongoSpanHelper.java b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/support/MongoSpanHelper.java index c820179a75a7..418707e432c6 100644 --- a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/support/MongoSpanHelper.java +++ b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/support/MongoSpanHelper.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.mongodb.v3.support; import org.apache.skywalking.apm.agent.core.conf.Config; @@ -27,9 +26,6 @@ import org.apache.skywalking.apm.agent.core.context.trace.SpanLayer; import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; -/** - * @author scolia - */ public class MongoSpanHelper { private MongoSpanHelper() { diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/mongodb/v3/interceptor/v30/MongoDBInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/mongodb/v3/interceptor/v30/MongoDBInterceptorTest.java index 2e4ee2215798..e0b32b2f712a 100644 --- a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/mongodb/v3/interceptor/v30/MongoDBInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/mongodb/v3/interceptor/v30/MongoDBInterceptorTest.java @@ -16,12 +16,13 @@ * */ - package org.apache.skywalking.apm.plugin.mongodb.v3.interceptor.v30; import com.mongodb.Mongo; import com.mongodb.MongoNamespace; import com.mongodb.operation.FindOperation; +import java.lang.reflect.Method; +import java.util.List; import org.apache.skywalking.apm.agent.core.conf.Config; import org.apache.skywalking.apm.agent.core.context.trace.AbstractTracingSpan; import org.apache.skywalking.apm.agent.core.context.trace.LogDataEntity; @@ -31,7 +32,11 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; import org.apache.skywalking.apm.agent.test.helper.SegmentHelper; import org.apache.skywalking.apm.agent.test.helper.SpanHelper; -import org.apache.skywalking.apm.agent.test.tools.*; +import org.apache.skywalking.apm.agent.test.tools.AgentServiceRule; +import org.apache.skywalking.apm.agent.test.tools.SegmentStorage; +import org.apache.skywalking.apm.agent.test.tools.SegmentStoragePoint; +import org.apache.skywalking.apm.agent.test.tools.SpanAssert; +import org.apache.skywalking.apm.agent.test.tools.TracingSegmentRunner; import org.bson.BsonDocument; import org.bson.BsonString; import org.bson.codecs.Decoder; @@ -46,9 +51,6 @@ import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.modules.junit4.PowerMockRunnerDelegate; -import java.lang.reflect.Method; -import java.util.List; - import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import static org.mockito.Mockito.when; @@ -71,7 +73,10 @@ public class MongoDBInterceptorTest { private Object[] arguments; private Class[] argumentTypes; - @SuppressWarnings({"rawtypes", "unchecked"}) + @SuppressWarnings({ + "rawtypes", + "unchecked" + }) @Before public void setUp() throws Exception { @@ -88,8 +93,8 @@ public void setUp() throws Exception { FindOperation findOperation = new FindOperation(mongoNamespace, decoder); findOperation.filter(document); - arguments = new Object[]{findOperation}; - argumentTypes = new Class[]{findOperation.getClass()}; + arguments = new Object[] {findOperation}; + argumentTypes = new Class[] {findOperation.getClass()}; } @Test diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/mongodb/v3/interceptor/v37/MongoDBClientDelegateInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/mongodb/v3/interceptor/v37/MongoDBClientDelegateInterceptorTest.java index 1190e2dfe823..ad601200776c 100644 --- a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/mongodb/v3/interceptor/v37/MongoDBClientDelegateInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/mongodb/v3/interceptor/v37/MongoDBClientDelegateInterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.mongodb.v3.interceptor.v37; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; @@ -29,9 +28,6 @@ import static org.mockito.Mockito.when; -/** - * @author scolia - */ @RunWith(PowerMockRunner.class) public class MongoDBClientDelegateInterceptorTest { @@ -72,5 +68,4 @@ public void setSkyWalkingDynamicField(Object value) { } } - } diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/mongodb/v3/interceptor/v37/MongoDBOperationExecutorInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/mongodb/v3/interceptor/v37/MongoDBOperationExecutorInterceptorTest.java index 6ccd15c50e10..fe06f4f430b1 100644 --- a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/mongodb/v3/interceptor/v37/MongoDBOperationExecutorInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/mongodb/v3/interceptor/v37/MongoDBOperationExecutorInterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.mongodb.v3.interceptor.v37; import com.mongodb.MongoNamespace; @@ -24,6 +23,8 @@ import com.mongodb.client.internal.OperationExecutor; import com.mongodb.operation.FindOperation; import com.mongodb.operation.WriteOperation; +import java.lang.reflect.Method; +import java.util.List; import org.apache.skywalking.apm.agent.core.conf.Config; import org.apache.skywalking.apm.agent.core.context.trace.AbstractTracingSpan; import org.apache.skywalking.apm.agent.core.context.trace.LogDataEntity; @@ -33,7 +34,11 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; import org.apache.skywalking.apm.agent.test.helper.SegmentHelper; import org.apache.skywalking.apm.agent.test.helper.SpanHelper; -import org.apache.skywalking.apm.agent.test.tools.*; +import org.apache.skywalking.apm.agent.test.tools.AgentServiceRule; +import org.apache.skywalking.apm.agent.test.tools.SegmentStorage; +import org.apache.skywalking.apm.agent.test.tools.SegmentStoragePoint; +import org.apache.skywalking.apm.agent.test.tools.SpanAssert; +import org.apache.skywalking.apm.agent.test.tools.TracingSegmentRunner; import org.bson.BsonDocument; import org.bson.BsonString; import org.bson.codecs.Decoder; @@ -48,16 +53,10 @@ import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.modules.junit4.PowerMockRunnerDelegate; -import java.lang.reflect.Method; -import java.util.List; - import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import static org.mockito.Mockito.when; -/** - * @author scolia - */ @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(TracingSegmentRunner.class) public class MongoDBOperationExecutorInterceptorTest { @@ -93,8 +92,8 @@ public void setUp() { FindOperation findOperation = new FindOperation(mongoNamespace, decoder); findOperation.filter(document); - arguments = new Object[]{findOperation}; - argumentTypes = new Class[]{findOperation.getClass()}; + arguments = new Object[] {findOperation}; + argumentTypes = new Class[] {findOperation.getClass()}; } @Test diff --git a/apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml index 16e8a7c6a7b3..a1625db10471 100644 --- a/apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml @@ -16,7 +16,8 @@ ~ --> - + apm-sdk-plugin org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/apache/skywalking/apm/plugin/motan/MotanConsumerInterceptor.java b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/apache/skywalking/apm/plugin/motan/MotanConsumerInterceptor.java index 0bb46f4fa5b4..b0ba10fc7dbc 100644 --- a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/apache/skywalking/apm/plugin/motan/MotanConsumerInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/apache/skywalking/apm/plugin/motan/MotanConsumerInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.motan; import com.weibo.api.motan.rpc.Request; @@ -36,11 +35,8 @@ import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; /** - * {@link MotanProviderInterceptor} create span by fetch request url from - * {@link EnhancedInstance#getSkyWalkingDynamicField()} and transport serialized context - * data to provider side through {@link Request#setAttachment(String, String)}. - * - * @author zhangxin + * {@link MotanProviderInterceptor} create span by fetch request url from {@link EnhancedInstance#getSkyWalkingDynamicField()} + * and transport serialized context data to provider side through {@link Request#setAttachment(String, String)}. */ public class MotanConsumerInterceptor implements InstanceConstructorInterceptor, InstanceMethodsAroundInterceptor { @Override @@ -49,11 +45,11 @@ public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { } @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { - URL url = (URL)objInst.getSkyWalkingDynamicField(); - Request request = (Request)allArguments[0]; + URL url = (URL) objInst.getSkyWalkingDynamicField(); + Request request = (Request) allArguments[0]; if (url != null) { ContextCarrier contextCarrier = new ContextCarrier(); String remotePeer = url.getHost() + ":" + url.getPort(); @@ -69,9 +65,10 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } } - @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { - Response response = (Response)ret; + @Override + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { + Response response = (Response) ret; if (response != null && response.getException() != null) { AbstractSpan span = ContextManager.activeSpan(); span.errorOccurred(); @@ -81,7 +78,8 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { AbstractSpan span = ContextManager.activeSpan(); span.errorOccurred(); @@ -94,7 +92,11 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr * @return operation name. */ private static String generateOperationName(URL serviceURI, Request request) { - return new StringBuilder(serviceURI.getPath()).append(".").append(request.getMethodName()).append("(") - .append(request.getParamtersDesc()).append(")").toString(); + return new StringBuilder(serviceURI.getPath()).append(".") + .append(request.getMethodName()) + .append("(") + .append(request.getParamtersDesc()) + .append(")") + .toString(); } } diff --git a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/apache/skywalking/apm/plugin/motan/MotanProviderInterceptor.java b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/apache/skywalking/apm/plugin/motan/MotanProviderInterceptor.java index 1ed8d47e652b..7b99d3794532 100644 --- a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/apache/skywalking/apm/plugin/motan/MotanProviderInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/apache/skywalking/apm/plugin/motan/MotanProviderInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.motan; import com.weibo.api.motan.rpc.Request; @@ -38,14 +37,13 @@ *

* {@link MotanConsumerInterceptor} intercept all constructor of {@link com.weibo.api.motan.rpc.AbstractProvider} for * record the request url from consumer side. - * - * @author zhangxin */ public class MotanProviderInterceptor implements InstanceMethodsAroundInterceptor { - @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - Request request = (Request)allArguments[0]; + @Override + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { + Request request = (Request) allArguments[0]; ContextCarrier contextCarrier = new ContextCarrier(); CarrierItem next = contextCarrier.items(); while (next.hasNext()) { @@ -58,9 +56,10 @@ public class MotanProviderInterceptor implements InstanceMethodsAroundIntercepto span.setComponent(ComponentsDefine.MOTAN); } - @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { - Response response = (Response)ret; + @Override + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { + Response response = (Response) ret; if (response != null && response.getException() != null) { AbstractSpan span = ContextManager.activeSpan(); span.log(response.getException()); @@ -71,7 +70,8 @@ public class MotanProviderInterceptor implements InstanceMethodsAroundIntercepto return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { AbstractSpan activeSpan = ContextManager.activeSpan(); activeSpan.errorOccurred(); diff --git a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/apache/skywalking/apm/plugin/motan/define/MotanConsumerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/apache/skywalking/apm/plugin/motan/define/MotanConsumerInstrumentation.java index 4dcd0fa5c986..1bb3cd21b236 100644 --- a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/apache/skywalking/apm/plugin/motan/define/MotanConsumerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/apache/skywalking/apm/plugin/motan/define/MotanConsumerInstrumentation.java @@ -80,7 +80,8 @@ public String getMethodsInterceptor() { return PROVIDER_INVOKE_INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } diff --git a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/apache/skywalking/apm/plugin/motan/define/MotanProviderInstrumentation.java b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/apache/skywalking/apm/plugin/motan/define/MotanProviderInstrumentation.java index 68c732ec5dd8..2ebb75f3bec6 100644 --- a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/apache/skywalking/apm/plugin/motan/define/MotanProviderInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/java/org/apache/skywalking/apm/plugin/motan/define/MotanProviderInstrumentation.java @@ -58,7 +58,8 @@ public String getMethodsInterceptor() { return INVOKE_INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } diff --git a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/test/java/org/apache/skywalking/apm/plugin/motan/MotanConsumerInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/test/java/org/apache/skywalking/apm/plugin/motan/MotanConsumerInterceptorTest.java index 1f0f2b04081d..6867b7c4a16c 100644 --- a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/test/java/org/apache/skywalking/apm/plugin/motan/MotanConsumerInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/test/java/org/apache/skywalking/apm/plugin/motan/MotanConsumerInterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.motan; import com.weibo.api.motan.rpc.Request; diff --git a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/test/java/org/apache/skywalking/apm/plugin/motan/MotanProviderInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/test/java/org/apache/skywalking/apm/plugin/motan/MotanProviderInterceptorTest.java index 2397851f5f13..e0c521b06035 100644 --- a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/test/java/org/apache/skywalking/apm/plugin/motan/MotanProviderInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/test/java/org/apache/skywalking/apm/plugin/motan/MotanProviderInterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.motan; import com.weibo.api.motan.rpc.Request; @@ -92,7 +91,6 @@ public void setUp() { when(request.getParamtersDesc()).thenReturn("java.lang.String, java.lang.Object"); } - @Test public void testInvokerWithoutRefSegment() throws Throwable { invokeInterceptor.beforeMethod(enhancedInstance, null, arguments, argumentType, null); diff --git a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/pom.xml index 6ee0f0c6be40..7c1a6db30d26 100755 --- a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/pom.xml @@ -16,7 +16,8 @@ ~ --> - + apm-sdk-plugin org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/ConnectionCreate5xInterceptor.java b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/ConnectionCreate5xInterceptor.java index 115ea5d0607f..11226b8a943c 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/ConnectionCreate5xInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/ConnectionCreate5xInterceptor.java @@ -28,19 +28,19 @@ import java.lang.reflect.Method; /** - * ConnectionImpl#getInstance in mysql-5.x has 5 parameters such as - * getInstance(String hostToConnectTo, int portToConnectTo, Properties info, String databaseToConnectTo, String url) - * - * @author: dingshaocheng + * ConnectionImpl#getInstance in mysql-5.x has 5 parameters such as getInstance(String hostToConnectTo, int + * portToConnectTo, Properties info, String databaseToConnectTo, String url) */ public class ConnectionCreate5xInterceptor implements StaticMethodsAroundInterceptor { @Override - public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, MethodInterceptResult result) { + public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + MethodInterceptResult result) { } @Override - public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, Object ret) { + public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + Object ret) { if (ret instanceof EnhancedInstance) { ConnectionInfo connectionInfo = ConnectionCache.get(allArguments[0].toString(), allArguments[1].toString()); if (connectionInfo == null) { @@ -52,7 +52,8 @@ public Object afterMethod(Class clazz, Method method, Object[] allArguments, Cla } @Override - public void handleMethodException(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, Throwable t) { + public void handleMethodException(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + Throwable t) { } } diff --git a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/AbstractConnectionInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/AbstractConnectionInstrumentation.java index d824cd250fac..6f8b8b1b22d6 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/AbstractConnectionInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/AbstractConnectionInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.mysql.v5.define; import net.bytebuddy.description.method.MethodDescription; @@ -31,85 +30,102 @@ /** * {@link AbstractConnectionInstrumentation} intercepts the following methods that the class which extend - * com.mysql.jdbc.ConnectionImpl. - * + * com.mysql.jdbc.ConnectionImpl. + *

* 1. Enhance prepareStatement by org.apache.skywalking.apm.plugin.jdbc.define.JDBCPrepareStatementInterceptor * 2. Enhance prepareCall by org.apache.skywalking.apm.plugin.jdbc.define.JDBCPrepareCallInterceptor * 3. Enhance createStatement by org.apache.skywalking.apm.plugin.jdbc.define.JDBCStatementInterceptor * 4. Enhance commit, rollback, close, releaseSavepoint by org.apache.skywalking.apm.plugin.jdbc.define.ConnectionServiceMethodInterceptor - * - * @author zhangxin */ public abstract class AbstractConnectionInstrumentation extends AbstractMysqlInstrumentation { - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(Constants.PREPARE_STATEMENT_METHOD_NAME); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return org.apache.skywalking.apm.plugin.jdbc.mysql.Constants.CREATE_PREPARED_STATEMENT_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(Constants.PREPARE_CALL_METHOD_NAME); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return org.apache.skywalking.apm.plugin.jdbc.mysql.Constants.CREATE_CALLABLE_STATEMENT_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(Constants.CREATE_STATEMENT_METHOD_NAME).and(takesArguments(2)); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return org.apache.skywalking.apm.plugin.jdbc.mysql.Constants.CREATE_STATEMENT_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named(Constants.COMMIT_METHOD_NAME).or(named(Constants.ROLLBACK_METHOD_NAME)).or(named(Constants.CLOSE_METHOD_NAME)).or(named(Constants.RELEASE_SAVE_POINT_METHOD_NAME)); + @Override + public ElementMatcher getMethodsMatcher() { + return named(Constants.COMMIT_METHOD_NAME).or(named(Constants.ROLLBACK_METHOD_NAME)) + .or(named(Constants.CLOSE_METHOD_NAME)) + .or(named(Constants.RELEASE_SAVE_POINT_METHOD_NAME)); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return Constants.SERVICE_METHOD_INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named("setCatalog"); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return org.apache.skywalking.apm.plugin.jdbc.mysql.Constants.SET_CATALOG_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } @@ -117,5 +133,6 @@ public abstract class AbstractConnectionInstrumentation extends AbstractMysqlIns } - @Override protected abstract ClassMatch enhanceClass(); + @Override + protected abstract ClassMatch enhanceClass(); } diff --git a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/AbstractMysqlInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/AbstractMysqlInstrumentation.java index 46419b4aaf83..c29f3ffd4dd7 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/AbstractMysqlInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/AbstractMysqlInstrumentation.java @@ -23,14 +23,13 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.StaticMethodsInterceptPoint; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassEnhancePluginDefine; -/** - * @author: dingshaocheng - */ public abstract class AbstractMysqlInstrumentation extends ClassEnhancePluginDefine { + @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return null; } + @Override public StaticMethodsInterceptPoint[] getStaticMethodsInterceptPoints() { return null; @@ -43,6 +42,6 @@ public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { @Override protected String[] witnessClasses() { - return new String[]{Constants.WITNESS_MYSQL_5X_CLASS}; + return new String[] {Constants.WITNESS_MYSQL_5X_CLASS}; } } diff --git a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/CacheIpsInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/CacheIpsInstrumentation.java index 63a0dfcbe64f..659fa820efaf 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/CacheIpsInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/CacheIpsInstrumentation.java @@ -28,16 +28,12 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.MultiClassNameMatch.byMultiClassMatch; import static org.apache.skywalking.apm.plugin.jdbc.mysql.Constants.DRIVER_CONNECT_INTERCEPTOR; -/** - * @author: dingshaocheng - */ public class CacheIpsInstrumentation extends AbstractMysqlInstrumentation { private static final String ENHANCE_CLASS_NON_REG_REP = "com.mysql.jdbc.NonRegisteringReplicationDriver"; private static final String ENHANCE_CLASS = "com.mysql.jdbc.Driver"; private static final String ENHANCE_CLASS_NON_REG = "com.mysql.jdbc.NonRegisteringDriver"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; @@ -67,6 +63,6 @@ public boolean isOverrideArgs() { @Override protected ClassMatch enhanceClass() { - return byMultiClassMatch(ENHANCE_CLASS,ENHANCE_CLASS_NON_REG,ENHANCE_CLASS_NON_REG_REP); + return byMultiClassMatch(ENHANCE_CLASS, ENHANCE_CLASS_NON_REG, ENHANCE_CLASS_NON_REG_REP); } } diff --git a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/CallableInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/CallableInstrumentation.java index 6c282bd969b3..57511ef15724 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/CallableInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/CallableInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.mysql.v5.define; import net.bytebuddy.description.method.MethodDescription; @@ -29,43 +28,42 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; /** - * {@link CallableInstrumentation} define that the mysql-2.x plugin intercepts the following methods in the - * com.mysql.jdbc.CallableStatement - * 1. execute - * 2. executeQuery - * 3. executeUpdate - * - * @author zhangxin + * {@link CallableInstrumentation} define that the mysql-2.x plugin intercepts the following methods in the + * com.mysql.jdbc.CallableStatement 1. execute 2. executeQuery 3. executeUpdate */ public class CallableInstrumentation extends AbstractMysqlInstrumentation { private static final String ENHANCE_CLASS = "com.mysql.jdbc.CallableStatement"; private static final String SERVICE_METHOD_INTERCEPTOR = org.apache.skywalking.apm.plugin.jdbc.mysql.Constants.PREPARED_STATEMENT_EXECUTE_METHODS_INTERCEPTOR; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named("execute") - .or(named("executeQuery")) - .or(named("executeUpdate")); + @Override + public ElementMatcher getMethodsMatcher() { + return named("execute").or(named("executeQuery")).or(named("executeUpdate")); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return SERVICE_METHOD_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName(ENHANCE_CLASS); } diff --git a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/ConnectionImplCreateInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/ConnectionImplCreateInstrumentation.java index 9a1e2e76d1c4..14831f42bc4e 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/ConnectionImplCreateInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/ConnectionImplCreateInstrumentation.java @@ -18,7 +18,6 @@ package org.apache.skywalking.apm.plugin.jdbc.mysql.v5.define; - import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; import org.apache.skywalking.apm.agent.core.plugin.interceptor.StaticMethodsInterceptPoint; @@ -32,6 +31,7 @@ public class ConnectionImplCreateInstrumentation extends AbstractMysqlInstrument private static final String JDBC_ENHANCE_CLASS = "com.mysql.jdbc.ConnectionImpl"; private static final String CONNECT_METHOD = "getInstance"; + @Override public StaticMethodsInterceptPoint[] getStaticMethodsInterceptPoints() { return new StaticMethodsInterceptPoint[] { diff --git a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/Constants.java b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/Constants.java index b1a7db86e056..560d11b83423 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/Constants.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/Constants.java @@ -18,10 +18,6 @@ package org.apache.skywalking.apm.plugin.jdbc.mysql.v5.define; -/** - * - * @author: dingshaocheng - */ public class Constants { public static final String WITNESS_MYSQL_5X_CLASS = "com.mysql.jdbc.ConnectionImpl"; } diff --git a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/Mysql50ConnectionInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/Mysql50ConnectionInstrumentation.java index e78cfe9b846f..4955b635decd 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/Mysql50ConnectionInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/Mysql50ConnectionInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.mysql.v5.define; import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; @@ -24,10 +23,8 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; /** - * {@link Mysql50ConnectionInstrumentation} interceptor the com.mysql.jdbc.Connection class in the 5.0.x version - * of mysql driver jar. - * - * @author zhangxin + * {@link Mysql50ConnectionInstrumentation} interceptor the com.mysql.jdbc.Connection class in the 5.0.x version of + * mysql driver jar. */ public class Mysql50ConnectionInstrumentation extends AbstractConnectionInstrumentation { @Override @@ -35,7 +32,8 @@ protected ClassMatch enhanceClass() { return byName("com.mysql.jdbc.Connection"); } - @Override protected String[] witnessClasses() { + @Override + protected String[] witnessClasses() { return new String[] {"com.mysql.jdbc.CursorRowProvider"}; } } diff --git a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/Mysql5xConnectionInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/Mysql5xConnectionInstrumentation.java index ec4afee8bb2d..2e47c71f9c78 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/Mysql5xConnectionInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/Mysql5xConnectionInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.mysql.v5.define; import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; @@ -26,13 +25,12 @@ /** * {@link Mysql5xConnectionInstrumentation } interceptor {@link com.mysql.jdbc.ConnectionImpl} and * com.mysql.jdbc.ConnectionImpl in mysql jdbc driver 5.1 and 5.1+ - * - * @author zhangxin */ public class Mysql5xConnectionInstrumentation extends AbstractConnectionInstrumentation { public static final String ENHANCE_CLASS = "com.mysql.jdbc.ConnectionImpl"; - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName(ENHANCE_CLASS); } diff --git a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/PreparedStatementIgnoredSetterInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/PreparedStatementIgnoredSetterInstrumentation.java index 310d1a985b29..289d4287ceac 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/PreparedStatementIgnoredSetterInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/PreparedStatementIgnoredSetterInstrumentation.java @@ -16,15 +16,11 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.mysql.v5.define; import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; import org.apache.skywalking.apm.plugin.jdbc.PSSetterDefinitionOfJDBCInstrumentation; -/** - * @author kezhenxu94 - */ public class PreparedStatementIgnoredSetterInstrumentation extends PreparedStatementInstrumentation { @Override public final InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { diff --git a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/PreparedStatementInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/PreparedStatementInstrumentation.java index bf2209f72129..959c9cbd879f 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/PreparedStatementInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/PreparedStatementInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.mysql.v5.define; import static net.bytebuddy.matcher.ElementMatchers.named; @@ -32,47 +31,45 @@ /** * {@link PreparedStatementInstrumentation} define that the mysql-2.x plugin intercepts the following methods in the - * com.mysql.jdbc.JDBC42PreparedStatement, com.mysql.jdbc.PreparedStatement and - * com.mysql.cj.jdbc.PreparedStatement class: - * 1. execute - * 2. executeQuery - * 3. executeUpdate - * 4. executeLargeUpdate - * 5. addBatch - * - * @author zhangxin + * com.mysql.jdbc.JDBC42PreparedStatement, com.mysql.jdbc.PreparedStatement and com.mysql.cj.jdbc.PreparedStatement + * class: 1. execute 2. executeQuery 3. executeUpdate 4. executeLargeUpdate 5. addBatch */ public class PreparedStatementInstrumentation extends AbstractMysqlInstrumentation { private static final String SERVICE_METHOD_INTERCEPTOR = Constants.PREPARED_STATEMENT_EXECUTE_METHODS_INTERCEPTOR; public static final String MYSQL_PREPARED_STATEMENT_CLASS_NAME = "com.mysql.jdbc.PreparedStatement"; - @Override public final ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public final ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named("execute") - .or(named("executeQuery")) - .or(named("executeUpdate")) - .or(named("executeLargeUpdate")); + @Override + public ElementMatcher getMethodsMatcher() { + return named("execute").or(named("executeQuery")) + .or(named("executeUpdate")) + .or(named("executeLargeUpdate")); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return SERVICE_METHOD_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName(MYSQL_PREPARED_STATEMENT_CLASS_NAME); } diff --git a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/PreparedStatementNullSetterInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/PreparedStatementNullSetterInstrumentation.java index 807b768d9f33..b7f445be305c 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/PreparedStatementNullSetterInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/PreparedStatementNullSetterInstrumentation.java @@ -16,15 +16,11 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.mysql.v5.define; import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; import org.apache.skywalking.apm.plugin.jdbc.JDBCPreparedStatementNullSetterInstanceMethodsInterceptPoint; -/** - * @author kezhenxu94 - */ public class PreparedStatementNullSetterInstrumentation extends PreparedStatementInstrumentation { @Override diff --git a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/PreparedStatementSetterInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/PreparedStatementSetterInstrumentation.java index f9f004ad70a8..7b039eda81c4 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/PreparedStatementSetterInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/PreparedStatementSetterInstrumentation.java @@ -16,15 +16,11 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.mysql.v5.define; import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; import org.apache.skywalking.apm.plugin.jdbc.PSSetterDefinitionOfJDBCInstrumentation; -/** - * @author kezhenxu94 - */ public class PreparedStatementSetterInstrumentation extends PreparedStatementInstrumentation { @Override diff --git a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/StatementInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/StatementInstrumentation.java index ec0d012c9c92..05c61069abc7 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/StatementInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/define/StatementInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.mysql.v5.define; import net.bytebuddy.description.method.MethodDescription; @@ -29,54 +28,49 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; /** - * {@link StatementInstrumentation} intercepts the following methods in the - * com.mysql.jdbc.StatementImpl and com.mysql.cj.jdbc.StatementImpl class. - * 1. execute - * 2. executeQuery - * 3. executeUpdate - * 4. executeLargeUpdate - * 5. addBatch - * 6. executeBatchInternal - * 7. executeUpdateInternal - * 8. executeQuery - * 9. executeBatch - * - * @author zhangxin + * {@link StatementInstrumentation} intercepts the following methods in the com.mysql.jdbc.StatementImpl and + * com.mysql.cj.jdbc.StatementImpl class. 1. execute 2. executeQuery 3. executeUpdate 4. executeLargeUpdate 5. addBatch + * 6. executeBatchInternal 7. executeUpdateInternal 8. executeQuery 9. executeBatch */ public class StatementInstrumentation extends AbstractMysqlInstrumentation { private static final String SERVICE_METHOD_INTERCEPTOR = org.apache.skywalking.apm.plugin.jdbc.mysql.Constants.STATEMENT_EXECUTE_METHODS_INTERCEPTOR; public static final String MYSQL_STATEMENT_CLASS_NAME = "com.mysql.jdbc.StatementImpl"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named("execute") - .or(named("executeQuery")) - .or(named("executeUpdate")) - .or(named("executeLargeUpdate")) - .or(named("executeBatchInternal")) - .or(named("executeUpdateInternal")) - .or(named("executeQuery")) - .or(named("executeBatch")); + @Override + public ElementMatcher getMethodsMatcher() { + return named("execute").or(named("executeQuery")) + .or(named("executeUpdate")) + .or(named("executeLargeUpdate")) + .or(named("executeBatchInternal")) + .or(named("executeUpdateInternal")) + .or(named("executeQuery")) + .or(named("executeBatch")); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return SERVICE_METHOD_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName(MYSQL_STATEMENT_CLASS_NAME); } diff --git a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/ConnectionImplCreateInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/ConnectionImplCreateInterceptorTest.java index b333fb7a5421..6a9e155c2ee2 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/ConnectionImplCreateInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v5/ConnectionImplCreateInterceptorTest.java @@ -28,10 +28,6 @@ import static org.mockito.Mockito.verify; -/** - * - * @author: dingshaocheng - */ @RunWith(MockitoJUnitRunner.class) public class ConnectionImplCreateInterceptorTest { private ConnectionCreate5xInterceptor interceptor; @@ -39,7 +35,6 @@ public class ConnectionImplCreateInterceptorTest { @Mock private EnhancedInstance objectInstance; - @Before public void setUp() { interceptor = new ConnectionCreate5xInterceptor(); @@ -47,7 +42,13 @@ public void setUp() { @Test public void testResultIsEnhanceInstance() throws Throwable { - interceptor.afterMethod(null,null,new Object[]{"localhost",3360,null,"test","jdbc:mysql:replication://localhost:3360,localhost:3360,localhost:3360/test?useUnicode=true&characterEncoding=utf8&useSSL=false&roundRobinLoadBalance=true"},null,objectInstance); + interceptor.afterMethod(null, null, new Object[] { + "localhost", + 3360, + null, + "test", + "jdbc:mysql:replication://localhost:3360,localhost:3360,localhost:3360/test?useUnicode=true&characterEncoding=utf8&useSSL=false&roundRobinLoadBalance=true" + }, null, objectInstance); verify(objectInstance).setSkyWalkingDynamicField(Matchers.any()); } } \ No newline at end of file diff --git a/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/pom.xml index 6989958d96d6..2c1c0bb68bc5 100755 --- a/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/pom.xml @@ -16,7 +16,8 @@ ~ --> - + apm-sdk-plugin org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/ConnectionCreateNewInterceptor.java b/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/ConnectionCreateNewInterceptor.java index e7a5adf35cad..256d9611b744 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/ConnectionCreateNewInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/ConnectionCreateNewInterceptor.java @@ -29,18 +29,18 @@ /** * for mysql connector java 6.0.4+ - * @author lican */ public class ConnectionCreateNewInterceptor implements StaticMethodsAroundInterceptor { - @Override - public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, MethodInterceptResult result) { + public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + MethodInterceptResult result) { } @Override - public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, Object ret) { + public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + Object ret) { if (ret instanceof EnhancedInstance) { final HostInfo hostInfo = (HostInfo) allArguments[0]; ConnectionInfo connectionInfo = URLParser.parser(hostInfo.getDatabaseUrl()); @@ -50,7 +50,8 @@ public Object afterMethod(Class clazz, Method method, Object[] allArguments, Cla } @Override - public void handleMethodException(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, Throwable t) { + public void handleMethodException(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + Throwable t) { } } diff --git a/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/ConnectionCreateOldInterceptor.java b/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/ConnectionCreateOldInterceptor.java index 65cc78588181..8ab712678215 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/ConnectionCreateOldInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/ConnectionCreateOldInterceptor.java @@ -28,18 +28,18 @@ /** * for mysql connector java 6.0.2,6.0.3 - * @author lican */ public class ConnectionCreateOldInterceptor implements StaticMethodsAroundInterceptor { - @Override - public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, MethodInterceptResult result) { + public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + MethodInterceptResult result) { } @Override - public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, Object ret) { + public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + Object ret) { if (ret instanceof EnhancedInstance) { ConnectionInfo connectionInfo = ConnectionCache.get(allArguments[1].toString(), allArguments[2].toString()); ((EnhancedInstance) ret).setSkyWalkingDynamicField(connectionInfo); @@ -48,7 +48,8 @@ public Object afterMethod(Class clazz, Method method, Object[] allArguments, Cla } @Override - public void handleMethodException(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, Throwable t) { + public void handleMethodException(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + Throwable t) { } } diff --git a/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/AbstractMysqlInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/AbstractMysqlInstrumentation.java index 107dc7b13e1a..182b45c8addf 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/AbstractMysqlInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/AbstractMysqlInstrumentation.java @@ -23,14 +23,13 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.StaticMethodsInterceptPoint; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassEnhancePluginDefine; -/** - * @author: dingshaocheng - */ public abstract class AbstractMysqlInstrumentation extends ClassEnhancePluginDefine { + @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return null; } + @Override public StaticMethodsInterceptPoint[] getStaticMethodsInterceptPoints() { return null; @@ -41,9 +40,8 @@ public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return null; } - @Override protected String[] witnessClasses() { - return new String[]{Constants.WITNESS_MYSQL_6X_CLASS}; + return new String[] {Constants.WITNESS_MYSQL_6X_CLASS}; } } diff --git a/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/CacheIpsInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/CacheIpsInstrumentation.java index d53b6edf44e2..6f22622c78e5 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/CacheIpsInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/CacheIpsInstrumentation.java @@ -28,14 +28,10 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.MultiClassNameMatch.byMultiClassMatch; import static org.apache.skywalking.apm.plugin.jdbc.mysql.Constants.DRIVER_CONNECT_INTERCEPTOR; -/** - * @author dingshaocheng lican - */ public class CacheIpsInstrumentation extends AbstractMysqlInstrumentation { private static final String ENHANCE_CLASS_NON_REG = "com.mysql.cj.jdbc.NonRegisteringDriver"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; @@ -43,22 +39,23 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override public 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 DRIVER_CONNECT_INTERCEPTOR; - } + @Override + public String getMethodsInterceptor() { + return DRIVER_CONNECT_INTERCEPTOR; + } - @Override - public boolean isOverrideArgs() { - return false; + @Override + public boolean isOverrideArgs() { + return false; + } } - } }; } diff --git a/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/CallableInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/CallableInstrumentation.java index 568bbb2b49ae..4af7063073c5 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/CallableInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/CallableInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.mysql.v6.define; import net.bytebuddy.description.method.MethodDescription; @@ -29,43 +28,42 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; /** - * {@link CallableInstrumentation} define that the mysql-2.x plugin intercepts the following methods in the - * com.mysql.jdbc.CallableStatement - * 1. execute - * 2. executeQuery - * 3. executeUpdate - * - * @author zhangxin + * {@link CallableInstrumentation} define that the mysql-2.x plugin intercepts the following methods in the + * com.mysql.jdbc.CallableStatement 1. execute 2. executeQuery 3. executeUpdate */ public class CallableInstrumentation extends AbstractMysqlInstrumentation { private static final String ENHANCE_CLASS = "com.mysql.jdbc.cj.CallableStatement"; private static final String SERVICE_METHOD_INTERCEPTOR = org.apache.skywalking.apm.plugin.jdbc.mysql.Constants.PREPARED_STATEMENT_EXECUTE_METHODS_INTERCEPTOR; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named("execute") - .or(named("executeQuery")) - .or(named("executeUpdate")); + @Override + public ElementMatcher getMethodsMatcher() { + return named("execute").or(named("executeQuery")).or(named("executeUpdate")); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return SERVICE_METHOD_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName(ENHANCE_CLASS); } diff --git a/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/ConnectionImplCreateInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/ConnectionImplCreateInstrumentation.java index f69766162fa4..14bc7bb59f54 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/ConnectionImplCreateInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/ConnectionImplCreateInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.mysql.v6.define; import net.bytebuddy.description.method.MethodDescription; @@ -30,8 +29,6 @@ /** * interceptor the method {@link com.mysql.cj.jdbc.ConnectionImpl#getInstance} for mysql client version 6.x - * - * @author dingshaocheng lican */ public class ConnectionImplCreateInstrumentation extends AbstractMysqlInstrumentation { @@ -43,10 +40,9 @@ public class ConnectionImplCreateInstrumentation extends AbstractMysqlInstrument private static final String GET_INSTANCE_OLD_INTERCEPTOR = "org.apache.skywalking.apm.plugin.jdbc.mysql.v6.ConnectionCreateOldInterceptor"; - @Override public StaticMethodsInterceptPoint[] getStaticMethodsInterceptPoints() { - return new StaticMethodsInterceptPoint[]{ + return new StaticMethodsInterceptPoint[] { new StaticMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { diff --git a/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/ConnectionInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/ConnectionInstrumentation.java index 44b3767fd0c1..eeef82253021 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/ConnectionInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/ConnectionInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.mysql.v6.define; import net.bytebuddy.description.method.MethodDescription; @@ -31,81 +30,100 @@ public class ConnectionInstrumentation extends AbstractMysqlInstrumentation { - public static final String ENHANCE_CLASS = "com.mysql.cj.jdbc.ConnectionImpl"; - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName(ENHANCE_CLASS); } - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.PREPARE_STATEMENT_METHOD_NAME); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return org.apache.skywalking.apm.plugin.jdbc.mysql.Constants.CREATE_PREPARED_STATEMENT_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.PREPARE_CALL_METHOD_NAME); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return org.apache.skywalking.apm.plugin.jdbc.mysql.Constants.CREATE_CALLABLE_STATEMENT_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.CREATE_STATEMENT_METHOD_NAME).and(takesArguments(2)); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return org.apache.skywalking.apm.plugin.jdbc.mysql.Constants.CREATE_STATEMENT_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.COMMIT_METHOD_NAME).or(named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.ROLLBACK_METHOD_NAME)).or(named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.CLOSE_METHOD_NAME)).or(named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.RELEASE_SAVE_POINT_METHOD_NAME)); + @Override + public ElementMatcher getMethodsMatcher() { + return named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.COMMIT_METHOD_NAME).or(named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.ROLLBACK_METHOD_NAME)) + .or(named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.CLOSE_METHOD_NAME)) + .or(named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.RELEASE_SAVE_POINT_METHOD_NAME)); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return org.apache.skywalking.apm.plugin.jdbc.define.Constants.SERVICE_METHOD_INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named("setCatalog"); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return org.apache.skywalking.apm.plugin.jdbc.mysql.Constants.SET_CATALOG_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } diff --git a/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/Constants.java b/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/Constants.java index a0b19d1ccbcb..51a441fbd23d 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/Constants.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/Constants.java @@ -18,10 +18,6 @@ package org.apache.skywalking.apm.plugin.jdbc.mysql.v6.define; -/** - * - * @author: dingshaocheng - */ public class Constants { public static final String WITNESS_MYSQL_6X_CLASS = "com.mysql.cj.api.MysqlConnection"; } diff --git a/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/DriverInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/DriverInstrumentation.java index 01e019aca477..87ea26890d3f 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/DriverInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/DriverInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.mysql.v6.define; import org.apache.skywalking.apm.plugin.jdbc.define.AbstractDriverInstrumentation; @@ -26,8 +25,6 @@ /** * {@link DriverInstrumentation} presents that skywalking intercepts {@link com.mysql.jdbc.Driver}. - * - * @author zhangxin */ public class DriverInstrumentation extends AbstractDriverInstrumentation { @Override diff --git a/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/PreparedStatementIgnoredSetterInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/PreparedStatementIgnoredSetterInstrumentation.java index 5fadbf8501c7..b37a0e573d24 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/PreparedStatementIgnoredSetterInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/PreparedStatementIgnoredSetterInstrumentation.java @@ -16,15 +16,11 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.mysql.v6.define; import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; import org.apache.skywalking.apm.plugin.jdbc.PSSetterDefinitionOfJDBCInstrumentation; -/** - * @author kezhenxu94 - */ public class PreparedStatementIgnoredSetterInstrumentation extends PreparedStatementInstrumentation { @Override diff --git a/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/PreparedStatementInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/PreparedStatementInstrumentation.java index 1ebd1a97eb69..c0b3edfccb27 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/PreparedStatementInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/PreparedStatementInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.mysql.v6.define; import net.bytebuddy.description.method.MethodDescription; @@ -30,47 +29,45 @@ /** * {@link PreparedStatementInstrumentation} define that the mysql-2.x plugin intercepts the following methods in the - * com.mysql.jdbc.JDBC42PreparedStatement, com.mysql.jdbc.PreparedStatement and - * com.mysql.cj.jdbc.PreparedStatement class: - * 1. execute - * 2. executeQuery - * 3. executeUpdate - * 4. executeLargeUpdate - * 5. addBatch - * - * @author zhangxin + * com.mysql.jdbc.JDBC42PreparedStatement, com.mysql.jdbc.PreparedStatement and com.mysql.cj.jdbc.PreparedStatement + * class: 1. execute 2. executeQuery 3. executeUpdate 4. executeLargeUpdate 5. addBatch */ public class PreparedStatementInstrumentation extends AbstractMysqlInstrumentation { private static final String SERVICE_METHOD_INTERCEPTOR = org.apache.skywalking.apm.plugin.jdbc.mysql.Constants.PREPARED_STATEMENT_EXECUTE_METHODS_INTERCEPTOR; public static final String MYSQL6_PREPARED_STATEMENT_CLASS_NAME = "com.mysql.cj.jdbc.PreparedStatement"; - @Override public final ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public final ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named("execute") - .or(named("executeQuery")) - .or(named("executeUpdate")) - .or(named("executeLargeUpdate")); + @Override + public ElementMatcher getMethodsMatcher() { + return named("execute").or(named("executeQuery")) + .or(named("executeUpdate")) + .or(named("executeLargeUpdate")); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return SERVICE_METHOD_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName(MYSQL6_PREPARED_STATEMENT_CLASS_NAME); } diff --git a/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/PreparedStatementNullSetterInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/PreparedStatementNullSetterInstrumentation.java index 051852db9908..3c513bc5f7fa 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/PreparedStatementNullSetterInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/PreparedStatementNullSetterInstrumentation.java @@ -16,15 +16,11 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.mysql.v6.define; import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; import org.apache.skywalking.apm.plugin.jdbc.JDBCPreparedStatementNullSetterInstanceMethodsInterceptPoint; -/** - * @author kezhenxu94 - */ public class PreparedStatementNullSetterInstrumentation extends PreparedStatementInstrumentation { @Override diff --git a/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/PreparedStatementSetterInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/PreparedStatementSetterInstrumentation.java index 93e00b49a3e3..d775ebcffef6 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/PreparedStatementSetterInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/PreparedStatementSetterInstrumentation.java @@ -16,15 +16,11 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.mysql.v6.define; import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; import org.apache.skywalking.apm.plugin.jdbc.PSSetterDefinitionOfJDBCInstrumentation; -/** - * @author kezhenxu94 - */ public class PreparedStatementSetterInstrumentation extends PreparedStatementInstrumentation { @Override diff --git a/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/StatementInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/StatementInstrumentation.java index a99997fe257e..21f16ac56cad 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/StatementInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v6/define/StatementInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.mysql.v6.define; import net.bytebuddy.description.method.MethodDescription; @@ -29,54 +28,49 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; /** - * {@link StatementInstrumentation} intercepts the following methods in the - * com.mysql.jdbc.StatementImpl and com.mysql.cj.jdbc.StatementImpl class. - * 1. execute - * 2. executeQuery - * 3. executeUpdate - * 4. executeLargeUpdate - * 5. addBatch - * 6. executeBatchInternal - * 7. executeUpdateInternal - * 8. executeQuery - * 9. executeBatch - * - * @author zhangxin + * {@link StatementInstrumentation} intercepts the following methods in the com.mysql.jdbc.StatementImpl and + * com.mysql.cj.jdbc.StatementImpl class. 1. execute 2. executeQuery 3. executeUpdate 4. executeLargeUpdate 5. addBatch + * 6. executeBatchInternal 7. executeUpdateInternal 8. executeQuery 9. executeBatch */ public class StatementInstrumentation extends AbstractMysqlInstrumentation { private static final String SERVICE_METHOD_INTERCEPTOR = org.apache.skywalking.apm.plugin.jdbc.mysql.Constants.STATEMENT_EXECUTE_METHODS_INTERCEPTOR; public static final String MYSQL6_STATEMENT_CLASS_NAME = "com.mysql.cj.jdbc.StatementImpl"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named("execute") - .or(named("executeQuery")) - .or(named("executeUpdate")) - .or(named("executeLargeUpdate")) - .or(named("executeBatchInternal")) - .or(named("executeUpdateInternal")) - .or(named("executeQuery")) - .or(named("executeBatch")); + @Override + public ElementMatcher getMethodsMatcher() { + return named("execute").or(named("executeQuery")) + .or(named("executeUpdate")) + .or(named("executeLargeUpdate")) + .or(named("executeBatchInternal")) + .or(named("executeUpdateInternal")) + .or(named("executeQuery")) + .or(named("executeBatch")); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return SERVICE_METHOD_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName(MYSQL6_STATEMENT_CLASS_NAME); } diff --git a/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/pom.xml index ea90a42ccbac..b96f691d838e 100755 --- a/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/pom.xml @@ -16,7 +16,8 @@ ~ --> - + apm-sdk-plugin org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/ConnectionCreateInterceptor.java b/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/ConnectionCreateInterceptor.java index f4569326c388..762dbc1e5952 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/ConnectionCreateInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/ConnectionCreateInterceptor.java @@ -27,19 +27,17 @@ import java.lang.reflect.Method; -/** - * @author: dingshaocheng - */ public class ConnectionCreateInterceptor implements StaticMethodsAroundInterceptor { - @Override - public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, MethodInterceptResult result) { + public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + MethodInterceptResult result) { } @Override - public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, Object ret) { + public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + Object ret) { if (ret instanceof EnhancedInstance) { final HostInfo hostInfo = (HostInfo) allArguments[0]; ConnectionInfo connectionInfo = URLParser.parser(hostInfo.getDatabaseUrl()); @@ -49,7 +47,8 @@ public Object afterMethod(Class clazz, Method method, Object[] allArguments, Cla } @Override - public void handleMethodException(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, Throwable t) { + public void handleMethodException(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + Throwable t) { } } diff --git a/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/AbstractMysqlInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/AbstractMysqlInstrumentation.java index 5af53c8c41e9..5ad51b953d83 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/AbstractMysqlInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/AbstractMysqlInstrumentation.java @@ -23,15 +23,13 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.StaticMethodsInterceptPoint; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassEnhancePluginDefine; -/** - * @author: dingshaocheng - */ public abstract class AbstractMysqlInstrumentation extends ClassEnhancePluginDefine { @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return null; } + @Override public StaticMethodsInterceptPoint[] getStaticMethodsInterceptPoints() { return null; @@ -42,9 +40,8 @@ public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return null; } - @Override protected String[] witnessClasses() { - return new String[]{Constants.WITNESS_MYSQL_8X_CLASS}; + return new String[] {Constants.WITNESS_MYSQL_8X_CLASS}; } } diff --git a/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/CallableInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/CallableInstrumentation.java index a1fffbb1e83e..2559614f35c0 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/CallableInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/CallableInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.mysql.v8.define; import net.bytebuddy.description.method.MethodDescription; @@ -28,37 +27,39 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; - - public class CallableInstrumentation extends AbstractMysqlInstrumentation { private static final String ENHANCE_CLASS = "com.mysql.cj.jdbc.CallableStatement"; private static final String SERVICE_METHOD_INTERCEPTOR = org.apache.skywalking.apm.plugin.jdbc.mysql.Constants.PREPARED_STATEMENT_EXECUTE_METHODS_INTERCEPTOR; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named("execute") - .or(named("executeQuery")) - .or(named("executeUpdate")); + @Override + public ElementMatcher getMethodsMatcher() { + return named("execute").or(named("executeQuery")).or(named("executeUpdate")); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return SERVICE_METHOD_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName(ENHANCE_CLASS); } diff --git a/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/ConnectionImplCreateInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/ConnectionImplCreateInstrumentation.java index 74845d8a6240..ccca97255d4f 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/ConnectionImplCreateInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/ConnectionImplCreateInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.mysql.v8.define; import net.bytebuddy.description.method.MethodDescription; @@ -30,9 +29,8 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; /** - * interceptor the method {@link com.mysql.cj.jdbc.ConnectionImpl#getInstance(com.mysql.cj.conf.HostInfo)} - * instead of {@link com.mysql.cj.jdbc.Driver#connect(String, Properties)} - * @author: dingshaocheng + * interceptor the method {@link com.mysql.cj.jdbc.ConnectionImpl#getInstance(com.mysql.cj.conf.HostInfo)} instead of + * {@link com.mysql.cj.jdbc.Driver#connect(String, Properties)} */ public class ConnectionImplCreateInstrumentation extends AbstractMysqlInstrumentation { @@ -40,7 +38,6 @@ public class ConnectionImplCreateInstrumentation extends AbstractMysqlInstrument private static final String CONNECT_METHOD = "getInstance"; - @Override public StaticMethodsInterceptPoint[] getStaticMethodsInterceptPoints() { return new StaticMethodsInterceptPoint[] { diff --git a/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/ConnectionInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/ConnectionInstrumentation.java index af441fae4bbd..c464e2b2a9b0 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/ConnectionInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/ConnectionInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.mysql.v8.define; import net.bytebuddy.description.method.MethodDescription; @@ -29,77 +28,95 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; - public class ConnectionInstrumentation extends AbstractMysqlInstrumentation { - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.PREPARE_STATEMENT_METHOD_NAME); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return org.apache.skywalking.apm.plugin.jdbc.mysql.Constants.CREATE_PREPARED_STATEMENT_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.PREPARE_CALL_METHOD_NAME); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return org.apache.skywalking.apm.plugin.jdbc.mysql.Constants.CREATE_CALLABLE_STATEMENT_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.CREATE_STATEMENT_METHOD_NAME).and(takesArguments(2)); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return org.apache.skywalking.apm.plugin.jdbc.mysql.Constants.CREATE_STATEMENT_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.COMMIT_METHOD_NAME).or(named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.ROLLBACK_METHOD_NAME)).or(named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.CLOSE_METHOD_NAME)).or(named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.RELEASE_SAVE_POINT_METHOD_NAME)); + @Override + public ElementMatcher getMethodsMatcher() { + return named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.COMMIT_METHOD_NAME).or(named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.ROLLBACK_METHOD_NAME)) + .or(named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.CLOSE_METHOD_NAME)) + .or(named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.RELEASE_SAVE_POINT_METHOD_NAME)); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return org.apache.skywalking.apm.plugin.jdbc.define.Constants.SERVICE_METHOD_INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named("setCatalog"); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return org.apache.skywalking.apm.plugin.jdbc.mysql.Constants.SET_CATALOG_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } @@ -107,8 +124,8 @@ public class ConnectionInstrumentation extends AbstractMysqlInstrumentation { } - - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName("com.mysql.cj.jdbc.ConnectionImpl"); } diff --git a/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/Constants.java b/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/Constants.java index a7c2744cce1e..f32ce46d12d0 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/Constants.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/Constants.java @@ -18,7 +18,6 @@ package org.apache.skywalking.apm.plugin.jdbc.mysql.v8.define; - public class Constants { public static final String WITNESS_MYSQL_8X_CLASS = "com.mysql.cj.interceptors.QueryInterceptor"; } diff --git a/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/PreparedStatementIgnoredSetterInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/PreparedStatementIgnoredSetterInstrumentation.java index 8786b3e92764..bf8bf4190c10 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/PreparedStatementIgnoredSetterInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/PreparedStatementIgnoredSetterInstrumentation.java @@ -16,15 +16,11 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.mysql.v8.define; import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; import org.apache.skywalking.apm.plugin.jdbc.PSSetterDefinitionOfJDBCInstrumentation; -/** - * @author kezhenxu94 - */ public class PreparedStatementIgnoredSetterInstrumentation extends PreparedStatementInstrumentation { @Override diff --git a/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/PreparedStatementInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/PreparedStatementInstrumentation.java index 7088dbfde58c..280ce5965b1c 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/PreparedStatementInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/PreparedStatementInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.mysql.v8.define; import net.bytebuddy.description.method.MethodDescription; @@ -34,34 +33,39 @@ public class PreparedStatementInstrumentation extends AbstractMysqlInstrumentati private static final String PREPARED_STATEMENT_CLASS_NAME = "com.mysql.cj.jdbc.ClientPreparedStatement"; private static final String PREPARED_STATEMENT_SERVER_SIDE_CLASS_NAME = "com.mysql.cj.jdbc.ServerPreparedStatement"; - private static final String SERVICE_METHOD_INTERCEPTOR = Constants.PREPARED_STATEMENT_EXECUTE_METHODS_INTERCEPTOR; + private static final String SERVICE_METHOD_INTERCEPTOR = Constants.PREPARED_STATEMENT_EXECUTE_METHODS_INTERCEPTOR; - @Override public final ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public final ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named("execute") - .or(named("executeQuery")) - .or(named("executeUpdate")) - .or(named("executeLargeUpdate")); + @Override + public ElementMatcher getMethodsMatcher() { + return named("execute").or(named("executeQuery")) + .or(named("executeUpdate")) + .or(named("executeLargeUpdate")); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return SERVICE_METHOD_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byMultiClassMatch(PREPARED_STATEMENT_CLASS_NAME, PREPARED_STATEMENT_SERVER_SIDE_CLASS_NAME); } } diff --git a/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/PreparedStatementNullSetterInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/PreparedStatementNullSetterInstrumentation.java index 1d73311affb7..a9e6e6bebca3 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/PreparedStatementNullSetterInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/PreparedStatementNullSetterInstrumentation.java @@ -16,15 +16,11 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.mysql.v8.define; import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; import org.apache.skywalking.apm.plugin.jdbc.JDBCPreparedStatementNullSetterInstanceMethodsInterceptPoint; -/** - * @author kezhenxu94 - */ public class PreparedStatementNullSetterInstrumentation extends PreparedStatementInstrumentation { @Override diff --git a/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/PreparedStatementSetterInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/PreparedStatementSetterInstrumentation.java index 0eab1fc96a29..a451ceed2cb4 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/PreparedStatementSetterInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/PreparedStatementSetterInstrumentation.java @@ -16,15 +16,11 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.mysql.v8.define; import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; import org.apache.skywalking.apm.plugin.jdbc.PSSetterDefinitionOfJDBCInstrumentation; -/** - * @author kezhenxu94 - */ public class PreparedStatementSetterInstrumentation extends PreparedStatementInstrumentation { @Override diff --git a/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/StatementInstrumentation.java b/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/StatementInstrumentation.java index d23e9d02b303..ea650c179364 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/StatementInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/StatementInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.mysql.v8.define; import net.bytebuddy.description.method.MethodDescription; @@ -29,39 +28,44 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; public class StatementInstrumentation extends AbstractMysqlInstrumentation { - private static final String SERVICE_METHOD_INTERCEPTOR = org.apache.skywalking.apm.plugin.jdbc.mysql.Constants.STATEMENT_EXECUTE_METHODS_INTERCEPTOR; + private static final String SERVICE_METHOD_INTERCEPTOR = org.apache.skywalking.apm.plugin.jdbc.mysql.Constants.STATEMENT_EXECUTE_METHODS_INTERCEPTOR; public static final String MYSQL8_STATEMENT_CLASS_NAME = "com.mysql.cj.jdbc.StatementImpl"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named("execute") - .or(named("executeQuery")) - .or(named("executeUpdate")) - .or(named("executeLargeUpdate")) - .or(named("executeBatchInternal")) - .or(named("executeUpdateInternal")) - .or(named("executeQuery")) - .or(named("executeBatch")); + @Override + public ElementMatcher getMethodsMatcher() { + return named("execute").or(named("executeQuery")) + .or(named("executeUpdate")) + .or(named("executeLargeUpdate")) + .or(named("executeBatchInternal")) + .or(named("executeUpdateInternal")) + .or(named("executeQuery")) + .or(named("executeBatch")); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return SERVICE_METHOD_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName(MYSQL8_STATEMENT_CLASS_NAME); } } diff --git a/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/ConnectionImplCreateInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/ConnectionImplCreateInterceptorTest.java index a4f95bcf7b7d..b959453af8df 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/ConnectionImplCreateInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/ConnectionImplCreateInterceptorTest.java @@ -29,10 +29,6 @@ import static org.mockito.Mockito.verify; -/** - * - * @author: dingshaocheng - */ @RunWith(MockitoJUnitRunner.class) public class ConnectionImplCreateInterceptorTest { private ConnectionCreateInterceptor interceptor; @@ -40,7 +36,6 @@ public class ConnectionImplCreateInterceptorTest { @Mock private EnhancedInstance objectInstance; - @Before public void setUp() { interceptor = new ConnectionCreateInterceptor(); @@ -50,7 +45,7 @@ public void setUp() { public void testResultIsEnhanceInstance() throws Throwable { final ConnectionUrlParser connectionUrlParser = ConnectionUrlParser.parseConnectionString("jdbc:mysql:replication://localhost:3360,localhost:3360,localhost:3360/test?useUnicode=true&characterEncoding=utf8&useSSL=false&roundRobinLoadBalance=true"); - interceptor.afterMethod(null,null,connectionUrlParser.getHosts().toArray(),null,objectInstance); + interceptor.afterMethod(null, null, connectionUrlParser.getHosts().toArray(), null, objectInstance); verify(objectInstance).setSkyWalkingDynamicField(Matchers.any()); } } \ No newline at end of file diff --git a/apm-sniffer/apm-sdk-plugin/mysql-common/pom.xml b/apm-sniffer/apm-sdk-plugin/mysql-common/pom.xml index cf5866280d26..8cada59a7414 100755 --- a/apm-sniffer/apm-sdk-plugin/mysql-common/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/mysql-common/pom.xml @@ -16,7 +16,8 @@ ~ --> - + apm-sdk-plugin org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/ConnectionCache.java b/apm-sniffer/apm-sdk-plugin/mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/ConnectionCache.java index d24b01cfa232..7aebd558c605 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/ConnectionCache.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/ConnectionCache.java @@ -23,9 +23,6 @@ import java.util.concurrent.ConcurrentHashMap; -/** - * @author: dingshaocheng - */ public class ConnectionCache { private static final ConcurrentHashMap CONNECTIONS_MAP = new ConcurrentHashMap(); diff --git a/apm-sniffer/apm-sdk-plugin/mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/Constants.java b/apm-sniffer/apm-sdk-plugin/mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/Constants.java index 80dcb147c526..00599f9e8207 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/Constants.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/Constants.java @@ -20,9 +20,6 @@ import org.apache.skywalking.apm.agent.core.context.tag.StringTag; -/** - * @author: dingshaocheng - */ public class Constants { public static final String CREATE_CALLABLE_STATEMENT_INTERCEPTOR = "org.apache.skywalking.apm.plugin.jdbc.mysql.CreateCallableStatementInterceptor"; public static final String CREATE_PREPARED_STATEMENT_INTERCEPTOR = "org.apache.skywalking.apm.plugin.jdbc.mysql.CreatePreparedStatementInterceptor"; diff --git a/apm-sniffer/apm-sdk-plugin/mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreateCallableStatementInterceptor.java b/apm-sniffer/apm-sdk-plugin/mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreateCallableStatementInterceptor.java index 41e6d9a6d518..9c611beab173 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreateCallableStatementInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreateCallableStatementInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.mysql; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; @@ -38,12 +37,13 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { if (ret instanceof EnhancedInstance) { - ((EnhancedInstance)ret).setSkyWalkingDynamicField(new StatementEnhanceInfos((ConnectionInfo)objInst.getSkyWalkingDynamicField(), (String)allArguments[0], "CallableStatement")); + ((EnhancedInstance) ret).setSkyWalkingDynamicField(new StatementEnhanceInfos((ConnectionInfo) objInst.getSkyWalkingDynamicField(), (String) allArguments[0], "CallableStatement")); } return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { } diff --git a/apm-sniffer/apm-sdk-plugin/mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreatePreparedStatementInterceptor.java b/apm-sniffer/apm-sdk-plugin/mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreatePreparedStatementInterceptor.java index d4c9d3478588..e197789759bc 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreatePreparedStatementInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreatePreparedStatementInterceptor.java @@ -36,12 +36,13 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { if (ret instanceof EnhancedInstance) { - ((EnhancedInstance)ret).setSkyWalkingDynamicField(new StatementEnhanceInfos((ConnectionInfo)objInst.getSkyWalkingDynamicField(), (String)allArguments[0], "PreparedStatement")); + ((EnhancedInstance) ret).setSkyWalkingDynamicField(new StatementEnhanceInfos((ConnectionInfo) objInst.getSkyWalkingDynamicField(), (String) allArguments[0], "PreparedStatement")); } return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { } diff --git a/apm-sniffer/apm-sdk-plugin/mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreateStatementInterceptor.java b/apm-sniffer/apm-sdk-plugin/mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreateStatementInterceptor.java index a35b17918a93..5c58ec546836 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreateStatementInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreateStatementInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.mysql; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; @@ -27,7 +26,6 @@ import java.lang.reflect.Method; - public class CreateStatementInterceptor implements InstanceMethodsAroundInterceptor { @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, @@ -39,12 +37,13 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { if (ret instanceof EnhancedInstance) { - ((EnhancedInstance)ret).setSkyWalkingDynamicField(new StatementEnhanceInfos((ConnectionInfo)objInst.getSkyWalkingDynamicField(), "", "Statement")); + ((EnhancedInstance) ret).setSkyWalkingDynamicField(new StatementEnhanceInfos((ConnectionInfo) objInst.getSkyWalkingDynamicField(), "", "Statement")); } return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { } diff --git a/apm-sniffer/apm-sdk-plugin/mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/DriverConnectInterceptor.java b/apm-sniffer/apm-sdk-plugin/mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/DriverConnectInterceptor.java index b32519f2c91a..d17573dd3f32 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/DriverConnectInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/DriverConnectInterceptor.java @@ -25,23 +25,23 @@ import java.lang.reflect.Method; -/** - * @author: dingshaocheng - */ public class DriverConnectInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { ConnectionCache.save(URLParser.parser(allArguments[0].toString())); } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { return ret; } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { } } diff --git a/apm-sniffer/apm-sdk-plugin/mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/PreparedStatementExecuteMethodsInterceptor.java b/apm-sniffer/apm-sdk-plugin/mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/PreparedStatementExecuteMethodsInterceptor.java index 732816c07d08..91b01862d643 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/PreparedStatementExecuteMethodsInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/PreparedStatementExecuteMethodsInterceptor.java @@ -37,9 +37,8 @@ public class PreparedStatementExecuteMethodsInterceptor implements InstanceMetho @Override public final void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { - StatementEnhanceInfos cacheObject = (StatementEnhanceInfos)objInst.getSkyWalkingDynamicField(); + Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + StatementEnhanceInfos cacheObject = (StatementEnhanceInfos) objInst.getSkyWalkingDynamicField(); ConnectionInfo connectInfo = cacheObject.getConnectionInfo(); /** * For avoid NPE. In this particular case, Execute sql inside the {@link com.mysql.jdbc.ConnectionImpl} constructor, @@ -49,7 +48,8 @@ public final void beforeMethod(EnhancedInstance objInst, Method method, Object[] */ if (connectInfo != null) { - AbstractSpan span = ContextManager.createExitSpan(buildOperationName(connectInfo, method.getName(), cacheObject.getStatementName()), connectInfo.getDatabasePeer()); + AbstractSpan span = ContextManager.createExitSpan(buildOperationName(connectInfo, method.getName(), cacheObject + .getStatementName()), connectInfo.getDatabasePeer()); Tags.DB_TYPE.set(span, "sql"); Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName()); Tags.DB_STATEMENT.set(span, cacheObject.getSql()); @@ -74,18 +74,18 @@ public final void beforeMethod(EnhancedInstance objInst, Method method, Object[] @Override public final Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, - Object ret) throws Throwable { - StatementEnhanceInfos cacheObject = (StatementEnhanceInfos)objInst.getSkyWalkingDynamicField(); + Class[] argumentsTypes, Object ret) throws Throwable { + StatementEnhanceInfos cacheObject = (StatementEnhanceInfos) objInst.getSkyWalkingDynamicField(); if (cacheObject.getConnectionInfo() != null) { ContextManager.stopSpan(); } return ret; } - @Override public final void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public final void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { - StatementEnhanceInfos cacheObject = (StatementEnhanceInfos)objInst.getSkyWalkingDynamicField(); + StatementEnhanceInfos cacheObject = (StatementEnhanceInfos) objInst.getSkyWalkingDynamicField(); if (cacheObject.getConnectionInfo() != null) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/SetCatalogInterceptor.java b/apm-sniffer/apm-sdk-plugin/mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/SetCatalogInterceptor.java index ed15bbb84cb1..dd176a369fdd 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/SetCatalogInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/SetCatalogInterceptor.java @@ -31,7 +31,7 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr MethodInterceptResult result) throws Throwable { Object dynamicField = objInst.getSkyWalkingDynamicField(); if (dynamicField instanceof ConnectionInfo) { - ((ConnectionInfo)dynamicField).setDatabaseName(String.valueOf(allArguments[0])); + ((ConnectionInfo) dynamicField).setDatabaseName(String.valueOf(allArguments[0])); } } @@ -41,7 +41,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { } } diff --git a/apm-sniffer/apm-sdk-plugin/mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/StatementExecuteMethodsInterceptor.java b/apm-sniffer/apm-sdk-plugin/mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/StatementExecuteMethodsInterceptor.java index 684d9600496d..cd642e04182b 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/StatementExecuteMethodsInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-common/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/StatementExecuteMethodsInterceptor.java @@ -30,13 +30,11 @@ import java.lang.reflect.Method; - public class StatementExecuteMethodsInterceptor implements InstanceMethodsAroundInterceptor { @Override public final void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { - StatementEnhanceInfos cacheObject = (StatementEnhanceInfos)objInst.getSkyWalkingDynamicField(); + Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + StatementEnhanceInfos cacheObject = (StatementEnhanceInfos) objInst.getSkyWalkingDynamicField(); ConnectionInfo connectInfo = cacheObject.getConnectionInfo(); /** * To protected the code occur NullPointException. because mysql execute system sql when constructor method in @@ -47,7 +45,8 @@ public final void beforeMethod(EnhancedInstance objInst, Method method, Object[] */ if (connectInfo != null) { - AbstractSpan span = ContextManager.createExitSpan(buildOperationName(connectInfo, method.getName(), cacheObject.getStatementName()), connectInfo.getDatabasePeer()); + AbstractSpan span = ContextManager.createExitSpan(buildOperationName(connectInfo, method.getName(), cacheObject + .getStatementName()), connectInfo.getDatabasePeer()); Tags.DB_TYPE.set(span, "sql"); Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName()); @@ -57,7 +56,7 @@ public final void beforeMethod(EnhancedInstance objInst, Method method, Object[] */ String sql = ""; if (allArguments.length > 0) { - sql = (String)allArguments[0]; + sql = (String) allArguments[0]; } Tags.DB_STATEMENT.set(span, sql); @@ -69,18 +68,18 @@ public final void beforeMethod(EnhancedInstance objInst, Method method, Object[] @Override public final Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, - Object ret) throws Throwable { - StatementEnhanceInfos cacheObject = (StatementEnhanceInfos)objInst.getSkyWalkingDynamicField(); + Class[] argumentsTypes, Object ret) throws Throwable { + StatementEnhanceInfos cacheObject = (StatementEnhanceInfos) objInst.getSkyWalkingDynamicField(); if (cacheObject.getConnectionInfo() != null) { ContextManager.stopSpan(); } return ret; } - @Override public final void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public final void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { - StatementEnhanceInfos cacheObject = (StatementEnhanceInfos)objInst.getSkyWalkingDynamicField(); + StatementEnhanceInfos cacheObject = (StatementEnhanceInfos) objInst.getSkyWalkingDynamicField(); if (cacheObject.getConnectionInfo() != null) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/mysql-common/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreateCallableStatementInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/mysql-common/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreateCallableStatementInterceptorTest.java index 569c1a750121..2b65ce8b5e31 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-common/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreateCallableStatementInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-common/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreateCallableStatementInterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.mysql; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; diff --git a/apm-sniffer/apm-sdk-plugin/mysql-common/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreatePreparedStatementInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/mysql-common/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreatePreparedStatementInterceptorTest.java index 4d6d829adc1d..8278c93fa3af 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-common/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreatePreparedStatementInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-common/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreatePreparedStatementInterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.mysql; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; diff --git a/apm-sniffer/apm-sdk-plugin/mysql-common/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreateStatementInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/mysql-common/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreateStatementInterceptorTest.java index b50fdbec43d2..9c664c87b2f5 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-common/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreateStatementInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-common/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreateStatementInterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.mysql; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; diff --git a/apm-sniffer/apm-sdk-plugin/mysql-common/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/StatementExecuteMethodsInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/mysql-common/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/StatementExecuteMethodsInterceptorTest.java index 785aca6a6122..2a09c4708ab6 100644 --- a/apm-sniffer/apm-sdk-plugin/mysql-common/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/StatementExecuteMethodsInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/mysql-common/src/test/java/org/apache/skywalking/apm/plugin/jdbc/mysql/StatementExecuteMethodsInterceptorTest.java @@ -18,12 +18,17 @@ package org.apache.skywalking.apm.plugin.jdbc.mysql; +import java.lang.reflect.Method; import org.apache.skywalking.apm.agent.core.context.trace.AbstractTracingSpan; import org.apache.skywalking.apm.agent.core.context.trace.SpanLayer; import org.apache.skywalking.apm.agent.core.context.trace.TraceSegment; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; import org.apache.skywalking.apm.agent.test.helper.SegmentHelper; -import org.apache.skywalking.apm.agent.test.tools.*; +import org.apache.skywalking.apm.agent.test.tools.AgentServiceRule; +import org.apache.skywalking.apm.agent.test.tools.SegmentStorage; +import org.apache.skywalking.apm.agent.test.tools.SegmentStoragePoint; +import org.apache.skywalking.apm.agent.test.tools.SpanAssert; +import org.apache.skywalking.apm.agent.test.tools.TracingSegmentRunner; import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; import org.apache.skywalking.apm.plugin.jdbc.define.StatementEnhanceInfos; import org.apache.skywalking.apm.plugin.jdbc.trace.ConnectionInfo; @@ -35,8 +40,6 @@ import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.modules.junit4.PowerMockRunnerDelegate; -import java.lang.reflect.Method; - import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import static org.powermock.api.mockito.PowerMockito.when; diff --git a/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/pom.xml index a269921ed4bd..e49a947bfdd1 100644 --- a/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-sdk-plugin org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/socketio/NettySocketIOClientInfo.java b/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/socketio/NettySocketIOClientInfo.java index 392c38d4fa67..59979ed20c72 100644 --- a/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/socketio/NettySocketIOClientInfo.java +++ b/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/socketio/NettySocketIOClientInfo.java @@ -23,8 +23,6 @@ /** * {@link com.corundumstudio.socketio.transport.NamespaceClient} all data - * - * @author MrPro */ public class NettySocketIOClientInfo { diff --git a/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/socketio/NettySocketIOConnectionInterceptor.java b/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/socketio/NettySocketIOConnectionInterceptor.java index 6a511dbb2541..f97c4d43200c 100644 --- a/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/socketio/NettySocketIOConnectionInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/socketio/NettySocketIOConnectionInterceptor.java @@ -32,13 +32,11 @@ import java.lang.reflect.Method; import java.net.InetSocketAddress; -/** - * @author MrPro - */ public class NettySocketIOConnectionInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { SocketIOClient client = (SocketIOClient) allArguments[0]; AbstractSpan span = ContextManager.createEntrySpan("SocketIO/" + method.getName(), new ContextCarrier()); @@ -52,13 +50,15 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { if (ContextManager.isActive()) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/socketio/NettySocketIOConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/socketio/NettySocketIOConstructorInterceptor.java index 7fe4929f1ca0..a69cf28bd9a3 100644 --- a/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/socketio/NettySocketIOConstructorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/socketio/NettySocketIOConstructorInterceptor.java @@ -25,9 +25,6 @@ import java.net.InetSocketAddress; -/** - * @author MrPro - */ public class NettySocketIOConstructorInterceptor implements InstanceConstructorInterceptor { @Override public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { diff --git a/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/socketio/NettySocketIOOnEventInterceptor.java b/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/socketio/NettySocketIOOnEventInterceptor.java index 5b7d11136e72..ca85984cef3b 100644 --- a/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/socketio/NettySocketIOOnEventInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/socketio/NettySocketIOOnEventInterceptor.java @@ -29,13 +29,11 @@ import java.lang.reflect.Method; -/** - * @author MrPro - */ public class NettySocketIOOnEventInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { String eventName = (String) allArguments[1]; // no place to get context carrier @@ -46,13 +44,15 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { if (ContextManager.isActive()) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/socketio/NettySocketIORoomInterceptor.java b/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/socketio/NettySocketIORoomInterceptor.java index 5a1924de7798..e05e39ba4807 100644 --- a/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/socketio/NettySocketIORoomInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/socketio/NettySocketIORoomInterceptor.java @@ -28,13 +28,11 @@ import java.lang.reflect.Method; -/** - * @author MrPro - */ public class NettySocketIORoomInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { String roomName = (String) allArguments[0]; AbstractSpan span = ContextManager.createLocalSpan("SocketIO/" + roomName + "/" + method.getName()); span.setComponent(ComponentsDefine.SOCKET_IO); @@ -42,13 +40,15 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { if (ContextManager.isActive()) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/socketio/define/NettySocketIOPluginClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/socketio/define/NettySocketIOPluginClientInstrumentation.java index 31847624130f..b0ee10a4932f 100644 --- a/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/socketio/define/NettySocketIOPluginClientInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/socketio/define/NettySocketIOPluginClientInstrumentation.java @@ -25,13 +25,12 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; -import static net.bytebuddy.matcher.ElementMatchers.*; +import static net.bytebuddy.matcher.ElementMatchers.named; +import static net.bytebuddy.matcher.ElementMatchers.takesArguments; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; /** * enhance operate client - * - * @author MrPro */ public class NettySocketIOPluginClientInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -59,7 +58,7 @@ public String getConstructorInterceptor() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { diff --git a/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/socketio/define/NettySocketIOPluginNameSpaceInstrumentation.java b/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/socketio/define/NettySocketIOPluginNameSpaceInstrumentation.java index 0294ed0b471a..66c385d1b36b 100644 --- a/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/socketio/define/NettySocketIOPluginNameSpaceInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/socketio/define/NettySocketIOPluginNameSpaceInstrumentation.java @@ -30,8 +30,6 @@ /** * enhance socketio get event - * - * @author MrPro */ public class NettySocketIOPluginNameSpaceInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { diff --git a/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/src/test/java/org/apache/skywalking/apm/plugin/netty/socketio/NettySocketIOTest.java b/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/src/test/java/org/apache/skywalking/apm/plugin/netty/socketio/NettySocketIOTest.java index 81d955b3031c..751522324b39 100644 --- a/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/src/test/java/org/apache/skywalking/apm/plugin/netty/socketio/NettySocketIOTest.java +++ b/apm-sniffer/apm-sdk-plugin/netty-socketio-plugin/src/test/java/org/apache/skywalking/apm/plugin/netty/socketio/NettySocketIOTest.java @@ -46,9 +46,6 @@ import static org.hamcrest.CoreMatchers.is; import static org.powermock.api.mockito.PowerMockito.when; -/** - * @author MrPro - */ @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(TracingSegmentRunner.class) public class NettySocketIOTest { @@ -115,11 +112,11 @@ public void setUp() { @Test public void assertConnection() throws Throwable { - connectionInterceptor.beforeMethod(null, connectOnConnectMethod, new Object[]{socketIOClient}, null, null); - connectionInterceptor.afterMethod(null, connectOnConnectMethod, new Object[]{socketIOClient}, null, null); + connectionInterceptor.beforeMethod(null, connectOnConnectMethod, new Object[] {socketIOClient}, null, null); + connectionInterceptor.afterMethod(null, connectOnConnectMethod, new Object[] {socketIOClient}, null, null); - connectionInterceptor.beforeMethod(null, connectOnDisConnectMethod, new Object[]{socketIOClient}, null, null); - connectionInterceptor.afterMethod(null, connectOnDisConnectMethod, new Object[]{socketIOClient}, null, null); + connectionInterceptor.beforeMethod(null, connectOnDisConnectMethod, new Object[] {socketIOClient}, null, null); + connectionInterceptor.afterMethod(null, connectOnDisConnectMethod, new Object[] {socketIOClient}, null, null); List traceSegments = segmentStorage.getTraceSegments(); Assert.assertThat(traceSegments.size(), is(2)); @@ -127,8 +124,14 @@ public void assertConnection() throws Throwable { @Test public void assertOnEvent() throws Throwable { - onEventInterceptor.beforeMethod(null, null, new Object[]{null, "test"}, null, null); - onEventInterceptor.afterMethod(null, null, new Object[]{null, "test"}, null, null); + onEventInterceptor.beforeMethod(null, null, new Object[] { + null, + "test" + }, null, null); + onEventInterceptor.afterMethod(null, null, new Object[] { + null, + "test" + }, null, null); List traceSegments = segmentStorage.getTraceSegments(); Assert.assertThat(traceSegments.size(), is(1)); @@ -136,16 +139,19 @@ public void assertOnEvent() throws Throwable { @Test public void assertConstructor() throws Throwable { - constructorInterceptor.onConstruct(enhancedInstance, new Object[] {clientHead, namespace}); + constructorInterceptor.onConstruct(enhancedInstance, new Object[] { + clientHead, + namespace + }); } @Test public void assertRoom() throws Throwable { - roomInterceptor.beforeMethod(null, roomJoinMethod, new Object[] {"test_room"}, null,null); - roomInterceptor.afterMethod(null, roomJoinMethod, new Object[] {"test_room"}, null,null); + roomInterceptor.beforeMethod(null, roomJoinMethod, new Object[] {"test_room"}, null, null); + roomInterceptor.afterMethod(null, roomJoinMethod, new Object[] {"test_room"}, null, null); - roomInterceptor.beforeMethod(null, roomLeaveMethod, new Object[] {"test_room"}, null,null); - roomInterceptor.afterMethod(null, roomLeaveMethod, new Object[] {"test_room"}, null,null); + roomInterceptor.beforeMethod(null, roomLeaveMethod, new Object[] {"test_room"}, null, null); + roomInterceptor.afterMethod(null, roomLeaveMethod, new Object[] {"test_room"}, null, null); List traceSegments = segmentStorage.getTraceSegments(); Assert.assertThat(traceSegments.size(), is(2)); diff --git a/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/pom.xml index e39591115dc6..3991b9e356ac 100644 --- a/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/pom.xml @@ -16,7 +16,8 @@ ~ --> - + nutz-plugins org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/http/sync/SenderConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/http/sync/SenderConstructorInterceptor.java index b904dc1211a8..3b94043e1972 100644 --- a/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/http/sync/SenderConstructorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/http/sync/SenderConstructorInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.nutz.http.sync; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; diff --git a/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/http/sync/SenderSendInterceptor.java b/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/http/sync/SenderSendInterceptor.java index 0bc661e2ddd6..d9201d7ce759 100644 --- a/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/http/sync/SenderSendInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/http/sync/SenderSendInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.nutz.http.sync; import java.lang.reflect.Method; @@ -39,9 +38,8 @@ public class SenderSendInterceptor implements InstanceMethodsAroundInterceptor { @Override public void beforeMethod(final EnhancedInstance objInst, final Method method, final Object[] allArguments, - final Class[] argumentsTypes, - final MethodInterceptResult result) throws Throwable { - Request req = (Request)objInst.getSkyWalkingDynamicField(); + final Class[] argumentsTypes, final MethodInterceptResult result) throws Throwable { + Request req = (Request) objInst.getSkyWalkingDynamicField(); final URI requestURL = req.getUrl().toURI(); final METHOD httpMethod = req.getMethod(); final ContextCarrier contextCarrier = new ContextCarrier(); @@ -49,7 +47,8 @@ public void beforeMethod(final EnhancedInstance objInst, final Method method, fi AbstractSpan span = ContextManager.createExitSpan(requestURL.getPath(), contextCarrier, remotePeer); span.setComponent(ComponentsDefine.NUTZ_HTTP); - Tags.URL.set(span, requestURL.getScheme() + "://" + requestURL.getHost() + ":" + requestURL.getPort() + requestURL.getPath()); + Tags.URL.set(span, requestURL.getScheme() + "://" + requestURL.getHost() + ":" + requestURL.getPort() + requestURL + .getPath()); Tags.HTTP.METHOD.set(span, httpMethod.toString()); SpanLayer.asHttp(span); @@ -62,9 +61,8 @@ public void beforeMethod(final EnhancedInstance objInst, final Method method, fi @Override public Object afterMethod(final EnhancedInstance objInst, final Method method, final Object[] allArguments, - final Class[] argumentsTypes, - Object ret) throws Throwable { - Response response = (Response)ret; + final Class[] argumentsTypes, Object ret) throws Throwable { + Response response = (Response) ret; int statusCode = response.getStatus(); AbstractSpan span = ContextManager.activeSpan(); if (statusCode >= 400) { diff --git a/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/http/sync/define/AbstractNutzHttpInstrumentation.java b/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/http/sync/define/AbstractNutzHttpInstrumentation.java index 5077fd0e95bd..9e0b55819fd4 100644 --- a/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/http/sync/define/AbstractNutzHttpInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/http/sync/define/AbstractNutzHttpInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.nutz.http.sync.define; import net.bytebuddy.description.method.MethodDescription; diff --git a/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/http/sync/define/NutzHttpFilePostSenderInstrumentation.java b/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/http/sync/define/NutzHttpFilePostSenderInstrumentation.java index 59faa3d28655..0fbc17376555 100644 --- a/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/http/sync/define/NutzHttpFilePostSenderInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/http/sync/define/NutzHttpFilePostSenderInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.nutz.http.sync.define; import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; diff --git a/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/http/sync/define/NutzHttpGetSenderInstrumentation.java b/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/http/sync/define/NutzHttpGetSenderInstrumentation.java index 29969f9332e2..d7693071bd29 100644 --- a/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/http/sync/define/NutzHttpGetSenderInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/http/sync/define/NutzHttpGetSenderInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.nutz.http.sync.define; import org.apache.skywalking.apm.agent.core.plugin.match.NameMatch; diff --git a/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/http/sync/define/NutzHttpPostSenderInstrumentation.java b/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/http/sync/define/NutzHttpPostSenderInstrumentation.java index 3c0ab61d9d4c..2ff1856ca803 100644 --- a/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/http/sync/define/NutzHttpPostSenderInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/http/sync/define/NutzHttpPostSenderInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.nutz.http.sync.define; import org.apache.skywalking.apm.agent.core.plugin.match.NameMatch; diff --git a/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/nutz/http/sync/SenderInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/nutz/http/sync/SenderInterceptorTest.java index 973176670d1f..f9f982db9c28 100644 --- a/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/nutz/http/sync/SenderInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/nutz/http/sync/SenderInterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.nutz.http.sync; import java.lang.reflect.Method; diff --git a/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/pom.xml index a29e0388c6d4..6d2ffd91349a 100644 --- a/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/pom.xml @@ -16,7 +16,8 @@ ~ --> - + nutz-plugins org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/mvc/ActionConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/mvc/ActionConstructorInterceptor.java index a0f15b4c3a12..ffa3c45c8cf0 100644 --- a/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/mvc/ActionConstructorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/mvc/ActionConstructorInterceptor.java @@ -16,16 +16,12 @@ * */ - package org.apache.skywalking.apm.plugin.nutz.mvc; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor; import org.nutz.mvc.annotation.At; -/** - * @author wendal - */ public class ActionConstructorInterceptor implements InstanceConstructorInterceptor { @Override diff --git a/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/mvc/ActionMethodInterceptor.java b/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/mvc/ActionMethodInterceptor.java index 3e8d8f1f0858..37695c13e62c 100644 --- a/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/mvc/ActionMethodInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/mvc/ActionMethodInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.nutz.mvc; import java.lang.reflect.Method; @@ -37,14 +36,12 @@ /** * The ActionMethodInterceptor only use the first mapping value. - * - * @author wendal */ public class ActionMethodInterceptor implements InstanceMethodsAroundInterceptor { @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - PathMappingCache pathMappingCache = (PathMappingCache)objInst.getSkyWalkingDynamicField(); + PathMappingCache pathMappingCache = (PathMappingCache) objInst.getSkyWalkingDynamicField(); String requestURL = pathMappingCache.findPathMapping(method); if (requestURL == null) { At methodRequestMapping = method.getAnnotation(At.class); @@ -85,7 +82,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/mvc/PathMappingCache.java b/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/mvc/PathMappingCache.java index a81529acb2f9..86e4054508e0 100644 --- a/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/mvc/PathMappingCache.java +++ b/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/mvc/PathMappingCache.java @@ -16,18 +16,13 @@ * */ - package org.apache.skywalking.apm.plugin.nutz.mvc; import java.lang.reflect.Method; import java.util.concurrent.ConcurrentHashMap; /** - * The PathMappingCache represents a mapping cache. - * key: {@link Method} - * value: the url pattern - * - * @author wendal + * The PathMappingCache represents a mapping cache. key: {@link Method} value: the url pattern */ public class PathMappingCache { private String classPath = ""; diff --git a/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/mvc/define/ActionInstrumentation.java b/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/mvc/define/ActionInstrumentation.java index 2ac772dcd57f..f7b687b3a32d 100644 --- a/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/mvc/define/ActionInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/nutz/mvc/define/ActionInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.nutz.mvc.define; import net.bytebuddy.description.method.MethodDescription; diff --git a/apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml b/apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml index 7f234fdd7816..25ac2bad15f7 100644 --- a/apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml @@ -17,7 +17,8 @@ ~ --> - + 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/pom.xml index 7a7b46759d07..b0656ddbf991 100644 --- a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + org.apache.skywalking apm-sdk-plugin diff --git a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/AsyncCallInterceptor.java b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/AsyncCallInterceptor.java index 1ae84ef10eae..7ea109c19845 100644 --- a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/AsyncCallInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/AsyncCallInterceptor.java @@ -39,11 +39,9 @@ /** * {@link AsyncCallInterceptor} get the `EnhanceRequiredInfo` instance from `SkyWalkingDynamicField` and then put it * into `AsyncCall` instance when the `AsyncCall` constructor called. - * + *

* {@link AsyncCallInterceptor} also create an exit span by using the `EnhanceRequiredInfo` when the `execute` method * called. - * - * @author zhangxin */ public class AsyncCallInterceptor implements InstanceConstructorInterceptor, InstanceMethodsAroundInterceptor { @Override @@ -52,7 +50,7 @@ public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { * The first argument of constructor is not the `real` parameter when the enhance class is an inner class. This * is the JDK compiler mechanism. */ - EnhancedInstance realCallInstance = (EnhancedInstance)allArguments[1]; + EnhancedInstance realCallInstance = (EnhancedInstance) allArguments[1]; Object enhanceRequireInfo = realCallInstance.getSkyWalkingDynamicField(); objInst.setSkyWalkingDynamicField(enhanceRequireInfo); @@ -61,12 +59,12 @@ public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - EnhanceRequiredInfo enhanceRequiredInfo = (EnhanceRequiredInfo)objInst.getSkyWalkingDynamicField(); - Request request = (Request)enhanceRequiredInfo.getRealCallEnhance().getSkyWalkingDynamicField(); - + EnhanceRequiredInfo enhanceRequiredInfo = (EnhanceRequiredInfo) objInst.getSkyWalkingDynamicField(); + Request request = (Request) enhanceRequiredInfo.getRealCallEnhance().getSkyWalkingDynamicField(); HttpUrl requestUrl = request.url(); - AbstractSpan span = ContextManager.createExitSpan(requestUrl.uri().getPath(), requestUrl.host() + ":" + requestUrl.port()); + AbstractSpan span = ContextManager.createExitSpan(requestUrl.uri() + .getPath(), requestUrl.host() + ":" + requestUrl.port()); ContextManager.continued(enhanceRequiredInfo.getContextSnapshot()); ContextCarrier contextCarrier = new ContextCarrier(); ContextManager.inject(contextCarrier); @@ -89,7 +87,6 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } headersField.set(request, headerBuilder.build()); - } @Override @@ -99,7 +96,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/EnhanceRequiredInfo.java b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/EnhanceRequiredInfo.java index ff8a4664b072..25046cd48623 100644 --- a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/EnhanceRequiredInfo.java +++ b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/EnhanceRequiredInfo.java @@ -24,15 +24,12 @@ /** * {@link EnhanceRequiredInfo} storage the `ContextSnapshot` and `RealCall` instances for support the async function of * okhttp client. - * - * @author zhangxin */ public class EnhanceRequiredInfo { private ContextSnapshot contextSnapshot; private EnhancedInstance realCallEnhance; - public EnhanceRequiredInfo(EnhancedInstance realCallEnhance, - ContextSnapshot contextSnapshot) { + public EnhanceRequiredInfo(EnhancedInstance realCallEnhance, ContextSnapshot contextSnapshot) { this.contextSnapshot = contextSnapshot; this.realCallEnhance = realCallEnhance; } diff --git a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/EnqueueInterceptor.java b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/EnqueueInterceptor.java index 63884651f5f9..7f12e625dcc5 100644 --- a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/EnqueueInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/EnqueueInterceptor.java @@ -30,15 +30,13 @@ * {@link EnqueueInterceptor} create a local span and the prefix of the span operation name is start with `Async` when * the `enqueue` method called and also put the `ContextSnapshot` and `RealCall` instance into the * `SkyWalkingDynamicField`. - * - * @author zhangxin */ public class EnqueueInterceptor implements InstanceMethodsAroundInterceptor, InstanceConstructorInterceptor { @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - EnhancedInstance callbackInstance = (EnhancedInstance)allArguments[0]; - Request request = (Request)objInst.getSkyWalkingDynamicField(); + EnhancedInstance callbackInstance = (EnhancedInstance) allArguments[0]; + Request request = (Request) objInst.getSkyWalkingDynamicField(); ContextManager.createLocalSpan("Async" + request.url().uri().getPath()); /** @@ -61,12 +59,14 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } - @Override public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { + @Override + public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { objInst.setSkyWalkingDynamicField(allArguments[1]); } } diff --git a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/OnFailureInterceptor.java b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/OnFailureInterceptor.java index 45157239f639..0463fa77fa94 100644 --- a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/OnFailureInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/OnFailureInterceptor.java @@ -28,7 +28,7 @@ public class OnFailureInterceptor implements InstanceMethodsAroundInterceptor { @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - ContextManager.activeSpan().errorOccurred().log((Throwable)allArguments[1]); + ContextManager.activeSpan().errorOccurred().log((Throwable) allArguments[1]); } @Override @@ -37,7 +37,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/OnResponseInterceptor.java b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/OnResponseInterceptor.java index c7c0f390c37c..abf91fa6c368 100644 --- a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/OnResponseInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/OnResponseInterceptor.java @@ -28,14 +28,12 @@ /** * {@link OnResponseInterceptor} validate the response code if it is great equal than 400. if so. the transaction status * chang to `error`, or do nothing. - * - * @author zhangxin */ public class OnResponseInterceptor implements InstanceMethodsAroundInterceptor { @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - Response response = (Response)allArguments[1]; + Response response = (Response) allArguments[1]; if (response.code() >= 400) { ContextManager.activeSpan().errorOccurred(); @@ -48,7 +46,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/RealCallInterceptor.java b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/RealCallInterceptor.java index d9a9ae7abf88..07113a31edf9 100644 --- a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/RealCallInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/RealCallInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.okhttp.v3; import java.lang.reflect.Field; @@ -40,8 +39,6 @@ /** * {@link RealCallInterceptor} intercept the synchronous http calls by the discovery of okhttp. - * - * @author peng-yongsheng */ public class RealCallInterceptor implements InstanceMethodsAroundInterceptor, InstanceConstructorInterceptor { @@ -52,20 +49,21 @@ public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { /** * Get the {@link okhttp3.Request} from {@link EnhancedInstance}, then create {@link AbstractSpan} and set host, - * port, kind, component, url from {@link okhttp3.Request}. - * Through the reflection of the way, set the http header of context data into {@link okhttp3.Request#headers}. + * port, kind, component, url from {@link okhttp3.Request}. Through the reflection of the way, set the http header + * of context data into {@link okhttp3.Request#headers}. * - * @param method * @param result change this result, if you want to truncate the method. - * @throws Throwable */ - @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - Request request = (Request)objInst.getSkyWalkingDynamicField(); + @Override + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { + Request request = (Request) objInst.getSkyWalkingDynamicField(); ContextCarrier contextCarrier = new ContextCarrier(); HttpUrl requestUrl = request.url(); - AbstractSpan span = ContextManager.createExitSpan(requestUrl.uri().getPath(), contextCarrier, requestUrl.host() + ":" + requestUrl.port()); + AbstractSpan span = ContextManager.createExitSpan(requestUrl.uri() + .getPath(), contextCarrier, requestUrl.host() + ":" + requestUrl + .port()); span.setComponent(ComponentsDefine.OKHTTP); Tags.HTTP.METHOD.set(span, request.method()); Tags.URL.set(span, requestUrl.uri().toString()); @@ -88,18 +86,14 @@ public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { /** * Get the status code from {@link Response}, when status code greater than 400, it means there was some errors in - * the server. - * Finish the {@link AbstractSpan}. + * the server. Finish the {@link AbstractSpan}. * - * @param method * @param ret the method's original return value. - * @return - * @throws Throwable */ @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { - Response response = (Response)ret; + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { + Response response = (Response) ret; if (response != null) { int statusCode = response.code(); AbstractSpan span = ContextManager.activeSpan(); @@ -114,7 +108,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { AbstractSpan abstractSpan = ContextManager.activeSpan(); abstractSpan.errorOccurred(); diff --git a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/define/AsyncCallInstrumentation.java b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/define/AsyncCallInstrumentation.java index ffe8a7eec881..0bcf20ece9ea 100644 --- a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/define/AsyncCallInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/define/AsyncCallInstrumentation.java @@ -31,39 +31,47 @@ public class AsyncCallInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { - @Override public ElementMatcher getConstructorMatcher() { + @Override + public ElementMatcher getConstructorMatcher() { return any(); } - @Override public String getConstructorInterceptor() { + @Override + public String getConstructorInterceptor() { return "org.apache.skywalking.apm.plugin.okhttp.v3.AsyncCallInterceptor"; } } }; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named("execute"); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return "org.apache.skywalking.apm.plugin.okhttp.v3.AsyncCallInterceptor"; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName("okhttp3.RealCall$AsyncCall"); } } diff --git a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/define/CallbackInstrumentation.java b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/define/CallbackInstrumentation.java index ef42f23b78fa..a2455489672a 100644 --- a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/define/CallbackInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/define/CallbackInstrumentation.java @@ -29,42 +29,51 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.HierarchyMatch.byHierarchyMatch; public class CallbackInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named("onFailure"); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return "org.apache.skywalking.apm.plugin.okhttp.v3.OnFailureInterceptor"; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named("onResponse"); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return "org.apache.skywalking.apm.plugin.okhttp.v3.OnResponseInterceptor"; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byHierarchyMatch(new String[] {"okhttp3.Callback"}); } } diff --git a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/define/RealCallInstrumentation.java b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/define/RealCallInstrumentation.java index 4de9fa6d0886..7644d9b4c1f8 100644 --- a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/define/RealCallInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/define/RealCallInstrumentation.java @@ -30,9 +30,6 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.takesArguments; -/** - * @author peng-yongsheng - */ public class RealCallInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { /** @@ -45,49 +42,60 @@ public class RealCallInstrumentation extends ClassInstanceMethodsEnhancePluginDe */ private static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.okhttp.v3.RealCallInterceptor"; - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); } - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { - @Override public ElementMatcher getConstructorMatcher() { + @Override + public ElementMatcher getConstructorMatcher() { return any(); } - @Override public String getConstructorInterceptor() { + @Override + public String getConstructorInterceptor() { return INTERCEPT_CLASS; } } }; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named("execute"); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named("enqueue").and(takesArguments(1)); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return "org.apache.skywalking.apm.plugin.okhttp.v3.EnqueueInterceptor"; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } diff --git a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/okhttp/v3/RealCallInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/okhttp/v3/RealCallInterceptorTest.java index e5836b87a3c2..cc6caaeb4894 100644 --- a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/okhttp/v3/RealCallInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/okhttp/v3/RealCallInterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.okhttp.v3; import java.util.List; @@ -50,9 +49,6 @@ import static org.mockito.Mockito.when; import static org.apache.skywalking.apm.agent.test.tools.SpanAssert.assertComponent; -/** - * @author peng-yongsheng - */ @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(TracingSegmentRunner.class) @PrepareForTest({Response.class}) @@ -83,7 +79,8 @@ public Object getSkyWalkingDynamicField() { return object; } - @Override public void setSkyWalkingDynamicField(Object value) { + @Override + public void setSkyWalkingDynamicField(Object value) { this.object = value; } }; @@ -91,8 +88,16 @@ public Object getSkyWalkingDynamicField() { @Before public void setUp() throws Exception { request = new Request.Builder().url("http://skywalking.org").build(); - allArguments = new Object[] {client, request, false}; - argumentTypes = new Class[] {client.getClass(), request.getClass(), Boolean.class}; + allArguments = new Object[] { + client, + request, + false + }; + argumentTypes = new Class[] { + client.getClass(), + request.getClass(), + Boolean.class + }; realCallInterceptor = new RealCallInterceptor(); } @@ -163,6 +168,7 @@ public void testException() throws Throwable { assertSpan(spans.get(0)); SpanAssert.assertOccurException(spans.get(0), true); SpanAssert.assertLogSize(spans.get(0), 1); - SpanAssert.assertException(SpanHelper.getLogs(spans.get(0)).get(0), NullPointerException.class, "testException"); + SpanAssert.assertException(SpanHelper.getLogs(spans.get(0)) + .get(0), NullPointerException.class, "testException"); } } diff --git a/apm-sniffer/apm-sdk-plugin/play-2.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/play-2.x-plugin/pom.xml index c8d40a81c2ab..e81604e30a98 100644 --- a/apm-sniffer/apm-sdk-plugin/play-2.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/play-2.x-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + 4.0.0 apm-sdk-plugin diff --git a/apm-sniffer/apm-sdk-plugin/play-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/play/v2x/HttpFiltersInterceptor.java b/apm-sniffer/apm-sdk-plugin/play-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/play/v2x/HttpFiltersInterceptor.java index 7c7198cf3c12..3739004cbf62 100644 --- a/apm-sniffer/apm-sdk-plugin/play-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/play/v2x/HttpFiltersInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/play-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/play/v2x/HttpFiltersInterceptor.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.play.v2x; import org.apache.skywalking.apm.agent.core.context.ContextManager; @@ -29,20 +30,18 @@ import java.util.ArrayList; import java.util.List; -/** - * @author AI - * 2019-08-01 - */ public class HttpFiltersInterceptor implements InstanceMethodsAroundInterceptor, InstanceConstructorInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { } @Override @SuppressWarnings("unchecked") - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { Object object = objInst.getSkyWalkingDynamicField(); Injector injector = (Injector) object; TracingFilter filter = injector.instanceOf(TracingFilter.class); @@ -54,7 +53,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/play-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/play/v2x/TracingFilter.java b/apm-sniffer/apm-sdk-plugin/play-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/play/v2x/TracingFilter.java index df6a1aa738a2..0bd29ce1b9ae 100644 --- a/apm-sniffer/apm-sdk-plugin/play-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/play/v2x/TracingFilter.java +++ b/apm-sniffer/apm-sdk-plugin/play-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/play/v2x/TracingFilter.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.play.v2x; import akka.stream.Materializer; @@ -39,10 +40,6 @@ import java.util.function.Function; import java.util.regex.Pattern; -/** - * @author AI - * 2019-08-01 - */ @Singleton public class TracingFilter extends Filter { @@ -54,7 +51,8 @@ public TracingFilter(Materializer mat) { } @Override - public CompletionStage apply(Function> next, Http.RequestHeader request) { + public CompletionStage apply(Function> next, + Http.RequestHeader request) { HandlerDef def = null; try { def = request.attrs().get(Router.Attrs.HANDLER_DEF); diff --git a/apm-sniffer/apm-sdk-plugin/play-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/play/v2x/define/Play2xInstrumentation.java b/apm-sniffer/apm-sdk-plugin/play-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/play/v2x/define/Play2xInstrumentation.java index 8cfd2427c12e..fa3daaf3801e 100644 --- a/apm-sniffer/apm-sdk-plugin/play-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/play/v2x/define/Play2xInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/play-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/play/v2x/define/Play2xInstrumentation.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.play.v2x.define; import net.bytebuddy.description.method.MethodDescription; @@ -30,10 +31,6 @@ import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * @author AI - * 2019-08-01 - */ public class Play2xInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "play.api.http.EnabledFilters"; private static final String ENHANCE_METHOD = "filters"; @@ -46,7 +43,7 @@ protected ClassMatch enhanceClass() { @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { - return new ConstructorInterceptPoint[]{ + return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { @Override public ElementMatcher getConstructorMatcher() { @@ -63,7 +60,7 @@ public String getConstructorInterceptor() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { @@ -84,15 +81,14 @@ public boolean isOverrideArgs() { } public static ElementMatcher getInjectConstructorMatcher() { - return isAnnotatedWithType("javax.inject.Inject") - .and(takesArgumentWithType(2, "play.api.inject.Injector")); + return isAnnotatedWithType("javax.inject.Inject").and(takesArgumentWithType(2, "play.api.inject.Injector")); } public static ElementMatcher getFiltersMethodMatcher() { String scala212Seq = "scala.collection.Seq"; String scala213Seq = "scala.collection.immutable.Seq"; - return (named(ENHANCE_METHOD).and(ReturnTypeNameMatch.returnsWithType(scala212Seq))) - .or(named(ENHANCE_METHOD).and(ReturnTypeNameMatch.returnsWithType(scala213Seq))); + return (named(ENHANCE_METHOD).and(ReturnTypeNameMatch.returnsWithType(scala212Seq))).or(named(ENHANCE_METHOD).and(ReturnTypeNameMatch + .returnsWithType(scala213Seq))); } } diff --git a/apm-sniffer/apm-sdk-plugin/play-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/play/v2x/HttpFiltersInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/play-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/play/v2x/HttpFiltersInterceptorTest.java index 292671886497..f72f527e8495 100644 --- a/apm-sniffer/apm-sdk-plugin/play-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/play/v2x/HttpFiltersInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/play-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/play/v2x/HttpFiltersInterceptorTest.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.play.v2x; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; @@ -28,10 +29,6 @@ import java.util.Objects; -/** - * @author AI - * 2019-08-07 - */ public class HttpFiltersInterceptorTest { private EnhancedInstance enhancedInstance = new EnhancedInstance() { @@ -73,7 +70,11 @@ public play.inject.Injector asJava() { @Test public void testBindingInjector() { - Object[] arguments = new Object[]{null, null, injector}; + Object[] arguments = new Object[] { + null, + null, + injector + }; interceptor.onConstruct(enhancedInstance, arguments); Assert.assertTrue(Objects.nonNull(enhancedInstance.getSkyWalkingDynamicField())); Assert.assertTrue(enhancedInstance.getSkyWalkingDynamicField() instanceof Injector); diff --git a/apm-sniffer/apm-sdk-plugin/play-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/play/v2x/Play2xInstrumentationTest.java b/apm-sniffer/apm-sdk-plugin/play-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/play/v2x/Play2xInstrumentationTest.java index d6b08fe08787..7748cf7e021a 100644 --- a/apm-sniffer/apm-sdk-plugin/play-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/play/v2x/Play2xInstrumentationTest.java +++ b/apm-sniffer/apm-sdk-plugin/play-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/play/v2x/Play2xInstrumentationTest.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.play.v2x; import net.bytebuddy.description.method.MethodDescription; @@ -24,18 +25,12 @@ import org.junit.Test; import play.api.http.EnabledFilters; -/** - * @author AI - * 2019-08-15 - */ public class Play2xInstrumentationTest { @Test public void testConstructorMatch() throws Exception { final ElementMatcher matcher = Play2xInstrumentation.getInjectConstructorMatcher(); - final MethodDescription method = new MethodDescription.ForLoadedConstructor( - EnabledFilters.class.getConstructor(play.api.Environment.class, play.api.Configuration.class, play.api.inject.Injector.class) - ); + final MethodDescription method = new MethodDescription.ForLoadedConstructor(EnabledFilters.class.getConstructor(play.api.Environment.class, play.api.Configuration.class, play.api.inject.Injector.class)); Assert.assertTrue(matcher.matches(method)); } diff --git a/apm-sniffer/apm-sdk-plugin/play-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/play/v2x/TracingFilterTest.java b/apm-sniffer/apm-sdk-plugin/play-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/play/v2x/TracingFilterTest.java index 5493c8b8ce4d..26315e934169 100644 --- a/apm-sniffer/apm-sdk-plugin/play-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/play/v2x/TracingFilterTest.java +++ b/apm-sniffer/apm-sdk-plugin/play-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/play/v2x/TracingFilterTest.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.play.v2x; import akka.stream.Materializer; @@ -60,11 +61,6 @@ import static play.mvc.Results.badRequest; import static play.mvc.Results.ok; - -/** - * @author AI - * 2019-08-16 - */ @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(TracingSegmentRunner.class) public class TracingFilterTest { @@ -105,8 +101,7 @@ public boolean secure() { @Override public TypedMap attrs() { - HandlerDef def = new HandlerDef(null, null, null, "GET", - null, null, "/projects/$projectId<[^/]+>", null, null); + HandlerDef def = new HandlerDef(null, null, null, "GET", null, null, "/projects/$projectId<[^/]+>", null, null); return TypedMap.empty().put(Router.Attrs.HANDLER_DEF, def); } diff --git a/apm-sniffer/apm-sdk-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/pom.xml index 0ff686837d02..9b1a5341246b 100644 --- a/apm-sniffer/apm-sdk-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + 4.0.0 @@ -95,7 +96,7 @@ UTF-8 - + net.bytebuddy ${shade.package}.${shade.net.bytebuddy.source} @@ -163,12 +164,16 @@ - + - + - - + + diff --git a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/pom.xml index 138954afedac..c016c17abdbd 100755 --- a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/pom.xml @@ -16,7 +16,8 @@ ~ --> - + apm-sdk-plugin org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/CreateCallableStatementInterceptor.java b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/CreateCallableStatementInterceptor.java index 8c93ce98625d..69e63973487a 100755 --- a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/CreateCallableStatementInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/CreateCallableStatementInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.postgresql; import java.lang.reflect.Method; @@ -26,9 +25,6 @@ import org.apache.skywalking.apm.plugin.jdbc.define.StatementEnhanceInfos; import org.apache.skywalking.apm.plugin.jdbc.trace.ConnectionInfo; -/** - * @author zhangxin - */ public class CreateCallableStatementInterceptor implements InstanceMethodsAroundInterceptor { @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, @@ -40,12 +36,13 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { if (ret instanceof EnhancedInstance) { - ((EnhancedInstance)ret).setSkyWalkingDynamicField(new StatementEnhanceInfos((ConnectionInfo)objInst.getSkyWalkingDynamicField(), (String)allArguments[0], "CallableStatement")); + ((EnhancedInstance) ret).setSkyWalkingDynamicField(new StatementEnhanceInfos((ConnectionInfo) objInst.getSkyWalkingDynamicField(), (String) allArguments[0], "CallableStatement")); } return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { } diff --git a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/CreatePreparedStatementInterceptor.java b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/CreatePreparedStatementInterceptor.java index ef084ba60d1b..3af14bb0b69b 100755 --- a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/CreatePreparedStatementInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/CreatePreparedStatementInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.postgresql; import java.lang.reflect.Method; @@ -26,9 +25,6 @@ import org.apache.skywalking.apm.plugin.jdbc.define.StatementEnhanceInfos; import org.apache.skywalking.apm.plugin.jdbc.trace.ConnectionInfo; -/** - * @author zhangxin - */ public class CreatePreparedStatementInterceptor implements InstanceMethodsAroundInterceptor { @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, @@ -40,12 +36,13 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { if (ret instanceof EnhancedInstance) { - ((EnhancedInstance)ret).setSkyWalkingDynamicField(new StatementEnhanceInfos((ConnectionInfo)objInst.getSkyWalkingDynamicField(), (String)allArguments[0], "PreparedStatement")); + ((EnhancedInstance) ret).setSkyWalkingDynamicField(new StatementEnhanceInfos((ConnectionInfo) objInst.getSkyWalkingDynamicField(), (String) allArguments[0], "PreparedStatement")); } return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { } diff --git a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/CreateStatementInterceptor.java b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/CreateStatementInterceptor.java index 678e2b0d3e84..47a1f00e1451 100755 --- a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/CreateStatementInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/CreateStatementInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.postgresql; import java.lang.reflect.Method; @@ -26,9 +25,6 @@ import org.apache.skywalking.apm.plugin.jdbc.define.StatementEnhanceInfos; import org.apache.skywalking.apm.plugin.jdbc.trace.ConnectionInfo; -/** - * @author zhangxin - */ public class CreateStatementInterceptor implements InstanceMethodsAroundInterceptor { @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, @@ -41,13 +37,14 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA Object ret) throws Throwable { if (ret instanceof EnhancedInstance) { - ((EnhancedInstance)ret).setSkyWalkingDynamicField(new StatementEnhanceInfos((ConnectionInfo)objInst.getSkyWalkingDynamicField(), "", "Statement")); + ((EnhancedInstance) ret).setSkyWalkingDynamicField(new StatementEnhanceInfos((ConnectionInfo) objInst.getSkyWalkingDynamicField(), "", "Statement")); } return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { } diff --git a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/JDBCPrepareStatementWithStringArrayInterceptor.java b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/JDBCPrepareStatementWithStringArrayInterceptor.java index 8bca9004bb17..870f90e5bcc2 100755 --- a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/JDBCPrepareStatementWithStringArrayInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/JDBCPrepareStatementWithStringArrayInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.postgresql; import java.lang.reflect.Method; @@ -32,8 +31,6 @@ * {@link JDBCPrepareStatementWithStringArrayInterceptor} return {@link SWPreparedStatement} instance that wrapper the * real preparedStatement instance when the client call org.postgresql.jdbc.PgConnection#prepareStatement(String, * String[]) method. method. - * - * @author zhangxin */ public class JDBCPrepareStatementWithStringArrayInterceptor implements InstanceMethodsAroundInterceptor { @Override @@ -52,14 +49,15 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA * * @see org.postgresql.jdbc.PgConnection#prepareStatement(String, String[]) **/ - String[] columnNames = (String[])allArguments[1]; + String[] columnNames = (String[]) allArguments[1]; if (columnNames != null && columnNames.length == 0) { return ret; } - return new SWPreparedStatement((Connection)objInst, (PreparedStatement)ret, (ConnectionInfo)objInst.getSkyWalkingDynamicField(), (String)allArguments[0]); + return new SWPreparedStatement((Connection) objInst, (PreparedStatement) ret, (ConnectionInfo) objInst.getSkyWalkingDynamicField(), (String) allArguments[0]); } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { } diff --git a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/PreparedStatementExecuteMethodsInterceptor.java b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/PreparedStatementExecuteMethodsInterceptor.java index b723782ea198..5a76cf3f9ba9 100755 --- a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/PreparedStatementExecuteMethodsInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/PreparedStatementExecuteMethodsInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.postgresql; import java.lang.reflect.Method; @@ -33,9 +32,8 @@ import org.apache.skywalking.apm.plugin.jdbc.trace.ConnectionInfo; /** - * {@link PreparedStatementExecuteMethodsInterceptor} create the exit span when the client call the interceptor methods. - * - * @author zhangxin + * {@link PreparedStatementExecuteMethodsInterceptor} create the exit span when the client call the interceptor + * methods. */ public class PreparedStatementExecuteMethodsInterceptor implements InstanceMethodsAroundInterceptor { @@ -43,11 +41,11 @@ public class PreparedStatementExecuteMethodsInterceptor implements InstanceMetho @Override public final void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { - StatementEnhanceInfos cacheObject = (StatementEnhanceInfos)objInst.getSkyWalkingDynamicField(); + Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + StatementEnhanceInfos cacheObject = (StatementEnhanceInfos) objInst.getSkyWalkingDynamicField(); ConnectionInfo connectInfo = cacheObject.getConnectionInfo(); - AbstractSpan span = ContextManager.createExitSpan(buildOperationName(connectInfo, method.getName(), cacheObject.getStatementName()), connectInfo.getDatabasePeer()); + AbstractSpan span = ContextManager.createExitSpan(buildOperationName(connectInfo, method.getName(), cacheObject.getStatementName()), connectInfo + .getDatabasePeer()); Tags.DB_TYPE.set(span, "sql"); Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName()); Tags.DB_STATEMENT.set(span, cacheObject.getSql()); @@ -71,18 +69,18 @@ public final void beforeMethod(EnhancedInstance objInst, Method method, Object[] @Override public final Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, - Object ret) throws Throwable { - StatementEnhanceInfos cacheObject = (StatementEnhanceInfos)objInst.getSkyWalkingDynamicField(); + Class[] argumentsTypes, Object ret) throws Throwable { + StatementEnhanceInfos cacheObject = (StatementEnhanceInfos) objInst.getSkyWalkingDynamicField(); if (cacheObject.getConnectionInfo() != null) { ContextManager.stopSpan(); } return ret; } - @Override public final void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public final void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { - StatementEnhanceInfos cacheObject = (StatementEnhanceInfos)objInst.getSkyWalkingDynamicField(); + StatementEnhanceInfos cacheObject = (StatementEnhanceInfos) objInst.getSkyWalkingDynamicField(); if (cacheObject.getConnectionInfo() != null) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/StatementExecuteMethodsInterceptor.java b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/StatementExecuteMethodsInterceptor.java index fd7562656c09..7572315ced23 100755 --- a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/StatementExecuteMethodsInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/StatementExecuteMethodsInterceptor.java @@ -31,20 +31,18 @@ /** * {@link StatementExecuteMethodsInterceptor} create the exit span when the client call the interceptor methods. - * - * @author zhangxin */ public class StatementExecuteMethodsInterceptor implements InstanceMethodsAroundInterceptor { @Override public final void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { - StatementEnhanceInfos cacheObject = (StatementEnhanceInfos)objInst.getSkyWalkingDynamicField(); + Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + StatementEnhanceInfos cacheObject = (StatementEnhanceInfos) objInst.getSkyWalkingDynamicField(); ConnectionInfo connectInfo = cacheObject.getConnectionInfo(); - AbstractSpan span = ContextManager.createExitSpan(buildOperationName(connectInfo, method.getName(), cacheObject.getStatementName()), connectInfo.getDatabasePeer()); + AbstractSpan span = ContextManager.createExitSpan(buildOperationName(connectInfo, method.getName(), cacheObject.getStatementName()), connectInfo + .getDatabasePeer()); Tags.DB_TYPE.set(span, "sql"); Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName()); - Tags.DB_STATEMENT.set(span, (String)allArguments[0]); + Tags.DB_STATEMENT.set(span, (String) allArguments[0]); span.setComponent(connectInfo.getComponent()); SpanLayer.asDB(span); @@ -52,18 +50,18 @@ public final void beforeMethod(EnhancedInstance objInst, Method method, Object[] @Override public final Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, - Object ret) throws Throwable { - StatementEnhanceInfos cacheObject = (StatementEnhanceInfos)objInst.getSkyWalkingDynamicField(); + Class[] argumentsTypes, Object ret) throws Throwable { + StatementEnhanceInfos cacheObject = (StatementEnhanceInfos) objInst.getSkyWalkingDynamicField(); if (cacheObject.getConnectionInfo() != null) { ContextManager.stopSpan(); } return ret; } - @Override public final void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public final void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { - StatementEnhanceInfos cacheObject = (StatementEnhanceInfos)objInst.getSkyWalkingDynamicField(); + StatementEnhanceInfos cacheObject = (StatementEnhanceInfos) objInst.getSkyWalkingDynamicField(); if (cacheObject.getConnectionInfo() != null) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/AbstractJdbc2StatementInstrumentation.java b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/AbstractJdbc2StatementInstrumentation.java index 507f0256d2b3..744f1cffead3 100755 --- a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/AbstractJdbc2StatementInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/AbstractJdbc2StatementInstrumentation.java @@ -35,46 +35,55 @@ public class AbstractJdbc2StatementInstrumentation extends ClassInstanceMethodsE private static final String ENHANCE_CLASS = "org.postgresql.jdbc2.AbstractJdbc2Statement"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named("execute").and(takesArguments(0)) - .or(named("executeQuery").and(takesArguments(0))) - .or(named("executeUpdate").and(takesArguments(0))); + .or(named("executeQuery").and(takesArguments(0))) + .or(named("executeUpdate").and(takesArguments(0))); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return PG_PREPARED_STATEMENT_EXECUTE_METHOD_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named("execute").and(takesArguments(1)) - .or(named("executeQuery").and(takesArguments(1))) - .or(named("executeUpdate").and(takesArguments(1))); + .or(named("executeQuery").and(takesArguments(1))) + .or(named("executeUpdate").and(takesArguments(1))); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return PG_STATEMENT_EXECUTE_METHOD_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName(ENHANCE_CLASS); } } diff --git a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/ConnectionInstrumentation.java b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/ConnectionInstrumentation.java index 6c942bb615b0..dfac047e0125 100755 --- a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/ConnectionInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/ConnectionInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.postgresql.define; import net.bytebuddy.description.method.MethodDescription; @@ -32,19 +31,16 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.MultiClassNameMatch.byMultiClassMatch; /** - * {@link ConnectionInstrumentation} intercept the following methods that the class which extend - * {@link org.postgresql.jdbc.PgConnection}. - * + * {@link ConnectionInstrumentation} intercept the following methods that the class which extend {@link + * org.postgresql.jdbc.PgConnection}. + *

* 1. Enhance prepareStatement by org.apache.skywalking.apm.plugin.jdbc.define.JDBCPrepareStatementInterceptor * 2. Enhance prepareStatement that the seconds argument type is java.lang.String[] by * JDBCPrepareStatementWithStringArrayInterceptor * 3. Enhance prepareCall by * org.apache.skywalking.apm.plugin.jdbc.define.JDBCPrepareCallInterceptor - * 4. Enhance createStatement - * by org.apache.skywalking.apm.plugin.jdbc.define.JDBCStatementInterceptor + * 4. Enhance createStatement by org.apache.skywalking.apm.plugin.jdbc.define.JDBCStatementInterceptor * 5. Enhance commit, rollback, close, releaseSavepoint by org.apache.skywalking.apm.plugin.jdbc.define.ConnectionServiceMethodInterceptor - * - * @author zhangxin */ public class ConnectionInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -55,81 +51,101 @@ public class ConnectionInstrumentation extends ClassInstanceMethodsEnhancePlugin public static final String PG_JDBC3_CONNECTION_ENHANCE_CLASS = "org.postgresql.jdbc3g.Jdbc3gConnection"; public static final String PG_JDBC4_CONNECTION_ENHANCE_CLASS = "org.postgresql.jdbc4.Jdbc4Connection"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.PREPARE_STATEMENT_METHOD_NAME).and(takesArguments(4)); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return Constants.CREATE_PREPARED_STATEMENT_INTERCEPTOR_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.PREPARE_STATEMENT_METHOD_NAME).and(takesArgumentWithType(1, STRING_ARRAY_ARGUMENT_TYPE)); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return PREPARE_STATEMENT_METHOD_WITH_STRING_ARRAY_INTERCEPTOR_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.PREPARE_CALL_METHOD_NAME).and(takesArguments(4)); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return Constants.CREATE_CALLABLE_STATEMENT_INTERCEPTOR_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.CREATE_STATEMENT_METHOD_NAME).and(takesArguments(3)); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return Constants.CREATE_STATEMENT_INTERCEPTOR_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.COMMIT_METHOD_NAME).or(named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.ROLLBACK_METHOD_NAME)).or(named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.CLOSE_METHOD_NAME)).or(named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.RELEASE_SAVE_POINT_METHOD_NAME)); + @Override + public ElementMatcher getMethodsMatcher() { + return named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.COMMIT_METHOD_NAME).or(named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.ROLLBACK_METHOD_NAME)) + .or(named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.CLOSE_METHOD_NAME)) + .or(named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.RELEASE_SAVE_POINT_METHOD_NAME)); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return org.apache.skywalking.apm.plugin.jdbc.define.Constants.SERVICE_METHOD_INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byMultiClassMatch(PG_CONNECTION_ENHANCE_CLASS, PG_JDBC42_CONNECTION_ENHANCE_CLASS, PG_JDBC3_CONNECTION_ENHANCE_CLASS, PG_JDBC4_CONNECTION_ENHANCE_CLASS); } } diff --git a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/Constants.java b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/Constants.java index cda27df745f2..c045719a1e74 100755 --- a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/Constants.java +++ b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/Constants.java @@ -16,13 +16,10 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.postgresql.define; /** * Interceptor class name constant variable - * - * @author zhangxin */ public class Constants { public static final String CREATE_STATEMENT_INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.jdbc.postgresql.CreateStatementInterceptor"; diff --git a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/DriverInstrumentation.java b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/DriverInstrumentation.java index e431ca168208..1e8982c69d78 100755 --- a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/DriverInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/DriverInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.postgresql.define; import org.apache.skywalking.apm.plugin.jdbc.define.AbstractDriverInstrumentation; @@ -26,8 +25,6 @@ /** * {@link DriverInstrumentation} presents that skywalking intercepts {@link org.postgresql.Driver}. - * - * @author zhangxin */ public class DriverInstrumentation extends AbstractDriverInstrumentation { diff --git a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/Jdbc3ConnectionInstrumentation.java b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/Jdbc3ConnectionInstrumentation.java index 6e67fe09afa2..8f3385dad072 100755 --- a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/Jdbc3ConnectionInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/Jdbc3ConnectionInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.postgresql.define; import net.bytebuddy.description.method.MethodDescription; @@ -33,83 +32,96 @@ /** * {@link Jdbc3ConnectionInstrumentation} intercept the following methods that the class which extend * org.postgresql.jdbc3.Jdbc3Connection - * + *

* 1. Enhance prepareStatement by org.apache.skywalking.apm.plugin.jdbc.define.JDBCPrepareStatementInterceptor * 2. Enhance prepareCall by * org.apache.skywalking.apm.plugin.jdbc.define.JDBCPrepareCallInterceptor - * 3. Enhance createStatement - * by org.apache.skywalking.apm.plugin.jdbc.define.JDBCStatementInterceptor + * 3. Enhance createStatement by org.apache.skywalking.apm.plugin.jdbc.define.JDBCStatementInterceptor * 4. Enhance commit, rollback, close, releaseSavepoint by org.apache.skywalking.apm.plugin.jdbc.define.ConnectionServiceMethodInterceptor - * - * @author zhangxin */ public class Jdbc3ConnectionInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { public static final String ENHANCE_CLASS = "org.postgresql.jdbc3.Jdbc3Connection"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.PREPARE_STATEMENT_METHOD_NAME).and(takesArguments(4)); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return Constants.CREATE_PREPARED_STATEMENT_INTERCEPTOR_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.PREPARE_CALL_METHOD_NAME).and(takesArguments(4)); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return Constants.CREATE_CALLABLE_STATEMENT_INTERCEPTOR_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.CREATE_STATEMENT_METHOD_NAME).and(takesArguments(3)); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return Constants.CREATE_STATEMENT_INTERCEPTOR_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.COMMIT_METHOD_NAME).or(named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.ROLLBACK_METHOD_NAME)).or(named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.CLOSE_METHOD_NAME)) - .or(named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.RELEASE_SAVE_POINT_METHOD_NAME)); + @Override + public ElementMatcher getMethodsMatcher() { + return named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.COMMIT_METHOD_NAME).or(named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.ROLLBACK_METHOD_NAME)) + .or(named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.CLOSE_METHOD_NAME)) + .or(named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.RELEASE_SAVE_POINT_METHOD_NAME)); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return org.apache.skywalking.apm.plugin.jdbc.define.Constants.SERVICE_METHOD_INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); } } diff --git a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/Jdbc4ConnectionInstrumentation.java b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/Jdbc4ConnectionInstrumentation.java index df4cf51ff8e2..059933f0a515 100755 --- a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/Jdbc4ConnectionInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/Jdbc4ConnectionInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.jdbc.postgresql.define; import net.bytebuddy.description.method.MethodDescription; @@ -33,82 +32,96 @@ /** * {@link Jdbc4ConnectionInstrumentation} intercept the following methods that the class which extend * org.postgresql.jdbc4.Jdbc4Connection. - * + *

* 1. Enhance prepareStatement by org.apache.skywalking.apm.plugin.jdbc.define.JDBCPrepareStatementInterceptor * 2. Enhance prepareCall by * org.apache.skywalking.apm.plugin.jdbc.define.JDBCPrepareCallInterceptor - * 3. Enhance createStatement - * by org.apache.skywalking.apm.plugin.jdbc.define.JDBCStatementInterceptor + * 3. Enhance createStatement by org.apache.skywalking.apm.plugin.jdbc.define.JDBCStatementInterceptor * 4. Enhance commit, rollback, close, releaseSavepoint by org.apache.skywalking.apm.plugin.jdbc.define.ConnectionServiceMethodInterceptor - * - * @author zhangxin */ public class Jdbc4ConnectionInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { public static final String ENHANCE_CLASS = "org.postgresql.jdbc4.Jdbc4Connection"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.PREPARE_STATEMENT_METHOD_NAME).and(takesArguments(4)); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return Constants.CREATE_PREPARED_STATEMENT_INTERCEPTOR_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.PREPARE_CALL_METHOD_NAME).and(takesArguments(4)); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return Constants.CREATE_CALLABLE_STATEMENT_INTERCEPTOR_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.CREATE_STATEMENT_METHOD_NAME).and(takesArguments(3)); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return org.apache.skywalking.apm.plugin.jdbc.define.Constants.CREATE_STATEMENT_INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.COMMIT_METHOD_NAME).or(named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.ROLLBACK_METHOD_NAME)).or(named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.CLOSE_METHOD_NAME)).or(named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.RELEASE_SAVE_POINT_METHOD_NAME)); + @Override + public ElementMatcher getMethodsMatcher() { + return named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.COMMIT_METHOD_NAME).or(named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.ROLLBACK_METHOD_NAME)) + .or(named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.CLOSE_METHOD_NAME)) + .or(named(org.apache.skywalking.apm.plugin.jdbc.define.Constants.RELEASE_SAVE_POINT_METHOD_NAME)); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return org.apache.skywalking.apm.plugin.jdbc.define.Constants.SERVICE_METHOD_INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName(ENHANCE_CLASS); } } diff --git a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/PgCallableStatementInstrumentation.java b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/PgCallableStatementInstrumentation.java index 58511664ccef..f2616abd5b25 100755 --- a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/PgCallableStatementInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/PgCallableStatementInstrumentation.java @@ -31,30 +31,35 @@ import static org.apache.skywalking.apm.plugin.jdbc.postgresql.Variables.PG_PREPARED_STATEMENT_EXECUTE_METHOD_INTERCEPTOR; public class PgCallableStatementInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named("executeWithFlags").and(takesArgumentWithType(0, "int")) - .or(named("executeUpdate")); + @Override + public ElementMatcher getMethodsMatcher() { + return named("executeWithFlags").and(takesArgumentWithType(0, "int")).or(named("executeUpdate")); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return PG_PREPARED_STATEMENT_EXECUTE_METHOD_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName("org.postgresql.jdbc.PgCallableStatement"); } } diff --git a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/PgPreparedStatementInstrumentation.java b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/PgPreparedStatementInstrumentation.java index a88878c49a66..6f69abe6eeb7 100755 --- a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/PgPreparedStatementInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/PgPreparedStatementInstrumentation.java @@ -30,36 +30,39 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; import static org.apache.skywalking.apm.plugin.jdbc.postgresql.Variables.PG_PREPARED_STATEMENT_EXECUTE_METHOD_INTERCEPTOR; -/** - * @author zhang xin - */ public class PgPreparedStatementInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named("execute").and(takesArgumentWithType(0, "java.lang.String")) - .or(named("executeWithFlags").and(takesArgumentWithType(0, "int"))) - .or(named("executeQuery")) - .or(named("executeUpdate")); + .or(named("executeWithFlags").and(takesArgumentWithType(0, "int"))) + .or(named("executeQuery")) + .or(named("executeUpdate")); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return PG_PREPARED_STATEMENT_EXECUTE_METHOD_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName("org.postgresql.jdbc.PgPreparedStatement"); } } diff --git a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/PgPreparedStatementSetterInstrumentation.java b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/PgPreparedStatementSetterInstrumentation.java index 3893b43d09ce..465a20c80338 100644 --- a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/PgPreparedStatementSetterInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/PgPreparedStatementSetterInstrumentation.java @@ -15,14 +15,12 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.jdbc.postgresql.define; import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; import org.apache.skywalking.apm.plugin.jdbc.PSSetterDefinitionOfJDBCInstrumentation; -/** - * @author aderm - */ public class PgPreparedStatementSetterInstrumentation extends PgPreparedStatementInstrumentation { @Override diff --git a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/PgStatementInstrumentation.java b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/PgStatementInstrumentation.java index 66f8c9079db3..8f68d15dc53c 100755 --- a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/PgStatementInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/PgStatementInstrumentation.java @@ -30,39 +30,42 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; import static org.apache.skywalking.apm.plugin.jdbc.postgresql.Variables.PG_STATEMENT_EXECUTE_METHOD_INTERCEPTOR; -/** - * @author zhang xin - */ public class PgStatementInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named("execute").and(takesArgumentWithType(0, "java.lang.String")) - .or(named("execute").and(takesArgumentWithType(0, "java.lang.String[]"))) - .or(named("executeQuery")) - .or(named("executeUpdate").and(takesArgumentWithType(0, "java.lang.String[]"))) - .or(named("executeUpdate").and(takesArgumentWithType(0, "java.lang.String"))) - .or(named("executeLargeUpdate")); + .or(named("execute").and(takesArgumentWithType(0, "java.lang.String[]"))) + .or(named("executeQuery")) + .or(named("executeUpdate").and(takesArgumentWithType(0, "java.lang.String[]"))) + .or(named("executeUpdate").and(takesArgumentWithType(0, "java.lang.String"))) + .or(named("executeLargeUpdate")); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return PG_STATEMENT_EXECUTE_METHOD_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName("org.postgresql.jdbc.PgStatement"); } } diff --git a/apm-sniffer/apm-sdk-plugin/pulsar-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/pulsar-plugin/pom.xml index 620b88883a62..d7612d4eb533 100644 --- a/apm-sniffer/apm-sdk-plugin/pulsar-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/pulsar-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-sdk-plugin org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/ConsumerConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/ConsumerConstructorInterceptor.java index 8965c933a535..173753bc6d8d 100644 --- a/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/ConsumerConstructorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/ConsumerConstructorInterceptor.java @@ -25,12 +25,10 @@ /** * Interceptor of pulsar consumer constructor. - * - * The interceptor create {@link ConsumerEnhanceRequiredInfo} which is required by instance method interceptor, - * So use it to update the skywalking dynamic field of pulsar consumer enhanced instance. - * So that the instance methods can get the {@link ConsumerEnhanceRequiredInfo} - * - * @author penghui + *

+ * The interceptor create {@link ConsumerEnhanceRequiredInfo} which is required by instance method interceptor, So use + * it to update the skywalking dynamic field of pulsar consumer enhanced instance. So that the instance methods can get + * the {@link ConsumerEnhanceRequiredInfo} */ public class ConsumerConstructorInterceptor implements InstanceConstructorInterceptor { diff --git a/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/ConsumerEnhanceRequiredInfo.java b/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/ConsumerEnhanceRequiredInfo.java index a1276d8fa479..25eec649e86a 100644 --- a/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/ConsumerEnhanceRequiredInfo.java +++ b/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/ConsumerEnhanceRequiredInfo.java @@ -20,8 +20,6 @@ /** * Pulsar consumer enhance required info is required by consumer enhanced object method interceptor - * - * @author penghui */ public class ConsumerEnhanceRequiredInfo { diff --git a/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/ProducerConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/ProducerConstructorInterceptor.java index 8db812014c9a..eb56e74c4638 100644 --- a/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/ProducerConstructorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/ProducerConstructorInterceptor.java @@ -24,12 +24,10 @@ /** * Interceptor of pulsar producer constructor. - * - * The interceptor create {@link ProducerEnhanceRequiredInfo} which is required by instance method interceptor, - * So use it to update the skywalking dynamic field of pulsar producer enhanced instance. - * So that the instance methods can get the {@link ProducerEnhanceRequiredInfo} - * - * @author penghui + *

+ * The interceptor create {@link ProducerEnhanceRequiredInfo} which is required by instance method interceptor, So use + * it to update the skywalking dynamic field of pulsar producer enhanced instance. So that the instance methods can get + * the {@link ProducerEnhanceRequiredInfo} */ public class ProducerConstructorInterceptor implements InstanceConstructorInterceptor { diff --git a/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/ProducerEnhanceRequiredInfo.java b/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/ProducerEnhanceRequiredInfo.java index 210e66a7eb9a..b95bbf58ce42 100644 --- a/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/ProducerEnhanceRequiredInfo.java +++ b/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/ProducerEnhanceRequiredInfo.java @@ -20,8 +20,6 @@ /** * Pulsar producer enhance required info is required by producer enhanced object method interceptor - * - * @author penghui */ public class ProducerEnhanceRequiredInfo { diff --git a/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/PulsarConsumerInterceptor.java b/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/PulsarConsumerInterceptor.java index 61ebe0411bd0..d76cce8a0100 100644 --- a/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/PulsarConsumerInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/PulsarConsumerInterceptor.java @@ -34,7 +34,7 @@ /** * Interceptor for pulsar consumer enhanced instance - * + *

* Here is the intercept process steps: * * 

@@ -43,8 +43,6 @@
  *  3. Extract all the Trace Context when call messageProcessed method
  *  4. Stop the entry span when messageProcessed method finished.
  *
- * - * @author penghui */ public class PulsarConsumerInterceptor implements InstanceMethodsAroundInterceptor { @@ -53,7 +51,7 @@ public class PulsarConsumerInterceptor implements InstanceMethodsAroundIntercept @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { if (allArguments[0] != null) { ConsumerEnhanceRequiredInfo requiredInfo = (ConsumerEnhanceRequiredInfo) objInst.getSkyWalkingDynamicField(); Message msg = (Message) allArguments[0]; @@ -63,8 +61,8 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr next = next.next(); next.setHeadValue(msg.getProperty(next.getHeadKey())); } - AbstractSpan activeSpan = ContextManager.createEntrySpan(OPERATE_NAME_PREFIX + - requiredInfo.getTopic() + CONSUMER_OPERATE_NAME + requiredInfo.getSubscriptionName(), carrier); + AbstractSpan activeSpan = ContextManager.createEntrySpan(OPERATE_NAME_PREFIX + requiredInfo.getTopic() + CONSUMER_OPERATE_NAME + requiredInfo + .getSubscriptionName(), carrier); activeSpan.setComponent(ComponentsDefine.PULSAR_CONSUMER); SpanLayer.asMQ(activeSpan); Tags.MQ_BROKER.set(activeSpan, requiredInfo.getServiceUrl()); @@ -74,7 +72,7 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { + Object ret) throws Throwable { if (allArguments[0] != null) { ContextManager.stopSpan(); } @@ -83,7 +81,7 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { if (allArguments[0] != null) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/PulsarProducerInterceptor.java b/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/PulsarProducerInterceptor.java index 3205973b6d54..75f2a6d3921d 100644 --- a/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/PulsarProducerInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/PulsarProducerInterceptor.java @@ -37,7 +37,7 @@ /** * Interceptor for pulsar producer enhanced instance. - * + *

* Here is the intercept process steps: * * 

@@ -48,8 +48,6 @@
  *     callback enhanced instance skywalking dynamic field to the created required info.
  *  5. Stop the exit span when sendAsync method finished.
  *
- * - * @author penghui */ public class PulsarProducerInterceptor implements InstanceMethodsAroundInterceptor { @@ -58,13 +56,13 @@ public class PulsarProducerInterceptor implements InstanceMethodsAroundIntercept @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { if (allArguments[0] != null) { ProducerEnhanceRequiredInfo requiredInfo = (ProducerEnhanceRequiredInfo) objInst.getSkyWalkingDynamicField(); ContextCarrier contextCarrier = new ContextCarrier(); String topicName = requiredInfo.getTopic(); - AbstractSpan activeSpan = ContextManager.createExitSpan(OPERATE_NAME_PREFIX + topicName + - PRODUCER_OPERATE_NAME_SUFFIX, contextCarrier, requiredInfo.getServiceUrl()); + AbstractSpan activeSpan = ContextManager.createExitSpan(OPERATE_NAME_PREFIX + topicName + PRODUCER_OPERATE_NAME_SUFFIX, contextCarrier, requiredInfo + .getServiceUrl()); Tags.MQ_BROKER.set(activeSpan, requiredInfo.getServiceUrl()); Tags.MQ_TOPIC.set(activeSpan, topicName); SpanLayer.asMQ(activeSpan); @@ -73,9 +71,10 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr MessageImpl msg = (MessageImpl) allArguments[0]; while (next.hasNext()) { next = next.next(); - msg.getMessageBuilder().addProperties(PulsarApi.KeyValue.newBuilder() - .setKey(next.getHeadKey()) - .setValue(next.getHeadValue())); + msg.getMessageBuilder() + .addProperties(PulsarApi.KeyValue.newBuilder() + .setKey(next.getHeadKey()) + .setValue(next.getHeadValue())); } if (allArguments.length > 1) { EnhancedInstance callbackInstance = (EnhancedInstance) allArguments[1]; @@ -94,7 +93,7 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { + Object ret) throws Throwable { if (allArguments[0] != null) { ContextManager.stopSpan(); } @@ -102,7 +101,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { if (allArguments[0] != null) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/SendCallbackEnhanceRequiredInfo.java b/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/SendCallbackEnhanceRequiredInfo.java index 06b0c8f9cd06..d210a5687ead 100644 --- a/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/SendCallbackEnhanceRequiredInfo.java +++ b/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/SendCallbackEnhanceRequiredInfo.java @@ -23,8 +23,6 @@ /** * Pulsar {@link org.apache.pulsar.client.impl.SendCallback} enhance required info is required by * SendCallback enhanced object method interceptor - * - * @author penghui */ public class SendCallbackEnhanceRequiredInfo { diff --git a/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/SendCallbackInterceptor.java b/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/SendCallbackInterceptor.java index f5573ef28fe7..c4e1c060a0cb 100644 --- a/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/SendCallbackInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/SendCallbackInterceptor.java @@ -31,7 +31,7 @@ /** * Interceptor for send callback enhanced instance. - * + *

* Here is the intercept process steps: * * 

@@ -39,8 +39,6 @@
  *  2. Create the local span when the callback invoke sendComplete method
  *  3. Stop the local span when sendComplete method finished.
  *
- * - * @author penghui */ public class SendCallbackInterceptor implements InstanceMethodsAroundInterceptor { @@ -48,7 +46,7 @@ public class SendCallbackInterceptor implements InstanceMethodsAroundInterceptor @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { SendCallbackEnhanceRequiredInfo requiredInfo = (SendCallbackEnhanceRequiredInfo) objInst.getSkyWalkingDynamicField(); if (null != requiredInfo.getContextSnapshot()) { AbstractSpan activeSpan = ContextManager.createLocalSpan(OPERATION_NAME); @@ -61,7 +59,7 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { + Object ret) throws Throwable { SendCallbackEnhanceRequiredInfo requiredInfo = (SendCallbackEnhanceRequiredInfo) objInst.getSkyWalkingDynamicField(); if (null != requiredInfo.getContextSnapshot()) { Exception exceptions = (Exception) allArguments[0]; @@ -75,7 +73,7 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { SendCallbackEnhanceRequiredInfo requiredInfo = (SendCallbackEnhanceRequiredInfo) objInst.getSkyWalkingDynamicField(); if (null != requiredInfo.getContextSnapshot()) { ContextManager.activeSpan().errorOccurred().log(t); diff --git a/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/define/PulsarConsumerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/define/PulsarConsumerInstrumentation.java index e52a774041a5..ef9215018154 100644 --- a/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/define/PulsarConsumerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/define/PulsarConsumerInstrumentation.java @@ -31,19 +31,16 @@ /** * The pulsar consumer instrumentation use {@link org.apache.pulsar.client.impl.ConsumerImpl} as an enhanced class. - * {@link org.apache.pulsar.client.api.Consumer} is a user-oriented interface and the implementations are - * {@link org.apache.pulsar.client.impl.ConsumerImpl} and {@link org.apache.pulsar.client.impl.MultiTopicsConsumerImpl} - * + * {@link org.apache.pulsar.client.api.Consumer} is a user-oriented interface and the implementations are {@link + * org.apache.pulsar.client.impl.ConsumerImpl} and {@link org.apache.pulsar.client.impl.MultiTopicsConsumerImpl} + *

* The MultiTopicsConsumerImpl is a complex type with multiple ConsumerImpl to support uses receive messages from - * multiple topics. As each ConsumerImpl has it's own topic name and it is the initial unit of a single topic - * to receiving messages, so use ConsumerImpl as an enhanced class is an effective way. - * - * Use messageProcessed as the enhanced method since pulsar - * consumer has multiple ways to receiving messages such as sync method, async method and listeners. - * Method messageProcessed is a basic unit of ConsumerImpl, no matter which way uses uses, messageProcessed will always - * record the message receiving. - * - * @author penghui + * multiple topics. As each ConsumerImpl has it's own topic name and it is the initial unit of a single topic to + * receiving messages, so use ConsumerImpl as an enhanced class is an effective way. + *

+ * Use messageProcessed as the enhanced method since pulsar consumer has multiple ways to receiving + * messages such as sync method, async method and listeners. Method messageProcessed is a basic unit of ConsumerImpl, no + * matter which way uses uses, messageProcessed will always record the message receiving. */ public class PulsarConsumerInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -63,11 +60,13 @@ protected ClassMatch enhanceClass() { public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { - @Override public ElementMatcher getConstructorMatcher() { + @Override + public ElementMatcher getConstructorMatcher() { return takesArgumentWithType(0, CONSTRUCTOR_INTERCEPT_TYPE); } - @Override public String getConstructorInterceptor() { + @Override + public String getConstructorInterceptor() { return CONSTRUCTOR_INTERCEPTOR_CLASS; } } @@ -78,15 +77,18 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(ENHANCE_METHOD).and(takesArgumentWithType(0, ENHANCE_METHOD_TYPE)); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return INTERCEPTOR_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } diff --git a/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/define/PulsarProducerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/define/PulsarProducerInstrumentation.java index 4a38f8fe7e83..df765a8057f6 100644 --- a/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/define/PulsarProducerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/define/PulsarProducerInstrumentation.java @@ -31,23 +31,21 @@ /** * Pulsar producer instrumentation. - * + *

* The pulsar producer instrumentation use {@link org.apache.pulsar.client.impl.ProducerImpl} as an enhanced class. * {@link org.apache.pulsar.client.api.Producer} is a user-oriented interface and the implementations of the Producer * are {@link org.apache.pulsar.client.impl.PartitionedProducerImpl} and {@link org.apache.pulsar.client.impl.ProducerImpl}. - * + *

* And the PartitionedProducerImpl is a complex type with multiple ProducerImpl to support uses send messages to - * multiple partitions. As each ProducerImpl has it's own topic name and it is the initial unit of a single topic - * to send messages, so use ProducerImpl as an enhanced class is an effective way. - * + * multiple partitions. As each ProducerImpl has it's own topic name and it is the initial unit of a single topic to + * send messages, so use ProducerImpl as an enhanced class is an effective way. + *

* About the enhanced methods, currently use {@link org.apache.pulsar.client.impl.ProducerImpl#sendAsync( - * org.apache.pulsar.client.api.Message, org.apache.pulsar.client.impl.SendCallback)} as the enhanced method. - * Pulsar provides users with two kinds of methods for sending messages sync methods and async methods. The async method - * use {@link java.util.concurrent.CompletableFuture as the method result}, if use this method as the enhanced method - * is hard to pass the snapshot of span, because can't ensure that the CompletableFuture is completed after the skywalking + *org.apache.pulsar.client.api.Message, org.apache.pulsar.client.impl.SendCallback)} as the enhanced method. Pulsar + * provides users with two kinds of methods for sending messages sync methods and async methods. The async method use + * {@link java.util.concurrent.CompletableFuture as the method result}, if use this method as the enhanced method is + * hard to pass the snapshot of span, because can't ensure that the CompletableFuture is completed after the skywalking * dynamic field was updated. But execution time of sync method will be inaccurate. - * - * @author penghui */ public class PulsarProducerInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -61,7 +59,7 @@ public class PulsarProducerInstrumentation extends ClassInstanceMethodsEnhancePl @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { - return new ConstructorInterceptPoint[]{ + return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { @Override public ElementMatcher getConstructorMatcher() { @@ -78,7 +76,7 @@ public String getConstructorInterceptor() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { diff --git a/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/define/SendCallbackInstrumentation.java b/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/define/SendCallbackInstrumentation.java index 865015c69a70..450b5361947d 100644 --- a/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/define/SendCallbackInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/main/java/org/apache/skywalking/apm/plugin/pulsar/define/SendCallbackInstrumentation.java @@ -31,15 +31,13 @@ /** * Pulsar producer send callback instrumentation. - * + *

* The send callback enhanced object will use {@link org.apache.skywalking.apm.plugin.pulsar.SendCallbackEnhanceRequiredInfo} * which {@link org.apache.skywalking.apm.plugin.pulsar.PulsarProducerInterceptor} set by skywalking dynamic field of * enhanced object. - * + *

* When a callback is complete, {@link org.apache.skywalking.apm.plugin.pulsar.SendCallbackInterceptor} will continue * the {@link SendCallbackEnhanceRequiredInfo#getContextSnapshot()}. - * - * @author penghui */ public class SendCallbackInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -47,29 +45,35 @@ public class SendCallbackInstrumentation extends ClassInstanceMethodsEnhancePlug public static final String ENHANCE_METHOD = "sendComplete"; public static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.pulsar.SendCallbackInterceptor"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(ENHANCE_METHOD); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return INTERCEPTOR_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byHierarchyMatch(new String[] {ENHANCE_CLASS}); } } diff --git a/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/test/java/org/apache/skywalking/apm/plugin/pulsar/ConsumerConstructorInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/test/java/org/apache/skywalking/apm/plugin/pulsar/ConsumerConstructorInterceptorTest.java index 371f45deb388..38a125937e20 100644 --- a/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/test/java/org/apache/skywalking/apm/plugin/pulsar/ConsumerConstructorInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/test/java/org/apache/skywalking/apm/plugin/pulsar/ConsumerConstructorInterceptorTest.java @@ -54,12 +54,14 @@ public class ConsumerConstructorInterceptorTest { private ConsumerEnhanceRequiredInfo consumerEnhanceRequiredInfo; - @Override public Object getSkyWalkingDynamicField() { + @Override + public Object getSkyWalkingDynamicField() { return consumerEnhanceRequiredInfo; } - @Override public void setSkyWalkingDynamicField(Object value) { - consumerEnhanceRequiredInfo = (ConsumerEnhanceRequiredInfo)value; + @Override + public void setSkyWalkingDynamicField(Object value) { + consumerEnhanceRequiredInfo = (ConsumerEnhanceRequiredInfo) value; } }; @@ -73,7 +75,11 @@ public void setUp() { @Test public void testOnConsumer() { - constructorInterceptor.onConstruct(enhancedInstance, new Object[] {pulsarClient, TOPIC_NAME, consumerConfigurationData}); + constructorInterceptor.onConstruct(enhancedInstance, new Object[] { + pulsarClient, + TOPIC_NAME, + consumerConfigurationData + }); ConsumerEnhanceRequiredInfo requiredInfo = (ConsumerEnhanceRequiredInfo) enhancedInstance.getSkyWalkingDynamicField(); assertThat(requiredInfo.getServiceUrl(), is(SERVICE_URL)); assertThat(requiredInfo.getTopic(), is(TOPIC_NAME)); diff --git a/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/test/java/org/apache/skywalking/apm/plugin/pulsar/ProducerConstructorInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/test/java/org/apache/skywalking/apm/plugin/pulsar/ProducerConstructorInterceptorTest.java index eaf4aa8f3a1f..e002cf77c412 100644 --- a/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/test/java/org/apache/skywalking/apm/plugin/pulsar/ProducerConstructorInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/test/java/org/apache/skywalking/apm/plugin/pulsar/ProducerConstructorInterceptorTest.java @@ -49,12 +49,14 @@ public class ProducerConstructorInterceptorTest { private ProducerEnhanceRequiredInfo requiredInfo; - @Override public Object getSkyWalkingDynamicField() { + @Override + public Object getSkyWalkingDynamicField() { return requiredInfo; } - @Override public void setSkyWalkingDynamicField(Object value) { - this.requiredInfo = (ProducerEnhanceRequiredInfo)value; + @Override + public void setSkyWalkingDynamicField(Object value) { + this.requiredInfo = (ProducerEnhanceRequiredInfo) value; } }; @@ -67,7 +69,10 @@ public void setUp() { @Test public void testOnConsumer() { - constructorInterceptor.onConstruct(enhancedInstance, new Object[] {pulsarClient, TOPIC_NAME}); + constructorInterceptor.onConstruct(enhancedInstance, new Object[] { + pulsarClient, + TOPIC_NAME + }); ProducerEnhanceRequiredInfo requiredInfo = (ProducerEnhanceRequiredInfo) enhancedInstance.getSkyWalkingDynamicField(); assertThat(requiredInfo.getServiceUrl(), is(SERVICE_URL)); assertThat(requiredInfo.getTopic(), is(TOPIC_NAME)); diff --git a/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/test/java/org/apache/skywalking/apm/plugin/pulsar/PulsarConsumerInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/test/java/org/apache/skywalking/apm/plugin/pulsar/PulsarConsumerInterceptorTest.java index f2ed5109b72c..e8717552bf24 100644 --- a/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/test/java/org/apache/skywalking/apm/plugin/pulsar/PulsarConsumerInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/test/java/org/apache/skywalking/apm/plugin/pulsar/PulsarConsumerInterceptorTest.java @@ -63,12 +63,14 @@ public class PulsarConsumerInterceptorTest { private MockMessage msg; private EnhancedInstance consumerInstance = new EnhancedInstance() { - @Override public Object getSkyWalkingDynamicField() { + @Override + public Object getSkyWalkingDynamicField() { return consumerEnhanceRequiredInfo; } - @Override public void setSkyWalkingDynamicField(Object value) { - consumerEnhanceRequiredInfo = (ConsumerEnhanceRequiredInfo)value; + @Override + public void setSkyWalkingDynamicField(Object value) { + consumerEnhanceRequiredInfo = (ConsumerEnhanceRequiredInfo) value; } }; @@ -81,15 +83,16 @@ public void setUp() { consumerEnhanceRequiredInfo.setServiceUrl("pulsar://localhost:6650"); consumerEnhanceRequiredInfo.setSubscriptionName("my-sub"); msg = new MockMessage(); - msg.getMessageBuilder().addProperties(PulsarApi.KeyValue.newBuilder() - .setKey(SW6CarrierItem.HEADER_NAME) - .setValue("1-MC4wLjA=-MS4yMzQuMTEx-3-1-1-IzE5Mi4xNjguMS44OjE4MDAy-Iy9wb3J0YWwv-I3Rlc3RFbnRyeVNwYW4=")); + msg.getMessageBuilder() + .addProperties(PulsarApi.KeyValue.newBuilder() + .setKey(SW6CarrierItem.HEADER_NAME) + .setValue("1-MC4wLjA=-MS4yMzQuMTEx-3-1-1-IzE5Mi4xNjguMS44OjE4MDAy-Iy9wb3J0YWwv-I3Rlc3RFbnRyeVNwYW4=")); } @Test public void testConsumerWithNullMessage() throws Throwable { - consumerInterceptor.beforeMethod(consumerInstance, null, new Object[]{null}, new Class[0], null); - consumerInterceptor.afterMethod(consumerInstance, null, new Object[]{null}, new Class[0], null); + consumerInterceptor.beforeMethod(consumerInstance, null, new Object[] {null}, new Class[0], null); + consumerInterceptor.afterMethod(consumerInstance, null, new Object[] {null}, new Class[0], null); List traceSegments = segmentStorage.getTraceSegments(); assertThat(traceSegments.size(), is(0)); @@ -97,8 +100,8 @@ public void testConsumerWithNullMessage() throws Throwable { @Test public void testConsumerWithMessage() throws Throwable { - consumerInterceptor.beforeMethod(consumerInstance, null, new Object[]{msg}, new Class[0], null); - consumerInterceptor.afterMethod(consumerInstance, null, new Object[]{msg}, new Class[0], null); + consumerInterceptor.beforeMethod(consumerInstance, null, new Object[] {msg}, new Class[0], null); + consumerInterceptor.afterMethod(consumerInstance, null, new Object[] {msg}, new Class[0], null); List traceSegments = segmentStorage.getTraceSegments(); assertThat(traceSegments.size(), is(1)); diff --git a/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/test/java/org/apache/skywalking/apm/plugin/pulsar/PulsarProducerInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/test/java/org/apache/skywalking/apm/plugin/pulsar/PulsarProducerInterceptorTest.java index ecbf72d0f3fa..1f5b48b1fa1d 100644 --- a/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/test/java/org/apache/skywalking/apm/plugin/pulsar/PulsarProducerInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/test/java/org/apache/skywalking/apm/plugin/pulsar/PulsarProducerInterceptorTest.java @@ -52,7 +52,6 @@ public class PulsarProducerInterceptorTest { @Rule public AgentServiceRule serviceRule = new AgentServiceRule(); - private PulsarProducerInterceptor producerInterceptor; private Object[] arguments; @@ -60,15 +59,16 @@ public class PulsarProducerInterceptorTest { private EnhancedInstance pulsarProducerInstance = new EnhancedInstance() { - - @Override public Object getSkyWalkingDynamicField() { + @Override + public Object getSkyWalkingDynamicField() { ProducerEnhanceRequiredInfo requiredInfo = new ProducerEnhanceRequiredInfo(); requiredInfo.setTopic("persistent://my-tenant/my-ns/my-topic"); requiredInfo.setServiceUrl("pulsar://localhost:6650"); return requiredInfo; } - @Override public void setSkyWalkingDynamicField(Object value) { + @Override + public void setSkyWalkingDynamicField(Object value) { } }; @@ -77,7 +77,10 @@ public class PulsarProducerInterceptorTest { @Before public void setUp() { producerInterceptor = new PulsarProducerInterceptor(); - arguments = new Object[] {msg, null}; + arguments = new Object[] { + msg, + null + }; argumentType = new Class[] {MessageImpl.class}; } @@ -98,8 +101,8 @@ public void testSendMessage() throws Throwable { @Test public void testSendWithNullMessage() throws Throwable { - producerInterceptor.beforeMethod(pulsarProducerInstance, null, new Object[]{null}, argumentType, null); - producerInterceptor.afterMethod(pulsarProducerInstance, null, new Object[]{null}, argumentType, null); + producerInterceptor.beforeMethod(pulsarProducerInstance, null, new Object[] {null}, argumentType, null); + producerInterceptor.afterMethod(pulsarProducerInstance, null, new Object[] {null}, argumentType, null); List traceSegmentList = segmentStorage.getTraceSegments(); assertThat(traceSegmentList.size(), is(0)); } diff --git a/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/test/java/org/apache/skywalking/apm/plugin/pulsar/SendCallbackInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/test/java/org/apache/skywalking/apm/plugin/pulsar/SendCallbackInterceptorTest.java index 177f959a3bba..062f02813355 100644 --- a/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/test/java/org/apache/skywalking/apm/plugin/pulsar/SendCallbackInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/pulsar-plugin/src/test/java/org/apache/skywalking/apm/plugin/pulsar/SendCallbackInterceptorTest.java @@ -61,14 +61,16 @@ public class SendCallbackInterceptorTest { private EnhancedInstance callBackInstance = new EnhancedInstance() { - @Override public Object getSkyWalkingDynamicField() { + @Override + public Object getSkyWalkingDynamicField() { SendCallbackEnhanceRequiredInfo requiredInfo = new SendCallbackEnhanceRequiredInfo(); requiredInfo.setTopic("persistent://my-tenant/my-ns/my-topic"); requiredInfo.setContextSnapshot(MockContextSnapshot.INSTANCE.mockContextSnapshot()); return requiredInfo; } - @Override public void setSkyWalkingDynamicField(Object value) { + @Override + public void setSkyWalkingDynamicField(Object value) { } }; diff --git a/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/pom.xml index 5a0654a4ee3d..738b8506add0 100644 --- a/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-sdk-plugin org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQConsumerInterceptor.java b/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQConsumerInterceptor.java index b2736ed949e8..e5e687c8c1d6 100644 --- a/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQConsumerInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQConsumerInterceptor.java @@ -36,15 +36,18 @@ public class RabbitMQConsumerInterceptor implements InstanceMethodsAroundInterceptor { public static final String OPERATE_NAME_PREFIX = "RabbitMQ/"; public static final String CONSUMER_OPERATE_NAME_SUFFIX = "/Consumer"; + @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { ContextCarrier contextCarrier = new ContextCarrier(); String url = (String) objInst.getSkyWalkingDynamicField(); Envelope envelope = (Envelope) allArguments[1]; - AMQP.BasicProperties properties = (AMQP.BasicProperties) allArguments[2]; - AbstractSpan activeSpan = ContextManager.createEntrySpan(OPERATE_NAME_PREFIX + "Topic/" + envelope.getExchange() + "Queue/" + envelope.getRoutingKey() + CONSUMER_OPERATE_NAME_SUFFIX, null).start(System.currentTimeMillis()); - Tags.MQ_BROKER.set(activeSpan,url); - Tags.MQ_TOPIC.set(activeSpan,envelope.getExchange()); + AMQP.BasicProperties properties = (AMQP.BasicProperties) allArguments[2]; + AbstractSpan activeSpan = ContextManager.createEntrySpan(OPERATE_NAME_PREFIX + "Topic/" + envelope.getExchange() + "Queue/" + envelope + .getRoutingKey() + CONSUMER_OPERATE_NAME_SUFFIX, null).start(System.currentTimeMillis()); + Tags.MQ_BROKER.set(activeSpan, url); + Tags.MQ_TOPIC.set(activeSpan, envelope.getExchange()); Tags.MQ_QUEUE.set(activeSpan, envelope.getRoutingKey()); activeSpan.setComponent(ComponentsDefine.RABBITMQ_CONSUMER); SpanLayer.asMQ(activeSpan); @@ -57,19 +60,19 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } ContextManager.extract(contextCarrier); - } - @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQProducerAndConsumerConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQProducerAndConsumerConstructorInterceptor.java index 6d9fd1549da1..6a385ed23b25 100644 --- a/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQProducerAndConsumerConstructorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQProducerAndConsumerConstructorInterceptor.java @@ -25,8 +25,8 @@ public class RabbitMQProducerAndConsumerConstructorInterceptor implements InstanceConstructorInterceptor { @Override public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { - Connection connection = (Connection)allArguments[0]; - String url = connection.getAddress().toString().replace("/","") + ":" + connection.getPort(); + Connection connection = (Connection) allArguments[0]; + String url = connection.getAddress().toString().replace("/", "") + ":" + connection.getPort(); objInst.setSkyWalkingDynamicField(url); } } diff --git a/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQProducerInterceptor.java b/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQProducerInterceptor.java index 991a7d6c0b81..5ee7e71c5bc8 100644 --- a/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQProducerInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQProducerInterceptor.java @@ -42,24 +42,25 @@ public class RabbitMQProducerInterceptor implements InstanceMethodsAroundInterce public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { ContextCarrier contextCarrier = new ContextCarrier(); - AMQP.BasicProperties properties = (AMQP.BasicProperties)allArguments[4]; + AMQP.BasicProperties properties = (AMQP.BasicProperties) allArguments[4]; AMQP.BasicProperties.Builder propertiesBuilder; Map headers = new HashMap(); if (properties != null) { - propertiesBuilder = properties.builder().appId(properties.getAppId()) - .clusterId(properties.getClusterId()) - .contentEncoding(properties.getContentEncoding()) - .contentType(properties.getContentType()) - .correlationId(properties.getCorrelationId()) - .deliveryMode(properties.getDeliveryMode()) - .expiration(properties.getExpiration()) - .messageId(properties.getMessageId()) - .priority(properties.getPriority()) - .replyTo(properties.getReplyTo()) - .timestamp(properties.getTimestamp()) - .type(properties.getType()) - .userId(properties.getUserId()); + propertiesBuilder = properties.builder() + .appId(properties.getAppId()) + .clusterId(properties.getClusterId()) + .contentEncoding(properties.getContentEncoding()) + .contentType(properties.getContentType()) + .correlationId(properties.getCorrelationId()) + .deliveryMode(properties.getDeliveryMode()) + .expiration(properties.getExpiration()) + .messageId(properties.getMessageId()) + .priority(properties.getPriority()) + .replyTo(properties.getReplyTo()) + .timestamp(properties.getTimestamp()) + .type(properties.getType()) + .userId(properties.getUserId()); // copy origin headers if (properties.getHeaders() != null) { @@ -69,9 +70,9 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr propertiesBuilder = new AMQP.BasicProperties.Builder(); } - String exChangeName = (String)allArguments[0]; - String queueName = (String)allArguments[1]; - String url = (String)objInst.getSkyWalkingDynamicField(); + String exChangeName = (String) allArguments[0]; + String queueName = (String) allArguments[1]; + String url = (String) objInst.getSkyWalkingDynamicField(); AbstractSpan activeSpan = ContextManager.createExitSpan(OPERATE_NAME_PREFIX + "Topic/" + exChangeName + "Queue/" + queueName + PRODUCER_OPERATE_NAME_SUFFIX, contextCarrier, url); Tags.MQ_BROKER.set(activeSpan, url); Tags.MQ_QUEUE.set(activeSpan, queueName); diff --git a/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/define/RabbitMQConsumerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/define/RabbitMQConsumerInstrumentation.java index 5e654871a486..0c9d0791c6b0 100644 --- a/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/define/RabbitMQConsumerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/define/RabbitMQConsumerInstrumentation.java @@ -35,18 +35,21 @@ public class RabbitMQConsumerInstrumentation extends ClassInstanceMethodsEnhance public static final String ENHANCE_CLASS_PRODUCER = "com.rabbitmq.client.Consumer"; public static final String ENHANCE_METHOD_DISPATCH = "handleDelivery"; public static final String INTERCEPTOR_CONSTRUCTOR = "org.apache.skywalking.apm.plugin.rabbitmq.RabbitMQProducerAndConsumerConstructorInterceptor"; + @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { - @Override public ElementMatcher getConstructorMatcher() { - return takesArgumentWithType(0,"com.rabbitmq.client.impl.AMQConnection"); - } + @Override + public ElementMatcher getConstructorMatcher() { + return takesArgumentWithType(0, "com.rabbitmq.client.impl.AMQConnection"); + } - @Override public String getConstructorInterceptor() { - return INTERCEPTOR_CONSTRUCTOR; - } + @Override + public String getConstructorInterceptor() { + return INTERCEPTOR_CONSTRUCTOR; } + } }; } @@ -54,19 +57,21 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new DeclaredInstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named(ENHANCE_METHOD_DISPATCH).and(takesArgumentWithType(2,"com.rabbitmq.client.AMQP$BasicProperties")); - } - + @Override + public ElementMatcher getMethodsMatcher() { + return named(ENHANCE_METHOD_DISPATCH).and(takesArgumentWithType(2, "com.rabbitmq.client.AMQP$BasicProperties")); + } - @Override public String getMethodsInterceptor() { - return INTERCEPTOR_CLASS; - } + @Override + public String getMethodsInterceptor() { + return INTERCEPTOR_CLASS; + } - @Override public boolean isOverrideArgs() { - return false; - } + @Override + public boolean isOverrideArgs() { + return false; } + } }; } diff --git a/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/define/RabbitMQProducerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/define/RabbitMQProducerInstrumentation.java index 8aee9bb791ad..96f0ac6249d9 100644 --- a/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/define/RabbitMQProducerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/define/RabbitMQProducerInstrumentation.java @@ -34,18 +34,21 @@ public class RabbitMQProducerInstrumentation extends ClassInstanceMethodsEnhance public static final String ENHANCE_CLASS_PRODUCER = "com.rabbitmq.client.impl.ChannelN"; public static final String ENHANCE_METHOD_DISPATCH = "basicPublish"; public static final String INTERCEPTOR_CONSTRUCTOR = "org.apache.skywalking.apm.plugin.rabbitmq.RabbitMQProducerAndConsumerConstructorInterceptor"; + @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { - @Override public ElementMatcher getConstructorMatcher() { - return takesArgumentWithType(3,"com.rabbitmq.client.MetricsCollector"); - } + @Override + public ElementMatcher getConstructorMatcher() { + return takesArgumentWithType(3, "com.rabbitmq.client.MetricsCollector"); + } - @Override public String getConstructorInterceptor() { - return INTERCEPTOR_CONSTRUCTOR; - } + @Override + public String getConstructorInterceptor() { + return INTERCEPTOR_CONSTRUCTOR; } + } }; } @@ -53,19 +56,21 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named(ENHANCE_METHOD_DISPATCH).and(takesArgumentWithType(4,"com.rabbitmq.client.AMQP$BasicProperties")); - } - + @Override + public ElementMatcher getMethodsMatcher() { + return named(ENHANCE_METHOD_DISPATCH).and(takesArgumentWithType(4, "com.rabbitmq.client.AMQP$BasicProperties")); + } - @Override public String getMethodsInterceptor() { - return INTERCEPTOR_CLASS; - } + @Override + public String getMethodsInterceptor() { + return INTERCEPTOR_CLASS; + } - @Override public boolean isOverrideArgs() { - return true; - } + @Override + public boolean isOverrideArgs() { + return true; } + } }; } diff --git a/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQConsumerInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQConsumerInterceptorTest.java index ee86be9f7b0b..fc3ef50e3815 100644 --- a/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQConsumerInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQConsumerInterceptorTest.java @@ -62,7 +62,7 @@ public void setSkyWalkingDynamicField(Object value) { } }; - private RabbitMQConsumerInterceptor rabbitMQConsumerInterceptor; + private RabbitMQConsumerInterceptor rabbitMQConsumerInterceptor; @Before public void setUp() throws Exception { @@ -71,39 +71,51 @@ public void setUp() throws Exception { @Test public void TestRabbitMQConsumerInterceptor() throws Throwable { - Envelope envelope = new Envelope(1111,false,"","rabbitmq-test"); + Envelope envelope = new Envelope(1111, false, "", "rabbitmq-test"); Map headers = new HashMap(); - headers.put(SW6CarrierItem.HEADER_NAME,"1-MS4xLjE1NDM5NzU1OTEwMTQwMDAx-MS4xLjE1NDM5NzU1OTA5OTcwMDAw-0-1-1-IzEyNy4wLjAuMTo1Mjcy-I1JhYmJpdE1RL1RvcGljL1F1ZXVlL3JhYmJpdG1xLXRlc3QvUHJvZHVjZXI=-I1JhYmJpdE1RL1RvcGljL1F1ZXVlL3JhYmJpdG1xLXRlc3QvUHJvZHVjZXI="); + headers.put(SW6CarrierItem.HEADER_NAME, "1-MS4xLjE1NDM5NzU1OTEwMTQwMDAx-MS4xLjE1NDM5NzU1OTA5OTcwMDAw-0-1-1-IzEyNy4wLjAuMTo1Mjcy-I1JhYmJpdE1RL1RvcGljL1F1ZXVlL3JhYmJpdG1xLXRlc3QvUHJvZHVjZXI=-I1JhYmJpdE1RL1RvcGljL1F1ZXVlL3JhYmJpdG1xLXRlc3QvUHJvZHVjZXI="); AMQP.BasicProperties.Builder propsBuilder = new AMQP.BasicProperties.Builder(); - Object[] arguments = new Object[] {0,envelope,propsBuilder.headers(headers).build()}; - - rabbitMQConsumerInterceptor.beforeMethod(enhancedInstance,null,arguments,null,null); - rabbitMQConsumerInterceptor.afterMethod(enhancedInstance,null,arguments,null,null); + Object[] arguments = new Object[] { + 0, + envelope, + propsBuilder.headers(headers).build() + }; + + rabbitMQConsumerInterceptor.beforeMethod(enhancedInstance, null, arguments, null, null); + rabbitMQConsumerInterceptor.afterMethod(enhancedInstance, null, arguments, null, null); List traceSegments = segmentStorage.getTraceSegments(); Assert.assertThat(traceSegments.size(), is(1)); } @Test public void testRabbitMQConsumerInterceptorWithNilHeaders() throws Throwable { - Envelope envelope = new Envelope(1111,false,"","rabbitmq-test"); + Envelope envelope = new Envelope(1111, false, "", "rabbitmq-test"); AMQP.BasicProperties.Builder propsBuilder = new AMQP.BasicProperties.Builder(); - Object[] arguments = new Object[] {0,envelope,propsBuilder.headers(null).build()}; - - rabbitMQConsumerInterceptor.beforeMethod(enhancedInstance,null,arguments,null,null); - rabbitMQConsumerInterceptor.afterMethod(enhancedInstance,null,arguments,null,null); + Object[] arguments = new Object[] { + 0, + envelope, + propsBuilder.headers(null).build() + }; + + rabbitMQConsumerInterceptor.beforeMethod(enhancedInstance, null, arguments, null, null); + rabbitMQConsumerInterceptor.afterMethod(enhancedInstance, null, arguments, null, null); List traceSegments = segmentStorage.getTraceSegments(); Assert.assertThat(traceSegments.size(), is(1)); } @Test public void testRabbitMQConsumerInterceptorWithEmptyHeaders() throws Throwable { - Envelope envelope = new Envelope(1111,false,"","rabbitmq-test"); + Envelope envelope = new Envelope(1111, false, "", "rabbitmq-test"); Map headers = new HashMap(); AMQP.BasicProperties.Builder propsBuilder = new AMQP.BasicProperties.Builder(); - Object[] arguments = new Object[] {0,envelope,propsBuilder.headers(headers).build()}; - - rabbitMQConsumerInterceptor.beforeMethod(enhancedInstance,null,arguments,null,null); - rabbitMQConsumerInterceptor.afterMethod(enhancedInstance,null,arguments,null,null); + Object[] arguments = new Object[] { + 0, + envelope, + propsBuilder.headers(headers).build() + }; + + rabbitMQConsumerInterceptor.beforeMethod(enhancedInstance, null, arguments, null, null); + rabbitMQConsumerInterceptor.afterMethod(enhancedInstance, null, arguments, null, null); List traceSegments = segmentStorage.getTraceSegments(); Assert.assertThat(traceSegments.size(), is(1)); } diff --git a/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQProducerAndConsumerConstructorInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQProducerAndConsumerConstructorInterceptorTest.java index 6f544f65418b..2056dd648a31 100644 --- a/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQProducerAndConsumerConstructorInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQProducerAndConsumerConstructorInterceptorTest.java @@ -18,7 +18,18 @@ package org.apache.skywalking.apm.plugin.rabbitmq; -import com.rabbitmq.client.*; +import com.rabbitmq.client.BlockedCallback; +import com.rabbitmq.client.BlockedListener; +import com.rabbitmq.client.Channel; +import com.rabbitmq.client.Connection; +import com.rabbitmq.client.ExceptionHandler; +import com.rabbitmq.client.ShutdownListener; +import com.rabbitmq.client.ShutdownSignalException; +import com.rabbitmq.client.UnblockedCallback; +import java.io.IOException; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.Map; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; import org.apache.skywalking.apm.agent.test.tools.TracingSegmentRunner; import org.junit.Before; @@ -27,11 +38,6 @@ import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.modules.junit4.PowerMockRunnerDelegate; -import java.io.IOException; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.Map; - import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; @@ -39,12 +45,11 @@ @PowerMockRunnerDelegate(TracingSegmentRunner.class) public class RabbitMQProducerAndConsumerConstructorInterceptorTest { - - private RabbitMQProducerAndConsumerConstructorInterceptor rabbitMQProducerAndConsumerConstructorInterceptor; private EnhancedInstance enhancedInstance = new EnhancedInstance() { private String test; + @Override public Object getSkyWalkingDynamicField() { return test; @@ -52,25 +57,25 @@ public Object getSkyWalkingDynamicField() { @Override public void setSkyWalkingDynamicField(Object value) { - test = (String)value; + test = (String) value; } }; - public class TestConnection implements Connection { + public class TestConnection implements Connection { @Override public InetAddress getAddress() { try { - return InetAddress.getByName("127.0.0.1"); + return InetAddress.getByName("127.0.0.1"); } catch (UnknownHostException e) { e.printStackTrace(); - return null; + return null; } } @Override public int getPort() { - return 5672; + return 5672; } @Override @@ -159,7 +164,8 @@ public void addBlockedListener(BlockedListener blockedListener) { } @Override - public BlockedListener addBlockedListener(BlockedCallback blockedCallback, UnblockedCallback unblockedCallback) { + public BlockedListener addBlockedListener(BlockedCallback blockedCallback, + UnblockedCallback unblockedCallback) { return null; } @@ -214,10 +220,7 @@ public boolean isOpen() { } } - - - - private Connection testConnection; + private Connection testConnection; @Before public void setUp() throws Exception { @@ -227,8 +230,8 @@ public void setUp() throws Exception { @Test public void TestRabbitMQConsumerAndProducerConstructorInterceptor() { - rabbitMQProducerAndConsumerConstructorInterceptor = new RabbitMQProducerAndConsumerConstructorInterceptor(); - rabbitMQProducerAndConsumerConstructorInterceptor.onConstruct(enhancedInstance,new Object[] {testConnection}); + rabbitMQProducerAndConsumerConstructorInterceptor = new RabbitMQProducerAndConsumerConstructorInterceptor(); + rabbitMQProducerAndConsumerConstructorInterceptor.onConstruct(enhancedInstance, new Object[] {testConnection}); assertThat((String) enhancedInstance.getSkyWalkingDynamicField(), is("127.0.0.1:5672")); } } diff --git a/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQProducerInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQProducerInterceptorTest.java index 99e3fad9dd44..69cc858fe7c5 100644 --- a/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQProducerInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQProducerInterceptorTest.java @@ -18,12 +18,17 @@ package org.apache.skywalking.apm.plugin.rabbitmq; +import java.util.List; import org.apache.skywalking.apm.agent.core.context.trace.AbstractTracingSpan; import org.apache.skywalking.apm.agent.core.context.trace.SpanLayer; import org.apache.skywalking.apm.agent.core.context.trace.TraceSegment; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; import org.apache.skywalking.apm.agent.test.helper.SegmentHelper; -import org.apache.skywalking.apm.agent.test.tools.*; +import org.apache.skywalking.apm.agent.test.tools.AgentServiceRule; +import org.apache.skywalking.apm.agent.test.tools.SegmentStorage; +import org.apache.skywalking.apm.agent.test.tools.SegmentStoragePoint; +import org.apache.skywalking.apm.agent.test.tools.SpanAssert; +import org.apache.skywalking.apm.agent.test.tools.TracingSegmentRunner; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -31,8 +36,6 @@ import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.modules.junit4.PowerMockRunnerDelegate; -import java.util.List; - import static org.apache.skywalking.apm.network.trace.component.ComponentsDefine.RABBITMQ_PRODUCER; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; @@ -58,20 +61,26 @@ public void setSkyWalkingDynamicField(Object value) { } }; - private RabbitMQProducerInterceptor rabbitMQProducerInterceptor; + private RabbitMQProducerInterceptor rabbitMQProducerInterceptor; private Object[] arguments; @Before public void setUp() throws Exception { rabbitMQProducerInterceptor = new RabbitMQProducerInterceptor(); - arguments = new Object[] {"","rabbitmq-test",0,0,null}; + arguments = new Object[] { + "", + "rabbitmq-test", + 0, + 0, + null + }; } @Test public void TestRabbitMQProducerInterceptor() throws Throwable { - rabbitMQProducerInterceptor.beforeMethod(enhancedInstance,null,arguments,null,null); - rabbitMQProducerInterceptor.afterMethod(enhancedInstance,null,arguments,null,null); + rabbitMQProducerInterceptor.beforeMethod(enhancedInstance, null, arguments, null, null); + rabbitMQProducerInterceptor.afterMethod(enhancedInstance, null, arguments, null, null); List traceSegmentList = segmentStorage.getTraceSegments(); assertThat(traceSegmentList.size(), is(1)); diff --git a/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/pom.xml index 1df2e35bc642..148da72cd9e5 100644 --- a/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + 4.0.0 org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/ConnectionManagerInterceptor.java b/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/ConnectionManagerInterceptor.java index 8df009d0f55b..6b3f62a70286 100644 --- a/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/ConnectionManagerInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/ConnectionManagerInterceptor.java @@ -15,8 +15,12 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.redisson.v3; +import java.lang.reflect.Method; +import java.net.URI; +import java.util.Collection; import org.apache.skywalking.apm.agent.core.context.util.PeerFormat; import org.apache.skywalking.apm.agent.core.logging.api.ILog; import org.apache.skywalking.apm.agent.core.logging.api.LogManager; @@ -24,28 +28,21 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; import org.apache.skywalking.apm.plugin.redisson.v3.util.ClassUtil; -import org.redisson.config.*; +import org.redisson.config.Config; import org.redisson.connection.ConnectionManager; -import java.lang.reflect.Method; -import java.net.URI; -import java.util.Collection; - -/** - * @author zhaoyuguang - */ public class ConnectionManagerInterceptor implements InstanceMethodsAroundInterceptor { private static final ILog logger = LogManager.getLogger(ConnectionManagerInterceptor.class); @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { try { ConnectionManager connectionManager = (ConnectionManager) objInst; Config config = connectionManager.getCfg(); @@ -95,9 +92,9 @@ private void appendAddresses(StringBuilder peer, Collection nodeAddresses) { } /** - * In some high versions of redisson, such as 3.11.1. - * The attribute address in the RedisClientConfig class is changed from the lower version of the URI to the String. - * So use the following code for compatibility. + * In some high versions of redisson, such as 3.11.1. The attribute address in the RedisClientConfig class is + * changed from the lower version of the URI to the String. So use the following code for compatibility. + * * @param obj Address object * @return the sw peer */ @@ -115,6 +112,6 @@ private String getPeer(Object obj) { @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { } } diff --git a/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/RedisClientConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/RedisClientConstructorInterceptor.java index 8cc407626794..8c4dcb3f0e78 100644 --- a/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/RedisClientConstructorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/RedisClientConstructorInterceptor.java @@ -15,16 +15,15 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.redisson.v3; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor; /** - * RedisClient is the link between RedisConnection and ConnectionManager. - * to enhance RedisClient for bring peer(the cluster configuration information) in ConnectionManager to RedisConnection. - * - * @author zhaoyuguang + * RedisClient is the link between RedisConnection and ConnectionManager. to enhance RedisClient for bring peer(the + * cluster configuration information) in ConnectionManager to RedisConnection. */ public class RedisClientConstructorInterceptor implements InstanceConstructorInterceptor { diff --git a/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/RedisConnectionMethodInterceptor.java b/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/RedisConnectionMethodInterceptor.java index 80029470d810..bcf8d7517428 100644 --- a/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/RedisConnectionMethodInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/RedisConnectionMethodInterceptor.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.redisson.v3; import io.netty.buffer.ByteBuf; @@ -39,16 +40,13 @@ import java.lang.reflect.Method; import java.net.InetSocketAddress; -/** - * @author zhaoyuguang - */ public class RedisConnectionMethodInterceptor implements InstanceMethodsAroundInterceptor, InstanceConstructorInterceptor { private static final ILog logger = LogManager.getLogger(RedisConnectionMethodInterceptor.class); @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { String peer = (String) objInst.getSkyWalkingDynamicField(); RedisConnection connection = (RedisConnection) objInst; @@ -91,15 +89,15 @@ private void addCommandData(StringBuilder dbStatement, CommandData commandData) } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { AbstractSpan span = ContextManager.activeSpan(); span.errorOccurred(); span.log(t); diff --git a/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/define/ConnectionManagerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/define/ConnectionManagerInstrumentation.java index 2711acab74ba..f33e77a37479 100644 --- a/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/define/ConnectionManagerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/define/ConnectionManagerInstrumentation.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.redisson.v3.define; import net.bytebuddy.description.method.MethodDescription; @@ -27,9 +28,6 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * @author zhaoyuguang - */ public class ConnectionManagerInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "org.redisson.connection.MasterSlaveConnectionManager"; @@ -43,7 +41,7 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { diff --git a/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/define/RedisClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/define/RedisClientInstrumentation.java index b1fbd5ab8315..44a4b4106f59 100644 --- a/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/define/RedisClientInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/define/RedisClientInstrumentation.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.redisson.v3.define; import net.bytebuddy.description.method.MethodDescription; @@ -27,9 +28,6 @@ import static net.bytebuddy.matcher.ElementMatchers.any; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * @author zhaoyuguang - */ public class RedisClientInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "org.redisson.client.RedisClient"; diff --git a/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/define/RedisConnectionInstrumentation.java b/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/define/RedisConnectionInstrumentation.java index 681070dbe53f..84bc82535fb9 100644 --- a/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/define/RedisConnectionInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/define/RedisConnectionInstrumentation.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.redisson.v3.define; import net.bytebuddy.description.method.MethodDescription; @@ -28,9 +29,6 @@ import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * @author zhaoyuguang - */ public class RedisConnectionInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "org.redisson.client.RedisConnection"; @@ -56,7 +54,7 @@ public String getConstructorInterceptor() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { diff --git a/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/util/ClassUtil.java b/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/util/ClassUtil.java index 23df3c4fdd00..4ce359ec9ccb 100644 --- a/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/util/ClassUtil.java +++ b/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/redisson/v3/util/ClassUtil.java @@ -15,18 +15,16 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.redisson.v3.util; import java.lang.reflect.Field; -/** - * @author zhaoyuguang - */ public class ClassUtil { /** - * This method should only be used in low frequency. - * It should not use in trace context, but just in the metadata preparation stage. + * This method should only be used in low frequency. It should not use in trace context, but just in the metadata + * preparation stage. */ public static Object getObjectField(Object obj, String name) throws NoSuchFieldException, IllegalAccessException { Field field = obj.getClass().getDeclaredField(name); diff --git a/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/redisson/v3/RedisConnectionMethodInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/redisson/v3/RedisConnectionMethodInterceptorTest.java index c63dba66304b..66d41a9ab03f 100644 --- a/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/redisson/v3/RedisConnectionMethodInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/redisson-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/redisson/v3/RedisConnectionMethodInterceptorTest.java @@ -33,9 +33,6 @@ import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.modules.junit4.PowerMockRunnerDelegate; -/** - * @author zhaoyuguang - */ @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(TracingSegmentRunner.class) public class RedisConnectionMethodInterceptorTest { @@ -67,7 +64,10 @@ public void setSkyWalkingDynamicField(Object value) { } } - @SuppressWarnings({"rawtypes", "unchecked"}) + @SuppressWarnings({ + "rawtypes", + "unchecked" + }) @Before public void setUp() throws Exception { mockRedisConnectionInstance = new MockInstance(); @@ -76,10 +76,9 @@ public void setUp() throws Exception { interceptor = new RedisConnectionMethodInterceptor(); } - @Test public void testIntercept() throws Throwable { - interceptor.onConstruct(mockRedisConnectionInstance, new Object[]{mockRedisClientInstance}); + interceptor.onConstruct(mockRedisConnectionInstance, new Object[] {mockRedisClientInstance}); MatcherAssert.assertThat((String) mockRedisConnectionInstance.getSkyWalkingDynamicField(), Is.is("127.0.0.1:6379;127.0.0.1:6378;")); } } diff --git a/apm-sniffer/apm-sdk-plugin/resteasy-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/resteasy-plugin/pom.xml index b12d9240aa57..ce5d690c084a 100644 --- a/apm-sniffer/apm-sdk-plugin/resteasy-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/resteasy-plugin/pom.xml @@ -16,7 +16,8 @@ ~ limitations under the License. ~ --> - + 4.0.0 org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/resteasy-plugin/resteasy-server-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/resteasy-plugin/resteasy-server-3.x-plugin/pom.xml index 5eb580e0e85c..b195b57abd7b 100644 --- a/apm-sniffer/apm-sdk-plugin/resteasy-plugin/resteasy-server-3.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/resteasy-plugin/resteasy-server-3.x-plugin/pom.xml @@ -16,7 +16,8 @@ ~ limitations under the License. ~ --> - + 4.0.0 resteasy-plugin diff --git a/apm-sniffer/apm-sdk-plugin/resteasy-plugin/resteasy-server-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resteasy/v3/server/SynchronousDispatcherExceptionInterceptor.java b/apm-sniffer/apm-sdk-plugin/resteasy-plugin/resteasy-server-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resteasy/v3/server/SynchronousDispatcherExceptionInterceptor.java index 5938716279e0..9234a95ebf5f 100644 --- a/apm-sniffer/apm-sdk-plugin/resteasy-plugin/resteasy-server-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resteasy/v3/server/SynchronousDispatcherExceptionInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/resteasy-plugin/resteasy-server-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resteasy/v3/server/SynchronousDispatcherExceptionInterceptor.java @@ -26,16 +26,13 @@ import java.lang.reflect.Method; -/** - * @author yan-fucheng - */ public class SynchronousDispatcherExceptionInterceptor implements InstanceMethodsAroundInterceptor { @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { if (ContextManager.isActive() && !((HttpRequest) allArguments[0]).getAsyncContext().isSuspended()) { - ContextManager.activeSpan().errorOccurred().log((Throwable)allArguments[2]); + ContextManager.activeSpan().errorOccurred().log((Throwable) allArguments[2]); } } @@ -47,7 +44,7 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/apm-sdk-plugin/resteasy-plugin/resteasy-server-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resteasy/v3/server/SynchronousDispatcherInterceptor.java b/apm-sniffer/apm-sdk-plugin/resteasy-plugin/resteasy-server-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resteasy/v3/server/SynchronousDispatcherInterceptor.java index 62da345ca986..d028a04f2d8a 100644 --- a/apm-sniffer/apm-sdk-plugin/resteasy-plugin/resteasy-server-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resteasy/v3/server/SynchronousDispatcherInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/resteasy-plugin/resteasy-server-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resteasy/v3/server/SynchronousDispatcherInterceptor.java @@ -33,9 +33,6 @@ import java.lang.reflect.Method; -/** - * @author yan-fucheng - */ public class SynchronousDispatcherInterceptor implements InstanceMethodsAroundInterceptor { @Override diff --git a/apm-sniffer/apm-sdk-plugin/resteasy-plugin/resteasy-server-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resteasy/v3/server/define/SynchronousDispatcherInstrumentation.java b/apm-sniffer/apm-sdk-plugin/resteasy-plugin/resteasy-server-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resteasy/v3/server/define/SynchronousDispatcherInstrumentation.java index 1e70e4a0ea2d..aaade1939894 100644 --- a/apm-sniffer/apm-sdk-plugin/resteasy-plugin/resteasy-server-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resteasy/v3/server/define/SynchronousDispatcherInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/resteasy-plugin/resteasy-server-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resteasy/v3/server/define/SynchronousDispatcherInstrumentation.java @@ -29,9 +29,6 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.takesArguments; -/** - * @author yan-fucheng - */ public class SynchronousDispatcherInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "org.jboss.resteasy.core.SynchronousDispatcher"; diff --git a/apm-sniffer/apm-sdk-plugin/resteasy-plugin/resteasy-server-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/resteasy/v3/server/AssertTools.java b/apm-sniffer/apm-sdk-plugin/resteasy-plugin/resteasy-server-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/resteasy/v3/server/AssertTools.java index 20b2f65ea701..a737fa91329d 100644 --- a/apm-sniffer/apm-sdk-plugin/resteasy-plugin/resteasy-server-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/resteasy/v3/server/AssertTools.java +++ b/apm-sniffer/apm-sdk-plugin/resteasy-plugin/resteasy-server-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/resteasy/v3/server/AssertTools.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.resteasy.v3.server; import org.apache.skywalking.apm.agent.core.context.trace.AbstractTracingSpan; @@ -28,9 +29,6 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -/** - * @author yan-fucheng - */ class AssertTools { static void assertTraceSegmentRef(TraceSegmentRef ref) { diff --git a/apm-sniffer/apm-sdk-plugin/resteasy-plugin/resteasy-server-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/resteasy/v3/server/SynchronousDispatcherInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/resteasy-plugin/resteasy-server-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/resteasy/v3/server/SynchronousDispatcherInterceptorTest.java index 79a65329f329..cda9c71337d5 100644 --- a/apm-sniffer/apm-sdk-plugin/resteasy-plugin/resteasy-server-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/resteasy/v3/server/SynchronousDispatcherInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/resteasy-plugin/resteasy-server-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/resteasy/v3/server/SynchronousDispatcherInterceptorTest.java @@ -18,6 +18,9 @@ package org.apache.skywalking.apm.plugin.resteasy.v3.server; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.List; import org.apache.skywalking.apm.agent.core.context.SW6CarrierItem; import org.apache.skywalking.apm.agent.core.context.trace.AbstractTracingSpan; import org.apache.skywalking.apm.agent.core.context.trace.LogDataEntity; @@ -26,7 +29,11 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; import org.apache.skywalking.apm.agent.test.helper.SegmentHelper; import org.apache.skywalking.apm.agent.test.helper.SpanHelper; -import org.apache.skywalking.apm.agent.test.tools.*; +import org.apache.skywalking.apm.agent.test.tools.AgentServiceRule; +import org.apache.skywalking.apm.agent.test.tools.SegmentStorage; +import org.apache.skywalking.apm.agent.test.tools.SegmentStoragePoint; +import org.apache.skywalking.apm.agent.test.tools.SpanAssert; +import org.apache.skywalking.apm.agent.test.tools.TracingSegmentRunner; import org.jboss.resteasy.core.ResourceInvoker; import org.jboss.resteasy.specimpl.MultivaluedMapImpl; import org.jboss.resteasy.specimpl.ResteasyHttpHeaders; @@ -42,17 +49,10 @@ import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.modules.junit4.PowerMockRunnerDelegate; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.List; - import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.when; -/** - * @author yan-fucheng - */ @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(TracingSegmentRunner.class) public class SynchronousDispatcherInterceptorTest { @@ -99,11 +99,27 @@ public void setup() throws URISyntaxException { when(response.getStatus()).thenReturn(200); when(request.getAsyncContext()).thenReturn(resteasyAsynchronousContext); when(request.getAsyncContext().isSuspended()).thenReturn(false); - arguments = new Object[] {request, response, resourceInvoker}; - argumentType = new Class[] {request.getClass(), response.getClass(), resourceInvoker.getClass()}; - - exceptionArguments = new Object[] {request, response, new RuntimeException()}; - exceptionArgumentType = new Class[] {request.getClass(), response.getClass(), new RuntimeException().getClass()}; + arguments = new Object[] { + request, + response, + resourceInvoker + }; + argumentType = new Class[] { + request.getClass(), + response.getClass(), + resourceInvoker.getClass() + }; + + exceptionArguments = new Object[] { + request, + response, + new RuntimeException() + }; + exceptionArgumentType = new Class[] { + request.getClass(), + response.getClass(), + new RuntimeException().getClass() + }; } @Test diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml index a64946fd886f..3825dc8eba2f 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-sdk-plugin org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/AbstractMessageConsumeInterceptor.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/AbstractMessageConsumeInterceptor.java index 23f815d2fd4f..3bb27dfbbc5d 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/AbstractMessageConsumeInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/AbstractMessageConsumeInterceptor.java @@ -35,8 +35,6 @@ * {@link AbstractMessageConsumeInterceptor} create entry span when the consumeMessage in the {@link * com.alibaba.rocketmq.client.consumer.listener.MessageListenerConcurrently} and {@link * com.alibaba.rocketmq.client.consumer.listener.MessageListenerOrderly} class. - * - * @author carlvine500 */ public abstract class AbstractMessageConsumeInterceptor implements InstanceMethodsAroundInterceptor { @@ -44,12 +42,12 @@ public abstract class AbstractMessageConsumeInterceptor implements InstanceMetho @Override public final void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { - List msgs = (List)allArguments[0]; + Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + List msgs = (List) allArguments[0]; ContextCarrier contextCarrier = getContextCarrierFromMessage(msgs.get(0)); - AbstractSpan span = ContextManager.createEntrySpan(CONSUMER_OPERATION_NAME_PREFIX + msgs.get(0).getTopic() + "/Consumer", contextCarrier); + AbstractSpan span = ContextManager.createEntrySpan(CONSUMER_OPERATION_NAME_PREFIX + msgs.get(0) + .getTopic() + "/Consumer", contextCarrier); span.setComponent(ComponentsDefine.ROCKET_MQ_CONSUMER); span.setLayer(SpanLayer.MQ); @@ -59,7 +57,8 @@ public final void beforeMethod(EnhancedInstance objInst, Method method, Object[] } - @Override public final void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public final void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/MessageConcurrentlyConsumeInterceptor.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/MessageConcurrentlyConsumeInterceptor.java index 06e1eaf0cc39..3188e3a4a61e 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/MessageConcurrentlyConsumeInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/MessageConcurrentlyConsumeInterceptor.java @@ -29,15 +29,13 @@ * {@link MessageConcurrentlyConsumeInterceptor} set the process status after the {@link * com.alibaba.rocketmq.client.consumer.listener.MessageListenerConcurrently#consumeMessage(java.util.List, * com.alibaba.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext)} method execute. - * - * @author carlvine500 */ public class MessageConcurrentlyConsumeInterceptor extends AbstractMessageConsumeInterceptor { @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { - ConsumeConcurrentlyStatus status = (ConsumeConcurrentlyStatus)ret; + ConsumeConcurrentlyStatus status = (ConsumeConcurrentlyStatus) ret; if (status == ConsumeConcurrentlyStatus.RECONSUME_LATER) { AbstractSpan activeSpan = ContextManager.activeSpan(); activeSpan.errorOccurred(); diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/MessageOrderlyConsumeInterceptor.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/MessageOrderlyConsumeInterceptor.java index f24ee47c89bf..f2abdfe59765 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/MessageOrderlyConsumeInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/MessageOrderlyConsumeInterceptor.java @@ -29,8 +29,6 @@ * {@link MessageOrderlyConsumeInterceptor} set the process status after the {@link * com.alibaba.rocketmq.client.consumer.listener.MessageListenerOrderly#consumeMessage(java.util.List, * com.alibaba.rocketmq.client.consumer.listener.ConsumeOrderlyContext)} method execute. - * - * @author carlvine500 */ public class MessageOrderlyConsumeInterceptor extends AbstractMessageConsumeInterceptor { @@ -38,7 +36,7 @@ public class MessageOrderlyConsumeInterceptor extends AbstractMessageConsumeInte public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { - ConsumeOrderlyStatus status = (ConsumeOrderlyStatus)ret; + ConsumeOrderlyStatus status = (ConsumeOrderlyStatus) ret; if (status == ConsumeOrderlyStatus.SUSPEND_CURRENT_QUEUE_A_MOMENT) { AbstractSpan activeSpan = ContextManager.activeSpan(); activeSpan.errorOccurred(); diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/MessageSendInterceptor.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/MessageSendInterceptor.java index bc98917c6da3..86a4bed67204 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/MessageSendInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/MessageSendInterceptor.java @@ -44,8 +44,6 @@ * com.alibaba.rocketmq.client.impl.producer.TopicPublishInfo, com.alibaba.rocketmq.client.impl.factory.MQClientInstance, * int, com.alibaba.rocketmq.client.hook.SendMessageContext, com.alibaba.rocketmq.client.impl.producer.DefaultMQProducerImpl)} * execute. - * - * @author carlvine500 */ public class MessageSendInterceptor implements InstanceMethodsAroundInterceptor { @@ -54,16 +52,16 @@ public class MessageSendInterceptor implements InstanceMethodsAroundInterceptor @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - Message message = (Message)allArguments[2]; + Message message = (Message) allArguments[2]; ContextCarrier contextCarrier = new ContextCarrier(); String namingServiceAddress = String.valueOf(objInst.getSkyWalkingDynamicField()); AbstractSpan span = ContextManager.createExitSpan(buildOperationName(message.getTopic()), contextCarrier, namingServiceAddress); span.setComponent(ComponentsDefine.ROCKET_MQ_PRODUCER); - Tags.MQ_BROKER.set(span, (String)allArguments[0]); + Tags.MQ_BROKER.set(span, (String) allArguments[0]); Tags.MQ_TOPIC.set(span, message.getTopic()); SpanLayer.asMQ(span); - SendMessageRequestHeader requestHeader = (SendMessageRequestHeader)allArguments[3]; + SendMessageRequestHeader requestHeader = (SendMessageRequestHeader) allArguments[3]; StringBuilder properties = new StringBuilder(requestHeader.getProperties()); CarrierItem next = contextCarrier.items(); while (next.hasNext()) { @@ -78,7 +76,8 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr requestHeader.setProperties(properties.toString()); if (allArguments[6] != null) { - ((EnhancedInstance)allArguments[6]).setSkyWalkingDynamicField(new SendCallBackEnhanceInfo(message.getTopic(), ContextManager.capture())); + ((EnhancedInstance) allArguments[6]).setSkyWalkingDynamicField(new SendCallBackEnhanceInfo(message.getTopic(), ContextManager + .capture())); } } @@ -89,7 +88,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/OnExceptionInterceptor.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/OnExceptionInterceptor.java index 00479671a1ba..374d56918841 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/OnExceptionInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/OnExceptionInterceptor.java @@ -30,8 +30,6 @@ /** * {@link OnExceptionInterceptor} create local span when the method {@link com.alibaba.rocketmq.client.producer.SendCallback#onException(Throwable)} * execute. - * - * @author carlvine500 */ public class OnExceptionInterceptor implements InstanceMethodsAroundInterceptor { @@ -40,10 +38,10 @@ public class OnExceptionInterceptor implements InstanceMethodsAroundInterceptor @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - SendCallBackEnhanceInfo enhanceInfo = (SendCallBackEnhanceInfo)objInst.getSkyWalkingDynamicField(); + SendCallBackEnhanceInfo enhanceInfo = (SendCallBackEnhanceInfo) objInst.getSkyWalkingDynamicField(); AbstractSpan activeSpan = ContextManager.createLocalSpan(CALLBACK_OPERATION_NAME_PREFIX + enhanceInfo.getTopicId() + "/Producer/Callback"); activeSpan.setComponent(ComponentsDefine.ROCKET_MQ_PRODUCER); - activeSpan.errorOccurred().log((Throwable)allArguments[0]); + activeSpan.errorOccurred().log((Throwable) allArguments[0]); ContextManager.continued(enhanceInfo.getContextSnapshot()); } @@ -54,7 +52,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/OnSuccessInterceptor.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/OnSuccessInterceptor.java index 3b38af5f0976..baabd26818c1 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/OnSuccessInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/OnSuccessInterceptor.java @@ -33,8 +33,6 @@ /** * {@link OnSuccessInterceptor} create local span when the method {@link com.alibaba.rocketmq.client.producer.SendCallback#onSuccess(SendResult)} * execute. - * - * @author carlvine500 */ public class OnSuccessInterceptor implements InstanceMethodsAroundInterceptor { @@ -43,10 +41,10 @@ public class OnSuccessInterceptor implements InstanceMethodsAroundInterceptor { @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - SendCallBackEnhanceInfo enhanceInfo = (SendCallBackEnhanceInfo)objInst.getSkyWalkingDynamicField(); + SendCallBackEnhanceInfo enhanceInfo = (SendCallBackEnhanceInfo) objInst.getSkyWalkingDynamicField(); AbstractSpan activeSpan = ContextManager.createLocalSpan(CALLBACK_OPERATION_NAME_PREFIX + enhanceInfo.getTopicId() + "/Producer/Callback"); activeSpan.setComponent(ComponentsDefine.ROCKET_MQ_PRODUCER); - SendStatus sendStatus = ((SendResult)allArguments[0]).getSendStatus(); + SendStatus sendStatus = ((SendResult) allArguments[0]).getSendStatus(); if (sendStatus != SendStatus.SEND_OK) { activeSpan.errorOccurred(); Tags.STATUS_CODE.set(activeSpan, sendStatus.name()); @@ -61,7 +59,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/UpdateNameServerInterceptor.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/UpdateNameServerInterceptor.java index d09e211f18bc..0b6d9f75ad77 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/UpdateNameServerInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/UpdateNameServerInterceptor.java @@ -36,7 +36,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { } diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/define/ConsumeMessageConcurrentlyInstrumentation.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/define/ConsumeMessageConcurrentlyInstrumentation.java index 06029e1303fe..7e36c3109a63 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/define/ConsumeMessageConcurrentlyInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/define/ConsumeMessageConcurrentlyInstrumentation.java @@ -32,37 +32,41 @@ * {@link ConsumeMessageConcurrentlyInstrumentation} intercepts the {@link com.alibaba.rocketmq.client.consumer.listener.MessageListenerConcurrently#consumeMessage(java.util.List, * com.alibaba.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext)} method by using {@link * org.apache.skywalking.apm.plugin.rocketMQ.v3.MessageConcurrentlyConsumeInterceptor}. - * - * @author carlvine500 */ public class ConsumeMessageConcurrentlyInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "com.alibaba.rocketmq.client.consumer.listener.MessageListenerConcurrently"; private static final String CONSUMER_MESSAGE_METHOD = "consumeMessage"; private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.rocketMQ.v3.MessageConcurrentlyConsumeInterceptor"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(CONSUMER_MESSAGE_METHOD); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return INTERCEPTOR_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byHierarchyMatch(new String[] {ENHANCE_CLASS}); } } diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/define/ConsumeMessageOrderlyInstrumentation.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/define/ConsumeMessageOrderlyInstrumentation.java index e3fb2f5bf9d4..83d4f33ab3c8 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/define/ConsumeMessageOrderlyInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/define/ConsumeMessageOrderlyInstrumentation.java @@ -32,37 +32,41 @@ * {@link ConsumeMessageOrderlyInstrumentation} intercepts the {@link com.alibaba.rocketmq.client.consumer.listener.MessageListenerOrderly#consumeMessage(java.util.List, * com.alibaba.rocketmq.client.consumer.listener.ConsumeOrderlyContext)} method by using {@link * org.apache.skywalking.apm.plugin.rocketMQ.v3.MessageConcurrentlyConsumeInterceptor}. - * - * @author carlvine500 */ public class ConsumeMessageOrderlyInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "com.alibaba.rocketmq.client.consumer.listener.MessageListenerOrderly"; private static final String ENHANCE_METHOD = "consumeMessage"; private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.rocketMQ.v3.MessageOrderlyConsumeInterceptor"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(ENHANCE_METHOD); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return INTERCEPTOR_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byHierarchyMatch(new String[] {ENHANCE_CLASS}); } } diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/define/MQClientAPIImplInstrumentation.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/define/MQClientAPIImplInstrumentation.java index 7c71ae650081..cc2de4206841 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/define/MQClientAPIImplInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/define/MQClientAPIImplInstrumentation.java @@ -36,8 +36,6 @@ * com.alibaba.rocketmq.client.impl.producer.TopicPublishInfo, com.alibaba.rocketmq.client.impl.factory.MQClientInstance, * int, com.alibaba.rocketmq.client.hook.SendMessageContext, com.alibaba.rocketmq.client.impl.producer.DefaultMQProducerImpl)} * method by using {@link org.apache.skywalking.apm.plugin.rocketMQ.v3.MessageSendInterceptor}. - * - * @author carlvine500 */ public class MQClientAPIImplInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -47,42 +45,51 @@ public class MQClientAPIImplInstrumentation extends ClassInstanceMethodsEnhanceP private static final String UPDATE_NAME_SERVER_INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.rocketMQ.v3.UpdateNameServerInterceptor"; private static final String UPDATE_NAME_SERVER_METHOD_NAME = "updateNameServerAddressList"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(SEND_MESSAGE_METHOD_NAME).and(takesArgumentWithType(6, "com.alibaba.rocketmq.client.producer.SendCallback")); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return ASYNC_METHOD_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(UPDATE_NAME_SERVER_METHOD_NAME); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return UPDATE_NAME_SERVER_INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName(ENHANCE_CLASS); } diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/define/SendCallBackEnhanceInfo.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/define/SendCallBackEnhanceInfo.java index 82c73b3ec7a1..8983cfc0a10e 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/define/SendCallBackEnhanceInfo.java +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/define/SendCallBackEnhanceInfo.java @@ -22,8 +22,6 @@ /** * {@link SendCallBackEnhanceInfo} saves the topic Id and {@link ContextSnapshot} instance for trace. - * - * @author carlvine500 */ public class SendCallBackEnhanceInfo { private String topicId; diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/define/SendCallbackInstrumentation.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/define/SendCallbackInstrumentation.java index 40f1d0b5b70f..e6852e27bd3f 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/define/SendCallbackInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/define/SendCallbackInstrumentation.java @@ -30,12 +30,10 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.HierarchyMatch.byHierarchyMatch; /** - * {@link SendCallbackInstrumentation} intercepts {@link com.alibaba.rocketmq.client.producer.SendCallback#onSuccess(com.alibaba.rocketmq.client.producer.SendResult sendResult)} - * method by using {@link org.apache.skywalking.apm.plugin.rocketMQ.v3.OnSuccessInterceptor} and also intercepts {@link - * com.alibaba.rocketmq.client.producer.SendCallback#onException(Throwable)} by using {@link + * {@link SendCallbackInstrumentation} intercepts {@link com.alibaba.rocketmq.client.producer.SendCallback#onSuccess(com.alibaba.rocketmq.client.producer.SendResult + * sendResult)} method by using {@link org.apache.skywalking.apm.plugin.rocketMQ.v3.OnSuccessInterceptor} and also + * intercepts {@link com.alibaba.rocketmq.client.producer.SendCallback#onException(Throwable)} by using {@link * org.apache.skywalking.apm.plugin.rocketMQ.v3.OnExceptionInterceptor}. - * - * @author carlvine500 */ public class SendCallbackInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -45,42 +43,51 @@ public class SendCallbackInstrumentation extends ClassInstanceMethodsEnhancePlug private static final String ON_EXCEPTION_METHOD = "onException"; private static final String ON_EXCEPTION_INTERCEPTOR = "org.apache.skywalking.apm.plugin.rocketMQ.v3.OnExceptionInterceptor"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(ON_SUCCESS_ENHANCE_METHOD).and(takesArgumentWithType(0, "com.alibaba.rocketmq.client.producer.SendResult")); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return ON_SUCCESS_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(ON_EXCEPTION_METHOD).and(takesArgumentWithType(0, "java.lang.Throwable")); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return ON_EXCEPTION_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byHierarchyMatch(new String[] {ENHANCE_CLASS}); } } diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/MessageSendInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/MessageSendInterceptorTest.java index 935f6dff7907..2d3d18e8d96a 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/MessageSendInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/MessageSendInterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.rocketMQ.v3; import java.util.List; @@ -80,17 +79,35 @@ public class MessageSendInterceptorTest { public void setUp() { messageSendInterceptor = new MessageSendInterceptor(); enhancedInstance = new EnhancedInstance() { - @Override public Object getSkyWalkingDynamicField() { + @Override + public Object getSkyWalkingDynamicField() { return "127.0.0.1:6543"; } - @Override public void setSkyWalkingDynamicField(Object value) { + @Override + public void setSkyWalkingDynamicField(Object value) { } }; - arguments = new Object[] {"127.0.0.1", "test", message, messageRequestHeader, null, CommunicationMode.ASYNC, callBack}; - argumentsWithoutCallback = new Object[] {"127.0.0.1", "test", message, messageRequestHeader, null, CommunicationMode.ASYNC, null}; + arguments = new Object[] { + "127.0.0.1", + "test", + message, + messageRequestHeader, + null, + CommunicationMode.ASYNC, + callBack + }; + argumentsWithoutCallback = new Object[] { + "127.0.0.1", + "test", + message, + messageRequestHeader, + null, + CommunicationMode.ASYNC, + null + }; when(messageRequestHeader.getProperties()).thenReturn(""); when(message.getTags()).thenReturn("TagA"); } diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/OnExceptionInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/OnExceptionInterceptorTest.java index a66d5e4b18e5..2ed6e7f58c99 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/OnExceptionInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/OnExceptionInterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.rocketMQ.v3; import java.util.List; diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/OnSuccessInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/OnSuccessInterceptorTest.java index 27483cd2827c..efb709c45844 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/OnSuccessInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/OnSuccessInterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.rocketMQ.v3; import java.util.List; diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml index 82cdacde64f8..55568bc48aa8 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-sdk-plugin org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/AbstractMessageConsumeInterceptor.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/AbstractMessageConsumeInterceptor.java index 70aadfbdc07e..23f2b005a160 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/AbstractMessageConsumeInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/AbstractMessageConsumeInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.rocketMQ.v4; import java.lang.reflect.Method; @@ -36,8 +35,6 @@ * {@link AbstractMessageConsumeInterceptor} create entry span when the consumeMessage in the {@link * org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently} and {@link * org.apache.rocketmq.client.consumer.listener.MessageListenerOrderly} class. - * - * @author zhangxin */ public abstract class AbstractMessageConsumeInterceptor implements InstanceMethodsAroundInterceptor { @@ -45,12 +42,12 @@ public abstract class AbstractMessageConsumeInterceptor implements InstanceMetho @Override public final void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { - List msgs = (List)allArguments[0]; + Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + List msgs = (List) allArguments[0]; ContextCarrier contextCarrier = getContextCarrierFromMessage(msgs.get(0)); - AbstractSpan span = ContextManager.createEntrySpan(CONSUMER_OPERATION_NAME_PREFIX + msgs.get(0).getTopic() + "/Consumer", contextCarrier); + AbstractSpan span = ContextManager.createEntrySpan(CONSUMER_OPERATION_NAME_PREFIX + msgs.get(0) + .getTopic() + "/Consumer", contextCarrier); span.setComponent(ComponentsDefine.ROCKET_MQ_CONSUMER); SpanLayer.asMQ(span); @@ -60,7 +57,8 @@ public final void beforeMethod(EnhancedInstance objInst, Method method, Object[] } - @Override public final void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public final void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/MessageConcurrentlyConsumeInterceptor.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/MessageConcurrentlyConsumeInterceptor.java index 224901942fb4..64693580db0b 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/MessageConcurrentlyConsumeInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/MessageConcurrentlyConsumeInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.rocketMQ.v4; import java.lang.reflect.Method; @@ -30,15 +29,13 @@ * {@link MessageConcurrentlyConsumeInterceptor} set the process status after the {@link * org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently#consumeMessage(java.util.List, * org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext)} method execute. - * - * @author zhang xin */ public class MessageConcurrentlyConsumeInterceptor extends AbstractMessageConsumeInterceptor { @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { - ConsumeConcurrentlyStatus status = (ConsumeConcurrentlyStatus)ret; + ConsumeConcurrentlyStatus status = (ConsumeConcurrentlyStatus) ret; if (status == ConsumeConcurrentlyStatus.RECONSUME_LATER) { AbstractSpan activeSpan = ContextManager.activeSpan(); activeSpan.errorOccurred(); diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/MessageOrderlyConsumeInterceptor.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/MessageOrderlyConsumeInterceptor.java index 0d1e13a9a303..70b1150996dd 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/MessageOrderlyConsumeInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/MessageOrderlyConsumeInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.rocketMQ.v4; import java.lang.reflect.Method; @@ -30,8 +29,6 @@ * {@link MessageOrderlyConsumeInterceptor} set the process status after the {@link * org.apache.rocketmq.client.consumer.listener.MessageListenerOrderly#consumeMessage(java.util.List, * org.apache.rocketmq.client.consumer.listener.ConsumeOrderlyContext)} method execute. - * - * @author zhang xin */ public class MessageOrderlyConsumeInterceptor extends AbstractMessageConsumeInterceptor { @@ -39,7 +36,7 @@ public class MessageOrderlyConsumeInterceptor extends AbstractMessageConsumeInte public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { - ConsumeOrderlyStatus status = (ConsumeOrderlyStatus)ret; + ConsumeOrderlyStatus status = (ConsumeOrderlyStatus) ret; if (status == ConsumeOrderlyStatus.SUSPEND_CURRENT_QUEUE_A_MOMENT) { AbstractSpan activeSpan = ContextManager.activeSpan(); activeSpan.errorOccurred(); diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/MessageSendInterceptor.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/MessageSendInterceptor.java index 5173bfc5a994..493965833388 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/MessageSendInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/MessageSendInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.rocketMQ.v4; import java.lang.reflect.Method; @@ -45,8 +44,6 @@ * org.apache.rocketmq.client.impl.producer.TopicPublishInfo, org.apache.rocketmq.client.impl.factory.MQClientInstance, * int, org.apache.rocketmq.client.hook.SendMessageContext, org.apache.rocketmq.client.impl.producer.DefaultMQProducerImpl)} * execute. - * - * @author zhang xin */ public class MessageSendInterceptor implements InstanceMethodsAroundInterceptor { @@ -55,16 +52,16 @@ public class MessageSendInterceptor implements InstanceMethodsAroundInterceptor @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - Message message = (Message)allArguments[2]; + Message message = (Message) allArguments[2]; ContextCarrier contextCarrier = new ContextCarrier(); String namingServiceAddress = String.valueOf(objInst.getSkyWalkingDynamicField()); AbstractSpan span = ContextManager.createExitSpan(buildOperationName(message.getTopic()), contextCarrier, namingServiceAddress); span.setComponent(ComponentsDefine.ROCKET_MQ_PRODUCER); - Tags.MQ_BROKER.set(span, (String)allArguments[0]); + Tags.MQ_BROKER.set(span, (String) allArguments[0]); Tags.MQ_TOPIC.set(span, message.getTopic()); SpanLayer.asMQ(span); - SendMessageRequestHeader requestHeader = (SendMessageRequestHeader)allArguments[3]; + SendMessageRequestHeader requestHeader = (SendMessageRequestHeader) allArguments[3]; StringBuilder properties = new StringBuilder(requestHeader.getProperties()); CarrierItem next = contextCarrier.items(); while (next.hasNext()) { @@ -79,7 +76,8 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr requestHeader.setProperties(properties.toString()); if (allArguments[6] != null) { - ((EnhancedInstance)allArguments[6]).setSkyWalkingDynamicField(new SendCallBackEnhanceInfo(message.getTopic(), ContextManager.capture())); + ((EnhancedInstance) allArguments[6]).setSkyWalkingDynamicField(new SendCallBackEnhanceInfo(message.getTopic(), ContextManager + .capture())); } } @@ -90,7 +88,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/OnExceptionInterceptor.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/OnExceptionInterceptor.java index f58b55f9ffb6..ab18a6b71502 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/OnExceptionInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/OnExceptionInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.rocketMQ.v4; import java.lang.reflect.Method; @@ -31,8 +30,6 @@ /** * {@link OnExceptionInterceptor} create local span when the method {@link org.apache.rocketmq.client.producer.SendCallback#onException(Throwable)} * execute. - * - * @author zhang xin */ public class OnExceptionInterceptor implements InstanceMethodsAroundInterceptor { @@ -41,10 +38,10 @@ public class OnExceptionInterceptor implements InstanceMethodsAroundInterceptor @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - SendCallBackEnhanceInfo enhanceInfo = (SendCallBackEnhanceInfo)objInst.getSkyWalkingDynamicField(); + SendCallBackEnhanceInfo enhanceInfo = (SendCallBackEnhanceInfo) objInst.getSkyWalkingDynamicField(); AbstractSpan activeSpan = ContextManager.createLocalSpan(CALLBACK_OPERATION_NAME_PREFIX + enhanceInfo.getTopicId() + "/Producer/Callback"); activeSpan.setComponent(ComponentsDefine.ROCKET_MQ_PRODUCER); - activeSpan.errorOccurred().log((Throwable)allArguments[0]); + activeSpan.errorOccurred().log((Throwable) allArguments[0]); ContextManager.continued(enhanceInfo.getContextSnapshot()); } @@ -55,7 +52,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/OnSuccessInterceptor.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/OnSuccessInterceptor.java index 9b5f30a93a33..e71d7244acc1 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/OnSuccessInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/OnSuccessInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.rocketMQ.v4; import java.lang.reflect.Method; @@ -34,8 +33,6 @@ /** * {@link OnSuccessInterceptor} create local span when the method {@link org.apache.rocketmq.client.producer.SendCallback#onSuccess(SendResult)} * execute. - * - * @author zhang xin */ public class OnSuccessInterceptor implements InstanceMethodsAroundInterceptor { @@ -44,10 +41,10 @@ public class OnSuccessInterceptor implements InstanceMethodsAroundInterceptor { @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - SendCallBackEnhanceInfo enhanceInfo = (SendCallBackEnhanceInfo)objInst.getSkyWalkingDynamicField(); + SendCallBackEnhanceInfo enhanceInfo = (SendCallBackEnhanceInfo) objInst.getSkyWalkingDynamicField(); AbstractSpan activeSpan = ContextManager.createLocalSpan(CALLBACK_OPERATION_NAME_PREFIX + enhanceInfo.getTopicId() + "/Producer/Callback"); activeSpan.setComponent(ComponentsDefine.ROCKET_MQ_PRODUCER); - SendStatus sendStatus = ((SendResult)allArguments[0]).getSendStatus(); + SendStatus sendStatus = ((SendResult) allArguments[0]).getSendStatus(); if (sendStatus != SendStatus.SEND_OK) { activeSpan.errorOccurred(); Tags.STATUS_CODE.set(activeSpan, sendStatus.name()); @@ -62,7 +59,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/UpdateNameServerInterceptor.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/UpdateNameServerInterceptor.java index 44aee6de4c6f..8aa9c8d98550 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/UpdateNameServerInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/UpdateNameServerInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.rocketMQ.v4; import java.lang.reflect.Method; @@ -37,7 +36,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { } diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/define/ConsumeMessageConcurrentlyInstrumentation.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/define/ConsumeMessageConcurrentlyInstrumentation.java index 1f2312064f1e..ecde176fcd08 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/define/ConsumeMessageConcurrentlyInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/define/ConsumeMessageConcurrentlyInstrumentation.java @@ -33,29 +33,35 @@ public class ConsumeMessageConcurrentlyInstrumentation extends ClassInstanceMeth private static final String CONSUMER_MESSAGE_METHOD = "consumeMessage"; private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.rocketMQ.v4.MessageConcurrentlyConsumeInterceptor"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(CONSUMER_MESSAGE_METHOD); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return INTERCEPTOR_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return HierarchyMatch.byHierarchyMatch(new String[] {ENHANCE_CLASS}); } } diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/define/ConsumeMessageOrderlyInstrumentation.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/define/ConsumeMessageOrderlyInstrumentation.java index a4488644a4eb..5d0da38989e1 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/define/ConsumeMessageOrderlyInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/define/ConsumeMessageOrderlyInstrumentation.java @@ -33,29 +33,35 @@ public class ConsumeMessageOrderlyInstrumentation extends ClassInstanceMethodsEn private static final String ENHANCE_METHOD = "consumeMessage"; private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.rocketMQ.v4.MessageOrderlyConsumeInterceptor"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(ENHANCE_METHOD); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return INTERCEPTOR_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byHierarchyMatch(new String[] {ENHANCE_CLASS}); } } diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/define/MQClientAPIImplInstrumentation.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/define/MQClientAPIImplInstrumentation.java index 563a05a1331c..62d5cb62f79b 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/define/MQClientAPIImplInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/define/MQClientAPIImplInstrumentation.java @@ -37,42 +37,51 @@ public class MQClientAPIImplInstrumentation extends ClassInstanceMethodsEnhanceP public static final String UPDATE_NAME_SERVER_INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.rocketMQ.v4.UpdateNameServerInterceptor"; public static final String UPDATE_NAME_SERVER_METHOD_NAME = "updateNameServerAddressList"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(SEND_MESSAGE_METHOD_NAME).and(takesArguments(12)); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return ASYNC_METHOD_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(UPDATE_NAME_SERVER_METHOD_NAME); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return UPDATE_NAME_SERVER_INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName(ENHANCE_CLASS); } } diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/define/SendCallBackEnhanceInfo.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/define/SendCallBackEnhanceInfo.java index b27ac1601765..64755dc390bc 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/define/SendCallBackEnhanceInfo.java +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/define/SendCallBackEnhanceInfo.java @@ -16,15 +16,12 @@ * */ - package org.apache.skywalking.apm.plugin.rocketMQ.v4.define; import org.apache.skywalking.apm.agent.core.context.ContextSnapshot; /** * {@link SendCallBackEnhanceInfo} saves the topic Id and {@link ContextSnapshot} instance for trace. - * - * @author zhang xin */ public class SendCallBackEnhanceInfo { private String topicId; diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/define/SendCallbackInstrumentation.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/define/SendCallbackInstrumentation.java index 9ee46096ce08..68abd0fb9fe9 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/define/SendCallbackInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/define/SendCallbackInstrumentation.java @@ -37,42 +37,51 @@ public class SendCallbackInstrumentation extends ClassInstanceMethodsEnhancePlug private static final String ON_EXCEPTION_METHOD = "onException"; private static final String ON_EXCEPTION_INTERCEPTOR = "org.apache.skywalking.apm.plugin.rocketMQ.v4.OnExceptionInterceptor"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(ON_SUCCESS_ENHANCE_METHOD).and(takesArgumentWithType(0, "org.apache.rocketmq.client.producer.SendResult")); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return ON_SUCCESS_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(ON_EXCEPTION_METHOD).and(takesArgumentWithType(0, "java.lang.Throwable")); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return ON_EXCEPTION_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byHierarchyMatch(new String[] {ENHANCE_CLASS}); } } diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/MessageSendInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/MessageSendInterceptorTest.java index 1c41f7f08f29..e9a9f3a04a31 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/MessageSendInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/MessageSendInterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.rocketMQ.v4; import java.util.List; @@ -80,17 +79,35 @@ public class MessageSendInterceptorTest { public void setUp() { messageSendInterceptor = new MessageSendInterceptor(); enhancedInstance = new EnhancedInstance() { - @Override public Object getSkyWalkingDynamicField() { + @Override + public Object getSkyWalkingDynamicField() { return "127.0.0.1:6543"; } - @Override public void setSkyWalkingDynamicField(Object value) { + @Override + public void setSkyWalkingDynamicField(Object value) { } }; - arguments = new Object[] {"127.0.0.1", "test", message, messageRequestHeader, null, CommunicationMode.ASYNC, callBack}; - argumentsWithoutCallback = new Object[] {"127.0.0.1", "test", message, messageRequestHeader, null, CommunicationMode.ASYNC, null}; + arguments = new Object[] { + "127.0.0.1", + "test", + message, + messageRequestHeader, + null, + CommunicationMode.ASYNC, + callBack + }; + argumentsWithoutCallback = new Object[] { + "127.0.0.1", + "test", + message, + messageRequestHeader, + null, + CommunicationMode.ASYNC, + null + }; when(messageRequestHeader.getProperties()).thenReturn(""); when(message.getTags()).thenReturn("TagA"); } diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/OnExceptionInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/OnExceptionInterceptorTest.java index 2707ee2dd2ef..f67094705c93 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/OnExceptionInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/OnExceptionInterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.rocketMQ.v4; import java.util.List; diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/OnSuccessInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/OnSuccessInterceptorTest.java index 4ba6a06b5a1f..b223a71fc2df 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/OnSuccessInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/OnSuccessInterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.rocketMQ.v4; import java.util.List; diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml index b7216dfb8607..e1c5e967a06d 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-sdk-plugin org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/pom.xml index 8278e4aee35e..b842b3666fa1 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + servicecomb-plugin org.apache.skywalking @@ -34,7 +35,7 @@ 0.5.0 - + io.servicecomb diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/ProducerOperationHandlerInterceptor.java b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/ProducerOperationHandlerInterceptor.java index b17d9542e8a7..a7ce3104be8a 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/ProducerOperationHandlerInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/ProducerOperationHandlerInterceptor.java @@ -31,15 +31,12 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; -/** - * @author lytscu - */ public class ProducerOperationHandlerInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - Invocation invocation = (Invocation)allArguments[0]; + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { + Invocation invocation = (Invocation) allArguments[0]; ContextCarrier contextCarrier = new ContextCarrier(); CarrierItem next = contextCarrier.items(); while (next.hasNext()) { @@ -54,9 +51,10 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr SpanLayer.asRPCFramework(span); } - @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { - Invocation invocation = (Invocation)allArguments[0]; + @Override + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { + Invocation invocation = (Invocation) allArguments[0]; AbstractSpan span = ContextManager.activeSpan(); int statusCode = invocation.getStatus().getStatusCode(); if (statusCode >= 400) { @@ -67,7 +65,8 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { AbstractSpan span = ContextManager.activeSpan(); span.errorOccurred(); diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/TransportClientHandlerInterceptor.java b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/TransportClientHandlerInterceptor.java index 3dd8bb62eab8..239acdf5be36 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/TransportClientHandlerInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/TransportClientHandlerInterceptor.java @@ -32,15 +32,12 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; -/** - * @author lytscu - */ public class TransportClientHandlerInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - Invocation invocation = (Invocation)allArguments[0]; + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { + Invocation invocation = (Invocation) allArguments[0]; if (!checkRegisterStatus(invocation)) { return; } @@ -60,9 +57,10 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr SpanLayer.asRPCFramework(span); } - @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { - Invocation invocation = (Invocation)allArguments[0]; + @Override + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { + Invocation invocation = (Invocation) allArguments[0]; if (!checkRegisterStatus(invocation)) { return ret; } @@ -76,9 +74,10 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { - Invocation invocation = (Invocation)allArguments[0]; + Invocation invocation = (Invocation) allArguments[0]; if (!checkRegisterStatus(invocation)) { return; } diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/define/ProducerOperationHandlerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/define/ProducerOperationHandlerInstrumentation.java index 8c8c61ab2bca..795a207b1a18 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/define/ProducerOperationHandlerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/define/ProducerOperationHandlerInstrumentation.java @@ -29,11 +29,9 @@ import static net.bytebuddy.matcher.ElementMatchers.named; /** - * {@link ProducerOperationHandlerInstrumentation} represents that skywalking intercept - * {@link io.servicecomb.core.handler.impl.ProducerOperationHandler#handle(io.servicecomb.core.Invocation, io.servicecomb.swagger.invocation.AsyncResponse)}by - * using ProducerOperationHandlerInterceptor - * - * @author lytscu + * {@link ProducerOperationHandlerInstrumentation} represents that skywalking intercept {@link + * io.servicecomb.core.handler.impl.ProducerOperationHandler#handle(io.servicecomb.core.Invocation, + * io.servicecomb.swagger.invocation.AsyncResponse)}by using ProducerOperationHandlerInterceptor */ public class ProducerOperationHandlerInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -65,7 +63,8 @@ public String getMethodsInterceptor() { return INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/define/TransportClientHandlerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/define/TransportClientHandlerInstrumentation.java index 4db7d5b28155..c50d99943b32 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/define/TransportClientHandlerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/define/TransportClientHandlerInstrumentation.java @@ -29,10 +29,8 @@ import static net.bytebuddy.matcher.ElementMatchers.named; /** - * {@link TransportClientHandlerInstrumentation} represents that skywalking intercept {@link io.servicecomb.core.handler.impl.TransportClientHandler} by - * using linkTransportClientHandlerInterceptor - * - * @author lytscu + * {@link TransportClientHandlerInstrumentation} represents that skywalking intercept {@link + * io.servicecomb.core.handler.impl.TransportClientHandler} by using linkTransportClientHandlerInterceptor */ public class TransportClientHandlerInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -64,10 +62,11 @@ public String getMethodsInterceptor() { return INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, - }; + }; } } diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/ProducerOperationHandlerInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/ProducerOperationHandlerInterceptorTest.java index 4ca96f939e4e..23009a495ebd 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/ProducerOperationHandlerInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/ProducerOperationHandlerInterceptorTest.java @@ -101,7 +101,7 @@ public void setUp() throws Exception { when(invocation.getInvocationType()).thenReturn(InvocationType.PRODUCER); Config.Agent.SERVICE_NAME = "serviceComnTestCases-APP"; - allArguments = new Object[] {invocation,}; + allArguments = new Object[] {invocation}; argumentsType = new Class[] {}; swaggerArguments = new Class[] {}; diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/TransportClientHandlerInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/TransportClientHandlerInterceptorTest.java index fd2793801a02..f0357c5c0bb4 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/TransportClientHandlerInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/TransportClientHandlerInterceptorTest.java @@ -100,7 +100,7 @@ public void setUp() throws Exception { when(invocation.getInvocationType()).thenReturn(InvocationType.CONSUMER); Config.Agent.SERVICE_NAME = "serviceComnTestCases-APP"; - allArguments = new Object[] {invocation,}; + allArguments = new Object[] {invocation}; argumentsType = new Class[] {}; swaggerArguments = new Class[] {}; } diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/pom.xml index c23724d92100..9376e6a36861 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + servicecomb-plugin org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1/ProducerOperationHandlerInterceptor.java b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1/ProducerOperationHandlerInterceptor.java index d6702dd26c45..29116289f5f4 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1/ProducerOperationHandlerInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1/ProducerOperationHandlerInterceptor.java @@ -31,15 +31,12 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; -/** - * @author lytscu - */ public class ProducerOperationHandlerInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - Invocation invocation = (Invocation)allArguments[0]; + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { + Invocation invocation = (Invocation) allArguments[0]; ContextCarrier contextCarrier = new ContextCarrier(); CarrierItem next = contextCarrier.items(); while (next.hasNext()) { @@ -54,9 +51,10 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr SpanLayer.asRPCFramework(span); } - @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { - Invocation invocation = (Invocation)allArguments[0]; + @Override + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { + Invocation invocation = (Invocation) allArguments[0]; AbstractSpan span = ContextManager.activeSpan(); int statusCode = invocation.getStatus().getStatusCode(); if (statusCode >= 400) { @@ -67,7 +65,8 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { AbstractSpan span = ContextManager.activeSpan(); span.errorOccurred(); diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1/TransportClientHandlerInterceptor.java b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1/TransportClientHandlerInterceptor.java index 86ce22416233..1c6bf6355e51 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1/TransportClientHandlerInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1/TransportClientHandlerInterceptor.java @@ -32,15 +32,12 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; -/** - * @author lytscu - */ public class TransportClientHandlerInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - Invocation invocation = (Invocation)allArguments[0]; + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { + Invocation invocation = (Invocation) allArguments[0]; if (!checkRegisterStatus(invocation)) { return; } @@ -60,9 +57,10 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr SpanLayer.asRPCFramework(span); } - @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { - Invocation invocation = (Invocation)allArguments[0]; + @Override + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { + Invocation invocation = (Invocation) allArguments[0]; if (!checkRegisterStatus(invocation)) { return ret; } @@ -76,9 +74,10 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { - Invocation invocation = (Invocation)allArguments[0]; + Invocation invocation = (Invocation) allArguments[0]; if (!checkRegisterStatus(invocation)) { return; } diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1/define/ProducerOperationHandlerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1/define/ProducerOperationHandlerInstrumentation.java index fc3abaec9d9a..d29980978df7 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1/define/ProducerOperationHandlerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1/define/ProducerOperationHandlerInstrumentation.java @@ -29,11 +29,9 @@ import static net.bytebuddy.matcher.ElementMatchers.named; /** - * {@link ProducerOperationHandlerInstrumentation} represents that skywalking intercept - * {@link org.apache.servicecomb.core.handler.impl.ProducerOperationHandler#handle(org.apache.servicecomb.core.Invocation, org.apache.servicecomb.swagger.invocation.AsyncResponse)} - * by using ProducerOperationHandlerInterceptor - * - * @author lytscu + * {@link ProducerOperationHandlerInstrumentation} represents that skywalking intercept {@link + * org.apache.servicecomb.core.handler.impl.ProducerOperationHandler#handle(org.apache.servicecomb.core.Invocation, + * org.apache.servicecomb.swagger.invocation.AsyncResponse)} by using ProducerOperationHandlerInterceptor */ public class ProducerOperationHandlerInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -65,7 +63,8 @@ public String getMethodsInterceptor() { return INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1/define/TransportClientHandlerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1/define/TransportClientHandlerInstrumentation.java index f83e008509c3..49001489982e 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1/define/TransportClientHandlerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1/define/TransportClientHandlerInstrumentation.java @@ -29,11 +29,8 @@ import static net.bytebuddy.matcher.ElementMatchers.named; /** - * {@link TransportClientHandlerInstrumentation} represents that skywalking intercept - * {@link org.apache.servicecomb.core.handler.impl.TransportClientHandler} by - * using linkTransportClientHandlerInterceptor - * - * @author lytscu + * {@link TransportClientHandlerInstrumentation} represents that skywalking intercept {@link + * org.apache.servicecomb.core.handler.impl.TransportClientHandler} by using linkTransportClientHandlerInterceptor */ public class TransportClientHandlerInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -65,10 +62,11 @@ public String getMethodsInterceptor() { return INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, - }; + }; } } diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/v1/ProducerOperationHandlerInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/v1/ProducerOperationHandlerInterceptorTest.java index 00ecffd24eaa..c8e96a6ac1f8 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/v1/ProducerOperationHandlerInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/v1/ProducerOperationHandlerInterceptorTest.java @@ -101,7 +101,7 @@ public void setUp() throws Exception { when(invocation.getInvocationType()).thenReturn(InvocationType.PRODUCER); Config.Agent.SERVICE_NAME = "serviceComnTestCases-APP"; - allArguments = new Object[] {invocation,}; + allArguments = new Object[] {invocation}; argumentsType = new Class[] {}; swaggerArguments = new Class[] {}; diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/v1/TransportClientHandlerInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/v1/TransportClientHandlerInterceptorTest.java index 959ad367cd09..54e69279a060 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/v1/TransportClientHandlerInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/v1/TransportClientHandlerInterceptorTest.java @@ -100,7 +100,7 @@ public void setUp() throws Exception { when(invocation.getInvocationType()).thenReturn(InvocationType.CONSUMER); Config.Agent.SERVICE_NAME = "serviceComnTestCases-APP"; - allArguments = new Object[] {invocation,}; + allArguments = new Object[] {invocation}; argumentsType = new Class[] {}; swaggerArguments = new Class[] {}; } diff --git a/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/pom.xml index bbabb3dc2e9d..40afadacb55e 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-sdk-plugin org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/sjdbc/ExecuteEventListener.java b/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/sjdbc/ExecuteEventListener.java index 4995ea0231d7..b57e0f957eb9 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/sjdbc/ExecuteEventListener.java +++ b/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/sjdbc/ExecuteEventListener.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.sjdbc; import com.dangdang.ddframe.rdb.sharding.executor.event.AbstractExecutionEvent; @@ -36,10 +35,8 @@ import org.apache.skywalking.apm.agent.core.context.ContextSnapshot; /** - * Sharding-jdbc provides {@link EventBusInstance} to help external systems getDefault events of sql execution. - * {@link ExecuteEventListener} can getDefault sql statement start and end events, resulting in db span. - * - * @author gaohongtao + * Sharding-jdbc provides {@link EventBusInstance} to help external systems getDefault events of sql execution. {@link + * ExecuteEventListener} can getDefault sql statement start and end events, resulting in db span. */ public class ExecuteEventListener { @@ -58,13 +55,14 @@ public void listenDML(DMLExecutionEvent event) { public void listenDQL(DQLExecutionEvent event) { handle(event, "QUERY"); } - + private void handle(AbstractExecutionEvent event, String operation) { switch (event.getEventExecutionType()) { case BEFORE_EXECUTE: AbstractSpan span = ContextManager.createExitSpan("/SJDBC/BRANCH/" + operation, event.getDataSource()); if (ExecutorDataMap.getDataMap().containsKey(AsyncExecuteInterceptor.SNAPSHOT_DATA_KEY)) { - ContextManager.continued((ContextSnapshot)ExecutorDataMap.getDataMap().get(AsyncExecuteInterceptor.SNAPSHOT_DATA_KEY)); + ContextManager.continued((ContextSnapshot) ExecutorDataMap.getDataMap() + .get(AsyncExecuteInterceptor.SNAPSHOT_DATA_KEY)); } Tags.DB_TYPE.set(span, "sql"); Tags.DB_INSTANCE.set(span, event.getDataSource()); diff --git a/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/sjdbc/define/AsyncExecuteInterceptor.java b/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/sjdbc/define/AsyncExecuteInterceptor.java index 6425cb93b789..2c5cdb483912 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/sjdbc/define/AsyncExecuteInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/sjdbc/define/AsyncExecuteInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.sjdbc.define; import com.dangdang.ddframe.rdb.sharding.constant.SQLType; @@ -33,13 +32,12 @@ import java.lang.reflect.Method; /** - * {@link AsyncExecuteInterceptor} enhances {@link com.dangdang.ddframe.rdb.sharding.executor.ExecutorEngine#asyncExecute(SQLType, Collection, List, ExecuteCallback)} - * so that the sql executor can get a {@link ContextSnapshot} of main thread when it is executed asynchronously. - * - * @author gaohongtao + * {@link AsyncExecuteInterceptor} enhances {@link com.dangdang.ddframe.rdb.sharding.executor.ExecutorEngine#asyncExecute(SQLType, + * Collection, List, ExecuteCallback)} so that the sql executor can get a {@link ContextSnapshot} of main thread when it + * is executed asynchronously. */ public class AsyncExecuteInterceptor implements InstanceMethodsAroundInterceptor { - + public static final String SNAPSHOT_DATA_KEY = "APM_SKYWALKING_SNAPSHOT_DATA"; @Override @@ -54,7 +52,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { } } diff --git a/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/sjdbc/define/ExecuteInterceptor.java b/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/sjdbc/define/ExecuteInterceptor.java index cf6e621a1231..cdd8e663c122 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/sjdbc/define/ExecuteInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/sjdbc/define/ExecuteInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.sjdbc.define; import com.dangdang.ddframe.rdb.sharding.constant.SQLType; @@ -31,16 +30,14 @@ import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; /** - * {@link ExecuteInterceptor} enhances {@link com.dangdang.ddframe.rdb.sharding.executor.ExecutorEngine#execute(SQLType, Collection, List, ExecuteCallback)} - * ,creating a local span that records the overall execution of sql - * - * @author gaohongtao + * {@link ExecuteInterceptor} enhances {@link com.dangdang.ddframe.rdb.sharding.executor.ExecutorEngine#execute(SQLType, + * Collection, List, ExecuteCallback)} ,creating a local span that records the overall execution of sql */ public class ExecuteInterceptor implements InstanceMethodsAroundInterceptor { @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - SQLType sqlType = (SQLType)allArguments[0]; + SQLType sqlType = (SQLType) allArguments[0]; ContextManager.createLocalSpan("/SJDBC/TRUNK/" + sqlType.name()).setComponent(ComponentsDefine.SHARDING_JDBC); } @@ -51,7 +48,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/sjdbc/define/ExecutorEngineConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/sjdbc/define/ExecutorEngineConstructorInterceptor.java index 9917467be60f..28b7f407b60b 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/sjdbc/define/ExecutorEngineConstructorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/sjdbc/define/ExecutorEngineConstructorInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.sjdbc.define; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; @@ -24,14 +23,13 @@ import org.apache.skywalking.apm.plugin.sjdbc.ExecuteEventListener; /** - * {@link ExecutorEngineConstructorInterceptor} enhances {@link com.dangdang.ddframe.rdb.sharding.executor.ExecutorEngine}'s constructor, - * initializing {@link ExecuteEventListener} - * - * @author gaohongtao + * {@link ExecutorEngineConstructorInterceptor} enhances {@link com.dangdang.ddframe.rdb.sharding.executor.ExecutorEngine}'s + * constructor, initializing {@link ExecuteEventListener} */ public class ExecutorEngineConstructorInterceptor implements InstanceConstructorInterceptor { - - @Override public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { + + @Override + public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { ExecuteEventListener.init(); } } diff --git a/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/sjdbc/define/ExecutorInstrumentation.java b/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/sjdbc/define/ExecutorInstrumentation.java index c7d3d05dfb24..b4625bb5317d 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/sjdbc/define/ExecutorInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/sjdbc/define/ExecutorInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.sjdbc.define; import net.bytebuddy.description.method.MethodDescription; @@ -32,22 +31,20 @@ /** * {@link ExecutorInstrumentation} presents that skywalking intercepts {@link com.dangdang.ddframe.rdb.sharding.executor.ExecutorEngine}. - * - * @author gaohongtao */ public class ExecutorInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { - + private static final String ENHANCE_CLASS = "com.dangdang.ddframe.rdb.sharding.executor.ExecutorEngine"; - + private static final String EXECUTOR_ENGINE_CONSTRUCTOR_INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.sjdbc.define.ExecutorEngineConstructorInterceptor"; private static final String EXECUTE_INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.sjdbc.define.ExecuteInterceptor"; - + private static final String ASYNC_EXECUTE_INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.sjdbc.define.AsyncExecuteInterceptor"; @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { - return new ConstructorInterceptPoint[] { + return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { @Override public ElementMatcher getConstructorMatcher() { @@ -61,10 +58,10 @@ public String getConstructorInterceptor() { } }; } - + @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { @@ -99,7 +96,7 @@ public boolean isOverrideArgs() { } }; } - + @Override protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); diff --git a/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/sjdbc/InterceptorTest.java b/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/sjdbc/InterceptorTest.java index e1820f70fb41..bf9e745789aa 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/sjdbc/InterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/sjdbc/InterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.sjdbc; import com.dangdang.ddframe.rdb.sharding.constant.SQLType; @@ -95,7 +94,10 @@ public static void finish() { public void setUp() throws SQLException { executeInterceptor = new ExecuteInterceptor(); asyncExecuteInterceptor = new AsyncExecuteInterceptor(); - allArguments = new Object[] {SQLType.DQL, null}; + allArguments = new Object[] { + SQLType.DQL, + null + }; } @Test @@ -118,7 +120,8 @@ public void assertAsyncExecute() throws Throwable { asyncExecuteInterceptor.beforeMethod(null, null, null, null, null); final Map dataMap = ExecutorDataMap.getDataMap(); ES.submit(new Runnable() { - @Override public void run() { + @Override + public void run() { ExecutorDataMap.setDataMap(dataMap); sendEvent("ds_1", "select * from t_order_1"); } @@ -148,7 +151,8 @@ public void assertExecuteError() throws Throwable { asyncExecuteInterceptor.beforeMethod(null, null, null, null, null); final Map dataMap = ExecutorDataMap.getDataMap(); ES.submit(new Runnable() { - @Override public void run() { + @Override + public void run() { ExecutorDataMap.setDataMap(dataMap); sendError(); } diff --git a/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/pom.xml index 3c71fa21f26a..784bde4e09d3 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-sdk-plugin org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/Constant.java b/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/Constant.java index ca1286f255f2..c17950541284 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/Constant.java +++ b/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/Constant.java @@ -19,6 +19,6 @@ package org.apache.skywalking.apm.plugin.shardingsphere; public final class Constant { - + public static final String CONTEXT_SNAPSHOT = "CONTEXT_SNAPSHOT"; } diff --git a/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/ExecuteInterceptor.java b/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/ExecuteInterceptor.java index b6515debbcb0..8f6308ec67f3 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/ExecuteInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/ExecuteInterceptor.java @@ -30,16 +30,17 @@ import java.util.Map; /** - * {@link ExecuteInterceptor} enhances {@link io.shardingsphere.core.executor.sql.execute.SQLExecuteCallback}, creating a local span that records the execution of sql. - * - * @author zhangyonglun + * {@link ExecuteInterceptor} enhances {@link io.shardingsphere.core.executor.sql.execute.SQLExecuteCallback}, creating + * a local span that records the execution of sql. */ public class ExecuteInterceptor implements InstanceMethodsAroundInterceptor { - + @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) { ContextManager.createLocalSpan("/ShardingSphere/executeSQL/").setComponent(ComponentsDefine.SHARDING_SPHERE); - ContextSnapshot contextSnapshot = (ContextSnapshot) ShardingExecuteDataMap.getDataMap().get(Constant.CONTEXT_SNAPSHOT); + ContextSnapshot contextSnapshot = (ContextSnapshot) ShardingExecuteDataMap.getDataMap() + .get(Constant.CONTEXT_SNAPSHOT); if (null == contextSnapshot) { contextSnapshot = (ContextSnapshot) ((Map) allArguments[2]).get(Constant.CONTEXT_SNAPSHOT); } @@ -47,15 +48,17 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr ContextManager.continued(contextSnapshot); } } - + @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) { ContextManager.stopSpan(); return ret; } - + @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/JDBCRootInvokeInterceptor.java b/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/JDBCRootInvokeInterceptor.java index 03fd31c194e4..ce7d52810ac1 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/JDBCRootInvokeInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/JDBCRootInvokeInterceptor.java @@ -28,26 +28,29 @@ import java.lang.reflect.Method; /** - * {@link JDBCRootInvokeInterceptor} enhances {@link io.shardingsphere.shardingjdbc.executor.AbstractStatementExecutor}, creating a local span that records the overall execution of sql. - * - * @author zhangyonglun + * {@link JDBCRootInvokeInterceptor} enhances {@link io.shardingsphere.shardingjdbc.executor.AbstractStatementExecutor}, + * creating a local span that records the overall execution of sql. */ public class JDBCRootInvokeInterceptor implements InstanceMethodsAroundInterceptor { - + @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) { - ContextManager.createLocalSpan("/ShardingSphere/JDBCRootInvoke/").setComponent(ComponentsDefine.SHARDING_SPHERE); + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) { + ContextManager.createLocalSpan("/ShardingSphere/JDBCRootInvoke/") + .setComponent(ComponentsDefine.SHARDING_SPHERE); ShardingExecuteDataMap.getDataMap().put(Constant.CONTEXT_SNAPSHOT, ContextManager.capture()); } - + @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) { ContextManager.stopSpan(); return ret; } - + @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/ParseInterceptor.java b/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/ParseInterceptor.java index c4857608929e..93c9cde951fa 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/ParseInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/ParseInterceptor.java @@ -29,26 +29,29 @@ import java.lang.reflect.Method; /** - * {@link ParseInterceptor} enhances {@link io.shardingsphere.core.routing.router.sharding.ParsingSQLRouter}, creating a local span that records the parse of sql. - * - * @author zhangyonglun + * {@link ParseInterceptor} enhances {@link io.shardingsphere.core.routing.router.sharding.ParsingSQLRouter}, creating a + * local span that records the parse of sql. */ public class ParseInterceptor implements InstanceMethodsAroundInterceptor { - + @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) { - AbstractSpan span = ContextManager.createLocalSpan("/ShardingSphere/parseSQL/").setComponent(ComponentsDefine.SHARDING_SPHERE); + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) { + AbstractSpan span = ContextManager.createLocalSpan("/ShardingSphere/parseSQL/") + .setComponent(ComponentsDefine.SHARDING_SPHERE); Tags.DB_STATEMENT.set(span, (String) allArguments[0]); } - + @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) { ContextManager.stopSpan(); return ret; } - + @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/ProxyRootInvokeInterceptor.java b/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/ProxyRootInvokeInterceptor.java index 8a8e024147dd..c1ba48dc60ce 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/ProxyRootInvokeInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/ProxyRootInvokeInterceptor.java @@ -28,26 +28,29 @@ import java.lang.reflect.Method; /** - * ProxyRootInvokeInterceptor enhances io.shardingsphere.shardingproxy.frontend.mysql.CommandExecutor, creating a local span that records the overall execution of sql. - * - * @author zhangyonglun + * ProxyRootInvokeInterceptor enhances io.shardingsphere.shardingproxy.frontend.mysql.CommandExecutor, creating a local + * span that records the overall execution of sql. */ public class ProxyRootInvokeInterceptor implements InstanceMethodsAroundInterceptor { - + @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) { - ContextManager.createLocalSpan("/ShardingSphere/ProxyRootInvoke/").setComponent(ComponentsDefine.SHARDING_SPHERE); + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) { + ContextManager.createLocalSpan("/ShardingSphere/ProxyRootInvoke/") + .setComponent(ComponentsDefine.SHARDING_SPHERE); ShardingExecuteDataMap.getDataMap().put(Constant.CONTEXT_SNAPSHOT, ContextManager.capture()); } - + @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) { ContextManager.stopSpan(); return ret; } - + @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/define/ExecuteInstrumentation.java b/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/define/ExecuteInstrumentation.java index d0e03c8a1b46..a54c8740daf7 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/define/ExecuteInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/define/ExecuteInstrumentation.java @@ -30,29 +30,27 @@ /** * {@link ExecuteInstrumentation} presents that skywalking intercepts {@link io.shardingsphere.core.executor.sql.execute.SQLExecuteCallback}. - * - * @author zhangyonglun */ public class ExecuteInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { - + private static final String ENHANCE_CLASS = "io.shardingsphere.core.executor.sql.execute.SQLExecuteCallback"; - + private static final String EXECUTE_INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.shardingsphere.ExecuteInterceptor"; - + @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { return named("execute0"); } - + @Override public String getMethodsInterceptor() { return EXECUTE_INTERCEPTOR_CLASS; } - + @Override public boolean isOverrideArgs() { return false; @@ -60,12 +58,12 @@ public boolean isOverrideArgs() { } }; } - + @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - + @Override protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); diff --git a/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/define/JDBCRootInvokeInstrumentation.java b/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/define/JDBCRootInvokeInstrumentation.java index e5d01d2f3645..f7c526218750 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/define/JDBCRootInvokeInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/define/JDBCRootInvokeInstrumentation.java @@ -29,30 +29,29 @@ import static net.bytebuddy.matcher.ElementMatchers.named; /** - * {@link JDBCRootInvokeInstrumentation} presents that skywalking intercepts {@link io.shardingsphere.shardingjdbc.executor.AbstractStatementExecutor}. - * - * @author zhangyonglun + * {@link JDBCRootInvokeInstrumentation} presents that skywalking intercepts {@link + * io.shardingsphere.shardingjdbc.executor.AbstractStatementExecutor}. */ public class JDBCRootInvokeInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { - + private static final String ENHANCE_CLASS = "io.shardingsphere.shardingjdbc.executor.AbstractStatementExecutor"; - + private static final String JDBC_ROOT_INVOKE_INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.shardingsphere.JDBCRootInvokeInterceptor"; - + @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { return named("executeCallback"); } - + @Override public String getMethodsInterceptor() { return JDBC_ROOT_INVOKE_INTERCEPTOR_CLASS; } - + @Override public boolean isOverrideArgs() { return false; @@ -60,12 +59,12 @@ public boolean isOverrideArgs() { } }; } - + @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - + @Override protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); diff --git a/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/define/ParseInstrumentation.java b/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/define/ParseInstrumentation.java index 972c2bd21875..a72bccd68345 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/define/ParseInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/define/ParseInstrumentation.java @@ -30,29 +30,27 @@ /** * {@link ParseInstrumentation} presents that skywalking intercepts {@link io.shardingsphere.core.routing.router.sharding.ParsingSQLRouter}. - * - * @author zhangyonglun */ public class ParseInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { - + private static final String ENHANCE_CLASS = "io.shardingsphere.core.routing.router.sharding.ParsingSQLRouter"; - + private static final String EXECUTE_INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.shardingsphere.ParseInterceptor"; - + @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { return named("parse"); } - + @Override public String getMethodsInterceptor() { return EXECUTE_INTERCEPTOR_CLASS; } - + @Override public boolean isOverrideArgs() { return false; @@ -60,12 +58,12 @@ public boolean isOverrideArgs() { } }; } - + @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - + @Override protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); diff --git a/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/define/ProxyRootInvokeInstrumentation.java b/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/define/ProxyRootInvokeInstrumentation.java index 60df79ba2f03..4467de0123c0 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/define/ProxyRootInvokeInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/define/ProxyRootInvokeInstrumentation.java @@ -30,29 +30,27 @@ /** * ProxyRootInvokeInstrumentation presents that skywalking intercepts io.shardingsphere.shardingproxy.frontend.mysql.CommandExecutor. - * - * @author zhangyonglun */ public class ProxyRootInvokeInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { - + private static final String ENHANCE_CLASS = "io.shardingsphere.shardingproxy.frontend.mysql.CommandExecutor"; - + private static final String PROXY_ROOT_INVOKE_INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.shardingsphere.ProxyRootInvokeInterceptor"; - + @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { return named("run"); } - + @Override public String getMethodsInterceptor() { return PROXY_ROOT_INVOKE_INTERCEPTOR_CLASS; } - + @Override public boolean isOverrideArgs() { return false; @@ -60,12 +58,12 @@ public boolean isOverrideArgs() { } }; } - + @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - + @Override protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); diff --git a/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/shardingsphere/InterceptorTest.java b/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/shardingsphere/InterceptorTest.java index d2875ac68367..be4040dcfdda 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/shardingsphere/InterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/sharding-sphere-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/shardingsphere/InterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.shardingsphere; import org.apache.skywalking.apm.agent.core.context.trace.AbstractTracingSpan; @@ -44,21 +43,21 @@ @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(TracingSegmentRunner.class) public class InterceptorTest { - + @SegmentStoragePoint private SegmentStorage segmentStorage; - + @Rule public AgentServiceRule serviceRule = new AgentServiceRule(); - + private ProxyRootInvokeInterceptor proxyRootInvokeInterceptor; - + private JDBCRootInvokeInterceptor jdbcRootInvokeInterceptor; - + private ParseInterceptor parseInterceptor; - + private ExecuteInterceptor executeInterceptor; - + @Before public void setUp() { proxyRootInvokeInterceptor = new ProxyRootInvokeInterceptor(); @@ -66,7 +65,7 @@ public void setUp() { parseInterceptor = new ParseInterceptor(); executeInterceptor = new ExecuteInterceptor(); } - + @Test public void assertProxyRootInvoke() { proxyRootInvokeInterceptor.beforeMethod(null, null, null, null, null); @@ -78,7 +77,7 @@ public void assertProxyRootInvoke() { assertThat(spans.size(), is(1)); assertThat(spans.get(0).getOperationName(), is("/ShardingSphere/ProxyRootInvoke/")); } - + @Test public void assertJDBCRootInvoke() { jdbcRootInvokeInterceptor.beforeMethod(null, null, null, null, null); @@ -90,10 +89,13 @@ public void assertJDBCRootInvoke() { assertThat(spans.size(), is(1)); assertThat(spans.get(0).getOperationName(), is("/ShardingSphere/JDBCRootInvoke/")); } - + @Test public void assertParse() { - Object[] allArguments = new Object[] {"SELECT * FROM t_order", false}; + Object[] allArguments = new Object[] { + "SELECT * FROM t_order", + false + }; parseInterceptor.beforeMethod(null, null, allArguments, null, null); parseInterceptor.afterMethod(null, null, allArguments, null, null); assertThat(segmentStorage.getTraceSegments().size(), is(1)); @@ -104,10 +106,14 @@ public void assertParse() { assertThat(spans.get(0).getOperationName(), is("/ShardingSphere/parseSQL/")); SpanAssert.assertTag(spans.get(0), 0, "SELECT * FROM t_order"); } - + @Test public void assertExecute() { - Object[] allArguments = new Object[] {null, null, new HashMap()}; + Object[] allArguments = new Object[] { + null, + null, + new HashMap() + }; executeInterceptor.beforeMethod(null, null, allArguments, null, null); executeInterceptor.afterMethod(null, null, allArguments, null, null); assertThat(segmentStorage.getTraceSegments().size(), is(1)); diff --git a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/pom.xml index c23748c0697a..0e32a0fb66c4 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-sdk-plugin org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/Constant.java b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/Constant.java index 683216985769..2629d309b94b 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/Constant.java +++ b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/Constant.java @@ -19,6 +19,6 @@ package org.apache.skywalking.apm.plugin.shardingsphere.v4rc3; public final class Constant { - + public static final String CONTEXT_SNAPSHOT = "CONTEXT_SNAPSHOT"; } diff --git a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/ExecuteInterceptor.java b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/ExecuteInterceptor.java index 6d0a237543ed..b4baeaa7fde3 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/ExecuteInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/ExecuteInterceptor.java @@ -30,16 +30,17 @@ import java.util.Map; /** - * {@link ExecuteInterceptor} enhances {@link org.apache.shardingsphere.core.execute.sql.execute.SQLExecuteCallback}, creating a local span that records the execution of sql. - * - * @author zhangyonglun + * {@link ExecuteInterceptor} enhances {@link org.apache.shardingsphere.core.execute.sql.execute.SQLExecuteCallback}, + * creating a local span that records the execution of sql. */ public class ExecuteInterceptor implements InstanceMethodsAroundInterceptor { - + @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) { ContextManager.createLocalSpan("/ShardingSphere/executeSQL/").setComponent(ComponentsDefine.SHARDING_SPHERE); - ContextSnapshot contextSnapshot = (ContextSnapshot) ShardingExecuteDataMap.getDataMap().get(Constant.CONTEXT_SNAPSHOT); + ContextSnapshot contextSnapshot = (ContextSnapshot) ShardingExecuteDataMap.getDataMap() + .get(Constant.CONTEXT_SNAPSHOT); if (null == contextSnapshot) { contextSnapshot = (ContextSnapshot) ((Map) allArguments[2]).get(Constant.CONTEXT_SNAPSHOT); } @@ -47,15 +48,17 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr ContextManager.continued(contextSnapshot); } } - + @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) { ContextManager.stopSpan(); return ret; } - + @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/JDBCRootInvokeInterceptor.java b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/JDBCRootInvokeInterceptor.java index 7e8963ad31d6..1364a04b205f 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/JDBCRootInvokeInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/JDBCRootInvokeInterceptor.java @@ -28,26 +28,29 @@ import java.lang.reflect.Method; /** - * {@link JDBCRootInvokeInterceptor} enhances {@link org.apache.shardingsphere.shardingjdbc.executor.AbstractStatementExecutor}, creating a local span that records the overall execution of sql. - * - * @author zhangyonglun + * {@link JDBCRootInvokeInterceptor} enhances {@link org.apache.shardingsphere.shardingjdbc.executor.AbstractStatementExecutor}, + * creating a local span that records the overall execution of sql. */ public class JDBCRootInvokeInterceptor implements InstanceMethodsAroundInterceptor { - + @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) { - ContextManager.createLocalSpan("/ShardingSphere/JDBCRootInvoke/").setComponent(ComponentsDefine.SHARDING_SPHERE); + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) { + ContextManager.createLocalSpan("/ShardingSphere/JDBCRootInvoke/") + .setComponent(ComponentsDefine.SHARDING_SPHERE); ShardingExecuteDataMap.getDataMap().put(Constant.CONTEXT_SNAPSHOT, ContextManager.capture()); } - + @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) { ContextManager.stopSpan(); return ret; } - + @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/ParseInterceptor.java b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/ParseInterceptor.java index 1218e8f7d3d6..66d410e2e035 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/ParseInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/ParseInterceptor.java @@ -29,26 +29,29 @@ import java.lang.reflect.Method; /** - * {@link ParseInterceptor} enhances {@link org.apache.shardingsphere.core.route.router.sharding.ShardingRouter}, creating a local span that records the parse of sql. - * - * @author zhangyonglun + * {@link ParseInterceptor} enhances {@link org.apache.shardingsphere.core.route.router.sharding.ShardingRouter}, + * creating a local span that records the parse of sql. */ public class ParseInterceptor implements InstanceMethodsAroundInterceptor { - + @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) { - AbstractSpan span = ContextManager.createLocalSpan("/ShardingSphere/parseSQL/").setComponent(ComponentsDefine.SHARDING_SPHERE); + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) { + AbstractSpan span = ContextManager.createLocalSpan("/ShardingSphere/parseSQL/") + .setComponent(ComponentsDefine.SHARDING_SPHERE); Tags.DB_STATEMENT.set(span, (String) allArguments[0]); } - + @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) { ContextManager.stopSpan(); return ret; } - + @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/ProxyRootInvokeInterceptor.java b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/ProxyRootInvokeInterceptor.java index 0d74ca3ff923..c45e17c79118 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/ProxyRootInvokeInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/ProxyRootInvokeInterceptor.java @@ -28,26 +28,29 @@ import java.lang.reflect.Method; /** - * ProxyRootInvokeInterceptor enhances org.apache.shardingsphere.shardingproxy.frontend.command.CommandExecutorTask, creating a local span that records the overall execution of sql. - * - * @author zhangyonglun + * ProxyRootInvokeInterceptor enhances org.apache.shardingsphere.shardingproxy.frontend.command.CommandExecutorTask, + * creating a local span that records the overall execution of sql. */ public class ProxyRootInvokeInterceptor implements InstanceMethodsAroundInterceptor { - + @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) { - ContextManager.createLocalSpan("/ShardingSphere/ProxyRootInvoke/").setComponent(ComponentsDefine.SHARDING_SPHERE); + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) { + ContextManager.createLocalSpan("/ShardingSphere/ProxyRootInvoke/") + .setComponent(ComponentsDefine.SHARDING_SPHERE); ShardingExecuteDataMap.getDataMap().put(Constant.CONTEXT_SNAPSHOT, ContextManager.capture()); } - + @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) { ContextManager.stopSpan(); return ret; } - + @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/define/ExecuteInstrumentation.java b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/define/ExecuteInstrumentation.java index 526eb4bda509..1ffddf2658ad 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/define/ExecuteInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/define/ExecuteInstrumentation.java @@ -30,29 +30,27 @@ /** * {@link ExecuteInstrumentation} presents that skywalking intercepts {@link org.apache.shardingsphere.core.execute.sql.execute.SQLExecuteCallback}. - * - * @author zhangyonglun */ public class ExecuteInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { - + private static final String ENHANCE_CLASS = "org.apache.shardingsphere.core.execute.sql.execute.SQLExecuteCallback"; - + private static final String EXECUTE_INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.shardingsphere.v4rc3.ExecuteInterceptor"; - + @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { return named("execute0"); } - + @Override public String getMethodsInterceptor() { return EXECUTE_INTERCEPTOR_CLASS; } - + @Override public boolean isOverrideArgs() { return false; @@ -60,12 +58,12 @@ public boolean isOverrideArgs() { } }; } - + @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - + @Override protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); diff --git a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/define/JDBCRootInvokeInstrumentation.java b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/define/JDBCRootInvokeInstrumentation.java index 0654592228a5..74126f7b51a5 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/define/JDBCRootInvokeInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/define/JDBCRootInvokeInstrumentation.java @@ -29,30 +29,29 @@ import static net.bytebuddy.matcher.ElementMatchers.named; /** - * {@link JDBCRootInvokeInstrumentation} presents that skywalking intercepts {@link org.apache.shardingsphere.shardingjdbc.executor.AbstractStatementExecutor}. - * - * @author zhangyonglun + * {@link JDBCRootInvokeInstrumentation} presents that skywalking intercepts {@link + * org.apache.shardingsphere.shardingjdbc.executor.AbstractStatementExecutor}. */ public class JDBCRootInvokeInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { - + private static final String ENHANCE_CLASS = "org.apache.shardingsphere.shardingjdbc.executor.AbstractStatementExecutor"; - + private static final String JDBC_ROOT_INVOKE_INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.shardingsphere.v4rc3.JDBCRootInvokeInterceptor"; - + @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { return named("executeCallback"); } - + @Override public String getMethodsInterceptor() { return JDBC_ROOT_INVOKE_INTERCEPTOR_CLASS; } - + @Override public boolean isOverrideArgs() { return false; @@ -60,12 +59,12 @@ public boolean isOverrideArgs() { } }; } - + @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - + @Override protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); diff --git a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/define/ParseInstrumentation.java b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/define/ParseInstrumentation.java index 62c1eccebb17..4e1c4b786580 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/define/ParseInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/define/ParseInstrumentation.java @@ -30,29 +30,27 @@ /** * {@link ParseInstrumentation} presents that skywalking intercepts {@link org.apache.shardingsphere.core.route.router.sharding.ShardingRouter}. - * - * @author zhangyonglun */ public class ParseInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { - + private static final String ENHANCE_CLASS = "org.apache.shardingsphere.core.route.router.sharding.ShardingRouter"; - + private static final String EXECUTE_INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.shardingsphere.v4rc3.ParseInterceptor"; - + @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { return named("parse"); } - + @Override public String getMethodsInterceptor() { return EXECUTE_INTERCEPTOR_CLASS; } - + @Override public boolean isOverrideArgs() { return false; @@ -60,12 +58,12 @@ public boolean isOverrideArgs() { } }; } - + @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - + @Override protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); diff --git a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/define/ProxyRootInvokeInstrumentation.java b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/define/ProxyRootInvokeInstrumentation.java index d5bcc4d1a58c..84762ad66c9c 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/define/ProxyRootInvokeInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/define/ProxyRootInvokeInstrumentation.java @@ -30,29 +30,27 @@ /** * ProxyRootInvokeInstrumentation presents that skywalking intercepts org.apache.shardingsphere.shardingproxy.frontend.command.CommandExecutorTask. - * - * @author zhangyonglun */ public class ProxyRootInvokeInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { - + private static final String ENHANCE_CLASS = "org.apache.shardingsphere.shardingproxy.frontend.command.CommandExecutorTask"; - + private static final String PROXY_ROOT_INVOKE_INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.shardingsphere.v4rc3.ProxyRootInvokeInterceptor"; - + @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { return named("run"); } - + @Override public String getMethodsInterceptor() { return PROXY_ROOT_INVOKE_INTERCEPTOR_CLASS; } - + @Override public boolean isOverrideArgs() { return false; @@ -60,12 +58,12 @@ public boolean isOverrideArgs() { } }; } - + @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - + @Override protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); diff --git a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/test/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/InterceptorTest.java b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/test/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/InterceptorTest.java index bb6a0a702970..be81a435178b 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/test/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/InterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-RC3-plugin/src/test/java/org/apache/skywalking/apm/plugin/shardingsphere/v4rc3/InterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.shardingsphere.v4rc3; import org.apache.skywalking.apm.agent.core.context.trace.AbstractTracingSpan; @@ -44,21 +43,21 @@ @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(TracingSegmentRunner.class) public class InterceptorTest { - + @SegmentStoragePoint private SegmentStorage segmentStorage; - + @Rule public AgentServiceRule serviceRule = new AgentServiceRule(); - + private ProxyRootInvokeInterceptor proxyRootInvokeInterceptor; - + private JDBCRootInvokeInterceptor jdbcRootInvokeInterceptor; - + private ParseInterceptor parseInterceptor; - + private ExecuteInterceptor executeInterceptor; - + @Before public void setUp() { proxyRootInvokeInterceptor = new ProxyRootInvokeInterceptor(); @@ -66,7 +65,7 @@ public void setUp() { parseInterceptor = new ParseInterceptor(); executeInterceptor = new ExecuteInterceptor(); } - + @Test public void assertProxyRootInvoke() { proxyRootInvokeInterceptor.beforeMethod(null, null, null, null, null); @@ -78,7 +77,7 @@ public void assertProxyRootInvoke() { assertThat(spans.size(), is(1)); assertThat(spans.get(0).getOperationName(), is("/ShardingSphere/ProxyRootInvoke/")); } - + @Test public void assertJDBCRootInvoke() { jdbcRootInvokeInterceptor.beforeMethod(null, null, null, null, null); @@ -90,10 +89,13 @@ public void assertJDBCRootInvoke() { assertThat(spans.size(), is(1)); assertThat(spans.get(0).getOperationName(), is("/ShardingSphere/JDBCRootInvoke/")); } - + @Test public void assertParse() { - Object[] allArguments = new Object[] {"SELECT * FROM t_order", false}; + Object[] allArguments = new Object[] { + "SELECT * FROM t_order", + false + }; parseInterceptor.beforeMethod(null, null, allArguments, null, null); parseInterceptor.afterMethod(null, null, allArguments, null, null); assertThat(segmentStorage.getTraceSegments().size(), is(1)); @@ -104,10 +106,14 @@ public void assertParse() { assertThat(spans.get(0).getOperationName(), is("/ShardingSphere/parseSQL/")); SpanAssert.assertTag(spans.get(0), 0, "SELECT * FROM t_order"); } - + @Test public void assertExecute() { - Object[] allArguments = new Object[] {null, null, new HashMap()}; + Object[] allArguments = new Object[] { + null, + null, + new HashMap() + }; executeInterceptor.beforeMethod(null, null, allArguments, null, null); executeInterceptor.afterMethod(null, null, allArguments, null, null); assertThat(segmentStorage.getTraceSegments().size(), is(1)); diff --git a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/pom.xml index 8acb63cd5375..1468c22c671d 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-sdk-plugin org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4/Constant.java b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4/Constant.java index ab4794073dc0..c2fc12866d93 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4/Constant.java +++ b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4/Constant.java @@ -19,6 +19,6 @@ package org.apache.skywalking.apm.plugin.shardingsphere.v4; public final class Constant { - + public static final String CONTEXT_SNAPSHOT = "CONTEXT_SNAPSHOT"; } diff --git a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4/ExecuteInterceptor.java b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4/ExecuteInterceptor.java index 024b47ceaaf7..c67a74cd5b29 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4/ExecuteInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4/ExecuteInterceptor.java @@ -30,16 +30,17 @@ import java.util.Map; /** - * {@link ExecuteInterceptor} enhances {@link org.apache.shardingsphere.core.execute.sql.execute.SQLExecuteCallback}, creating a local span that records the execution of sql. - * - * @author zhangyonglun + * {@link ExecuteInterceptor} enhances {@link org.apache.shardingsphere.core.execute.sql.execute.SQLExecuteCallback}, + * creating a local span that records the execution of sql. */ public class ExecuteInterceptor implements InstanceMethodsAroundInterceptor { - + @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) { ContextManager.createLocalSpan("/ShardingSphere/executeSQL/").setComponent(ComponentsDefine.SHARDING_SPHERE); - ContextSnapshot contextSnapshot = (ContextSnapshot) ShardingExecuteDataMap.getDataMap().get(Constant.CONTEXT_SNAPSHOT); + ContextSnapshot contextSnapshot = (ContextSnapshot) ShardingExecuteDataMap.getDataMap() + .get(Constant.CONTEXT_SNAPSHOT); if (null == contextSnapshot) { contextSnapshot = (ContextSnapshot) ((Map) allArguments[2]).get(Constant.CONTEXT_SNAPSHOT); } @@ -47,15 +48,17 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr ContextManager.continued(contextSnapshot); } } - + @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) { ContextManager.stopSpan(); return ret; } - + @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4/JDBCRootInvokeInterceptor.java b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4/JDBCRootInvokeInterceptor.java index 5ddad5c96518..9e684abba5ce 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4/JDBCRootInvokeInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4/JDBCRootInvokeInterceptor.java @@ -28,26 +28,29 @@ import java.lang.reflect.Method; /** - * {@link JDBCRootInvokeInterceptor} enhances {@link org.apache.shardingsphere.shardingjdbc.executor.AbstractStatementExecutor}, creating a local span that records the overall execution of sql. - * - * @author zhangyonglun + * {@link JDBCRootInvokeInterceptor} enhances {@link org.apache.shardingsphere.shardingjdbc.executor.AbstractStatementExecutor}, + * creating a local span that records the overall execution of sql. */ public class JDBCRootInvokeInterceptor implements InstanceMethodsAroundInterceptor { - + @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) { - ContextManager.createLocalSpan("/ShardingSphere/JDBCRootInvoke/").setComponent(ComponentsDefine.SHARDING_SPHERE); + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) { + ContextManager.createLocalSpan("/ShardingSphere/JDBCRootInvoke/") + .setComponent(ComponentsDefine.SHARDING_SPHERE); ShardingExecuteDataMap.getDataMap().put(Constant.CONTEXT_SNAPSHOT, ContextManager.capture()); } - + @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) { ContextManager.stopSpan(); return ret; } - + @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4/ParseInterceptor.java b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4/ParseInterceptor.java index 07398ca06bbc..12a120cf4f76 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4/ParseInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4/ParseInterceptor.java @@ -29,26 +29,29 @@ import java.lang.reflect.Method; /** - * {@link ParseInterceptor} enhances {@link org.apache.shardingsphere.core.route.router.sharding.ParsingSQLRouter}, creating a local span that records the parse of sql. - * - * @author zhangyonglun + * {@link ParseInterceptor} enhances {@link org.apache.shardingsphere.core.route.router.sharding.ParsingSQLRouter}, + * creating a local span that records the parse of sql. */ public class ParseInterceptor implements InstanceMethodsAroundInterceptor { - + @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) { - AbstractSpan span = ContextManager.createLocalSpan("/ShardingSphere/parseSQL/").setComponent(ComponentsDefine.SHARDING_SPHERE); + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) { + AbstractSpan span = ContextManager.createLocalSpan("/ShardingSphere/parseSQL/") + .setComponent(ComponentsDefine.SHARDING_SPHERE); Tags.DB_STATEMENT.set(span, (String) allArguments[0]); } - + @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) { ContextManager.stopSpan(); return ret; } - + @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4/ProxyRootInvokeInterceptor.java b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4/ProxyRootInvokeInterceptor.java index 846127bfe3f0..2142bd1cccfe 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4/ProxyRootInvokeInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4/ProxyRootInvokeInterceptor.java @@ -28,26 +28,29 @@ import java.lang.reflect.Method; /** - * ProxyRootInvokeInterceptor enhances org.apache.shardingsphere.shardingproxy.frontend.command.CommandExecutorTask, creating a local span that records the overall execution of sql. - * - * @author zhangyonglun + * ProxyRootInvokeInterceptor enhances org.apache.shardingsphere.shardingproxy.frontend.command.CommandExecutorTask, + * creating a local span that records the overall execution of sql. */ public class ProxyRootInvokeInterceptor implements InstanceMethodsAroundInterceptor { - + @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) { - ContextManager.createLocalSpan("/ShardingSphere/ProxyRootInvoke/").setComponent(ComponentsDefine.SHARDING_SPHERE); + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) { + ContextManager.createLocalSpan("/ShardingSphere/ProxyRootInvoke/") + .setComponent(ComponentsDefine.SHARDING_SPHERE); ShardingExecuteDataMap.getDataMap().put(Constant.CONTEXT_SNAPSHOT, ContextManager.capture()); } - + @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) { ContextManager.stopSpan(); return ret; } - + @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4/define/ExecuteInstrumentation.java b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4/define/ExecuteInstrumentation.java index 9329318b8f9c..97e091bd23e6 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4/define/ExecuteInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4/define/ExecuteInstrumentation.java @@ -30,29 +30,27 @@ /** * {@link ExecuteInstrumentation} presents that skywalking intercepts {@link org.apache.shardingsphere.core.execute.sql.execute.SQLExecuteCallback}. - * - * @author zhangyonglun */ public class ExecuteInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { - + private static final String ENHANCE_CLASS = "org.apache.shardingsphere.core.execute.sql.execute.SQLExecuteCallback"; - + private static final String EXECUTE_INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.shardingsphere.v4.ExecuteInterceptor"; - + @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { return named("execute0"); } - + @Override public String getMethodsInterceptor() { return EXECUTE_INTERCEPTOR_CLASS; } - + @Override public boolean isOverrideArgs() { return false; @@ -60,12 +58,12 @@ public boolean isOverrideArgs() { } }; } - + @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - + @Override protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); diff --git a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4/define/JDBCRootInvokeInstrumentation.java b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4/define/JDBCRootInvokeInstrumentation.java index afcfb9895ad8..04f67f7bcc8d 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4/define/JDBCRootInvokeInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4/define/JDBCRootInvokeInstrumentation.java @@ -29,30 +29,29 @@ import static net.bytebuddy.matcher.ElementMatchers.named; /** - * {@link JDBCRootInvokeInstrumentation} presents that skywalking intercepts {@link org.apache.shardingsphere.shardingjdbc.executor.AbstractStatementExecutor}. - * - * @author zhangyonglun + * {@link JDBCRootInvokeInstrumentation} presents that skywalking intercepts {@link + * org.apache.shardingsphere.shardingjdbc.executor.AbstractStatementExecutor}. */ public class JDBCRootInvokeInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { - + private static final String ENHANCE_CLASS = "org.apache.shardingsphere.shardingjdbc.executor.AbstractStatementExecutor"; - + private static final String JDBC_ROOT_INVOKE_INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.shardingsphere.v4.JDBCRootInvokeInterceptor"; - + @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { return named("executeCallback"); } - + @Override public String getMethodsInterceptor() { return JDBC_ROOT_INVOKE_INTERCEPTOR_CLASS; } - + @Override public boolean isOverrideArgs() { return false; @@ -60,12 +59,12 @@ public boolean isOverrideArgs() { } }; } - + @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - + @Override protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); diff --git a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4/define/ParseInstrumentation.java b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4/define/ParseInstrumentation.java index 2e1a715d5edb..05442c5b8460 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4/define/ParseInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4/define/ParseInstrumentation.java @@ -30,29 +30,27 @@ /** * {@link ParseInstrumentation} presents that skywalking intercepts {@link org.apache.shardingsphere.core.route.router.sharding.ParsingSQLRouter}. - * - * @author zhangyonglun */ public class ParseInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { - + private static final String ENHANCE_CLASS = "org.apache.shardingsphere.core.route.router.sharding.ParsingSQLRouter"; - + private static final String EXECUTE_INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.shardingsphere.v4.ParseInterceptor"; - + @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { return named("parse"); } - + @Override public String getMethodsInterceptor() { return EXECUTE_INTERCEPTOR_CLASS; } - + @Override public boolean isOverrideArgs() { return false; @@ -60,12 +58,12 @@ public boolean isOverrideArgs() { } }; } - + @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - + @Override protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); diff --git a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4/define/ProxyRootInvokeInstrumentation.java b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4/define/ProxyRootInvokeInstrumentation.java index d6835f4059ab..6270f2ee39d2 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4/define/ProxyRootInvokeInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v4/define/ProxyRootInvokeInstrumentation.java @@ -30,29 +30,27 @@ /** * ProxyRootInvokeInstrumentation presents that skywalking intercepts org.apache.shardingsphere.shardingproxy.frontend.command.CommandExecutorTask. - * - * @author zhangyonglun */ public class ProxyRootInvokeInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { - + private static final String ENHANCE_CLASS = "org.apache.shardingsphere.shardingproxy.frontend.command.CommandExecutorTask"; - + private static final String PROXY_ROOT_INVOKE_INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.shardingsphere.v4.ProxyRootInvokeInterceptor"; - + @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { return named("run"); } - + @Override public String getMethodsInterceptor() { return PROXY_ROOT_INVOKE_INTERCEPTOR_CLASS; } - + @Override public boolean isOverrideArgs() { return false; @@ -60,12 +58,12 @@ public boolean isOverrideArgs() { } }; } - + @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - + @Override protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); diff --git a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/shardingsphere/InterceptorTest.java b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/shardingsphere/InterceptorTest.java index 9e2888cd64b5..919039866632 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/shardingsphere/InterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/sharding-sphere-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/shardingsphere/InterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.shardingsphere; import org.apache.skywalking.apm.agent.core.context.trace.AbstractTracingSpan; @@ -48,21 +47,21 @@ @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(TracingSegmentRunner.class) public class InterceptorTest { - + @SegmentStoragePoint private SegmentStorage segmentStorage; - + @Rule public AgentServiceRule serviceRule = new AgentServiceRule(); - + private ProxyRootInvokeInterceptor proxyRootInvokeInterceptor; - + private JDBCRootInvokeInterceptor jdbcRootInvokeInterceptor; - + private ParseInterceptor parseInterceptor; - + private ExecuteInterceptor executeInterceptor; - + @Before public void setUp() { proxyRootInvokeInterceptor = new ProxyRootInvokeInterceptor(); @@ -70,7 +69,7 @@ public void setUp() { parseInterceptor = new ParseInterceptor(); executeInterceptor = new ExecuteInterceptor(); } - + @Test public void assertProxyRootInvoke() { proxyRootInvokeInterceptor.beforeMethod(null, null, null, null, null); @@ -82,7 +81,7 @@ public void assertProxyRootInvoke() { assertThat(spans.size(), is(1)); assertThat(spans.get(0).getOperationName(), is("/ShardingSphere/ProxyRootInvoke/")); } - + @Test public void assertJDBCRootInvoke() { jdbcRootInvokeInterceptor.beforeMethod(null, null, null, null, null); @@ -94,10 +93,13 @@ public void assertJDBCRootInvoke() { assertThat(spans.size(), is(1)); assertThat(spans.get(0).getOperationName(), is("/ShardingSphere/JDBCRootInvoke/")); } - + @Test public void assertParse() { - Object[] allArguments = new Object[] {"SELECT * FROM t_order", false}; + Object[] allArguments = new Object[] { + "SELECT * FROM t_order", + false + }; parseInterceptor.beforeMethod(null, null, allArguments, null, null); parseInterceptor.afterMethod(null, null, allArguments, null, null); assertThat(segmentStorage.getTraceSegments().size(), is(1)); @@ -108,10 +110,14 @@ public void assertParse() { assertThat(spans.get(0).getOperationName(), is("/ShardingSphere/parseSQL/")); SpanAssert.assertTag(spans.get(0), 0, "SELECT * FROM t_order"); } - + @Test public void assertExecute() { - Object[] allArguments = new Object[] {null, null, new HashMap()}; + Object[] allArguments = new Object[] { + null, + null, + new HashMap() + }; executeInterceptor.beforeMethod(null, null, allArguments, null, null); executeInterceptor.afterMethod(null, null, allArguments, null, null); assertThat(segmentStorage.getTraceSegments().size(), is(1)); diff --git a/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml index 535a8bd97765..18d131be9bd2 100644 --- a/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml @@ -16,7 +16,8 @@ ~ --> - + apm-sdk-plugin org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/src/main/java/org/apache/skywalking/apm/plugin/sofarpc/SofaRpcConsumerInterceptor.java b/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/src/main/java/org/apache/skywalking/apm/plugin/sofarpc/SofaRpcConsumerInterceptor.java index 18e5ae3aec1a..abbf99edb7d2 100644 --- a/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/src/main/java/org/apache/skywalking/apm/plugin/sofarpc/SofaRpcConsumerInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/src/main/java/org/apache/skywalking/apm/plugin/sofarpc/SofaRpcConsumerInterceptor.java @@ -35,16 +35,13 @@ import java.lang.reflect.Method; -/** - * @author leizhiyuan - */ public class SofaRpcConsumerInterceptor implements InstanceMethodsAroundInterceptor { public static final String SKYWALKING_PREFIX = "skywalking."; @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { SofaRequest sofaRequest = (SofaRequest) allArguments[0]; RpcInternalContext rpcContext = RpcInternalContext.getContext(); @@ -71,8 +68,8 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { SofaResponse result = (SofaResponse) ret; if (result != null && result.isError()) { dealException((Throwable) result.getAppResponse()); @@ -84,7 +81,7 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { dealException(t); } @@ -120,8 +117,7 @@ private String generateOperationName(ProviderInfo providerInfo, SofaRequest sofa } /** - * Format request url. - * e.g. bolt://127.0.0.1:20880/org.apache.skywalking.apm.plugin.test.Test.test(String). + * Format request url. e.g. bolt://127.0.0.1:20880/org.apache.skywalking.apm.plugin.test.Test.test(String). * * @return request url. */ diff --git a/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/src/main/java/org/apache/skywalking/apm/plugin/sofarpc/SofaRpcProviderInterceptor.java b/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/src/main/java/org/apache/skywalking/apm/plugin/sofarpc/SofaRpcProviderInterceptor.java index 8d89ce753bf2..39f3e2280c32 100644 --- a/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/src/main/java/org/apache/skywalking/apm/plugin/sofarpc/SofaRpcProviderInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/src/main/java/org/apache/skywalking/apm/plugin/sofarpc/SofaRpcProviderInterceptor.java @@ -32,16 +32,13 @@ import java.lang.reflect.Method; -/** - * @author leizhiyuan - */ public class SofaRpcProviderInterceptor implements InstanceMethodsAroundInterceptor { public static final String SKYWALKING_PREFIX = "skywalking."; @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { SofaRequest sofaRequest = (SofaRequest) allArguments[0]; AbstractSpan span = null; @@ -65,8 +62,8 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { SofaResponse result = (SofaResponse) ret; if (result != null && result.isError()) { dealException((Throwable) result.getAppResponse()); @@ -78,7 +75,7 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { dealException(t); } diff --git a/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/src/test/java/org/apache/skywalking/apm/plugin/sofarpc/SofaRpcConsumerInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/src/test/java/org/apache/skywalking/apm/plugin/sofarpc/SofaRpcConsumerInterceptorTest.java index 40b9a559e57e..a1699c278bef 100644 --- a/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/src/test/java/org/apache/skywalking/apm/plugin/sofarpc/SofaRpcConsumerInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/src/test/java/org/apache/skywalking/apm/plugin/sofarpc/SofaRpcConsumerInterceptorTest.java @@ -57,7 +57,11 @@ @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(TracingSegmentRunner.class) -@PrepareForTest({RpcInternalContext.class, SofaRequest.class, SofaResponse.class}) +@PrepareForTest({ + RpcInternalContext.class, + SofaRequest.class, + SofaResponse.class +}) public class SofaRpcConsumerInterceptorTest { @SegmentStoragePoint @@ -142,8 +146,7 @@ public void testConsumerWithResultHasException() throws Throwable { assertConsumerTraceSegmentInErrorCase(traceSegment); } - private void assertConsumerTraceSegmentInErrorCase( - TraceSegment traceSegment) { + private void assertConsumerTraceSegmentInErrorCase(TraceSegment traceSegment) { List spans = SegmentHelper.getSpans(traceSegment); assertThat(spans.size(), is(1)); assertConsumerSpan(spans.get(0)); @@ -169,7 +172,8 @@ private void assertCommonsAttribute(AbstractTracingSpan span) { assertThat(tags.size(), is(1)); assertThat(SpanHelper.getLayer(span), CoreMatchers.is(SpanLayer.RPC_FRAMEWORK)); assertThat(SpanHelper.getComponentId(span), is(43)); - assertThat(tags.get(0).getValue(), is("bolt://127.0.0.1:12200/org.apache.skywalking.apm.test.TestSofaRpcService.test(String)")); + assertThat(tags.get(0) + .getValue(), is("bolt://127.0.0.1:12200/org.apache.skywalking.apm.test.TestSofaRpcService.test(String)")); assertThat(span.getOperationName(), is("org.apache.skywalking.apm.test.TestSofaRpcService.test(String)")); } } diff --git a/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/src/test/java/org/apache/skywalking/apm/plugin/sofarpc/SofaRpcProviderInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/src/test/java/org/apache/skywalking/apm/plugin/sofarpc/SofaRpcProviderInterceptorTest.java index 40fec037721d..64c0042c02b9 100644 --- a/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/src/test/java/org/apache/skywalking/apm/plugin/sofarpc/SofaRpcProviderInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/src/test/java/org/apache/skywalking/apm/plugin/sofarpc/SofaRpcProviderInterceptorTest.java @@ -58,7 +58,11 @@ @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(TracingSegmentRunner.class) -@PrepareForTest({RpcInternalContext.class, SofaRequest.class, SofaResponse.class}) +@PrepareForTest({ + RpcInternalContext.class, + SofaRequest.class, + SofaResponse.class +}) public class SofaRpcProviderInterceptorTest { public static final String SKYWALKING_PREFIX = "skywalking."; @@ -113,8 +117,7 @@ public void setUp() throws Exception { @Test public void testProviderWithAttachment() throws Throwable { when(rpcContext.isConsumerSide()).thenReturn(false); - when(sofaRequest.getRequestProp(SKYWALKING_PREFIX + SW6CarrierItem.HEADER_NAME)).thenReturn( - "1-MC4wLjA=-MS4zMjMuNDQzMw==-3-1-1-IzE5Mi4xNjguMS44IDoxODAwMg==-Iy9wb3J0YWwv-Iy90ZXN0RW50cnlTcGFu"); + when(sofaRequest.getRequestProp(SKYWALKING_PREFIX + SW6CarrierItem.HEADER_NAME)).thenReturn("1-MC4wLjA=-MS4zMjMuNDQzMw==-3-1-1-IzE5Mi4xNjguMS44IDoxODAwMg==-Iy9wb3J0YWwv-Iy90ZXN0RW50cnlTcGFu"); sofaRpcProviderInterceptor.beforeMethod(enhancedInstance, null, allArguments, argumentTypes, methodInterceptResult); sofaRpcProviderInterceptor.afterMethod(enhancedInstance, null, allArguments, argumentTypes, sofaResponse); diff --git a/apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/pom.xml index 7708a2df0911..bd8fef109ac6 100644 --- a/apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/pom.xml @@ -16,7 +16,8 @@ ~ limitations under the License. ~ --> - + apm-sdk-plugin org.apache.skywalking @@ -33,7 +34,7 @@ UTF-8 7.7.1 - + diff --git a/apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/solrj/SolrClientInterceptor.java b/apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/solrj/SolrClientInterceptor.java index d2ac0dbe23f6..b819763a2254 100644 --- a/apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/solrj/SolrClientInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/solrj/SolrClientInterceptor.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.solrj; import org.apache.skywalking.apm.agent.core.conf.Config; @@ -74,7 +75,7 @@ public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { SolrRequest request = (SolrRequest) allArguments[0]; SolrjInstance instance = (SolrjInstance) objInst.getSkyWalkingDynamicField(); @@ -148,8 +149,8 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr @Override @SuppressWarnings("unchecked") - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { if (!ContextManager.isActive()) { return ret; } @@ -173,7 +174,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { if (ContextManager.isActive()) { AbstractSpan span = ContextManager.activeSpan(); int code = 500; @@ -187,9 +189,9 @@ public void handleMethodException(EnhancedInstance objInst, Method method, Objec private static final AbstractSpan getSpan(String operatorName, String remotePeer) { return ContextManager.createExitSpan(operatorName, remotePeer) - .setComponent(ComponentsDefine.SOLRJ) - .setLayer(SpanLayer.DB) - .tag(Tags.DB_TYPE, DB_TYPE); + .setComponent(ComponentsDefine.SOLRJ) + .setLayer(SpanLayer.DB) + .tag(Tags.DB_TYPE, DB_TYPE); } private static final String getOperatorNameWithAction(String collection, String path, String action) { @@ -217,7 +219,7 @@ private static final SolrParams getParams(SolrParams params) { private static final String toQueryString(SolrParams params) { final StringBuilder sb = new StringBuilder(128); boolean first = true; - for (final Iterator it = params.getParameterNamesIterator(); it.hasNext();) { + for (final Iterator it = params.getParameterNamesIterator(); it.hasNext(); ) { final String name = it.next(); for (String val : params.getParams(name)) { sb.append(first ? '?' : '&').append(name).append('=').append(val); diff --git a/apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/solrj/SolrConnectorInterceptor.java b/apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/solrj/SolrConnectorInterceptor.java index 69faa3a81d03..1e43d08369fa 100644 --- a/apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/solrj/SolrConnectorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/solrj/SolrConnectorInterceptor.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.solrj; import org.apache.http.client.methods.HttpRequestBase; @@ -31,7 +32,7 @@ public class SolrConnectorInterceptor implements InstanceMethodsAroundIntercepto @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { if (ContextManager.isActive()) { HttpRequestBase request = (HttpRequestBase) allArguments[0]; @@ -48,12 +49,13 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { + Object ret) throws Throwable { return ret; } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { if (ContextManager.isActive()) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/solrj/commons/SolrjInstance.java b/apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/solrj/commons/SolrjInstance.java index 91e4cfb362f0..993b148aa46f 100644 --- a/apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/solrj/commons/SolrjInstance.java +++ b/apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/solrj/commons/SolrjInstance.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.solrj.commons; public class SolrjInstance { diff --git a/apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/solrj/commons/SolrjTags.java b/apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/solrj/commons/SolrjTags.java index 3040b850b529..20157d4694c7 100644 --- a/apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/solrj/commons/SolrjTags.java +++ b/apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/solrj/commons/SolrjTags.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.solrj.commons; import org.apache.skywalking.apm.agent.core.context.tag.StringTag; diff --git a/apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/solrj/define/SolrClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/solrj/define/SolrClientInstrumentation.java index f776e5635291..ab37b7914517 100644 --- a/apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/solrj/define/SolrClientInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/solrj/define/SolrClientInstrumentation.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.solrj.define; import net.bytebuddy.description.method.MethodDescription; @@ -30,7 +31,7 @@ public class SolrClientInstrumentation extends ClassInstanceMethodsEnhancePlugin @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { - return new ConstructorInterceptPoint[]{ + return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { @Override @@ -48,7 +49,7 @@ public ElementMatcher getConstructorMatcher() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public boolean isOverrideArgs() { diff --git a/apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/solrj/SolrClientInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/solrj/SolrClientInterceptorTest.java index c7311a8c6b88..93381f7f920b 100644 --- a/apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/solrj/SolrClientInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/solrj/SolrClientInterceptorTest.java @@ -19,6 +19,8 @@ package org.apache.skywalking.apm.plugin.solrj; import com.google.common.collect.Lists; +import java.lang.reflect.Method; +import java.util.List; import org.apache.skywalking.apm.agent.core.conf.Config; import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan; import org.apache.skywalking.apm.agent.core.context.trace.AbstractTracingSpan; @@ -26,7 +28,11 @@ import org.apache.skywalking.apm.agent.core.context.trace.TraceSegment; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; import org.apache.skywalking.apm.agent.test.helper.SegmentHelper; -import org.apache.skywalking.apm.agent.test.tools.*; +import org.apache.skywalking.apm.agent.test.tools.AgentServiceRule; +import org.apache.skywalking.apm.agent.test.tools.SegmentStorage; +import org.apache.skywalking.apm.agent.test.tools.SegmentStoragePoint; +import org.apache.skywalking.apm.agent.test.tools.SpanAssert; +import org.apache.skywalking.apm.agent.test.tools.TracingSegmentRunner; import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; import org.apache.skywalking.apm.plugin.solrj.commons.SolrjInstance; import org.apache.solr.client.solrj.ResponseParser; @@ -35,7 +41,11 @@ import org.apache.solr.client.solrj.request.AbstractUpdateRequest; import org.apache.solr.client.solrj.request.QueryRequest; import org.apache.solr.client.solrj.request.UpdateRequest; -import org.apache.solr.common.*; +import org.apache.solr.common.SolrDocument; +import org.apache.solr.common.SolrDocumentList; +import org.apache.solr.common.SolrException; +import org.apache.solr.common.SolrInputDocument; +import org.apache.solr.common.StringUtils; import org.apache.solr.common.params.ModifiableSolrParams; import org.apache.solr.common.util.NamedList; import org.junit.Assert; @@ -47,9 +57,6 @@ import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.modules.junit4.PowerMockRunnerDelegate; -import java.lang.reflect.Method; -import java.util.List; - import static org.mockito.Mockito.when; @RunWith(PowerMockRunner.class) @@ -98,11 +105,10 @@ public void setup() throws Exception { header.add("status", 0); header.add("QTime", 5); -// Config.Plugin.SolrJ.TRACE_STATEMENT = true; -// Config.Plugin.SolrJ.TRACE_OPS_PARAMS = true; + // Config.Plugin.SolrJ.TRACE_STATEMENT = true; + // Config.Plugin.SolrJ.TRACE_OPS_PARAMS = true; } - @Test public void testConstructor() throws Throwable { arguments = new Object[] {builder}; @@ -112,7 +118,6 @@ public void testConstructor() throws Throwable { Assert.assertEquals(instance.getCollection(), "collection"); } - @Test public void testUpdateWithAdd() throws Throwable { UpdateRequest request = new UpdateRequest(); @@ -144,14 +149,14 @@ public void testUpdateWithAdd() throws Throwable { if (Config.Plugin.SolrJ.TRACE_OPS_PARAMS) { SpanAssert.assertTag(span, ++pox, "-1"); } - spanCommonAssert(span, pox,"solrJ/collection/update/ADD"); + spanCommonAssert(span, pox, "solrJ/collection/update/ADD"); } @Test public void testUpdateWithCommit() throws Throwable { final boolean softCommit = false; AbstractUpdateRequest request = (new UpdateRequest()).setAction(AbstractUpdateRequest.ACTION.COMMIT, true, true, false); - arguments = new Object[]{ + arguments = new Object[] { request, null, collection @@ -177,7 +182,7 @@ public void testUpdateWithCommit() throws Throwable { public void testUpdateWithOptimize() throws Throwable { final int maxSegments = 1; AbstractUpdateRequest request = (new UpdateRequest()).setAction(AbstractUpdateRequest.ACTION.OPTIMIZE, false, true, maxSegments); - arguments = new Object[]{ + arguments = new Object[] { request, null, collection @@ -225,9 +230,12 @@ public void testQuery() throws Throwable { public void testGet() throws Throwable { ModifiableSolrParams reqParams = new ModifiableSolrParams(); if (StringUtils.isEmpty(reqParams.get("qt"))) { - reqParams.set("qt", new String[]{"/get"}); + reqParams.set("qt", new String[] {"/get"}); } - reqParams.set("ids", new String[] {"99", "98"}); + reqParams.set("ids", new String[] { + "99", + "98" + }); QueryRequest request = new QueryRequest(reqParams); arguments = new Object[] { @@ -304,8 +312,7 @@ public void testException() throws Throwable { response.add("responseHeader", header); interceptor.beforeMethod(enhancedInstance, method, arguments, argumentType, null); - interceptor.handleMethodException(enhancedInstance, method, arguments, argumentType, - new SolrException(SolrException.ErrorCode.SERVER_ERROR, "for test", new Exception())); + interceptor.handleMethodException(enhancedInstance, method, arguments, argumentType, new SolrException(SolrException.ErrorCode.SERVER_ERROR, "for test", new Exception())); interceptor.afterMethod(enhancedInstance, method, arguments, argumentType, response); List segments = segmentStorage.getTraceSegments(); @@ -318,8 +325,6 @@ public void testException() throws Throwable { SpanAssert.assertOccurException(span, true); } - - private void querySpanAssert(AbstractSpan span, String qt, int numFound, String operationName) { Assert.assertEquals(span.getOperationName(), operationName); SpanAssert.assertTag(span, 0, "Solr"); diff --git a/apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/solrj/StringFormatBenchmarkTest.java b/apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/solrj/StringFormatBenchmarkTest.java index 8c68408041a7..a5c5d4232f5d 100644 --- a/apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/solrj/StringFormatBenchmarkTest.java +++ b/apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/solrj/StringFormatBenchmarkTest.java @@ -35,11 +35,8 @@ import java.util.concurrent.TimeUnit; /** - * Benchmark Mode Cnt Score Error Units - * StringFormatBenchmark.testStringConcat thrpt 10 326.444 ± 46.432 ops/ms - * StringFormatBenchmark.testStringFormat thrpt 10 6.094 ± 1.065 ops/ms - * - * @author kezhenxu94 + * Benchmark Mode Cnt Score Error Units StringFormatBenchmark.testStringConcat + * thrpt 10 326.444 ± 46.432 ops/ms StringFormatBenchmark.testStringFormat thrpt 10 6.094 ± 1.065 ops/ms */ @BenchmarkMode(Mode.Throughput) @OutputTimeUnit(TimeUnit.MILLISECONDS) diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/async-annotation-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/async-annotation-plugin/pom.xml index 353a33e2ece4..9cbca1985f0a 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/async-annotation-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/async-annotation-plugin/pom.xml @@ -16,7 +16,8 @@ ~ --> - + spring-plugins org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/async-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/async/DoSubmitMethodInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/async-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/async/DoSubmitMethodInterceptor.java index 61ea6418fbd5..9f1ad5d98813 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/async-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/async/DoSubmitMethodInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/async-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/async/DoSubmitMethodInterceptor.java @@ -26,29 +26,24 @@ import java.lang.reflect.Method; import java.util.concurrent.Callable; - -/** - * @author zhaoyuguang - */ public class DoSubmitMethodInterceptor implements InstanceMethodsAroundInterceptor { @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { if (ContextManager.isActive()) { allArguments[0] = new SWCallable((Callable) allArguments[0], ContextManager.capture()); } } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { } } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/async-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/async/SWCallable.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/async-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/async/SWCallable.java index 0769309d3985..f8f10a1453f9 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/async-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/async/SWCallable.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/async-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/async/SWCallable.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.spring.async; import org.apache.skywalking.apm.agent.core.context.ContextManager; @@ -24,9 +25,6 @@ import java.util.concurrent.Callable; -/** - * @author zhaoyuguang - */ public class SWCallable implements Callable { private static final String OPERATION_NAME = "SpringAsync"; diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/async-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/async/define/AsyncExecutionInterceptorInstrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/async-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/async/define/AsyncExecutionInterceptorInstrumentation.java index 7c4202ae8c05..2c6cdb60ce54 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/async-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/async/define/AsyncExecutionInterceptorInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/async-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/async/define/AsyncExecutionInterceptorInstrumentation.java @@ -29,10 +29,6 @@ import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * @author zhaoyuguang - */ - public class AsyncExecutionInterceptorInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @Override @@ -42,7 +38,7 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/pom.xml index ed52f22af3bc..18d950de4368 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/pom.xml @@ -16,7 +16,8 @@ ~ --> - + spring-plugins org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/FailureCallbackInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/FailureCallbackInterceptor.java index a174effc893e..d4c9e7fc6288 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/FailureCallbackInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/FailureCallbackInterceptor.java @@ -31,20 +31,23 @@ public class FailureCallbackInterceptor implements InstanceMethodsAroundIntercep @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - EnhanceCacheObjects cacheValues = (EnhanceCacheObjects)objInst.getSkyWalkingDynamicField(); + EnhanceCacheObjects cacheValues = (EnhanceCacheObjects) objInst.getSkyWalkingDynamicField(); if (cacheValues == null) { return; } AbstractSpan span = ContextManager.createLocalSpan("future/failureCallback:" + cacheValues.getOperationName()); - span.errorOccurred().log((Throwable)allArguments[0]).setComponent(cacheValues.getComponent()).setLayer(cacheValues.getSpanLayer()); + span.errorOccurred() + .log((Throwable) allArguments[0]) + .setComponent(cacheValues.getComponent()) + .setLayer(cacheValues.getSpanLayer()); ContextManager.continued(cacheValues.getContextSnapshot()); } @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { - EnhanceCacheObjects cacheValues = (EnhanceCacheObjects)objInst.getSkyWalkingDynamicField(); + EnhanceCacheObjects cacheValues = (EnhanceCacheObjects) objInst.getSkyWalkingDynamicField(); if (cacheValues == null) { return ret; } @@ -52,9 +55,10 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { - EnhanceCacheObjects cacheValues = (EnhanceCacheObjects)objInst.getSkyWalkingDynamicField(); + EnhanceCacheObjects cacheValues = (EnhanceCacheObjects) objInst.getSkyWalkingDynamicField(); if (cacheValues == null) { return; } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/SuccessCallbackInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/SuccessCallbackInterceptor.java index e44ccf61220c..60572122426a 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/SuccessCallbackInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/SuccessCallbackInterceptor.java @@ -31,7 +31,7 @@ public class SuccessCallbackInterceptor implements InstanceMethodsAroundIntercep @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - EnhanceCacheObjects cacheValues = (EnhanceCacheObjects)objInst.getSkyWalkingDynamicField(); + EnhanceCacheObjects cacheValues = (EnhanceCacheObjects) objInst.getSkyWalkingDynamicField(); if (cacheValues == null) { return; } @@ -44,7 +44,7 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { - EnhanceCacheObjects cacheValues = (EnhanceCacheObjects)objInst.getSkyWalkingDynamicField(); + EnhanceCacheObjects cacheValues = (EnhanceCacheObjects) objInst.getSkyWalkingDynamicField(); if (cacheValues == null) { return ret; } @@ -52,9 +52,10 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { - EnhanceCacheObjects cacheValues = (EnhanceCacheObjects)objInst.getSkyWalkingDynamicField(); + EnhanceCacheObjects cacheValues = (EnhanceCacheObjects) objInst.getSkyWalkingDynamicField(); if (cacheValues == null) { return; } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/define/ListenableFutureCallbackInstrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/define/ListenableFutureCallbackInstrumentation.java index d16309caa43b..7e63e7e707fd 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/define/ListenableFutureCallbackInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/define/ListenableFutureCallbackInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.spring.concurrent.define; import net.bytebuddy.description.method.MethodDescription; @@ -34,8 +33,6 @@ * that class inherited org.springframework.util.concurrent.ListenableFutureCallback by * SuccessCallbackInterceptor and * FailureCallbackInterceptor. - * - * @author zhangxin */ public class ListenableFutureCallbackInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @Override diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/define/SuccessCallbackInstrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/define/SuccessCallbackInstrumentation.java index b42e93644b38..7480ce057e8d 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/define/SuccessCallbackInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/define/SuccessCallbackInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.spring.concurrent.define; import net.bytebuddy.description.method.MethodDescription; @@ -32,38 +31,41 @@ /** * {@link SuccessCallbackInstrumentation} enhance the onSuccess method that class inherited * org.springframework.util.concurrent.SuccessCallback by SuccessCallbackInterceptor. - * - * @author zhangxin */ public class SuccessCallbackInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { - public static final String SUCCESS_CALLBACK_INTERCEPTOR = - "org.apache.skywalking.apm.plugin.spring.concurrent.SuccessCallbackInterceptor"; + public static final String SUCCESS_CALLBACK_INTERCEPTOR = "org.apache.skywalking.apm.plugin.spring.concurrent.SuccessCallbackInterceptor"; public static final String SUCCESS_METHOD_NAME = "onSuccess"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(SUCCESS_METHOD_NAME); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return SUCCESS_CALLBACK_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return successCallbackMatch(); } } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/match/EitherInterfaceMatch.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/match/EitherInterfaceMatch.java index 4f0b78757051..76c463c668c6 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/match/EitherInterfaceMatch.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/match/EitherInterfaceMatch.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.spring.concurrent.match; import net.bytebuddy.description.type.TypeDescription; @@ -31,8 +30,6 @@ /** * {@link EitherInterfaceMatch} match the class inherited {@link #getMatchInterface() } and not inherited {@link * #getMutexInterface()} - * - * @author zhangxin */ public abstract class EitherInterfaceMatch implements IndirectMatch { @@ -46,8 +43,8 @@ protected EitherInterfaceMatch() { @Override public ElementMatcher.Junction buildJunction() { return not(nameStartsWith(SPRING_PACKAGE_PREFIX)). - and(hasSuperType(named(getMatchInterface()))) - .and(not(hasSuperType(named(getMutexInterface())))); + and(hasSuperType(named(getMatchInterface()))) + .and(not(hasSuperType(named(getMutexInterface())))); } @Override diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/match/FailedCallbackMatch.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/match/FailedCallbackMatch.java index b8d6836fe683..37d64f4b9265 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/match/FailedCallbackMatch.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/match/FailedCallbackMatch.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.spring.concurrent.match; import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; @@ -24,8 +23,6 @@ /** * {@link FailedCallbackMatch} match the class that inherited org.springframework.util.concurrent.FailureCallback * and not inherited org.springframework.util.concurrent.SuccessCallback - * - * @author zhangxin */ public class FailedCallbackMatch extends EitherInterfaceMatch { @@ -36,11 +33,13 @@ private FailedCallbackMatch() { } - @Override public String getMatchInterface() { + @Override + public String getMatchInterface() { return MATCH_INTERFACE; } - @Override public String getMutexInterface() { + @Override + public String getMutexInterface() { return MUTEX_INTERFACE; } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/match/ListenableFutureCallbackMatch.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/match/ListenableFutureCallbackMatch.java index e9d7f0276543..dadff522abdf 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/match/ListenableFutureCallbackMatch.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/match/ListenableFutureCallbackMatch.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.spring.concurrent.match; import net.bytebuddy.description.type.TypeDescription; @@ -31,8 +30,6 @@ /** * {@link ListenableFutureCallbackMatch} match the class that inherited org.springframework.util.concurrent.ListenableFutureCallback. - * - * @author zhangxin */ public class ListenableFutureCallbackMatch implements IndirectMatch { @@ -45,7 +42,7 @@ private ListenableFutureCallbackMatch() { @Override public ElementMatcher.Junction buildJunction() { return not(nameStartsWith("org.springframework")). - and(hasSuperType(named(LISTENABLE_FUTURE_CALLBACK_CLASS_NAME))); + and(hasSuperType(named(LISTENABLE_FUTURE_CALLBACK_CLASS_NAME))); } @Override @@ -54,7 +51,7 @@ public boolean isMatch(TypeDescription typeDescription) { for (TypeDescription.Generic generic : typeDescription.getInterfaces()) { isMatch = isMatch || matchExactClass(generic); } - + if (typeDescription.getSuperClass() != null) { return isMatch || matchExactClass(typeDescription.getSuperClass()); } else { diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/match/SuccessCallbackMatch.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/match/SuccessCallbackMatch.java index 1847536276ba..c6ec17c907f9 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/match/SuccessCallbackMatch.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/match/SuccessCallbackMatch.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.spring.concurrent.match; import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; @@ -24,8 +23,6 @@ /** * {@link SuccessCallbackMatch} match the class that inherited org.springframework.util.concurrent.SuccessCallback * and not inherited org.springframework.util.concurrent.FailureCallback - * - * @author zhangxin */ public class SuccessCallbackMatch extends EitherInterfaceMatch { diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/pom.xml index f44e241f762a..32b98002ef08 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/pom.xml @@ -17,7 +17,8 @@ ~ --> - + spring-plugins org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/AopExpressionMatchInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/AopExpressionMatchInterceptor.java index da6c0c2ae655..f8f9203cd8c2 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/AopExpressionMatchInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/AopExpressionMatchInterceptor.java @@ -24,20 +24,20 @@ import java.lang.reflect.Method; /** - * {@link AopExpressionMatchInterceptor} check if the method is match the enhanced method - * if yes,return false else return true; - * - * @author lican + * {@link AopExpressionMatchInterceptor} check if the method is match the enhanced method if yes,return false else + * return true; */ public class AopExpressionMatchInterceptor implements StaticMethodsAroundInterceptor { @Override - public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, MethodInterceptResult result) { + public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + MethodInterceptResult result) { } @Override - public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, Object ret) { + public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + Object ret) { Method targetAopMethod = (Method) allArguments[1]; Class targetAopClass = (Class) allArguments[2]; if (targetAopClass != null && EnhancedInstance.class.isAssignableFrom(targetAopClass) && MatchUtil.isEnhancedMethod(targetAopMethod)) { @@ -48,7 +48,7 @@ public Object afterMethod(Class clazz, Method method, Object[] allArguments, Cla @Override public void handleMethodException(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, - Throwable t) { + Throwable t) { } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/AspectJExpressionPointCutInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/AspectJExpressionPointCutInterceptor.java index 1ce974ffa22f..05ea86cf023a 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/AspectJExpressionPointCutInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/AspectJExpressionPointCutInterceptor.java @@ -24,21 +24,20 @@ import java.lang.reflect.Method; /** - * {@link AspectJExpressionPointCutInterceptor} check if the method is match the enhanced method - * if yes,return false else return true; - * - * @author lican + * {@link AspectJExpressionPointCutInterceptor} check if the method is match the enhanced method if yes,return false + * else return true; */ public class AspectJExpressionPointCutInterceptor implements InstanceMethodsAroundInterceptor { - @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { Method targetAopMethod = (Method) allArguments[0]; Class targetAopClass = (Class) allArguments[1]; if (targetAopClass != null && EnhancedInstance.class.isAssignableFrom(targetAopClass) && MatchUtil.isEnhancedMethod(targetAopMethod)) { @@ -48,7 +47,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { } } \ No newline at end of file diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/AutowiredAnnotationProcessorInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/AutowiredAnnotationProcessorInterceptor.java index 46196bcb6823..ac03a0b50f70 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/AutowiredAnnotationProcessorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/AutowiredAnnotationProcessorInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.spring.patch; import java.lang.reflect.Constructor; @@ -34,8 +33,6 @@ /** * {@link AutowiredAnnotationProcessorInterceptor} return the correct constructor when the bean class is enhanced by * skywalking. - * - * @author zhangxin */ public class AutowiredAnnotationProcessorInterceptor implements InstanceMethodsAroundInterceptor, InstanceConstructorInterceptor { @@ -48,13 +45,13 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { - Class beanClass = (Class)allArguments[0]; + Class beanClass = (Class) allArguments[0]; if (EnhancedInstance.class.isAssignableFrom(beanClass)) { - Map, Constructor[]> candidateConstructorsCache = (Map, Constructor[]>)objInst.getSkyWalkingDynamicField(); + Map, Constructor[]> candidateConstructorsCache = (Map, Constructor[]>) objInst.getSkyWalkingDynamicField(); Constructor[] candidateConstructors = candidateConstructorsCache.get(beanClass); if (candidateConstructors == null) { - Constructor[] returnCandidateConstructors = (Constructor[])ret; + Constructor[] returnCandidateConstructors = (Constructor[]) ret; /** * The return for the method {@link org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor#determineCandidateConstructors(Class, String) @@ -80,7 +77,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA } } - if (candidateRawConstructors.size() == 1 && candidateRawConstructors.get(0).getParameterTypes().length > 0) { + if (candidateRawConstructors.size() == 1 && candidateRawConstructors.get(0) + .getParameterTypes().length > 0) { candidateConstructors = new Constructor[] {candidateRawConstructors.get(0)}; } else { candidateConstructors = new Constructor[0]; @@ -98,12 +96,14 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { } - @Override public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { + @Override + public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { Map, Constructor[]> candidateConstructorsCache = new ConcurrentHashMap, Constructor[]>(20); objInst.setSkyWalkingDynamicField(candidateConstructorsCache); } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/CreateAopProxyInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/CreateAopProxyInterceptor.java index a7300e4190d3..97bab4ad33a7 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/CreateAopProxyInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/CreateAopProxyInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.spring.patch; import java.lang.reflect.Method; @@ -28,8 +27,6 @@ /** * CreateAopProxyInterceptor check that the bean has been implement {@link EnhancedInstance}. * if yes, true will be returned. - * - * @author zhang xin */ public class CreateAopProxyInterceptor implements InstanceMethodsAroundInterceptor { @@ -42,7 +39,7 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { - AdvisedSupport advisedSupport = (AdvisedSupport)allArguments[0]; + AdvisedSupport advisedSupport = (AdvisedSupport) allArguments[0]; Class targetClass = advisedSupport.getTargetClass(); if (targetClass != null && EnhancedInstance.class.isAssignableFrom(targetClass)) { @@ -51,7 +48,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/GetPropertyDescriptorsInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/GetPropertyDescriptorsInterceptor.java index 276f8421564e..85b62a369dbe 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/GetPropertyDescriptorsInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/GetPropertyDescriptorsInterceptor.java @@ -39,7 +39,7 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { - PropertyDescriptor[] propertyDescriptors = (PropertyDescriptor[])ret; + PropertyDescriptor[] propertyDescriptors = (PropertyDescriptor[]) ret; Class rootClass = ((BeanWrapperImpl) objInst).getRootClass(); if (rootClass != null && EnhancedInstance.class.isAssignableFrom(rootClass)) { @@ -56,7 +56,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/MatchUtil.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/MatchUtil.java index fc39ba9981c7..4a311527e83d 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/MatchUtil.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/MatchUtil.java @@ -24,12 +24,8 @@ import java.util.Arrays; import java.util.List; -/** - * @author lican - */ public class MatchUtil { - private static List METHODS = new ArrayList(2); static { @@ -38,9 +34,9 @@ public class MatchUtil { static boolean isEnhancedMethod(Method targetMethod) { for (Method method : METHODS) { - if (method.getName().equals(targetMethod.getName()) - && method.getReturnType().equals(targetMethod.getReturnType()) - && equalParamTypes(method.getParameterTypes(), targetMethod.getParameterTypes())) { + if (method.getName().equals(targetMethod.getName()) && method.getReturnType() + .equals(targetMethod.getReturnType()) && equalParamTypes(method + .getParameterTypes(), targetMethod.getParameterTypes())) { return true; } } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/define/AopExpressionMatchInstrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/define/AopExpressionMatchInstrumentation.java index 2a68b5855533..d0de875ae322 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/define/AopExpressionMatchInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/define/AopExpressionMatchInstrumentation.java @@ -28,15 +28,13 @@ import static net.bytebuddy.matcher.ElementMatchers.named; /** - * {@link AopExpressionMatchInstrumentation} indicates that exclude enhanced method in @{link EnhancedInstance} to prevent - * side effect when use intercept all method in controller to complete their business code - * - * @author lican + * {@link AopExpressionMatchInstrumentation} indicates that exclude enhanced method in @{link EnhancedInstance} to + * prevent side effect when use intercept all method in controller to complete their business code */ public class AopExpressionMatchInstrumentation extends ClassStaticMethodsEnhancePluginDefine { - private static final String ENHANCE_CLASS = "org.springframework.aop.support.MethodMatchers"; - private static final String ENHANCE_METHOD = "matches"; + private static final String ENHANCE_CLASS = "org.springframework.aop.support.MethodMatchers"; + private static final String ENHANCE_METHOD = "matches"; private static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.spring.patch.AopExpressionMatchInterceptor"; @Override @@ -46,22 +44,23 @@ public final ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override public StaticMethodsInterceptPoint[] getStaticMethodsInterceptPoints() { - return new StaticMethodsInterceptPoint[]{new StaticMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named(ENHANCE_METHOD); - } + return new StaticMethodsInterceptPoint[] { + new StaticMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named(ENHANCE_METHOD); + } - @Override - public String getMethodsInterceptor() { - return INTERCEPT_CLASS; - } + @Override + public String getMethodsInterceptor() { + return INTERCEPT_CLASS; + } - @Override - public boolean isOverrideArgs() { - return false; + @Override + public boolean isOverrideArgs() { + return false; + } } - } }; } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/define/AopProxyFactoryInstrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/define/AopProxyFactoryInstrumentation.java index 514c064439d8..9db830cf3731 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/define/AopProxyFactoryInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/define/AopProxyFactoryInstrumentation.java @@ -34,29 +34,35 @@ public class AopProxyFactoryInstrumentation extends ClassInstanceMethodsEnhanceP public static final String ENHANCE_METHOD = "hasNoUserSuppliedProxyInterfaces"; public static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.spring.patch.CreateAopProxyInterceptor"; - @Override public final ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public final ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public final InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public final InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(ENHANCE_METHOD); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/define/AspectJExpressionPointCutInstrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/define/AspectJExpressionPointCutInstrumentation.java index 3738859ef04b..33acd1346d30 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/define/AspectJExpressionPointCutInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/define/AspectJExpressionPointCutInstrumentation.java @@ -30,10 +30,8 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments; /** - * {@link AspectJExpressionPointCutInstrumentation} indicates that exclude enhanced method in @{link EnhancedInstance} to prevent - * side effect when use pointcut way to intercept your code - * - * @author lican + * {@link AspectJExpressionPointCutInstrumentation} indicates that exclude enhanced method in @{link EnhancedInstance} + * to prevent side effect when use pointcut way to intercept your code */ public class AspectJExpressionPointCutInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -41,7 +39,6 @@ public class AspectJExpressionPointCutInstrumentation extends ClassInstanceMetho private static final String ENHANCE_METHOD = "matches"; private static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.spring.patch.AspectJExpressionPointCutInterceptor"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; @@ -49,22 +46,23 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new DeclaredInstanceMethodsInterceptPoint[]{new DeclaredInstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named(ENHANCE_METHOD).and(takesArguments(3)); - } + return new DeclaredInstanceMethodsInterceptPoint[] { + new DeclaredInstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named(ENHANCE_METHOD).and(takesArguments(3)); + } - @Override - public String getMethodsInterceptor() { - return INTERCEPT_CLASS; - } + @Override + public String getMethodsInterceptor() { + return INTERCEPT_CLASS; + } - @Override - public boolean isOverrideArgs() { - return false; + @Override + public boolean isOverrideArgs() { + return false; + } } - } }; } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/define/AutowiredAnnotationProcessorInstrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/define/AutowiredAnnotationProcessorInstrumentation.java index 721aa34ad04f..38e82af8cb6c 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/define/AutowiredAnnotationProcessorInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/define/AutowiredAnnotationProcessorInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.spring.patch.define; import net.bytebuddy.description.method.MethodDescription; @@ -34,47 +33,53 @@ * {@link AutowiredAnnotationProcessorInstrumentation} indicates a spring core class patch for making sure the * determineCandidateConstructors method in the class {@link org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor} * works in spring designed ways - * - * @author zhang xin */ public class AutowiredAnnotationProcessorInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor"; private static final String ENHANCE_METHOD = "determineCandidateConstructors"; private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.spring.patch.AutowiredAnnotationProcessorInterceptor"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { - @Override public ElementMatcher getConstructorMatcher() { + @Override + public ElementMatcher getConstructorMatcher() { return any(); } - @Override public String getConstructorInterceptor() { + @Override + public String getConstructorInterceptor() { return INTERCEPTOR_CLASS; } } }; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(ENHANCE_METHOD); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return INTERCEPTOR_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); } } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/define/BeanWrapperImplInstrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/define/BeanWrapperImplInstrumentation.java index 3211e482bd98..0fea0c41a590 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/define/BeanWrapperImplInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/define/BeanWrapperImplInstrumentation.java @@ -33,29 +33,35 @@ public class BeanWrapperImplInstrumentation extends ClassInstanceMethodsEnhanceP private static final String ENHANCE_CLASS = "org.springframework.beans.BeanWrapperImpl"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named("getPropertyDescriptors"); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return "org.apache.skywalking.apm.plugin.spring.patch.GetPropertyDescriptorsInterceptor"; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return true; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName(ENHANCE_CLASS); } } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/test/java/org/apache/skywalking/apm/plugin/spring/patch/AopExpressionMatchInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/test/java/org/apache/skywalking/apm/plugin/spring/patch/AopExpressionMatchInterceptorTest.java index 159748876cb7..dddfcde09bbf 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/test/java/org/apache/skywalking/apm/plugin/spring/patch/AopExpressionMatchInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/test/java/org/apache/skywalking/apm/plugin/spring/patch/AopExpressionMatchInterceptorTest.java @@ -27,13 +27,9 @@ import org.springframework.aop.MethodMatcher; import org.springframework.util.ReflectionUtils; -/** - * @author lican - */ @RunWith(MockitoJUnitRunner.class) public class AopExpressionMatchInterceptorTest { - private AopExpressionMatchInterceptor interceptor; @Mock private MethodMatcher methodMatcher; @@ -49,12 +45,12 @@ public void beforeMethod() { @Test public void afterMethod() { - Object ret = interceptor.afterMethod( - Object.class, - null, - new Object[]{methodMatcher, ReflectionUtils.findMethod(MockClass.class, "getSkyWalkingDynamicField"), MockClass.class, false}, - new Class[0], - true); + Object ret = interceptor.afterMethod(Object.class, null, new Object[] { + methodMatcher, + ReflectionUtils.findMethod(MockClass.class, "getSkyWalkingDynamicField"), + MockClass.class, + false + }, new Class[0], true); Assert.assertEquals(false, ret); } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/test/java/org/apache/skywalking/apm/plugin/spring/patch/CreateAopProxyInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/test/java/org/apache/skywalking/apm/plugin/spring/patch/CreateAopProxyInterceptorTest.java index 08d84a16b649..4073fb9692f5 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/test/java/org/apache/skywalking/apm/plugin/spring/patch/CreateAopProxyInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/test/java/org/apache/skywalking/apm/plugin/spring/patch/CreateAopProxyInterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.spring.patch; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; @@ -62,11 +61,13 @@ public void testInterceptEnhanceInstanceObject() throws Throwable { private class MockClass implements EnhancedInstance { - @Override public Object getSkyWalkingDynamicField() { + @Override + public Object getSkyWalkingDynamicField() { return null; } - @Override public void setSkyWalkingDynamicField(Object value) { + @Override + public void setSkyWalkingDynamicField(Object value) { } } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/pom.xml index 97d99d9d81ac..4d52bc549a83 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/pom.xml @@ -16,7 +16,8 @@ ~ --> - + spring-plugins org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v3/ControllerConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v3/ControllerConstructorInterceptor.java index 95732315a5d0..1df6f58f25f1 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v3/ControllerConstructorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v3/ControllerConstructorInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.spring.mvc.v3; import org.apache.skywalking.apm.plugin.spring.mvc.commons.PathMappingCache; @@ -28,8 +27,6 @@ /** * {@link ControllerConstructorInterceptor} cache the value of {@link RequestMapping} annotation with method in class * annotation with {@link org.springframework.stereotype.Controller}. - * - * @author zhangxin */ public class ControllerConstructorInterceptor implements InstanceConstructorInterceptor { @Override diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v3/HandlerMethodInvokerInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v3/HandlerMethodInvokerInterceptor.java index 19f2f6e784a7..212333873462 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v3/HandlerMethodInvokerInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v3/HandlerMethodInvokerInterceptor.java @@ -30,8 +30,6 @@ /** * {@link HandlerMethodInvokerInterceptor} pass the {@link NativeWebRequest} object into the {@link * org.springframework.stereotype.Controller} object. - * - * @author zhangxin */ public class HandlerMethodInvokerInterceptor implements InstanceMethodsAroundInterceptor { @Override @@ -39,7 +37,8 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr MethodInterceptResult result) throws Throwable { Object handler = allArguments[1]; if (handler instanceof EnhancedInstance) { - ContextManager.getRuntimeContext().put(RESPONSE_KEY_IN_RUNTIME_CONTEXT, ((NativeWebRequest)allArguments[2]).getNativeResponse()); + ContextManager.getRuntimeContext() + .put(RESPONSE_KEY_IN_RUNTIME_CONTEXT, ((NativeWebRequest) allArguments[2]).getNativeResponse()); } } @@ -49,7 +48,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v3/define/AbstractSpring3Instrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v3/define/AbstractSpring3Instrumentation.java index e534a6e0ef4e..3ecf23eaa443 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v3/define/AbstractSpring3Instrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v3/define/AbstractSpring3Instrumentation.java @@ -23,14 +23,13 @@ /** * {@link AbstractSpring3Instrumentation} define witness classes of the spring mvc 3 plugin. all Instrumentations * extends this class. - * - * @author zhangxin */ public abstract class AbstractSpring3Instrumentation extends ClassInstanceMethodsEnhancePluginDefine { public static final String WITHNESS_CLASSES = "org.springframework.web.servlet.view.xslt.AbstractXsltView"; - @Override protected final String[] witnessClasses() { + @Override + protected final String[] witnessClasses() { return new String[] {WITHNESS_CLASSES}; } } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v3/define/ControllerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v3/define/ControllerInstrumentation.java index 887f49d03987..75b43a06bcbb 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v3/define/ControllerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v3/define/ControllerInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.spring.mvc.v3.define; import net.bytebuddy.description.method.MethodDescription; @@ -27,7 +26,8 @@ import org.apache.skywalking.apm.agent.core.plugin.match.ClassAnnotationMatch; import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; -import static net.bytebuddy.matcher.ElementMatchers.*; +import static net.bytebuddy.matcher.ElementMatchers.any; +import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.skywalking.apm.agent.core.plugin.match.MethodInheritanceAnnotationMatcher.byMethodInheritanceAnnotationMatcher; import static org.apache.skywalking.apm.plugin.spring.mvc.commons.Constants.REQUEST_MAPPING_METHOD_INTERCEPTOR; @@ -35,8 +35,6 @@ * {@link ControllerInstrumentation} intercept the constructor and the methods annotated with {@link * org.springframework.web.bind.annotation.RequestMapping} in the class annotated with {@link * org.springframework.stereotype.Controller}. - * - * @author zhangxin */ public class ControllerInstrumentation extends AbstractSpring3Instrumentation { public static final String CONTROLLER_ENHANCE_ANNOTATION = "org.springframework.stereotype.Controller"; diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v3/define/HandlerMethodInstrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v3/define/HandlerMethodInstrumentation.java index 49644f9578db..8900dcba8131 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v3/define/HandlerMethodInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v3/define/HandlerMethodInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.spring.mvc.v3.define; import net.bytebuddy.description.method.MethodDescription; @@ -32,8 +31,6 @@ /** * {@link HandlerMethodInstrumentation} intercept the getBean method in the * org.springframework.web.method.HandlerMethod class. - * - * @author zhangxin */ public class HandlerMethodInstrumentation extends AbstractSpring3Instrumentation { diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v3/define/HandlerMethodInvokerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v3/define/HandlerMethodInvokerInstrumentation.java index 99beb76ceef8..03b837b8e92c 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v3/define/HandlerMethodInvokerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v3/define/HandlerMethodInvokerInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.spring.mvc.v3.define; import net.bytebuddy.description.method.MethodDescription; @@ -31,37 +30,41 @@ /** * {@link HandlerMethodInvokerInstrumentation} intercept the invokeHandlerMethod method in the * org.springframework.web.bind.annotation.support.HandlerMethodInvoker class. - * - * @author zhangxin */ public class HandlerMethodInvokerInstrumentation extends AbstractSpring3Instrumentation { private static final String ENHANCE_CLASS = "org.springframework.web.bind.annotation.support.HandlerMethodInvoker"; private static final String ENHANCE_METHOD = "invokeHandlerMethod"; private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.spring.mvc.v3.HandlerMethodInvokerInterceptor"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(ENHANCE_METHOD); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return INTERCEPTOR_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName(ENHANCE_CLASS); } } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v3/define/InvocableHandlerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v3/define/InvocableHandlerInstrumentation.java index eb45e0cd82cf..c22f07ed43dc 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v3/define/InvocableHandlerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v3/define/InvocableHandlerInstrumentation.java @@ -31,19 +31,19 @@ /** * {@link InvocableHandlerInstrumentation} intercept the invokeForRequest method in the * org.springframework.web.method.support.InvocableHandlerMethod class. - * - * @author zhangxin */ public class InvocableHandlerInstrumentation extends AbstractSpring3Instrumentation { public static final String ENHANCE_METHOD = "invokeForRequest"; public static final String ENHANCE_CLASS = "org.springframework.web.method.support.InvocableHandlerMethod"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override @@ -61,10 +61,11 @@ public boolean isOverrideArgs() { return false; } }, - }; + }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName(ENHANCE_CLASS); } } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spring/mvc/v3/ControllerConstructorInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spring/mvc/v3/ControllerConstructorInterceptorTest.java index 088d124c2561..ac69c2781af0 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spring/mvc/v3/ControllerConstructorInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spring/mvc/v3/ControllerConstructorInterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.spring.mvc.v3; import java.lang.reflect.Field; @@ -65,7 +64,7 @@ public void testClassAnnotationWithoutRequestMapping() throws NoSuchFieldExcepti private String getBasePath(PathMappingCache mappingCache) throws NoSuchFieldException, IllegalAccessException { Field classPath = mappingCache.getClass().getDeclaredField("classPath"); classPath.setAccessible(true); - return (String)classPath.get(mappingCache); + return (String) classPath.get(mappingCache); } @RequestMapping("/test") @@ -77,12 +76,14 @@ private void mockTestMethod() { } - @Override public Object getSkyWalkingDynamicField() { + @Override + public Object getSkyWalkingDynamicField() { return requireObjectCache; } - @Override public void setSkyWalkingDynamicField(Object value) { - this.requireObjectCache = (EnhanceRequireObjectCache)value; + @Override + public void setSkyWalkingDynamicField(Object value) { + this.requireObjectCache = (EnhanceRequireObjectCache) value; } } @@ -93,12 +94,14 @@ private void mockTestMethod() { } - @Override public Object getSkyWalkingDynamicField() { + @Override + public Object getSkyWalkingDynamicField() { return requireObjectCache; } - @Override public void setSkyWalkingDynamicField(Object value) { - this.requireObjectCache = (EnhanceRequireObjectCache)value; + @Override + public void setSkyWalkingDynamicField(Object value) { + this.requireObjectCache = (EnhanceRequireObjectCache) value; } } } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/pom.xml index 304ccc4dea11..0d1786b9f5e5 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/pom.xml @@ -16,7 +16,8 @@ ~ --> - + spring-plugins org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/ControllerConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/ControllerConstructorInterceptor.java index 45d70cd99057..2930c55473af 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/ControllerConstructorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/ControllerConstructorInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.spring.mvc.v4; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; @@ -28,14 +27,14 @@ /** * The ControllerConstructorInterceptor intercepts the Controller's constructor, in order to acquire the * mapping annotation, if exist. - * + *

* But, you can see we only use the first mapping value, Why? - * + *

* Right now, we intercept the controller by annotation as you known, so we CAN'T know which uri patten is actually * matched. Even we know, that costs a lot. - * + *

* If we want to resolve that, we must intercept the Spring MVC core codes, that is not a good choice for now. - * + *

* Comment by @wu-sheng */ public class ControllerConstructorInterceptor implements InstanceConstructorInterceptor { diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/AbstractControllerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/AbstractControllerInstrumentation.java index 95b6df72040d..e913f10514c4 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/AbstractControllerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/AbstractControllerInstrumentation.java @@ -27,7 +27,8 @@ import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; import org.apache.skywalking.apm.plugin.spring.mvc.commons.Constants; -import static net.bytebuddy.matcher.ElementMatchers.*; +import static net.bytebuddy.matcher.ElementMatchers.any; +import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.skywalking.apm.agent.core.plugin.match.MethodInheritanceAnnotationMatcher.byMethodInheritanceAnnotationMatcher; /** @@ -38,12 +39,10 @@ * ControllerConstructorInterceptor set the controller base path to * dynamic field before execute constructor. * - * org.apache.skywalking.apm.plugin.spring.mvc.v4.RequestMappingMethodInterceptor get the request path from - * dynamic field first, if not found, RequestMappingMethodInterceptor generate request path that + * org.apache.skywalking.apm.plugin.spring.mvc.v4.RequestMappingMethodInterceptor get the request path + * from dynamic field first, if not found, RequestMappingMethodInterceptor generate request path that * combine the path value of current annotation on current method and the base path and set the new path to the dynamic * filed - * - * @author zhangxin */ public abstract class AbstractControllerInstrumentation extends AbstractSpring4Instrumentation { @Override diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/AbstractSpring4Instrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/AbstractSpring4Instrumentation.java index 82e8369b84f7..e17f47f810ca 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/AbstractSpring4Instrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/AbstractSpring4Instrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.spring.mvc.v4.define; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; @@ -26,6 +25,9 @@ public abstract class AbstractSpring4Instrumentation extends ClassInstanceMethod @Override protected String[] witnessClasses() { - return new String[] {WITHNESS_CLASSES, "org.springframework.cache.interceptor.DefaultKeyGenerator"}; + return new String[] { + WITHNESS_CLASSES, + "org.springframework.cache.interceptor.DefaultKeyGenerator" + }; } } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/ControllerForLowVersionInstrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/ControllerForLowVersionInstrumentation.java index d28340b84896..81b57780fe6a 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/ControllerForLowVersionInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/ControllerForLowVersionInstrumentation.java @@ -42,16 +42,20 @@ public String getConstructorInterceptor() { return "org.apache.skywalking.apm.plugin.spring.mvc.v4.ControllerForLowVersionConstructorInterceptor"; } }; - return new ConstructorInterceptPoint[]{constructorInterceptPoint}; + return new ConstructorInterceptPoint[] {constructorInterceptPoint}; } @Override protected String[] witnessClasses() { - return new String[]{WITHNESS_CLASSES, "org.springframework.cache.interceptor.DefaultKeyGenerator", WITNESS_CLASSES_LOW_VERSION}; + return new String[] { + WITHNESS_CLASSES, + "org.springframework.cache.interceptor.DefaultKeyGenerator", + WITNESS_CLASSES_LOW_VERSION + }; } @Override protected String[] getEnhanceAnnotations() { - return new String[]{ENHANCE_ANNOTATION}; + return new String[] {ENHANCE_ANNOTATION}; } } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/ControllerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/ControllerInstrumentation.java index 4a47c9675292..f4e3a918dc5d 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/ControllerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/ControllerInstrumentation.java @@ -16,14 +16,14 @@ * */ - package org.apache.skywalking.apm.plugin.spring.mvc.v4.define; public class ControllerInstrumentation extends AbstractControllerInstrumentation { public static final String ENHANCE_ANNOTATION = "org.springframework.stereotype.Controller"; - @Override protected String[] getEnhanceAnnotations() { + @Override + protected String[] getEnhanceAnnotations() { return new String[] {ENHANCE_ANNOTATION}; } } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/HandlerMethodInstrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/HandlerMethodInstrumentation.java index bc6fa2c0525c..c1d91757e952 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/HandlerMethodInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/HandlerMethodInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.spring.mvc.v4.define; import net.bytebuddy.description.method.MethodDescription; @@ -32,8 +31,6 @@ /** * {@link HandlerMethodInstrumentation} intercept the getBean method in the * org.springframework.web.method.HandlerMethod class. - * - * @author zhangxin */ public class HandlerMethodInstrumentation extends AbstractSpring4Instrumentation { diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/InvocableHandlerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/InvocableHandlerInstrumentation.java index bd544ad8ad5d..d41639edade8 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/InvocableHandlerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/InvocableHandlerInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.spring.mvc.v4.define; import net.bytebuddy.description.method.MethodDescription; @@ -32,8 +31,6 @@ /** * {@link InvocableHandlerInstrumentation} intercept the invokeForRequest method in the * org.springframework.web.method.support.InvocableHandlerMethod class. - * - * @author zhangxin */ public class InvocableHandlerInstrumentation extends AbstractSpring4Instrumentation { diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/RestControllerForLowVersionInstrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/RestControllerForLowVersionInstrumentation.java index d1ba6ae7cc69..97863ec69b8d 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/RestControllerForLowVersionInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/RestControllerForLowVersionInstrumentation.java @@ -42,16 +42,20 @@ public String getConstructorInterceptor() { return "org.apache.skywalking.apm.plugin.spring.mvc.v4.ControllerForLowVersionConstructorInterceptor"; } }; - return new ConstructorInterceptPoint[]{constructorInterceptPoint}; + return new ConstructorInterceptPoint[] {constructorInterceptPoint}; } @Override protected String[] witnessClasses() { - return new String[]{WITHNESS_CLASSES, "org.springframework.cache.interceptor.DefaultKeyGenerator", WITNESS_CLASSES_LOW_VERSION}; + return new String[] { + WITHNESS_CLASSES, + "org.springframework.cache.interceptor.DefaultKeyGenerator", + WITNESS_CLASSES_LOW_VERSION + }; } @Override protected String[] getEnhanceAnnotations() { - return new String[]{ENHANCE_ANNOTATION}; + return new String[] {ENHANCE_ANNOTATION}; } } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/RestControllerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/RestControllerInstrumentation.java index 82061b19b108..5db1b79980e2 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/RestControllerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/RestControllerInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.spring.mvc.v4.define; public class RestControllerInstrumentation extends AbstractControllerInstrumentation { @@ -27,11 +26,15 @@ public class RestControllerInstrumentation extends AbstractControllerInstrumenta @Override protected String[] getEnhanceAnnotations() { - return new String[]{ENHANCE_ANNOTATION}; + return new String[] {ENHANCE_ANNOTATION}; } @Override protected String[] witnessClasses() { - return new String[]{WITHNESS_CLASSES, "org.springframework.cache.interceptor.DefaultKeyGenerator", WITNESS_CLASSES_HIGH_VERSION}; + return new String[] { + WITHNESS_CLASSES, + "org.springframework.cache.interceptor.DefaultKeyGenerator", + WITNESS_CLASSES_HIGH_VERSION + }; } } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/ControllerConstructorInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/ControllerConstructorInterceptorTest.java index a9e429be243e..bc95a7d26d43 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/ControllerConstructorInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/ControllerConstructorInterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.spring.mvc.v4; import java.lang.reflect.Method; @@ -47,7 +46,7 @@ public void setUp() throws Exception { @Test public void testOnConstruct_Accuracy1() throws Throwable { controllerConstructorInterceptor.onConstruct(inst1, null); - EnhanceRequireObjectCache cache = (EnhanceRequireObjectCache)inst1.getSkyWalkingDynamicField(); + EnhanceRequireObjectCache cache = (EnhanceRequireObjectCache) inst1.getSkyWalkingDynamicField(); Assert.assertNotNull(cache); Object obj = new Object(); @@ -60,7 +59,7 @@ public void testOnConstruct_Accuracy1() throws Throwable { @Test public void testOnConstruct_Accuracy2() throws Throwable { controllerConstructorInterceptor.onConstruct(inst2, null); - EnhanceRequireObjectCache cache = (EnhanceRequireObjectCache)inst2.getSkyWalkingDynamicField(); + EnhanceRequireObjectCache cache = (EnhanceRequireObjectCache) inst2.getSkyWalkingDynamicField(); Assert.assertNotNull(cache); Object obj = new Object(); @@ -73,7 +72,7 @@ public void testOnConstruct_Accuracy2() throws Throwable { @Test public void testOnConstruct_Accuracy3() throws Throwable { controllerConstructorInterceptor.onConstruct(inst3, null); - EnhanceRequireObjectCache cache = (EnhanceRequireObjectCache)inst3.getSkyWalkingDynamicField(); + EnhanceRequireObjectCache cache = (EnhanceRequireObjectCache) inst3.getSkyWalkingDynamicField(); Assert.assertNotNull(cache); Object obj = new Object(); diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/PathMappingCacheTest.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/PathMappingCacheTest.java index 776d4585fb88..7244593c75e2 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/PathMappingCacheTest.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/PathMappingCacheTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.spring.mvc.v4; import java.lang.reflect.Method; diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/RequestMappingMethodInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/RequestMappingMethodInterceptorTest.java index 43f41ef45e0b..45022f78fff4 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/RequestMappingMethodInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/RequestMappingMethodInterceptorTest.java @@ -103,8 +103,14 @@ public void setUp() throws Exception { when(request.getRequestURL()).thenReturn(new StringBuffer("http://localhost:8080/test/testRequestURL")); when(response.getStatus()).thenReturn(200); - arguments = new Object[] {request, response}; - argumentType = new Class[] {request.getClass(), response.getClass()}; + arguments = new Object[] { + request, + response + }; + argumentType = new Class[] { + request.getClass(), + response.getClass() + }; } @@ -132,7 +138,8 @@ public void handleCase() throws Throwable { @Test public void testWithOccurException() throws Throwable { SpringTestCaseHelper.createCaseHandler(request, response, new SpringTestCaseHelper.CaseHandler() { - @Override public void handleCase() throws Throwable { + @Override + public void handleCase() throws Throwable { controllerConstructorInterceptor.onConstruct(enhancedInstance, null); RequestMappingClass1 mappingClass1 = new RequestMappingClass1(); Method m = mappingClass1.getClass().getMethod("testRequestURL"); diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/RestMappingMethodInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/RestMappingMethodInterceptorTest.java index d71c1459d1f3..e0d49f52d8a4 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/RestMappingMethodInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/RestMappingMethodInterceptorTest.java @@ -104,15 +104,22 @@ public void setUp() throws Exception { when(response.getStatus()).thenReturn(200); when(nativeWebRequest.getNativeResponse()).thenReturn(response); - arguments = new Object[] {request, response}; - argumentType = new Class[] {request.getClass(), response.getClass()}; + arguments = new Object[] { + request, + response + }; + argumentType = new Class[] { + request.getClass(), + response.getClass() + }; } @Test public void testGetMapping() throws Throwable { SpringTestCaseHelper.createCaseHandler(request, response, new SpringTestCaseHelper.CaseHandler() { - @Override public void handleCase() throws Throwable { + @Override + public void handleCase() throws Throwable { controllerConstructorInterceptor.onConstruct(enhancedInstance, null); RestMappingClass1 mappingClass1 = new RestMappingClass1(); Method m = mappingClass1.getClass().getMethod("getRequestURL"); @@ -136,7 +143,8 @@ public void testGetMapping() throws Throwable { @Test public void testPostMapping() throws Throwable { SpringTestCaseHelper.createCaseHandler(request, response, new SpringTestCaseHelper.CaseHandler() { - @Override public void handleCase() throws Throwable { + @Override + public void handleCase() throws Throwable { controllerConstructorInterceptor.onConstruct(enhancedInstance, null); RestMappingClass1 mappingClass1 = new RestMappingClass1(); Method m = mappingClass1.getClass().getMethod("postRequestURL"); @@ -161,7 +169,8 @@ public void testPostMapping() throws Throwable { @Test public void testPutMapping() throws Throwable { SpringTestCaseHelper.createCaseHandler(request, response, new SpringTestCaseHelper.CaseHandler() { - @Override public void handleCase() throws Throwable { + @Override + public void handleCase() throws Throwable { controllerConstructorInterceptor.onConstruct(enhancedInstance, null); RestMappingClass1 mappingClass1 = new RestMappingClass1(); Method m = mappingClass1.getClass().getMethod("putRequestURL"); @@ -186,7 +195,8 @@ public void testPutMapping() throws Throwable { @Test public void testDeleteMapping() throws Throwable { SpringTestCaseHelper.createCaseHandler(request, response, new SpringTestCaseHelper.CaseHandler() { - @Override public void handleCase() throws Throwable { + @Override + public void handleCase() throws Throwable { controllerConstructorInterceptor.onConstruct(enhancedInstance, null); RestMappingClass1 mappingClass1 = new RestMappingClass1(); Method m = mappingClass1.getClass().getMethod("deleteRequestURL"); @@ -211,7 +221,8 @@ public void testDeleteMapping() throws Throwable { @Test public void testPatchMapping() throws Throwable { SpringTestCaseHelper.createCaseHandler(request, response, new SpringTestCaseHelper.CaseHandler() { - @Override public void handleCase() throws Throwable { + @Override + public void handleCase() throws Throwable { controllerConstructorInterceptor.onConstruct(enhancedInstance, null); RestMappingClass1 mappingClass1 = new RestMappingClass1(); Method m = mappingClass1.getClass().getMethod("patchRequestURL"); @@ -235,7 +246,8 @@ public void testPatchMapping() throws Throwable { @Test public void testDummy() throws Throwable { SpringTestCaseHelper.createCaseHandler(request, response, new SpringTestCaseHelper.CaseHandler() { - @Override public void handleCase() throws Throwable { + @Override + public void handleCase() throws Throwable { controllerConstructorInterceptor.onConstruct(enhancedInstance, null); RestMappingClass1 mappingClass1 = new RestMappingClass1(); Method m = mappingClass1.getClass().getMethod("dummy"); @@ -260,7 +272,8 @@ public void testDummy() throws Throwable { @Test public void testWithOccurException() throws Throwable { SpringTestCaseHelper.createCaseHandler(request, response, new SpringTestCaseHelper.CaseHandler() { - @Override public void handleCase() throws Throwable { + @Override + public void handleCase() throws Throwable { controllerConstructorInterceptor.onConstruct(enhancedInstance, null); RestMappingClass1 mappingClass1 = new RestMappingClass1(); Method m = mappingClass1.getClass().getMethod("getRequestURL"); diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/ControllerInstrumentationTest.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/ControllerInstrumentationTest.java index b365812879ec..1a57e8b19cb5 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/ControllerInstrumentationTest.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/ControllerInstrumentationTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.spring.mvc.v4.define; import net.bytebuddy.matcher.ElementMatchers; @@ -45,8 +44,7 @@ public void setUp() throws Exception { @Test public void testGetEnhanceAnnotations() throws Throwable { - Assert.assertArrayEquals(new String[] {ControllerInstrumentation.ENHANCE_ANNOTATION}, - controllerInstrumentation.getEnhanceAnnotations()); + Assert.assertArrayEquals(new String[] {ControllerInstrumentation.ENHANCE_ANNOTATION}, controllerInstrumentation.getEnhanceAnnotations()); } @Test diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/RestControllerInstrumentationTest.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/RestControllerInstrumentationTest.java index 6ecc21d1484e..ed53c0f05352 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/RestControllerInstrumentationTest.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/RestControllerInstrumentationTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.spring.mvc.v4.define; import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; @@ -43,8 +42,8 @@ public void setUp() throws Exception { @Test public void testGetEnhanceAnnotations() throws Throwable { - Assert.assertArrayEquals(new String[] {restControllerInstrumentation.ENHANCE_ANNOTATION}, - restControllerInstrumentation.getEnhanceAnnotations()); + Assert.assertArrayEquals(new String[] {restControllerInstrumentation.ENHANCE_ANNOTATION}, restControllerInstrumentation + .getEnhanceAnnotations()); } @Test diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/pom.xml index 967ee57b4036..75e706a57ad8 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/pom.xml @@ -15,7 +15,8 @@ ~ limitations under the License. --> - + spring-plugins org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/ControllerConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/ControllerConstructorInterceptor.java index f32ca4063863..422c39b23c83 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/ControllerConstructorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/ControllerConstructorInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.spring.mvc.v5; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; @@ -28,14 +27,14 @@ /** * The ControllerConstructorInterceptor intercepts the Controller's constructor, in order to acquire the * mapping annotation, if exist. - * + *

* But, you can see we only use the first mapping value, Why? - * + *

* Right now, we intercept the controller by annotation as you known, so we CAN'T know which uri patten is actually * matched. Even we know, that costs a lot. - * + *

* If we want to resolve that, we must intercept the Spring MVC core codes, that is not a good choice for now. - * + *

* Comment by @wu-sheng */ public class ControllerConstructorInterceptor implements InstanceConstructorInterceptor { diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/GetBeanInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/GetBeanInterceptor.java index a2e2144b0e0e..51e21852d8a6 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/GetBeanInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/GetBeanInterceptor.java @@ -32,8 +32,6 @@ /** * {@link GetBeanInterceptor} pass the {@link NativeWebRequest} object into the {@link * org.springframework.stereotype.Controller} object. - * - * @author zhangxin */ public class GetBeanInterceptor implements InstanceMethodsAroundInterceptor { @Override @@ -45,8 +43,12 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { if (ret instanceof EnhancedInstance) { - ContextManager.getRuntimeContext().put(REQUEST_KEY_IN_RUNTIME_CONTEXT, ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest()); - ContextManager.getRuntimeContext().put(RESPONSE_KEY_IN_RUNTIME_CONTEXT, ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getResponse()); + ContextManager.getRuntimeContext() + .put(REQUEST_KEY_IN_RUNTIME_CONTEXT, ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()) + .getRequest()); + ContextManager.getRuntimeContext() + .put(RESPONSE_KEY_IN_RUNTIME_CONTEXT, ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()) + .getResponse()); } return ret; } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/define/AbstractControllerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/define/AbstractControllerInstrumentation.java index e4cee47ac59e..4804df1f9d16 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/define/AbstractControllerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/define/AbstractControllerInstrumentation.java @@ -26,7 +26,8 @@ import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; import org.apache.skywalking.apm.plugin.spring.mvc.commons.Constants; -import static net.bytebuddy.matcher.ElementMatchers.*; +import static net.bytebuddy.matcher.ElementMatchers.any; +import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.skywalking.apm.agent.core.plugin.match.MethodInheritanceAnnotationMatcher.byMethodInheritanceAnnotationMatcher; /** @@ -37,12 +38,10 @@ * ControllerConstructorInterceptor set the controller base path to * dynamic field before execute constructor. * - * org.apache.skywalking.apm.plugin.spring.mvc.v4.RequestMappingMethodInterceptor get the request path from - * dynamic field first, if not found, RequestMappingMethodInterceptor generate request path that + * org.apache.skywalking.apm.plugin.spring.mvc.v4.RequestMappingMethodInterceptor get the request path + * from dynamic field first, if not found, RequestMappingMethodInterceptor generate request path that * combine the path value of current annotation on current method and the base path and set the new path to the dynamic * filed - * - * @author zhangxin */ public abstract class AbstractControllerInstrumentation extends AbstractSpring5Instrumentation { @Override diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/define/AbstractSpring5Instrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/define/AbstractSpring5Instrumentation.java index e7126c871b5c..1f1ee13318e4 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/define/AbstractSpring5Instrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/define/AbstractSpring5Instrumentation.java @@ -15,7 +15,6 @@ * limitations under the License. */ - package org.apache.skywalking.apm.plugin.spring.mvc.v5.define; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/define/ControllerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/define/ControllerInstrumentation.java index c0643382a399..2a6629118121 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/define/ControllerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/define/ControllerInstrumentation.java @@ -15,14 +15,14 @@ * limitations under the License. */ - package org.apache.skywalking.apm.plugin.spring.mvc.v5.define; public class ControllerInstrumentation extends AbstractControllerInstrumentation { public static final String ENHANCE_ANNOTATION = "org.springframework.stereotype.Controller"; - @Override protected String[] getEnhanceAnnotations() { + @Override + protected String[] getEnhanceAnnotations() { return new String[] {ENHANCE_ANNOTATION}; } } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/define/HandlerMethodInstrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/define/HandlerMethodInstrumentation.java index 659ce00e845d..c89044285330 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/define/HandlerMethodInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/define/HandlerMethodInstrumentation.java @@ -29,8 +29,6 @@ /** * {@link HandlerMethodInstrumentation} intercept the getBean method in the * org.springframework.web.method.HandlerMethod class. - * - * @author zhangxin */ public class HandlerMethodInstrumentation extends AbstractSpring5Instrumentation { diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/define/RestControllerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/define/RestControllerInstrumentation.java index a7ae800c3e30..7c4974f4ee00 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/define/RestControllerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/define/RestControllerInstrumentation.java @@ -16,14 +16,14 @@ * */ - package org.apache.skywalking.apm.plugin.spring.mvc.v5.define; public class RestControllerInstrumentation extends AbstractControllerInstrumentation { public static final String ENHANCE_ANNOTATION = "org.springframework.web.bind.annotation.RestController"; - @Override protected String[] getEnhanceAnnotations() { + @Override + protected String[] getEnhanceAnnotations() { return new String[] {ENHANCE_ANNOTATION}; } } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/pom.xml index 79d000d4708b..60a557f21919 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/pom.xml @@ -16,7 +16,8 @@ ~ --> - + spring-plugins org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/Constants.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/Constants.java index 42119d6ba789..6341b067c380 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/Constants.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/Constants.java @@ -20,8 +20,6 @@ /** * Interceptor class name constant variables - * - * @author zhangxin */ public class Constants { public static final String GET_BEAN_INTERCEPTOR = "org.apache.skywalking.apm.plugin.spring.mvc.commons.interceptor.GetBeanInterceptor"; @@ -40,5 +38,5 @@ public class Constants { public static final String WEBFLUX_REQUEST_KEY = "SW_WEBFLUX_REQUEST_KEY"; - public static final String CONTROLLER_METHOD_STACK_DEPTH = "SW_CONTROLLER_METHOD_STACK_DEPTH"; + public static final String CONTROLLER_METHOD_STACK_DEPTH = "SW_CONTROLLER_METHOD_STACK_DEPTH"; } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/ParsePathUtil.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/ParsePathUtil.java index 17737b7e5a66..bd2e8afe692f 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/ParsePathUtil.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/ParsePathUtil.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.spring.mvc.commons; import java.lang.reflect.Method; @@ -25,7 +26,6 @@ /** * Tools for parsing path from annotation - * @author jialong */ public class ParsePathUtil { @@ -38,7 +38,8 @@ public static String recursiveParseMethodAnnotaion(Method method, Function parseFunc) { + private static String recursiveMatches(Class claz, String methodName, Parameter[] parameters, + Function parseFunc) { Class[] interfaces = claz.getInterfaces(); for (Class implInterface : interfaces) { String path = recursiveMatches(implInterface, methodName, parameters, parseFunc); diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/PathMappingCache.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/PathMappingCache.java index 45b64744b92d..a4c76acc53ef 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/PathMappingCache.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/PathMappingCache.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.spring.mvc.commons; import org.apache.skywalking.apm.util.StringUtil; @@ -26,8 +25,6 @@ /** * {@link PathMappingCache} cache all request urls of {@link org.springframework.stereotype.Controller} . - * - * @author zhangxin */ public class PathMappingCache { @@ -49,10 +46,9 @@ public String findPathMapping(Method method) { } public void addPathMapping(Method method, String methodPath) { - if (!StringUtil.isEmpty(methodPath) && !methodPath.startsWith(PATH_SEPARATOR) - && !classPath.endsWith(PATH_SEPARATOR)) { + if (!StringUtil.isEmpty(methodPath) && !methodPath.startsWith(PATH_SEPARATOR) && !classPath.endsWith(PATH_SEPARATOR)) { methodPath = PATH_SEPARATOR + methodPath; } - methodPathMapping.put(method, (classPath + methodPath).replace("//","/")); + methodPathMapping.put(method, (classPath + methodPath).replace("//", "/")); } } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/define/AnnotationMethodHandlerAdapterInstrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/define/AnnotationMethodHandlerAdapterInstrumentation.java index aa18fc345c88..ba396c052e9f 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/define/AnnotationMethodHandlerAdapterInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/define/AnnotationMethodHandlerAdapterInstrumentation.java @@ -29,29 +29,35 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; public class AnnotationMethodHandlerAdapterInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named("invokeHandlerMethod"); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return "org.apache.skywalking.apm.plugin.spring.mvc.commons.interceptor.InvokeHandlerMethodInterceptor"; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName("org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter"); } } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/AbstractMethodInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/AbstractMethodInterceptor.java index 800894113f55..1de75ec277ab 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/AbstractMethodInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/AbstractMethodInterceptor.java @@ -66,7 +66,7 @@ public abstract class AbstractMethodInterceptor implements InstanceMethodsAround public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - Boolean forwardRequestFlag = (Boolean)ContextManager.getRuntimeContext().get(FORWARD_REQUEST_FLAG); + Boolean forwardRequestFlag = (Boolean) ContextManager.getRuntimeContext().get(FORWARD_REQUEST_FLAG); /** * Spring MVC plugin do nothing if current request is forward request. * Ref: https://github.com/apache/skywalking/pull/1325 @@ -79,7 +79,7 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr if (Config.Plugin.SpringMVC.USE_QUALIFIED_NAME_AS_ENDPOINT_NAME) { operationName = MethodUtil.generateOperationName(method); } else { - EnhanceRequireObjectCache pathMappingCache = (EnhanceRequireObjectCache)objInst.getSkyWalkingDynamicField(); + EnhanceRequireObjectCache pathMappingCache = (EnhanceRequireObjectCache) objInst.getSkyWalkingDynamicField(); String requestURL = pathMappingCache.findPathMapping(method); if (requestURL == null) { requestURL = getRequestURL(method); @@ -89,9 +89,10 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr operationName = requestURL; } - HttpServletRequest request = (HttpServletRequest)ContextManager.getRuntimeContext().get(REQUEST_KEY_IN_RUNTIME_CONTEXT); + HttpServletRequest request = (HttpServletRequest) ContextManager.getRuntimeContext() + .get(REQUEST_KEY_IN_RUNTIME_CONTEXT); if (request != null) { - StackDepth stackDepth = (StackDepth)ContextManager.getRuntimeContext().get(CONTROLLER_METHOD_STACK_DEPTH); + StackDepth stackDepth = (StackDepth) ContextManager.getRuntimeContext().get(CONTROLLER_METHOD_STACK_DEPTH); if (stackDepth == null) { ContextCarrier contextCarrier = new ContextCarrier(); @@ -111,9 +112,7 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr final Map parameterMap = request.getParameterMap(); if (parameterMap != null && !parameterMap.isEmpty()) { String tagValue = CollectionUtil.toString(parameterMap); - tagValue = Config.Plugin.Http.HTTP_PARAMS_LENGTH_THRESHOLD > 0 - ? StringUtil.cut(tagValue, Config.Plugin.Http.HTTP_PARAMS_LENGTH_THRESHOLD) - : tagValue; + tagValue = Config.Plugin.Http.HTTP_PARAMS_LENGTH_THRESHOLD > 0 ? StringUtil.cut(tagValue, Config.Plugin.Http.HTTP_PARAMS_LENGTH_THRESHOLD) : tagValue; Tags.HTTP.PARAMS.set(span, tagValue); } } @@ -121,8 +120,7 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr stackDepth = new StackDepth(); ContextManager.getRuntimeContext().put(CONTROLLER_METHOD_STACK_DEPTH, stackDepth); } else { - AbstractSpan span = - ContextManager.createLocalSpan(buildOperationName(objInst, method)); + AbstractSpan span = ContextManager.createLocalSpan(buildOperationName(objInst, method)); span.setComponent(ComponentsDefine.SPRING_MVC_ANNOTATION); } @@ -131,8 +129,9 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } private String buildOperationName(Object invoker, Method method) { - StringBuilder operationName = new StringBuilder(invoker.getClass().getName()) - .append(".").append(method.getName()).append("("); + StringBuilder operationName = new StringBuilder(invoker.getClass().getName()).append(".") + .append(method.getName()) + .append("("); for (Class type : method.getParameterTypes()) { operationName.append(type.getName()).append(","); } @@ -147,7 +146,7 @@ private String buildOperationName(Object invoker, Method method) { @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { - Boolean forwardRequestFlag = (Boolean)ContextManager.getRuntimeContext().get(FORWARD_REQUEST_FLAG); + Boolean forwardRequestFlag = (Boolean) ContextManager.getRuntimeContext().get(FORWARD_REQUEST_FLAG); /** * Spring MVC plugin do nothing if current request is forward request. * Ref: https://github.com/apache/skywalking/pull/1325 @@ -156,10 +155,11 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - HttpServletRequest request = (HttpServletRequest)ContextManager.getRuntimeContext().get(REQUEST_KEY_IN_RUNTIME_CONTEXT); + HttpServletRequest request = (HttpServletRequest) ContextManager.getRuntimeContext() + .get(REQUEST_KEY_IN_RUNTIME_CONTEXT); if (request != null) { - StackDepth stackDepth = (StackDepth)ContextManager.getRuntimeContext().get(CONTROLLER_METHOD_STACK_DEPTH); + StackDepth stackDepth = (StackDepth) ContextManager.getRuntimeContext().get(CONTROLLER_METHOD_STACK_DEPTH); if (stackDepth == null) { throw new IllegalMethodStackDepthException(); } else { @@ -169,7 +169,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA AbstractSpan span = ContextManager.activeSpan(); if (stackDepth.depth() == 0) { - HttpServletResponse response = (HttpServletResponse)ContextManager.getRuntimeContext().get(RESPONSE_KEY_IN_RUNTIME_CONTEXT); + HttpServletResponse response = (HttpServletResponse) ContextManager.getRuntimeContext() + .get(RESPONSE_KEY_IN_RUNTIME_CONTEXT); if (response == null) { throw new ServletResponseNotFoundException(); } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/GetBeanInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/GetBeanInterceptor.java index 613481fcde3c..6cc6c623348b 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/GetBeanInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/GetBeanInterceptor.java @@ -32,8 +32,6 @@ /** * {@link GetBeanInterceptor} pass the {@link NativeWebRequest} object into the {@link * org.springframework.stereotype.Controller} object. - * - * @author zhangxin */ public class GetBeanInterceptor implements InstanceMethodsAroundInterceptor { @Override @@ -45,7 +43,9 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { if (ret instanceof EnhancedInstance) { - ContextManager.getRuntimeContext().put(REQUEST_KEY_IN_RUNTIME_CONTEXT, ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest()); + ContextManager.getRuntimeContext() + .put(REQUEST_KEY_IN_RUNTIME_CONTEXT, ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()) + .getRequest()); } return ret; } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/InvokeForRequestInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/InvokeForRequestInterceptor.java index b21a62868c8c..e5430f7be0ac 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/InvokeForRequestInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/InvokeForRequestInterceptor.java @@ -30,14 +30,13 @@ /** * {@link InvokeForRequestInterceptor} pass the {@link NativeWebRequest} object into the {@link * org.springframework.stereotype.Controller} object. - * - * @author zhangxin */ public class InvokeForRequestInterceptor implements InstanceMethodsAroundInterceptor { @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - ContextManager.getRuntimeContext().put(RESPONSE_KEY_IN_RUNTIME_CONTEXT, ((NativeWebRequest)allArguments[0]).getNativeResponse()); + ContextManager.getRuntimeContext() + .put(RESPONSE_KEY_IN_RUNTIME_CONTEXT, ((NativeWebRequest) allArguments[0]).getNativeResponse()); } @Override diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/InvokeHandlerMethodInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/InvokeHandlerMethodInterceptor.java index 33fbec273f0c..8785d554a6f4 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/InvokeHandlerMethodInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/InvokeHandlerMethodInterceptor.java @@ -43,7 +43,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { } } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/RequestMappingMethodInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/RequestMappingMethodInterceptor.java index 70ab5fd9321f..b2e66dbf1ee5 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/RequestMappingMethodInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/RequestMappingMethodInterceptor.java @@ -25,10 +25,8 @@ import java.lang.reflect.Method; /** - * The RequestMappingMethodInterceptor only use the first mapping value. - * it will interceptor with @RequestMapping - * - * @author clevertension + * The RequestMappingMethodInterceptor only use the first mapping value. it will interceptor with + * @RequestMapping */ public class RequestMappingMethodInterceptor extends AbstractMethodInterceptor { @Override diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/RestMappingMethodInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/RestMappingMethodInterceptor.java index 05066b3bbd66..88780176b90c 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/RestMappingMethodInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/RestMappingMethodInterceptor.java @@ -29,12 +29,9 @@ import java.lang.reflect.Method; /** - * The RestMappingMethodInterceptor only use the first mapping value. - * it will interceptor with + * The RestMappingMethodInterceptor only use the first mapping value. it will interceptor with * @GetMapping, @PostMapping, @PutMapping * @DeleteMapping, @PatchMapping - * - * @author clevertension */ public class RestMappingMethodInterceptor extends AbstractMethodInterceptor { @Override diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml index dc8a22a97b5d..298430f4c8ff 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml @@ -17,7 +17,8 @@ ~ --> - + 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/pom.xml index 361cab605d41..f3e827309ca5 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/pom.xml @@ -16,7 +16,8 @@ ~ --> - + spring-plugins org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/async/FutureGetInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/async/FutureGetInterceptor.java index 2502fa5fff72..88d322878dd8 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/async/FutureGetInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/async/FutureGetInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.spring.resttemplate.async; import java.lang.reflect.Method; @@ -31,7 +30,7 @@ public class FutureGetInterceptor implements InstanceMethodsAroundInterceptor { @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - Object[] cacheValues = (Object[])objInst.getSkyWalkingDynamicField(); + Object[] cacheValues = (Object[]) objInst.getSkyWalkingDynamicField(); ContextManager.createLocalSpan("future/get:" + cacheValues[0]); } @@ -42,7 +41,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { AbstractSpan activeSpan = ContextManager.activeSpan(); activeSpan.errorOccurred().log(t); diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/async/ResponseCallBackInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/async/ResponseCallBackInterceptor.java index bdba4ef59e13..ee31c3f0eb21 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/async/ResponseCallBackInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/async/ResponseCallBackInterceptor.java @@ -28,11 +28,11 @@ public class ResponseCallBackInterceptor implements InstanceMethodsAroundInterce @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - EnhancedInstance successCallBak = (EnhancedInstance)allArguments[0]; + EnhancedInstance successCallBak = (EnhancedInstance) allArguments[0]; successCallBak.setSkyWalkingDynamicField(objInst.getSkyWalkingDynamicField()); if (allArguments.length == 2) { - EnhancedInstance failedCallBack = (EnhancedInstance)allArguments[1]; + EnhancedInstance failedCallBack = (EnhancedInstance) allArguments[1]; failedCallBack.setSkyWalkingDynamicField(objInst.getSkyWalkingDynamicField()); } } @@ -43,7 +43,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/async/RestExecuteInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/async/RestExecuteInterceptor.java index 48bbf2aff67d..a46650c37663 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/async/RestExecuteInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/async/RestExecuteInterceptor.java @@ -37,19 +37,19 @@ public class RestExecuteInterceptor implements InstanceMethodsAroundInterceptor @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - final URI requestURL = (URI)allArguments[0]; - final HttpMethod httpMethod = (HttpMethod)allArguments[1]; + final URI requestURL = (URI) allArguments[0]; + final HttpMethod httpMethod = (HttpMethod) allArguments[1]; final ContextCarrier contextCarrier = new ContextCarrier(); - String remotePeer = requestURL.getHost() + ":" + (requestURL.getPort() > 0 ? requestURL.getPort() : "https".equalsIgnoreCase(requestURL.getScheme()) ? 443 : 80); + String remotePeer = requestURL.getHost() + ":" + (requestURL.getPort() > 0 ? requestURL.getPort() : "https".equalsIgnoreCase(requestURL + .getScheme()) ? 443 : 80); String formatURIPath = requestURL.getPath(); - AbstractSpan span = ContextManager.createExitSpan( - formatURIPath, - contextCarrier, remotePeer); + AbstractSpan span = ContextManager.createExitSpan(formatURIPath, contextCarrier, remotePeer); span.setComponent(ComponentsDefine.SPRING_REST_TEMPLATE); - Tags.URL.set(span, requestURL.getScheme() + "://" + requestURL.getHost() + ":" + requestURL.getPort() + requestURL.getPath()); + Tags.URL.set(span, requestURL.getScheme() + "://" + requestURL.getHost() + ":" + requestURL.getPort() + requestURL + .getPath()); Tags.HTTP.METHOD.set(span, httpMethod.toString()); SpanLayer.asHttp(span); Object[] cacheValues = new Object[3]; @@ -61,17 +61,18 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { - Object[] cacheValues = (Object[])objInst.getSkyWalkingDynamicField(); + Object[] cacheValues = (Object[]) objInst.getSkyWalkingDynamicField(); cacheValues[2] = ContextManager.capture(); if (ret != null) { - String uri = (String)cacheValues[0]; - ((EnhancedInstance)ret).setSkyWalkingDynamicField(new EnhanceCacheObjects(uri, ComponentsDefine.SPRING_REST_TEMPLATE, SpanLayer.HTTP, (ContextSnapshot)cacheValues[2])); + String uri = (String) cacheValues[0]; + ((EnhancedInstance) ret).setSkyWalkingDynamicField(new EnhanceCacheObjects(uri, ComponentsDefine.SPRING_REST_TEMPLATE, SpanLayer.HTTP, (ContextSnapshot) cacheValues[2])); } ContextManager.stopSpan(); return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/async/RestRequestInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/async/RestRequestInterceptor.java index fc4452424040..c71dfbe3b709 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/async/RestRequestInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/async/RestRequestInterceptor.java @@ -37,10 +37,10 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { - AsyncClientHttpRequest clientHttpRequest = (AsyncClientHttpRequest)ret; + AsyncClientHttpRequest clientHttpRequest = (AsyncClientHttpRequest) ret; if (ret != null) { - Object[] cacheValues = (Object[])objInst.getSkyWalkingDynamicField(); - ContextCarrier contextCarrier = (ContextCarrier)cacheValues[1]; + Object[] cacheValues = (Object[]) objInst.getSkyWalkingDynamicField(); + ContextCarrier contextCarrier = (ContextCarrier) cacheValues[1]; CarrierItem next = contextCarrier.items(); while (next.hasNext()) { next = next.next(); @@ -50,7 +50,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/async/define/ResponseExtractorFutureInstrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/async/define/ResponseExtractorFutureInstrumentation.java index a3b91cb84648..93631691a638 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/async/define/ResponseExtractorFutureInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/async/define/ResponseExtractorFutureInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.spring.resttemplate.async.define; import java.net.URI; @@ -33,15 +32,14 @@ import static net.bytebuddy.matcher.ElementMatchers.named; /** - * {@link ResponseExtractorFutureInstrumentation} enhance the addCallback method and getDefault - * method of org.springframework.web.client.AsyncRestTemplate$ResponseExtractorFuture by + * {@link ResponseExtractorFutureInstrumentation} enhance the addCallback method and + * getDefault method of org.springframework.web.client.AsyncRestTemplate$ResponseExtractorFuture + * by * ResponseCallBackInterceptor and * FutureGetInterceptor. - * + *

* {@link ResponseCallBackInterceptor} set the {@link URI} and {@link ContextSnapshot} to inherited * org.springframework.util.concurrent.SuccessCallback and org.springframework.util.concurrent.FailureCallback - * - * @author zhangxin */ public class ResponseExtractorFutureInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -61,28 +59,34 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(ADD_CALLBACK_METHOD_NAME); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return ADD_CALLBACK_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(GET_METHOD_NAME); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return GET_METHOD_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/async/define/RestTemplateInstrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/async/define/RestTemplateInstrumentation.java index 9fe983524f0c..d0c8a3266259 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/async/define/RestTemplateInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/async/define/RestTemplateInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.spring.resttemplate.async.define; import java.net.URI; @@ -33,14 +32,12 @@ /** * {@link RestTemplateInstrumentation} enhance the doExecute method and createAsyncRequest - * method of org.springframework.web.client.AsyncRestTemplate by RestExecuteInterceptor - * and org.springframework.http.client.RestRequestInterceptor. + * method of org.springframework.web.client.AsyncRestTemplate by RestExecuteInterceptor and + * org.springframework.http.client.RestRequestInterceptor. * * org.springframework.http.client.RestRequestInterceptor set {@link URI} and {@link ContextSnapshot} to * org.springframework.web.client.AsyncRestTemplate$ResponseExtractorFuture for propagate trace context * after execute doExecute . - * - * @author zhangxin */ public class RestTemplateInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -59,28 +56,34 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(DO_EXECUTE_METHOD_NAME); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return DO_EXECUTE_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(CREATE_REQUEST_METHOD_NAME); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return CREATE_REQUEST_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/sync/RestExecuteInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/sync/RestExecuteInterceptor.java index 66b0e779da2a..0941d902890d 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/sync/RestExecuteInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/sync/RestExecuteInterceptor.java @@ -35,16 +35,18 @@ public class RestExecuteInterceptor implements InstanceMethodsAroundInterceptor @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - final URI requestURL = (URI)allArguments[0]; - final HttpMethod httpMethod = (HttpMethod)allArguments[1]; + final URI requestURL = (URI) allArguments[0]; + final HttpMethod httpMethod = (HttpMethod) allArguments[1]; final ContextCarrier contextCarrier = new ContextCarrier(); - String remotePeer = requestURL.getHost() + ":" + (requestURL.getPort() > 0 ? requestURL.getPort() : "https".equalsIgnoreCase(requestURL.getScheme()) ? 443 : 80); + String remotePeer = requestURL.getHost() + ":" + (requestURL.getPort() > 0 ? requestURL.getPort() : "https".equalsIgnoreCase(requestURL + .getScheme()) ? 443 : 80); String formatURIPath = requestURL.getPath(); AbstractSpan span = ContextManager.createExitSpan(formatURIPath, contextCarrier, remotePeer); span.setComponent(ComponentsDefine.SPRING_REST_TEMPLATE); - Tags.URL.set(span, requestURL.getScheme() + "://" + requestURL.getHost() + ":" + requestURL.getPort() + requestURL.getPath()); + Tags.URL.set(span, requestURL.getScheme() + "://" + requestURL.getHost() + ":" + requestURL.getPort() + requestURL + .getPath()); Tags.HTTP.METHOD.set(span, httpMethod.toString()); SpanLayer.asHttp(span); @@ -58,7 +60,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/sync/RestRequestInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/sync/RestRequestInterceptor.java index decf937b7c16..c45a951a49e9 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/sync/RestRequestInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/sync/RestRequestInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.spring.resttemplate.sync; import java.lang.reflect.Method; @@ -39,10 +38,10 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { - ClientHttpRequest clientHttpRequest = (ClientHttpRequest)ret; + ClientHttpRequest clientHttpRequest = (ClientHttpRequest) ret; if (clientHttpRequest instanceof AbstractClientHttpRequest) { - AbstractClientHttpRequest httpRequest = (AbstractClientHttpRequest)clientHttpRequest; - ContextCarrier contextCarrier = (ContextCarrier)objInst.getSkyWalkingDynamicField(); + AbstractClientHttpRequest httpRequest = (AbstractClientHttpRequest) clientHttpRequest; + ContextCarrier contextCarrier = (ContextCarrier) objInst.getSkyWalkingDynamicField(); CarrierItem next = contextCarrier.items(); while (next.hasNext()) { next = next.next(); @@ -52,7 +51,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/sync/RestResponseInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/sync/RestResponseInterceptor.java index 134db5dfdf7d..041b7a09044d 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/sync/RestResponseInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/sync/RestResponseInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.spring.resttemplate.sync; import java.lang.reflect.Method; @@ -40,7 +39,7 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { - ClientHttpResponse response = (ClientHttpResponse)allArguments[2]; + ClientHttpResponse response = (ClientHttpResponse) allArguments[2]; int statusCode = response.getStatusCode().value(); AbstractSpan span = ContextManager.activeSpan(); if (statusCode >= 400) { @@ -50,7 +49,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/sync/define/RestTemplateInstrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/sync/define/RestTemplateInstrumentation.java index 02482256e8e4..5f1e36b9125e 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/sync/define/RestTemplateInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/sync/define/RestTemplateInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.spring.resttemplate.sync.define; import net.bytebuddy.description.method.MethodDescription; @@ -38,8 +37,6 @@ * * RestResponseInterceptor set context to header for * propagate trace context after execute createRequest. - * - * @author zhangxin */ public class RestTemplateInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -60,41 +57,50 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(DO_EXECUTE_METHOD_NAME); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return DO_EXECUTE_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(HANDLE_REQUEST_METHOD_NAME); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return HAND_REQUEST_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(CREATE_REQUEST_METHOD_NAME); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return CREATE_REQUEST_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/pom.xml index 120230b6a4f8..328ce72e5f01 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/pom.xml @@ -17,7 +17,8 @@ ~ --> - + 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/pom.xml index 1c146dac9ee9..2bb3d2a3513e 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/netflix/feign/v11/define/NetflixFeignInstrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/netflix/feign/v11/define/NetflixFeignInstrumentation.java index 76da09932d2b..6a3c5d96e402 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/netflix/feign/v11/define/NetflixFeignInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/netflix/feign/v11/define/NetflixFeignInstrumentation.java @@ -39,26 +39,32 @@ public class NetflixFeignInstrumentation extends ClassInstanceMethodsEnhancePlug */ private static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.feign.http.v9.DefaultHttpClientInterceptor"; - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName(ENHANCE_CLASS); } - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named("execute"); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/pom.xml index cffde2a8e87c..279978accd45 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/pom.xml @@ -17,7 +17,8 @@ ~ --> - + 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-commons/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-commons/pom.xml index f7d08c104515..454c1755f818 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-commons/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-commons/pom.xml @@ -16,7 +16,8 @@ ~ limitations under the License. ~ --> - + spring-plugins org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/commons/EnhanceCacheObjects.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/commons/EnhanceCacheObjects.java index 0acf909aaf5a..dc500a33259c 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/commons/EnhanceCacheObjects.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/commons/EnhanceCacheObjects.java @@ -37,8 +37,7 @@ public EnhanceCacheObjects(String operationName, OfficialComponent component, Sp contextSnapshot = snapshot; } - public EnhanceCacheObjects(String operationName, OfficialComponent component, - ContextSnapshot snapshot) { + public EnhanceCacheObjects(String operationName, OfficialComponent component, ContextSnapshot snapshot) { this(operationName, component, null, snapshot); } diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-webflux-5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-webflux-5.x-plugin/pom.xml index 46e6c89300b3..db8241cec09f 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-webflux-5.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-webflux-5.x-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + spring-plugins org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-webflux-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/DispatcherHandlerHandleMethodInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-webflux-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/DispatcherHandlerHandleMethodInterceptor.java index 26f94ce1c282..1bfc942396c5 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-webflux-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/DispatcherHandlerHandleMethodInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-webflux-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/DispatcherHandlerHandleMethodInterceptor.java @@ -40,21 +40,18 @@ import org.springframework.web.util.pattern.PathPattern; import reactor.core.publisher.Mono; -/** - * @author zhaoyuguang, Born - */ public class DispatcherHandlerHandleMethodInterceptor implements InstanceMethodsAroundInterceptor { private static final String DEFAULT_OPERATION_NAME = "WEBFLUX.handle"; @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { } @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { + Object ret) throws Throwable { EnhancedInstance instance = getInstance(allArguments[0]); ServerWebExchange exchange = (ServerWebExchange) allArguments[0]; @@ -102,7 +99,7 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { } public static EnhancedInstance getInstance(Object o) { diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-webflux-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/ServerWebExchangeConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-webflux-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/ServerWebExchangeConstructorInterceptor.java index 6df67c842fe9..03dde32c41da 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-webflux-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/ServerWebExchangeConstructorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-webflux-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/ServerWebExchangeConstructorInterceptor.java @@ -21,10 +21,6 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor; -/** - * - * @author zhaoyuguang, Born - */ public class ServerWebExchangeConstructorInterceptor implements InstanceConstructorInterceptor { @Override public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-webflux-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/define/DispatcherHandlerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-webflux-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/define/DispatcherHandlerInstrumentation.java index a6451177f01a..d33eb8cf2f36 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-webflux-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/define/DispatcherHandlerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-webflux-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/define/DispatcherHandlerInstrumentation.java @@ -28,10 +28,6 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * @author zhaoyuguang, Born - */ - public class DispatcherHandlerInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @@ -40,7 +36,7 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-webflux-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/define/ServerWebExchangeInstrumentation.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-webflux-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/define/ServerWebExchangeInstrumentation.java index e4d0e3040a66..57f1ac026116 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-webflux-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/define/ServerWebExchangeInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-webflux-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/define/ServerWebExchangeInstrumentation.java @@ -28,13 +28,10 @@ import static net.bytebuddy.matcher.ElementMatchers.any; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * @author zhaoyuguang, Born - */ public class ServerWebExchangeInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { - return new ConstructorInterceptPoint[]{ + return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { @Override public ElementMatcher getConstructorMatcher() { diff --git a/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml index 0b1a67e663d6..eb7ca5ca9259 100644 --- a/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + 4.0.0 org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spymemcached/v2/MemcachedConstructorWithInetSocketAddressListArgInterceptor.java b/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spymemcached/v2/MemcachedConstructorWithInetSocketAddressListArgInterceptor.java index 298eaab3dce2..953a2940e520 100644 --- a/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spymemcached/v2/MemcachedConstructorWithInetSocketAddressListArgInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spymemcached/v2/MemcachedConstructorWithInetSocketAddressListArgInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.spymemcached.v2; import java.net.InetSocketAddress; @@ -29,8 +28,7 @@ public class MemcachedConstructorWithInetSocketAddressListArgInterceptor impleme @Override public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { StringBuilder memcachConnInfo = new StringBuilder(); - @SuppressWarnings("unchecked") - List inetSocketAddressList = (List)allArguments[1]; + @SuppressWarnings("unchecked") List inetSocketAddressList = (List) allArguments[1]; for (InetSocketAddress inetSocketAddress : inetSocketAddressList) { String host = inetSocketAddress.getAddress().getHostAddress(); int port = inetSocketAddress.getPort(); diff --git a/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spymemcached/v2/MemcachedMethodInterceptor.java b/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spymemcached/v2/MemcachedMethodInterceptor.java index 81e9fe1686c6..6cf1af0a6560 100644 --- a/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spymemcached/v2/MemcachedMethodInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spymemcached/v2/MemcachedMethodInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.spymemcached.v2; import java.lang.reflect.Method; @@ -34,8 +33,8 @@ public class MemcachedMethodInterceptor implements InstanceMethodsAroundIntercep private static final String SPY_MEMCACHE = "SpyMemcached/"; @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { String peer = String.valueOf(objInst.getSkyWalkingDynamicField()); AbstractSpan span = ContextManager.createExitSpan(SPY_MEMCACHE + method.getName(), peer); span.setComponent(ComponentsDefine.SPYMEMCACHED); @@ -53,13 +52,14 @@ private String getStatement(Method method, Object[] allArguments) { } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { AbstractSpan span = ContextManager.activeSpan(); span.errorOccurred(); diff --git a/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spymemcached/v2/define/MemcachedInstrumentation.java b/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spymemcached/v2/define/MemcachedInstrumentation.java index b32e06f0068e..8a82e487e513 100644 --- a/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spymemcached/v2/define/MemcachedInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spymemcached/v2/define/MemcachedInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.spymemcached.v2.define; import net.bytebuddy.description.method.MethodDescription; @@ -34,12 +33,10 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument; /** - * {@link MemcachedInstrumentation} presents that skywalking intercept all constructors and methods of - * {@link net.spy.memcached.MemcachedClient}. + * {@link MemcachedInstrumentation} presents that skywalking intercept all constructors and methods of {@link + * net.spy.memcached.MemcachedClient}. * MemcachedConstructorWithInetSocketAddressListArgInterceptor intercepts the constructor with * argument {@link java.net.InetSocketAddress}. - * - * @author IluckySi */ public class MemcachedInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -75,13 +72,27 @@ public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { - return named("touch").or(named("append")).or(named("prepend")).or(named("asyncCAS")) - .or(named("cas")).or(named("add")).or(named("set")).or(named("replace")) - .or(named("asyncGet")).or(named("asyncGets")).or(named("gets")).or(named("getAndTouch")) - .or(named("get")).or(named("asyncGetBulk")).or(named("asyncGetAndTouch")) - .or(named("getBulk")).or(named("getStats")).or(named("incr")) - .or(named("decr")).or(named("asyncIncr")).or(named("asyncDecr")) - .or(named("delete")); + return named("touch").or(named("append")) + .or(named("prepend")) + .or(named("asyncCAS")) + .or(named("cas")) + .or(named("add")) + .or(named("set")) + .or(named("replace")) + .or(named("asyncGet")) + .or(named("asyncGets")) + .or(named("gets")) + .or(named("getAndTouch")) + .or(named("get")) + .or(named("asyncGetBulk")) + .or(named("asyncGetAndTouch")) + .or(named("getBulk")) + .or(named("getStats")) + .or(named("incr")) + .or(named("decr")) + .or(named("asyncIncr")) + .or(named("asyncDecr")) + .or(named("delete")); } @Override @@ -89,7 +100,8 @@ public String getMethodsInterceptor() { return METHOD_INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } diff --git a/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spymemcached/v2/MemcachedConstructorWithInetSocketAddressListArgInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spymemcached/v2/MemcachedConstructorWithInetSocketAddressListArgInterceptorTest.java index 4d920d2736ba..5eb04a225d79 100644 --- a/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spymemcached/v2/MemcachedConstructorWithInetSocketAddressListArgInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spymemcached/v2/MemcachedConstructorWithInetSocketAddressListArgInterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.spymemcached.v2; import java.net.InetSocketAddress; @@ -49,7 +48,10 @@ public void onConstructWithInetSocketAddressList() { List inetSocketAddressList = new ArrayList(); inetSocketAddressList.add(new InetSocketAddress("127.0.0.1", 11211)); inetSocketAddressList.add(new InetSocketAddress("127.0.0.2", 11211)); - interceptor.onConstruct(enhancedInstance, new Object[] {null, inetSocketAddressList}); + interceptor.onConstruct(enhancedInstance, new Object[] { + null, + inetSocketAddressList + }); verify(enhancedInstance).setSkyWalkingDynamicField("127.0.0.1:11211;127.0.0.2:11211"); } diff --git a/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spymemcached/v2/MemcachedMethodInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spymemcached/v2/MemcachedMethodInterceptorTest.java index 9f842beea54e..e747a7c2236a 100644 --- a/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spymemcached/v2/MemcachedMethodInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spymemcached/v2/MemcachedMethodInterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.spymemcached.v2; import java.lang.reflect.Method; @@ -67,8 +66,14 @@ public class MemcachedMethodInterceptorTest { @Before public void setUp() throws Exception { - allArgument = new Object[] {"OperationKey", "OperationValue"}; - argumentType = new Class[] {String.class, String.class}; + allArgument = new Object[] { + "OperationKey", + "OperationValue" + }; + argumentType = new Class[] { + String.class, + String.class + }; interceptor = new MemcachedMethodInterceptor(); when(enhancedInstance.getSkyWalkingDynamicField()).thenReturn("127.0.0.1:11211"); @@ -104,7 +109,9 @@ private void assertLogData(List logDataEntities) { LogDataEntity logData = logDataEntities.get(0); Assert.assertThat(logData.getLogs().size(), is(4)); Assert.assertThat(logData.getLogs().get(0).getValue(), CoreMatchers.is("error")); - Assert.assertThat(logData.getLogs().get(1).getValue(), CoreMatchers.is(RuntimeException.class.getName())); + Assert.assertThat(logData.getLogs() + .get(1) + .getValue(), CoreMatchers.is(RuntimeException.class.getName())); Assert.assertNull(logData.getLogs().get(2).getValue()); assertNotNull(logData.getLogs().get(3).getValue()); } diff --git a/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/pom.xml index 748c7ef5c52e..76bb92ed836a 100644 --- a/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/pom.xml @@ -16,7 +16,8 @@ ~ --> - + apm-sdk-plugin org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/struts2/Struts2Interceptor.java b/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/struts2/Struts2Interceptor.java index 7c06a9042f02..18a15993cb8d 100644 --- a/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/struts2/Struts2Interceptor.java +++ b/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/struts2/Struts2Interceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.struts2; import java.lang.reflect.Method; @@ -68,7 +67,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/struts2/define/Struts2Instrumentation.java b/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/struts2/define/Struts2Instrumentation.java index dc6a4469d5d2..4807635cce51 100644 --- a/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/struts2/define/Struts2Instrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/struts2/define/Struts2Instrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.struts2.define; import net.bytebuddy.description.method.MethodDescription; @@ -30,11 +29,9 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; /** - * {@link Struts2Instrumentation} enhance the invokeAction method - * in com.opensymphony.xwork2.DefaultActionInvocation class by + * {@link Struts2Instrumentation} enhance the invokeAction method in com.opensymphony.xwork2.DefaultActionInvocation + * class by * Struts2Interceptor class - * - * @author zhangxin */ public class Struts2Instrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -42,29 +39,35 @@ public class Struts2Instrumentation extends ClassInstanceMethodsEnhancePluginDef private static final String ENHANCE_METHOD = "invokeAction"; private static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.struts2.Struts2Interceptor"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(ENHANCE_METHOD); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName(ENHANCE_CLASS); } } diff --git a/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/struts2/Struts2InterceptorTest.java b/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/struts2/Struts2InterceptorTest.java index ce5b5a1b95ed..4feda6db2485 100644 --- a/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/struts2/Struts2InterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/struts2/Struts2InterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.struts2; import com.opensymphony.xwork2.ActionContext; @@ -103,11 +102,25 @@ public void setUp() throws Exception { when(actionContext.get(StrutsStatics.HTTP_REQUEST)).thenReturn(request); when(ActionContext.getContext()).thenReturn(actionContext); - arguments = new Object[] {request, response}; - argumentType = new Class[] {request.getClass(), response.getClass()}; - - exceptionArguments = new Object[] {request, response, new RuntimeException()}; - exceptionArgumentType = new Class[] {request.getClass(), response.getClass(), new RuntimeException().getClass()}; + arguments = new Object[] { + request, + response + }; + argumentType = new Class[] { + request.getClass(), + response.getClass() + }; + + exceptionArguments = new Object[] { + request, + response, + new RuntimeException() + }; + exceptionArgumentType = new Class[] { + request.getClass(), + response.getClass(), + new RuntimeException().getClass() + }; } @Test diff --git a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml index 3d4bb14ccda8..4e8462fd7009 100644 --- a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml @@ -16,7 +16,8 @@ ~ --> - + apm-sdk-plugin org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/ForwardInterceptor.java b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/ForwardInterceptor.java index 4bcc46b59913..ab43e22fb3ce 100644 --- a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/ForwardInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/ForwardInterceptor.java @@ -50,7 +50,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { } diff --git a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/TomcatExceptionInterceptor.java b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/TomcatExceptionInterceptor.java index 53d2ba294e08..de71eff73153 100644 --- a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/TomcatExceptionInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/TomcatExceptionInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.tomcat78x; import java.lang.reflect.Method; @@ -29,7 +28,7 @@ public class TomcatExceptionInterceptor implements InstanceMethodsAroundIntercep @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - ContextManager.activeSpan().errorOccurred().log((Throwable)allArguments[2]); + ContextManager.activeSpan().errorOccurred().log((Throwable) allArguments[2]); } @Override @@ -38,7 +37,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { } diff --git a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/TomcatInvokeInterceptor.java b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/TomcatInvokeInterceptor.java index 09751f7ed181..3434fdbdf9d6 100644 --- a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/TomcatInvokeInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/TomcatInvokeInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.tomcat78x; import javax.servlet.http.HttpServletRequest; @@ -60,18 +59,14 @@ public class TomcatInvokeInterceptor implements InstanceMethodsAroundInterceptor } /** - * * The {@link TraceSegment#refs} of current trace segment will reference to the - * trace segment id of the previous level if the serialized context is not null. + * * The {@link TraceSegment#refs} of current trace segment will reference to the trace segment id of the previous + * level if the serialized context is not null. * - * @param objInst - * @param method - * @param allArguments - * @param argumentsTypes * @param result change this result, if you want to truncate the method. - * @throws Throwable */ - @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + @Override + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { Request request = (Request) allArguments[0]; ContextCarrier contextCarrier = new ContextCarrier(); @@ -98,17 +93,16 @@ public class TomcatInvokeInterceptor implements InstanceMethodsAroundInterceptor if (!parameterMap.isEmpty()) { String tagValue = CollectionUtil.toString(parameterMap); - tagValue = Config.Plugin.Http.HTTP_PARAMS_LENGTH_THRESHOLD > 0 - ? StringUtil.cut(tagValue, Config.Plugin.Http.HTTP_PARAMS_LENGTH_THRESHOLD) - : tagValue; + tagValue = Config.Plugin.Http.HTTP_PARAMS_LENGTH_THRESHOLD > 0 ? StringUtil.cut(tagValue, Config.Plugin.Http.HTTP_PARAMS_LENGTH_THRESHOLD) : tagValue; Tags.HTTP.PARAMS.set(span, tagValue); } } } - @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { - HttpServletResponse response = (HttpServletResponse)allArguments[1]; + @Override + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { + HttpServletResponse response = (HttpServletResponse) allArguments[1]; AbstractSpan span = ContextManager.activeSpan(); if (IS_SERVLET_GET_STATUS_METHOD_EXIST && response.getStatus() >= 400) { @@ -120,7 +114,8 @@ public class TomcatInvokeInterceptor implements InstanceMethodsAroundInterceptor return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { AbstractSpan span = ContextManager.activeSpan(); span.log(t); diff --git a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/define/ApplicationDispatcherInstrumentation.java b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/define/ApplicationDispatcherInstrumentation.java index f6bc4e70e83a..719d3dbbb938 100644 --- a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/define/ApplicationDispatcherInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/define/ApplicationDispatcherInstrumentation.java @@ -37,38 +37,45 @@ public class ApplicationDispatcherInstrumentation extends ClassInstanceMethodsEn @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { - return new ConstructorInterceptPoint[]{ + return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { - @Override public ElementMatcher getConstructorMatcher() { + @Override + public ElementMatcher getConstructorMatcher() { return any(); } - @Override public String getConstructorInterceptor() { + @Override + public String getConstructorInterceptor() { return INTERCEPTOR_CLASS; } } }; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(ENHANCE_METHOD); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return INTERCEPTOR_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byName(ENHANCE_CLASS); } } diff --git a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/define/TomcatInstrumentation.java b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/define/TomcatInstrumentation.java index 0ab0bf1ce2f1..2ccec04775d9 100644 --- a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/define/TomcatInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/define/TomcatInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.tomcat78x.define; import net.bytebuddy.description.method.MethodDescription; @@ -29,9 +28,6 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * @author zhangxin - */ public class TomcatInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { /** @@ -79,15 +75,18 @@ public boolean isOverrideArgs() { } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named("throwable"); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return EXCEPTION_INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } diff --git a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/tomcat78x/TomcatInvokeInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/tomcat78x/TomcatInvokeInterceptorTest.java index 7847f71d5c3d..d4c8277e2048 100644 --- a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/tomcat78x/TomcatInvokeInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/tomcat78x/TomcatInvokeInterceptorTest.java @@ -87,11 +87,25 @@ public void setUp() throws Exception { when(request.getRequestURI()).thenReturn("/test/testRequestURL"); when(request.getRequestURL()).thenReturn(new StringBuffer("http://localhost:8080/test/testRequestURL")); when(response.getStatus()).thenReturn(200); - arguments = new Object[] {request, response}; - argumentType = new Class[] {request.getClass(), response.getClass()}; - - exceptionArguments = new Object[] {request, response, new RuntimeException()}; - exceptionArgumentType = new Class[] {request.getClass(), response.getClass(), new RuntimeException().getClass()}; + arguments = new Object[] { + request, + response + }; + argumentType = new Class[] { + request.getClass(), + response.getClass() + }; + + exceptionArguments = new Object[] { + request, + response, + new RuntimeException() + }; + exceptionArgumentType = new Class[] { + request.getClass(), + response.getClass(), + new RuntimeException().getClass() + }; } @Test diff --git a/apm-sniffer/apm-sdk-plugin/undertow-plugins/pom.xml b/apm-sniffer/apm-sdk-plugin/undertow-plugins/pom.xml index fb98a6bb0fb1..f2ca8e5b3f43 100644 --- a/apm-sniffer/apm-sdk-plugin/undertow-plugins/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/undertow-plugins/pom.xml @@ -17,7 +17,8 @@ ~ --> - + 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/pom.xml index 1780dac7d095..05a854617b50 100644 --- a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/pom.xml @@ -16,7 +16,8 @@ ~ --> - + undertow-plugins org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/Constants.java b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/Constants.java index ac8b2082c410..07ecdf9c7f27 100644 --- a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/Constants.java +++ b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/Constants.java @@ -19,9 +19,6 @@ package org.apache.skywalking.apm.plugin.undertow.v2x; -/** - * @author chenpengfei - */ public class Constants { public static final String FORWARD_REQUEST_FLAG = "SW_FORWARD_REQUEST_FLAG"; } diff --git a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/ForwardInterceptor.java b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/ForwardInterceptor.java index 3640d530e408..080fccaa2275 100644 --- a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/ForwardInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/ForwardInterceptor.java @@ -30,13 +30,11 @@ import java.util.HashMap; import java.util.Map; -/** - * @author chenpengfei - */ public class ForwardInterceptor implements InstanceMethodsAroundInterceptor, InstanceConstructorInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { if (ContextManager.isActive()) { AbstractSpan abstractTracingSpan = ContextManager.activeSpan(); Map eventMap = new HashMap(); @@ -47,13 +45,15 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { return ret; } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { } diff --git a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/HttpServerExchangeInterceptor.java b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/HttpServerExchangeInterceptor.java index 87b7b78950e2..a07ecbb30b65 100644 --- a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/HttpServerExchangeInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/HttpServerExchangeInterceptor.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.undertow.v2x; import org.apache.skywalking.apm.agent.core.context.ContextManager; @@ -24,13 +25,11 @@ import java.lang.reflect.Method; -/** - * @author zhangwei - */ public class HttpServerExchangeInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { if (ContextManager.isActive()) { Object argument = allArguments[1]; if (argument != null) { @@ -40,12 +39,14 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { return ret; } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { } } diff --git a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/ListenerConfigInterceptor.java b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/ListenerConfigInterceptor.java index 048c188a93f0..0d30e680fffe 100644 --- a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/ListenerConfigInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/ListenerConfigInterceptor.java @@ -30,14 +30,11 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; -/** - * @author AI - * 2019-08-10 - */ public class ListenerConfigInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { final Undertow.ListenerBuilder builder = (Undertow.ListenerBuilder) allArguments[0]; final Field rootHandlerField = Undertow.ListenerBuilder.class.getDeclaredField("rootHandler"); rootHandlerField.setAccessible(true); @@ -48,12 +45,14 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { return ret; } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/RootHandlerInterceptor.java b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/RootHandlerInterceptor.java index 78b3839ec9bf..bde36823cb06 100644 --- a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/RootHandlerInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/RootHandlerInterceptor.java @@ -28,14 +28,11 @@ import java.lang.reflect.Method; -/** - * @author chenpengfei - * @author AI - */ public class RootHandlerInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { int handlerIndex = allArguments.length - 1; if (!(allArguments[handlerIndex] instanceof RoutingHandler)) { allArguments[handlerIndex] = new TracingHandler((HttpHandler) allArguments[handlerIndex]); @@ -43,12 +40,14 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { return ret; } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/RoutingHandlerInterceptor.java b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/RoutingHandlerInterceptor.java index 3a5c866757d9..51217bffaab0 100644 --- a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/RoutingHandlerInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/RoutingHandlerInterceptor.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.undertow.v2x; import io.undertow.server.HttpHandler; @@ -26,14 +27,11 @@ import java.lang.reflect.Method; -/** - * @author AI - * 2019-07-25 - */ public class RoutingHandlerInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { final int httpHandlerIndex = argumentsTypes.length - 1; final HttpHandler handler = (HttpHandler) allArguments[httpHandlerIndex]; final String template = (String) allArguments[1]; @@ -41,12 +39,14 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { return ret; } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/SWRunnable.java b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/SWRunnable.java index 75796bf6a8df..37ac55dfd3ec 100644 --- a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/SWRunnable.java +++ b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/SWRunnable.java @@ -23,9 +23,6 @@ import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan; import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; -/** - * @author zhangwei - */ public class SWRunnable implements Runnable { private static final String OPERATION_NAME = "UndertowDispatch"; diff --git a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/define/HttpServerExchangeInstrumentation.java b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/define/HttpServerExchangeInstrumentation.java index d63f57e83ac0..53bad46c2199 100644 --- a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/define/HttpServerExchangeInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/define/HttpServerExchangeInstrumentation.java @@ -29,10 +29,6 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType; - -/** - * @author zhangwei - */ public class HttpServerExchangeInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_METHOD = "dispatch"; @@ -57,9 +53,8 @@ public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { - return named(ENHANCE_METHOD) - .and(takesArgumentWithType(0, "java.util.concurrent.Executor")) - .and(takesArgumentWithType(1, "java.lang.Runnable")); + return named(ENHANCE_METHOD).and(takesArgumentWithType(0, "java.util.concurrent.Executor")) + .and(takesArgumentWithType(1, "java.lang.Runnable")); } @Override diff --git a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/define/RequestDispatcherImplInstrumentation.java b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/define/RequestDispatcherImplInstrumentation.java index e3be9d329899..a0f13d97c1c4 100644 --- a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/define/RequestDispatcherImplInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/define/RequestDispatcherImplInstrumentation.java @@ -30,9 +30,6 @@ import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * @author chenpengfei - */ public class RequestDispatcherImplInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "io.undertow.servlet.spec.RequestDispatcherImpl"; diff --git a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/define/RoutingHandlerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/define/RoutingHandlerInstrumentation.java index 1e9361c9e92a..066e683073fe 100644 --- a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/define/RoutingHandlerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/define/RoutingHandlerInstrumentation.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.undertow.v2x.define; import net.bytebuddy.description.method.MethodDescription; @@ -28,11 +29,6 @@ import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; - -/** - * @author AI - * 2019-07-26 - */ public class RoutingHandlerInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_METHOD = "add"; @@ -46,7 +42,7 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { @@ -72,12 +68,10 @@ protected ClassMatch enhanceClass() { } public static ElementMatcher getRoutingHandlerMethodMatcher() { - final ElementMatcher.Junction basicMatcher = named(ENHANCE_METHOD) - .and(takesArgumentWithType(0, "io.undertow.util.HttpString")) - .and(takesArgumentWithType(1, "java.lang.String")); + final ElementMatcher.Junction basicMatcher = named(ENHANCE_METHOD).and(takesArgumentWithType(0, "io.undertow.util.HttpString")) + .and(takesArgumentWithType(1, "java.lang.String")); final String httpHandlerClassName = "io.undertow.server.HttpHandler"; - return (basicMatcher.and(takesArgumentWithType(2, httpHandlerClassName))) - .or(basicMatcher.and(takesArgumentWithType(3, httpHandlerClassName))); + return (basicMatcher.and(takesArgumentWithType(2, httpHandlerClassName))).or(basicMatcher.and(takesArgumentWithType(3, httpHandlerClassName))); } } diff --git a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/define/UndertowAddListenerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/define/UndertowAddListenerInstrumentation.java index 75445d17667c..e99cfe9d68c3 100644 --- a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/define/UndertowAddListenerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/define/UndertowAddListenerInstrumentation.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.undertow.v2x.define; import net.bytebuddy.description.method.MethodDescription; @@ -28,15 +29,14 @@ import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; - -/** - * @author AI - * 2019-08-10 - */ public class UndertowAddListenerInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "io.undertow.Undertow$Builder"; private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.undertow.v2x.RootHandlerInterceptor"; - private static final String[] ENHANCE_METHODS = new String[]{"addHttpListener", "addHttpsListener", "addAjpListener"}; + private static final String[] ENHANCE_METHODS = new String[] { + "addHttpListener", + "addHttpsListener", + "addAjpListener" + }; @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { diff --git a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/define/UndertowListenerConfigInstrumentation.java b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/define/UndertowListenerConfigInstrumentation.java index f7e36dfd9309..87f88a8c4da8 100644 --- a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/define/UndertowListenerConfigInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/define/UndertowListenerConfigInstrumentation.java @@ -29,10 +29,6 @@ import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * @author AI - * 2019-08-10 - */ public class UndertowListenerConfigInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_METHOD = "addListener"; @@ -46,7 +42,7 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { diff --git a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/define/UndertowRootHandlerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/define/UndertowRootHandlerInstrumentation.java index 7c606db3067a..2de77bea38be 100644 --- a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/define/UndertowRootHandlerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/define/UndertowRootHandlerInstrumentation.java @@ -29,10 +29,6 @@ import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * @author chenpengfei - * @author AI - */ public class UndertowRootHandlerInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_METHOD = "setHandler"; @@ -47,7 +43,7 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { diff --git a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/handler/TracingHandler.java b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/handler/TracingHandler.java index a8ceb2f466ae..e3bd641fddaa 100644 --- a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/handler/TracingHandler.java +++ b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/undertow/v2x/handler/TracingHandler.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.undertow.v2x.handler; import io.undertow.server.ExchangeCompletionListener; @@ -30,10 +31,6 @@ import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; import org.apache.skywalking.apm.plugin.undertow.v2x.Constants; -/** - * @author AI - * 2019-08-06 - */ public class TracingHandler implements HttpHandler { private final String template; private final HttpHandler next; @@ -42,7 +39,6 @@ public TracingHandler(HttpHandler handler) { this(null, handler); } - public TracingHandler(String template, HttpHandler handler) { this.next = handler; this.template = template; diff --git a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/undertow/v2x/ForwardInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/undertow/v2x/ForwardInterceptorTest.java index 0ca917a66334..e43e7840d1d3 100644 --- a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/undertow/v2x/ForwardInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/undertow/v2x/ForwardInterceptorTest.java @@ -47,9 +47,6 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.when; -/** - * @author chenpengfei - */ @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(TracingSegmentRunner.class) public class ForwardInterceptorTest { @@ -80,8 +77,14 @@ public class ForwardInterceptorTest { public void setUp() throws Exception { forwardInterceptor = new ForwardInterceptor(); when(enhancedInstance.getSkyWalkingDynamicField()).thenReturn("http://localhost:8080/test/testRequestURL"); - arguments = new Object[]{request, response}; - argumentType = new Class[]{request.getClass(), response.getClass()}; + arguments = new Object[] { + request, + response + }; + argumentType = new Class[] { + request.getClass(), + response.getClass() + }; } @Test @@ -98,6 +101,7 @@ public void testWithoutSerializedContextData() throws Throwable { assertThat(logs.get(0).getKey(), is("forward-url")); assertThat(logs.get(0).getValue(), is("http://localhost:8080/test/testRequestURL")); - assertThat(ContextManager.getRuntimeContext().get(Constants.FORWARD_REQUEST_FLAG), CoreMatchers.is(true)); + assertThat(ContextManager.getRuntimeContext() + .get(Constants.FORWARD_REQUEST_FLAG), CoreMatchers.is(true)); } } \ No newline at end of file diff --git a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/undertow/v2x/RootHandlerInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/undertow/v2x/RootHandlerInterceptorTest.java index e319083b48e3..bd67a7a6cfee 100644 --- a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/undertow/v2x/RootHandlerInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/undertow/v2x/RootHandlerInterceptorTest.java @@ -41,9 +41,6 @@ import static org.junit.Assert.assertTrue; -/** - * @author chenpengfei - */ @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(TracingSegmentRunner.class) public class RootHandlerInterceptorTest { @@ -59,14 +56,12 @@ public class RootHandlerInterceptorTest { @Mock private HttpHandler httpHandler; - @Mock private MethodInterceptResult methodInterceptResult; @Mock private EnhancedInstance enhancedInstance; - @Before public void setUp() throws Exception { rootHandlerInterceptor = new RootHandlerInterceptor(); @@ -74,8 +69,8 @@ public void setUp() throws Exception { @Test public void testBindTracingHandler() throws Throwable { - Object[] arguments = new Object[]{httpHandler}; - Class[] argumentType = new Class[]{HttpHandler.class}; + Object[] arguments = new Object[] {httpHandler}; + Class[] argumentType = new Class[] {HttpHandler.class}; final Method method = Undertow.Builder.class.getMethod("setHandler", argumentType); rootHandlerInterceptor.beforeMethod(enhancedInstance, method, arguments, argumentType, methodInterceptResult); rootHandlerInterceptor.afterMethod(enhancedInstance, method, arguments, argumentType, null); @@ -86,8 +81,8 @@ public void testBindTracingHandler() throws Throwable { public void testBindRoutingHandler() throws Throwable { RoutingHandler handler = new RoutingHandler(); handler.add(Methods.GET, "/projects/{projectId}", httpHandler); - Object[] arguments = new Object[]{handler}; - Class[] argumentType = new Class[]{HttpHandler.class}; + Object[] arguments = new Object[] {handler}; + Class[] argumentType = new Class[] {HttpHandler.class}; final Method method = Undertow.Builder.class.getMethod("setHandler", argumentType); rootHandlerInterceptor.beforeMethod(enhancedInstance, method, arguments, argumentType, methodInterceptResult); rootHandlerInterceptor.afterMethod(enhancedInstance, method, arguments, argumentType, null); diff --git a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/undertow/v2x/RoutingHandlerInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/undertow/v2x/RoutingHandlerInterceptorTest.java index f63da22dc703..61f805090b06 100644 --- a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/undertow/v2x/RoutingHandlerInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/undertow/v2x/RoutingHandlerInterceptorTest.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.undertow.v2x; import io.undertow.server.HttpHandler; @@ -56,10 +57,6 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; -/** - * @author AI - * 2019-07-29 - */ @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(TracingSegmentRunner.class) public class RoutingHandlerInterceptorTest { @@ -89,7 +86,11 @@ public void setUp() throws Exception { @Test public void testBindArguments() throws Throwable { Method method = RoutingHandler.class.getMethod("add", HttpString.class, String.class, HttpHandler.class); - Object[] arguments = new Object[]{Methods.GET, template, httpHandler}; + Object[] arguments = new Object[] { + Methods.GET, + template, + httpHandler + }; interceptor.beforeMethod(enhancedInstance, method, arguments, method.getParameterTypes(), methodInterceptResult); interceptor.afterMethod(enhancedInstance, method, arguments, method.getParameterTypes(), null); assertTrue(arguments[2] instanceof TracingHandler); diff --git a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/undertow/v2x/TracingHandlerTest.java b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/undertow/v2x/TracingHandlerTest.java index 9314eb7c4fc1..ed424b4ec246 100644 --- a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/undertow/v2x/TracingHandlerTest.java +++ b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/undertow/v2x/TracingHandlerTest.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.undertow.v2x; import io.undertow.server.HttpHandler; @@ -53,10 +54,6 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -/** - * @author AI - * 2019-07-29 - */ @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(TracingSegmentRunner.class) public class TracingHandlerTest { @@ -72,7 +69,6 @@ public class TracingHandlerTest { private String template = "/projects/{projectId}/users"; private String uri = "/projects/{projectId}/users"; - @Test public void testStatusCodeIsOk() throws Throwable { TracingHandler handler = new TracingHandler(template, httpHandler); @@ -103,7 +99,8 @@ public void testStatusCodeIsNotOk() throws Throwable { public void testWithSerializedContextData() throws Throwable { TracingHandler handler = new TracingHandler(httpHandler); HttpServerExchange exchange = buildExchange(); - exchange.getRequestHeaders().put(HttpString.tryFromString(SW6CarrierItem.HEADER_NAME), "1-MC4wLjA=-MS4yMzQuMTEx-3-1-1-IzE5Mi4xNjguMS44OjE4MDAy-Iy9wb3J0YWwv-Iy90ZXN0RW50cnlTcGFu"); + exchange.getRequestHeaders() + .put(HttpString.tryFromString(SW6CarrierItem.HEADER_NAME), "1-MC4wLjA=-MS4yMzQuMTEx-3-1-1-IzE5Mi4xNjguMS44OjE4MDAy-Iy9wb3J0YWwv-Iy90ZXN0RW50cnlTcGFu"); handler.handleRequest(exchange); exchange.endExchange(); diff --git a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/undertow/v2x/UndertowBuilderMethodMatcherTest.java b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/undertow/v2x/UndertowBuilderMethodMatcherTest.java index faba00869a02..12f7e3fe7f4a 100644 --- a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/undertow/v2x/UndertowBuilderMethodMatcherTest.java +++ b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/undertow/v2x/UndertowBuilderMethodMatcherTest.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.undertow.v2x; import io.undertow.Undertow; @@ -34,10 +35,6 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; -/** - * @author AI - * 2019-08-10 - */ public class UndertowBuilderMethodMatcherTest { @Test diff --git a/apm-sniffer/apm-sdk-plugin/vertx-plugins/pom.xml b/apm-sniffer/apm-sdk-plugin/vertx-plugins/pom.xml index b3267e48443b..d0b634cb7fdf 100644 --- a/apm-sniffer/apm-sdk-plugin/vertx-plugins/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/vertx-plugins/pom.xml @@ -17,7 +17,8 @@ ~ --> - + 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/pom.xml index a713754f6aa3..75eed24a9efa 100644 --- a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/pom.xml @@ -16,7 +16,8 @@ ~ --> - + vertx-plugins org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/ClusteredEventBusSendRemoteInterceptor.java b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/ClusteredEventBusSendRemoteInterceptor.java index 661343c3825e..2b15cf10a8cf 100644 --- a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/ClusteredEventBusSendRemoteInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/ClusteredEventBusSendRemoteInterceptor.java @@ -37,7 +37,7 @@ public class ClusteredEventBusSendRemoteInterceptor implements InstanceMethodsAr @Override @SuppressWarnings("unchecked") public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { ContextManager.getRuntimeContext().remove(VertxContext.STOP_SPAN_NECESSARY + "." + getClass().getName()); ClusteredMessage message = (ClusteredMessage) allArguments[1]; @@ -58,8 +58,7 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } if (message.replyAddress() != null) { - VertxContext.pushContext(message.replyAddress(), - new VertxContext(ContextManager.capture(), span.prepareForAsync())); + VertxContext.pushContext(message.replyAddress(), new VertxContext(ContextManager.capture(), span.prepareForAsync())); } ContextManager.getRuntimeContext().put(VertxContext.STOP_SPAN_NECESSARY + "." + getClass().getName(), true); } @@ -67,9 +66,9 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { - Boolean closeSpan = (Boolean) ContextManager.getRuntimeContext().get( - VertxContext.STOP_SPAN_NECESSARY + "." + getClass().getName()); + Object ret) throws Throwable { + Boolean closeSpan = (Boolean) ContextManager.getRuntimeContext() + .get(VertxContext.STOP_SPAN_NECESSARY + "." + getClass().getName()); if (Boolean.TRUE.equals(closeSpan)) { ContextManager.stopSpan(); } @@ -78,7 +77,7 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/EventBusImplDeliverToHandlerInterceptor.java b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/EventBusImplDeliverToHandlerInterceptor.java index 779d5bb6d140..52398e3ed7b6 100644 --- a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/EventBusImplDeliverToHandlerInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/EventBusImplDeliverToHandlerInterceptor.java @@ -30,15 +30,12 @@ import java.lang.reflect.Method; -/** - * @author brandon.fergerson - */ public class EventBusImplDeliverToHandlerInterceptor implements InstanceMethodsAroundInterceptor { @Override @SuppressWarnings("unchecked") public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { ContextManager.getRuntimeContext().remove(VertxContext.STOP_SPAN_NECESSARY + "." + getClass().getName()); Message message = (Message) allArguments[0]; @@ -59,8 +56,7 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr SpanLayer.asRPCFramework(span); if (message.replyAddress() != null) { - VertxContext.pushContext(message.replyAddress(), - new VertxContext(ContextManager.capture(), span.prepareForAsync())); + VertxContext.pushContext(message.replyAddress(), new VertxContext(ContextManager.capture(), span.prepareForAsync())); } ContextManager.getRuntimeContext().put(VertxContext.STOP_SPAN_NECESSARY + "." + getClass().getName(), true); } @@ -68,9 +64,9 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { - Boolean closeSpan = (Boolean) ContextManager.getRuntimeContext().get( - VertxContext.STOP_SPAN_NECESSARY + "." + getClass().getName()); + Object ret) throws Throwable { + Boolean closeSpan = (Boolean) ContextManager.getRuntimeContext() + .get(VertxContext.STOP_SPAN_NECESSARY + "." + getClass().getName()); if (Boolean.TRUE.equals(closeSpan)) { ContextManager.stopSpan(); } @@ -79,7 +75,7 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/HandlerRegistrationInterceptor.java b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/HandlerRegistrationInterceptor.java index 3615b03c07c1..7333894de7e0 100644 --- a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/HandlerRegistrationInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/HandlerRegistrationInterceptor.java @@ -32,15 +32,12 @@ import java.lang.reflect.Method; -/** - * @author brandon.fergerson - */ public class HandlerRegistrationInterceptor implements InstanceMethodsAroundInterceptor { @Override @SuppressWarnings("unchecked") public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { ContextManager.getRuntimeContext().remove(VertxContext.STOP_SPAN_NECESSARY + "." + getClass().getName()); Message message = (Message) allArguments[1]; @@ -73,8 +70,7 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr SpanLayer.asRPCFramework(span); if (message.replyAddress() != null) { - VertxContext.pushContext(message.replyAddress(), - new VertxContext(ContextManager.capture(), span.prepareForAsync())); + VertxContext.pushContext(message.replyAddress(), new VertxContext(ContextManager.capture(), span.prepareForAsync())); } ContextManager.getRuntimeContext().put(VertxContext.STOP_SPAN_NECESSARY + "." + getClass().getName(), true); } @@ -82,17 +78,18 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { - Boolean closeSpan = (Boolean) ContextManager.getRuntimeContext().get( - VertxContext.STOP_SPAN_NECESSARY + "." + getClass().getName()); + Object ret) throws Throwable { + Boolean closeSpan = (Boolean) ContextManager.getRuntimeContext() + .get(VertxContext.STOP_SPAN_NECESSARY + "." + getClass().getName()); if (Boolean.TRUE.equals(closeSpan)) { ContextManager.stopSpan(); } return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/HttpClientRequestImplEndInterceptor.java b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/HttpClientRequestImplEndInterceptor.java index 229468ed42f6..d7daf033f12f 100644 --- a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/HttpClientRequestImplEndInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/HttpClientRequestImplEndInterceptor.java @@ -33,9 +33,6 @@ import java.lang.reflect.Method; -/** - * @author brandon.fergerson - */ public class HttpClientRequestImplEndInterceptor implements InstanceMethodsAroundInterceptor, InstanceConstructorInterceptor { @Override @@ -55,11 +52,10 @@ public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { @Override @SuppressWarnings("unchecked") public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { HttpClientRequest request = (HttpClientRequest) objInst; ContextCarrier contextCarrier = new ContextCarrier(); - AbstractSpan span = ContextManager.createExitSpan(toPath(request.uri()), contextCarrier, - (String) objInst.getSkyWalkingDynamicField()); + AbstractSpan span = ContextManager.createExitSpan(toPath(request.uri()), contextCarrier, (String) objInst.getSkyWalkingDynamicField()); span.setComponent(ComponentsDefine.VERTX); SpanLayer.asHttp(span); Tags.HTTP.METHOD.set(span, request.method().toString()); @@ -75,13 +71,14 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/HttpClientRequestImplHandleExceptionInterceptor.java b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/HttpClientRequestImplHandleExceptionInterceptor.java index 669384caa406..43e526d97556 100644 --- a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/HttpClientRequestImplHandleExceptionInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/HttpClientRequestImplHandleExceptionInterceptor.java @@ -25,27 +25,25 @@ import java.lang.reflect.Method; -/** - * @author brandon.fergerson - */ public class HttpClientRequestImplHandleExceptionInterceptor implements InstanceMethodsAroundInterceptor { @Override @SuppressWarnings("unchecked") public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { VertxContext context = (VertxContext) objInst.getSkyWalkingDynamicField(); context.getSpan().errorOccurred().log((Throwable) allArguments[0]); } @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { + Object ret) throws Throwable { return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/HttpClientRequestImplHandleResponseInterceptor.java b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/HttpClientRequestImplHandleResponseInterceptor.java index 0c6acb2f8a82..cd112add6f2f 100644 --- a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/HttpClientRequestImplHandleResponseInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/HttpClientRequestImplHandleResponseInterceptor.java @@ -28,15 +28,12 @@ import java.lang.reflect.Method; -/** - * @author brandon.fergerson - */ public class HttpClientRequestImplHandleResponseInterceptor implements InstanceMethodsAroundInterceptor { @Override @SuppressWarnings("unchecked") public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { VertxContext context = (VertxContext) objInst.getSkyWalkingDynamicField(); context.getSpan().asyncFinish(); @@ -48,13 +45,14 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/HttpServerResponseImplEndInterceptor.java b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/HttpServerResponseImplEndInterceptor.java index 10d7d868e52d..3234e2bb4a86 100644 --- a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/HttpServerResponseImplEndInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/HttpServerResponseImplEndInterceptor.java @@ -25,15 +25,12 @@ import java.lang.reflect.Method; -/** - * @author brandon.fergerson - */ public class HttpServerResponseImplEndInterceptor implements InstanceMethodsAroundInterceptor { @Override @SuppressWarnings("unchecked") public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { if (allArguments.length == 0) { VertxContext context = (VertxContext) objInst.getSkyWalkingDynamicField(); context.getSpan().asyncFinish(); @@ -42,12 +39,13 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { + Object ret) throws Throwable { return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/HttpServerResponseImplHandleExceptionInterceptor.java b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/HttpServerResponseImplHandleExceptionInterceptor.java index 98e8d5efa479..2db587c92425 100644 --- a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/HttpServerResponseImplHandleExceptionInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/HttpServerResponseImplHandleExceptionInterceptor.java @@ -25,27 +25,25 @@ import java.lang.reflect.Method; -/** - * @author brandon.fergerson - */ public class HttpServerResponseImplHandleExceptionInterceptor implements InstanceMethodsAroundInterceptor { @Override @SuppressWarnings("unchecked") public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { VertxContext context = (VertxContext) objInst.getSkyWalkingDynamicField(); context.getSpan().errorOccurred().log((Throwable) allArguments[0]); } @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { + Object ret) throws Throwable { return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/RouterImplAcceptInterceptor.java b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/RouterImplAcceptInterceptor.java index f063a6a7c4d7..0eb4470f98a2 100644 --- a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/RouterImplAcceptInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/RouterImplAcceptInterceptor.java @@ -32,15 +32,12 @@ import java.lang.reflect.Method; -/** - * @author brandon.fergerson - */ public class RouterImplAcceptInterceptor implements InstanceMethodsAroundInterceptor { @Override @SuppressWarnings("unchecked") public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { HttpServerRequest request = (HttpServerRequest) allArguments[0]; ContextCarrier contextCarrier = new ContextCarrier(); CarrierItem next = contextCarrier.items(); @@ -56,19 +53,20 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr Tags.HTTP.METHOD.set(span, request.method().toString()); Tags.URL.set(span, request.uri()); - ((EnhancedInstance) request.response()).setSkyWalkingDynamicField(new VertxContext( - ContextManager.capture(), span.prepareForAsync())); + ((EnhancedInstance) request.response()).setSkyWalkingDynamicField(new VertxContext(ContextManager.capture(), span + .prepareForAsync())); } @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/VertxContext.java b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/VertxContext.java index 1819394b70b8..ed12da154aa5 100644 --- a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/VertxContext.java +++ b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/VertxContext.java @@ -25,9 +25,6 @@ import java.util.Stack; import java.util.concurrent.ConcurrentHashMap; -/** - * @author brandon.fergerson - */ class VertxContext { public static final String STOP_SPAN_NECESSARY = "VERTX_STOP_SPAN_NECESSARY"; diff --git a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/ClusteredEventBusSendRemoteInstrumentation.java b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/ClusteredEventBusSendRemoteInstrumentation.java index 5cce181caa3b..e69fac9574d5 100644 --- a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/ClusteredEventBusSendRemoteInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/ClusteredEventBusSendRemoteInstrumentation.java @@ -29,11 +29,9 @@ import static net.bytebuddy.matcher.ElementMatchers.named; /** - * {@link ClusteredEventBusSendRemoteInstrumentation} enhance the sendRemote method - * in io.vertx.core.eventbus.impl.clustered.ClusteredEventBus class by + * {@link ClusteredEventBusSendRemoteInstrumentation} enhance the sendRemote method in + * io.vertx.core.eventbus.impl.clustered.ClusteredEventBus class by * ClusteredEventBusSendRemoteInterceptor class - * - * @author brandon.fergerson */ public class ClusteredEventBusSendRemoteInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -41,34 +39,40 @@ public class ClusteredEventBusSendRemoteInstrumentation extends ClassInstanceMet private static final String ENHANCE_METHOD = "sendRemote"; private static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.vertx3.ClusteredEventBusSendRemoteInterceptor"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(ENHANCE_METHOD); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); } @Override protected String[] witnessClasses() { - return new String[]{"io.vertx.core.eventbus.impl.clustered.ClusteredMessage"}; + return new String[] {"io.vertx.core.eventbus.impl.clustered.ClusteredMessage"}; } } diff --git a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/EventBusImplDeliverToHandlerInstrumentation.java b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/EventBusImplDeliverToHandlerInstrumentation.java index 70cf39fbfc69..0cfbf6eea2da 100644 --- a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/EventBusImplDeliverToHandlerInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/EventBusImplDeliverToHandlerInstrumentation.java @@ -29,11 +29,9 @@ import static net.bytebuddy.matcher.ElementMatchers.named; /** - * {@link EventBusImplDeliverToHandlerInstrumentation} enhance the deliverToHandler method - * in io.vertx.core.eventbus.impl.EventBusImpl class by + * {@link EventBusImplDeliverToHandlerInstrumentation} enhance the deliverToHandler method in + * io.vertx.core.eventbus.impl.EventBusImpl class by * EventBusImplDeliverToHandlerInterceptor class - * - * @author brandon.fergerson */ public class EventBusImplDeliverToHandlerInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -41,34 +39,40 @@ public class EventBusImplDeliverToHandlerInstrumentation extends ClassInstanceMe private static final String ENHANCE_METHOD = "deliverToHandler"; private static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.vertx3.EventBusImplDeliverToHandlerInterceptor"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(ENHANCE_METHOD); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); } @Override protected String[] witnessClasses() { - return new String[]{"io.vertx.core.eventbus.impl.clustered.ClusteredMessage"}; + return new String[] {"io.vertx.core.eventbus.impl.clustered.ClusteredMessage"}; } } diff --git a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/HandlerRegistrationInstrumentation.java b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/HandlerRegistrationInstrumentation.java index 04b3b41054ec..6863d980286d 100644 --- a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/HandlerRegistrationInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/HandlerRegistrationInstrumentation.java @@ -30,44 +30,49 @@ /** * {@link HandlerRegistrationInstrumentation} enhance the deliver and handleMessage methods - * in io.vertx.core.eventbus.impl.HandlerRegistration class by + * in + * io.vertx.core.eventbus.impl.HandlerRegistration class by * HandlerRegistrationInterceptor class - * - * @author brandon.fergerson */ public class HandlerRegistrationInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "io.vertx.core.eventbus.impl.HandlerRegistration"; private static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.vertx3.HandlerRegistrationInterceptor"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named("deliver").or(named("handleMessage")); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); } @Override protected String[] witnessClasses() { - return new String[]{"io.vertx.core.eventbus.impl.clustered.ClusteredMessage"}; + return new String[] {"io.vertx.core.eventbus.impl.clustered.ClusteredMessage"}; } } diff --git a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/HttpClientRequestImplEndInstrumentation.java b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/HttpClientRequestImplEndInstrumentation.java index 93c0aac9ebac..236c1fe75b24 100644 --- a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/HttpClientRequestImplEndInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/HttpClientRequestImplEndInstrumentation.java @@ -30,11 +30,9 @@ import static net.bytebuddy.matcher.ElementMatchers.named; /** - * {@link HttpClientRequestImplEndInstrumentation} enhance the end method - * in io.vertx.core.http.impl.HttpClientRequestImpl class by + * {@link HttpClientRequestImplEndInstrumentation} enhance the end method in + * io.vertx.core.http.impl.HttpClientRequestImpl class by * HttpClientRequestImplEndInterceptor class - * - * @author brandon.fergerson */ public class HttpClientRequestImplEndInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -42,39 +40,47 @@ public class HttpClientRequestImplEndInstrumentation extends ClassInstanceMethod private static final String ENHANCE_METHOD = "end"; private static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.vertx3.HttpClientRequestImplEndInterceptor"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { - @Override public ElementMatcher getConstructorMatcher() { + @Override + public ElementMatcher getConstructorMatcher() { return any(); } - @Override public String getConstructorInterceptor() { + @Override + public String getConstructorInterceptor() { return INTERCEPT_CLASS; } } }; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(ENHANCE_METHOD); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); } } diff --git a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/HttpClientRequestImplHandleExceptionInstrumentation.java b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/HttpClientRequestImplHandleExceptionInstrumentation.java index b1a84ba916d2..401275aade1a 100644 --- a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/HttpClientRequestImplHandleExceptionInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/HttpClientRequestImplHandleExceptionInstrumentation.java @@ -29,11 +29,9 @@ import static net.bytebuddy.matcher.ElementMatchers.named; /** - * {@link HttpClientRequestImplHandleExceptionInstrumentation} enhance the handleException method - * in io.vertx.core.http.impl.HttpClientRequestBase class by + * {@link HttpClientRequestImplHandleExceptionInstrumentation} enhance the handleException method in + * io.vertx.core.http.impl.HttpClientRequestBase class by * HttpClientRequestImplHandleExceptionInterceptor class - * - * @author brandon.fergerson */ public class HttpClientRequestImplHandleExceptionInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -41,29 +39,35 @@ public class HttpClientRequestImplHandleExceptionInstrumentation extends ClassIn private static final String ENHANCE_METHOD = "handleException"; private static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.vertx3.HttpClientRequestImplHandleExceptionInterceptor"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(ENHANCE_METHOD); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); } } diff --git a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/HttpClientRequestImplHandleResponseInstrumentation.java b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/HttpClientRequestImplHandleResponseInstrumentation.java index 7bab320a2cfc..d4212988d663 100644 --- a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/HttpClientRequestImplHandleResponseInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/HttpClientRequestImplHandleResponseInstrumentation.java @@ -29,11 +29,9 @@ import static net.bytebuddy.matcher.ElementMatchers.named; /** - * {@link HttpClientRequestImplHandleResponseInstrumentation} enhance the handleResponse method - * in io.vertx.core.http.impl.HttpClientRequestImpl class by + * {@link HttpClientRequestImplHandleResponseInstrumentation} enhance the handleResponse method in + * io.vertx.core.http.impl.HttpClientRequestImpl class by * HttpClientRequestImplHandleResponseInterceptor class - * - * @author brandon.fergerson */ public class HttpClientRequestImplHandleResponseInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -41,29 +39,35 @@ public class HttpClientRequestImplHandleResponseInstrumentation extends ClassIns private static final String ENHANCE_METHOD = "handleResponse"; private static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.vertx3.HttpClientRequestImplHandleResponseInterceptor"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(ENHANCE_METHOD); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); } } diff --git a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/HttpServerResponseImplEndInstrumentation.java b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/HttpServerResponseImplEndInstrumentation.java index 457fca601f86..e7ce3973a74e 100644 --- a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/HttpServerResponseImplEndInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/HttpServerResponseImplEndInstrumentation.java @@ -29,11 +29,9 @@ import static net.bytebuddy.matcher.ElementMatchers.named; /** - * {@link HttpServerResponseImplEndInstrumentation} enhance the end method - * in io.vertx.core.http.impl.HttpServerResponseImpl class by + * {@link HttpServerResponseImplEndInstrumentation} enhance the end method in + * io.vertx.core.http.impl.HttpServerResponseImpl class by * HttpServerResponseImplEndInterceptor class - * - * @author brandon.fergerson */ public class HttpServerResponseImplEndInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -41,29 +39,35 @@ public class HttpServerResponseImplEndInstrumentation extends ClassInstanceMetho private static final String ENHANCE_METHOD = "end"; private static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.vertx3.HttpServerResponseImplEndInterceptor"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(ENHANCE_METHOD); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); } } diff --git a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/HttpServerResponseImplHandleExceptionInstrumentation.java b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/HttpServerResponseImplHandleExceptionInstrumentation.java index afb39da0cb1e..ba7f27bf3802 100644 --- a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/HttpServerResponseImplHandleExceptionInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/HttpServerResponseImplHandleExceptionInstrumentation.java @@ -29,11 +29,9 @@ import static net.bytebuddy.matcher.ElementMatchers.named; /** - * {@link HttpServerResponseImplHandleExceptionInstrumentation} enhance the handleException method - * in io.vertx.core.http.impl.HttpServerResponseImpl class by + * {@link HttpServerResponseImplHandleExceptionInstrumentation} enhance the handleException method in + * io.vertx.core.http.impl.HttpServerResponseImpl class by * HttpServerResponseImplHandleExceptionInterceptor class - * - * @author brandon.fergerson */ public class HttpServerResponseImplHandleExceptionInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -41,29 +39,35 @@ public class HttpServerResponseImplHandleExceptionInstrumentation extends ClassI private static final String ENHANCE_METHOD = "handleException"; private static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.vertx3.HttpServerResponseImplHandleExceptionInterceptor"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(ENHANCE_METHOD); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); } } diff --git a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/RouterImplAcceptInstrumentation.java b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/RouterImplAcceptInstrumentation.java index 02d8c1bbecb9..0c68bd86e94c 100644 --- a/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/RouterImplAcceptInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/RouterImplAcceptInstrumentation.java @@ -29,11 +29,9 @@ import static net.bytebuddy.matcher.ElementMatchers.named; /** - * {@link RouterImplAcceptInstrumentation} enhance the accept method - * in io.vertx.core.http.impl.HttpServerRequestImpl class by + * {@link RouterImplAcceptInstrumentation} enhance the accept method in + * io.vertx.core.http.impl.HttpServerRequestImpl class by * RouterImplAcceptInterceptor class - * - * @author brandon.fergerson */ public class RouterImplAcceptInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -41,29 +39,35 @@ public class RouterImplAcceptInstrumentation extends ClassInstanceMethodsEnhance private static final String ENHANCE_METHOD = "accept"; private static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.vertx3.RouterImplAcceptInterceptor"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(ENHANCE_METHOD); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); } } diff --git a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml index 9aaebf8060b1..1c1ab74c9567 100644 --- a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml @@ -16,7 +16,8 @@ ~ limitations under the License. ~ --> - + 4.0.0 org.apache.skywalking diff --git a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithComplexArgInterceptor.java b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithComplexArgInterceptor.java index ec430a05949c..b4ea5be3b06e 100644 --- a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithComplexArgInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithComplexArgInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.xmemcached.v2; import java.net.InetSocketAddress; @@ -26,16 +25,12 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor; -/** - * @author IluckySi - */ public class XMemcachedConstructorWithComplexArgInterceptor implements InstanceConstructorInterceptor { @Override public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { StringBuilder memcachConnInfo = new StringBuilder(); - @SuppressWarnings("unchecked") - Map inetSocketAddressMap = (Map)allArguments[6]; + @SuppressWarnings("unchecked") Map inetSocketAddressMap = (Map) allArguments[6]; for (Entry entry : inetSocketAddressMap.entrySet()) { memcachConnInfo = append(memcachConnInfo, entry.getKey()); memcachConnInfo = append(memcachConnInfo, entry.getValue()); @@ -49,9 +44,6 @@ public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { /** * Parse InetSocketAddress in specified format - * @param sb - * @param inetSocketAddress - * @return */ private StringBuilder append(StringBuilder sb, InetSocketAddress inetSocketAddress) { if (inetSocketAddress != null) { diff --git a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithHostPortArgInterceptor.java b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithHostPortArgInterceptor.java index b114651bd19c..cc6fd257d151 100644 --- a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithHostPortArgInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithHostPortArgInterceptor.java @@ -16,15 +16,11 @@ * */ - package org.apache.skywalking.apm.plugin.xmemcached.v2; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor; -/** - * @author IluckySi - */ public class XMemcachedConstructorWithHostPortArgInterceptor implements InstanceConstructorInterceptor { @Override diff --git a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithInetSocketAddressArgInterceptor.java b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithInetSocketAddressArgInterceptor.java index b9962274bdf7..c3a163ed704b 100644 --- a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithInetSocketAddressArgInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithInetSocketAddressArgInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.xmemcached.v2; import java.net.InetSocketAddress; @@ -24,14 +23,11 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor; -/** - * @author IluckySi - */ public class XMemcachedConstructorWithInetSocketAddressArgInterceptor implements InstanceConstructorInterceptor { @Override public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { - InetSocketAddress inetSocketAddress = (InetSocketAddress)allArguments[0]; + InetSocketAddress inetSocketAddress = (InetSocketAddress) allArguments[0]; String host = inetSocketAddress.getAddress().getHostAddress(); int port = inetSocketAddress.getPort(); objInst.setSkyWalkingDynamicField(host + ":" + port); diff --git a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithInetSocketAddressListArgInterceptor.java b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithInetSocketAddressListArgInterceptor.java index b7496e30cc56..af69484ac7b3 100644 --- a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithInetSocketAddressListArgInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithInetSocketAddressListArgInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.xmemcached.v2; import java.net.InetSocketAddress; @@ -25,16 +24,12 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor; -/** - * @author IluckySi - */ public class XMemcachedConstructorWithInetSocketAddressListArgInterceptor implements InstanceConstructorInterceptor { @Override public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { StringBuilder memcachConnInfo = new StringBuilder(); - @SuppressWarnings("unchecked") - List inetSocketAddressList = (List)allArguments[0]; + @SuppressWarnings("unchecked") List inetSocketAddressList = (List) allArguments[0]; for (InetSocketAddress inetSocketAddress : inetSocketAddressList) { String host = inetSocketAddress.getAddress().getHostAddress(); int port = inetSocketAddress.getPort(); diff --git a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedMethodInterceptor.java b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedMethodInterceptor.java index a45daf41aae7..da7ea3a70919 100644 --- a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedMethodInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedMethodInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.xmemcached.v2; import java.lang.reflect.Method; @@ -31,17 +30,16 @@ import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; /** - * {@link XMemcachedMethodInterceptor} intercept the operation method, - * record the memcached host, operation name and the key of the operation. - * - * @author IluckySi + * {@link XMemcachedMethodInterceptor} intercept the operation method, record the memcached host, operation name and the + * key of the operation. */ public class XMemcachedMethodInterceptor implements InstanceMethodsAroundInterceptor { private static final String XMEMCACHED = "XMemcached/"; - - @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + + @Override + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { String peer = String.valueOf(objInst.getSkyWalkingDynamicField()); AbstractSpan span = ContextManager.createExitSpan(XMEMCACHED + method.getName(), peer); span.setComponent(ComponentsDefine.XMEMCACHED); @@ -50,13 +48,15 @@ public class XMemcachedMethodInterceptor implements InstanceMethodsAroundInterce Tags.DB_STATEMENT.set(span, method.getName() + " " + allArguments[0]); } - @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + @Override + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { AbstractSpan span = ContextManager.activeSpan(); span.errorOccurred(); diff --git a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/define/XMemcachedInstrumentation.java b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/define/XMemcachedInstrumentation.java index 53986aa05512..a1606ca5d96c 100644 --- a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/define/XMemcachedInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/xmemcached/v2/define/XMemcachedInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.xmemcached.v2.define; import java.net.InetSocketAddress; @@ -36,10 +35,8 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments; /** - * {@link XMemcachedInstrumentation} presents that skywalking intercept all constructors and methods of - * {@link net.rubyeye.xmemcached.XMemcachedClient}. - * - * @author IluckySi + * {@link XMemcachedInstrumentation} presents that skywalking intercept all constructors and methods of {@link + * net.rubyeye.xmemcached.XMemcachedClient}. */ public class XMemcachedInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -54,6 +51,7 @@ public class XMemcachedInstrumentation extends ClassInstanceMethodsEnhancePlugin public ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); } + @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[] { @@ -110,9 +108,19 @@ public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { - return named("get").or(named("set")) .or(named("add")).or(named("replace")).or(named("gets")) - .or(named("append")) .or(named("prepend")).or(named("cas")).or(named("delete")).or(named("touch")). - or(named("getAndTouch")).or(named("incr")) .or(named("decr")); + return named("get").or(named("set")) + .or(named("add")) + .or(named("replace")) + .or(named("gets")) + .or(named("append")) + .or(named("prepend")) + .or(named("cas")) + .or(named("delete")) + .or(named("touch")) + . + or(named("getAndTouch")) + .or(named("incr")) + .or(named("decr")); } @Override @@ -120,7 +128,8 @@ public String getMethodsInterceptor() { return METHOD_INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } diff --git a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithComplexArgInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithComplexArgInterceptorTest.java index a91af969da67..60ceaf246fe4 100644 --- a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithComplexArgInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithComplexArgInterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.xmemcached.v2; import static org.mockito.Mockito.verify; @@ -49,7 +48,15 @@ public void setUp() throws Exception { public void onConstructWithComplex() { Map inetSocketAddressMap = new HashMap(); inetSocketAddressMap.put(new InetSocketAddress("127.0.0.1", 11211), new InetSocketAddress("127.0.0.2", 11211)); - interceptor.onConstruct(enhancedInstance, new Object[]{null, null, null, null, null, null, inetSocketAddressMap}); + interceptor.onConstruct(enhancedInstance, new Object[] { + null, + null, + null, + null, + null, + null, + inetSocketAddressMap + }); verify(enhancedInstance).setSkyWalkingDynamicField("127.0.0.1:11211;127.0.0.2:11211"); } diff --git a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithHostPortArgInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithHostPortArgInterceptorTest.java index 165746f37387..88d123fe223e 100644 --- a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithHostPortArgInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithHostPortArgInterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.xmemcached.v2; import static org.mockito.Mockito.verify; @@ -43,7 +42,10 @@ public void setUp() throws Exception { @Test public void onConstructWithHostPort() { - interceptor.onConstruct(enhancedInstance, new Object[]{"127.0.0.1", 11211}); + interceptor.onConstruct(enhancedInstance, new Object[] { + "127.0.0.1", + 11211 + }); verify(enhancedInstance).setSkyWalkingDynamicField("127.0.0.1:11211"); } diff --git a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithInetSocketAddressArgInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithInetSocketAddressArgInterceptorTest.java index ca658c057640..9f85e9fdabaf 100644 --- a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithInetSocketAddressArgInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithInetSocketAddressArgInterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.xmemcached.v2; import static org.mockito.Mockito.verify; @@ -45,7 +44,7 @@ public void setUp() throws Exception { @Test public void onConstructWithInetSocketAddress() { - interceptor.onConstruct(enhancedInstance, new Object[]{new InetSocketAddress("127.0.0.1", 11211)}); + interceptor.onConstruct(enhancedInstance, new Object[] {new InetSocketAddress("127.0.0.1", 11211)}); verify(enhancedInstance).setSkyWalkingDynamicField("127.0.0.1:11211"); } diff --git a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithInetSocketAddressListArgInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithInetSocketAddressListArgInterceptorTest.java index 847cfc261700..b4414e7d1c87 100644 --- a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithInetSocketAddressListArgInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedConstructorWithInetSocketAddressListArgInterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.xmemcached.v2; import static org.mockito.Mockito.verify; @@ -50,7 +49,7 @@ public void onConstructWithInetSocketAddressList() { List inetSocketAddressList = new ArrayList(); inetSocketAddressList.add(new InetSocketAddress("127.0.0.1", 11211)); inetSocketAddressList.add(new InetSocketAddress("127.0.0.2", 11211)); - interceptor.onConstruct(enhancedInstance, new Object[]{inetSocketAddressList}); + interceptor.onConstruct(enhancedInstance, new Object[] {inetSocketAddressList}); verify(enhancedInstance).setSkyWalkingDynamicField("127.0.0.1:11211;127.0.0.2:11211"); } diff --git a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedMethodInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedMethodInterceptorTest.java index e2cc6f37c8da..b36a1de7b648 100644 --- a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedMethodInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/xmemcached/v2/XMemcachedMethodInterceptorTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.xmemcached.v2; import java.lang.reflect.Method; @@ -68,8 +67,14 @@ public class XMemcachedMethodInterceptorTest { @Before public void setUp() throws Exception { - allArgument = new Object[] {"OperationKey", "OperationValue"}; - argumentType = new Class[] {String.class, String.class}; + allArgument = new Object[] { + "OperationKey", + "OperationValue" + }; + argumentType = new Class[] { + String.class, + String.class + }; interceptor = new XMemcachedMethodInterceptor(); when(enhancedInstance.getSkyWalkingDynamicField()).thenReturn("127.0.0.1:11211"); @@ -105,7 +110,9 @@ private void assertLogData(List logDataEntities) { LogDataEntity logData = logDataEntities.get(0); Assert.assertThat(logData.getLogs().size(), is(4)); Assert.assertThat(logData.getLogs().get(0).getValue(), CoreMatchers.is("error")); - Assert.assertThat(logData.getLogs().get(1).getValue(), CoreMatchers.is(RuntimeException.class.getName())); + Assert.assertThat(logData.getLogs() + .get(1) + .getValue(), CoreMatchers.is(RuntimeException.class.getName())); Assert.assertNull(logData.getLogs().get(2).getValue()); TestCase.assertNotNull(logData.getLogs().get(3).getValue()); } diff --git a/apm-sniffer/apm-test-tools/pom.xml b/apm-sniffer/apm-test-tools/pom.xml index 71ee1e1924ca..5b90feffd2b3 100644 --- a/apm-sniffer/apm-test-tools/pom.xml +++ b/apm-sniffer/apm-test-tools/pom.xml @@ -16,7 +16,8 @@ ~ --> - + 4.0.0 diff --git a/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/helper/FieldGetter.java b/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/helper/FieldGetter.java index f01a5645cbf7..2aa5966f7dec 100644 --- a/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/helper/FieldGetter.java +++ b/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/helper/FieldGetter.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.test.helper; import java.lang.reflect.Field; @@ -26,20 +25,20 @@ public static T getValue(Object instance, String fieldName) throws IllegalAccessException, NoSuchFieldException { Field field = instance.getClass().getDeclaredField(fieldName); field.setAccessible(true); - return (T)field.get(instance); + return (T) field.get(instance); } public static T getParentFieldValue(Object instance, String fieldName) throws IllegalAccessException, NoSuchFieldException { Field field = instance.getClass().getSuperclass().getDeclaredField(fieldName); field.setAccessible(true); - return (T)field.get(instance); + return (T) field.get(instance); } public static T get2LevelParentFieldValue(Object instance, String fieldName) throws IllegalAccessException, NoSuchFieldException { Field field = instance.getClass().getSuperclass().getSuperclass().getDeclaredField(fieldName); field.setAccessible(true); - return (T)field.get(instance); + return (T) field.get(instance); } } diff --git a/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/helper/FieldSetter.java b/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/helper/FieldSetter.java index 0c0a15bdb226..e08bc85e02a9 100644 --- a/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/helper/FieldSetter.java +++ b/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/helper/FieldSetter.java @@ -16,25 +16,21 @@ * */ - package org.apache.skywalking.apm.agent.test.helper; import java.lang.reflect.Field; -/** - * Created by xin on 2017/7/9. - */ public class FieldSetter { - public static void setValue(Object instance, - String fieldName, T value) throws IllegalAccessException, NoSuchFieldException { + public static void setValue(Object instance, String fieldName, + T value) throws IllegalAccessException, NoSuchFieldException { Field field = instance.getClass().getDeclaredField(fieldName); field.setAccessible(true); field.set(instance, value); } - public static void setStaticValue(Class instance, - String fieldName, T value) throws IllegalAccessException, NoSuchFieldException { + public static void setStaticValue(Class instance, String fieldName, + T value) throws IllegalAccessException, NoSuchFieldException { Field field = instance.getDeclaredField(fieldName); field.setAccessible(true); field.set(instance, value); diff --git a/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/helper/SegmentHelper.java b/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/helper/SegmentHelper.java index e5e14a25cc33..1a717c45ff2d 100644 --- a/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/helper/SegmentHelper.java +++ b/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/helper/SegmentHelper.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.test.helper; import java.util.List; diff --git a/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/helper/SegmentRefHelper.java b/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/helper/SegmentRefHelper.java index 60041bcf21d8..6693d054cd80 100644 --- a/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/helper/SegmentRefHelper.java +++ b/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/helper/SegmentRefHelper.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.test.helper; import org.apache.skywalking.apm.agent.core.context.ids.ID; diff --git a/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/helper/SpanHelper.java b/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/helper/SpanHelper.java index 35e64407b58f..31ad6e93e76c 100644 --- a/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/helper/SpanHelper.java +++ b/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/helper/SpanHelper.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.test.helper; import java.util.Collections; diff --git a/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/tools/AgentServiceRule.java b/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/tools/AgentServiceRule.java index 30c21a93aace..20e3f8a60077 100644 --- a/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/tools/AgentServiceRule.java +++ b/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/tools/AgentServiceRule.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.test.tools; import java.util.HashMap; diff --git a/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/tools/SegmentRefAssert.java b/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/tools/SegmentRefAssert.java index dd24591dc12d..55487abb9526 100644 --- a/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/tools/SegmentRefAssert.java +++ b/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/tools/SegmentRefAssert.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.test.tools; import org.apache.skywalking.apm.agent.core.context.trace.TraceSegmentRef; diff --git a/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/tools/SegmentStorage.java b/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/tools/SegmentStorage.java index 7c369d2ccbc5..6e28509fca61 100644 --- a/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/tools/SegmentStorage.java +++ b/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/tools/SegmentStorage.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.test.tools; import java.util.LinkedList; diff --git a/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/tools/SegmentStoragePoint.java b/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/tools/SegmentStoragePoint.java index fb149c7a7fde..8090b33970ff 100644 --- a/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/tools/SegmentStoragePoint.java +++ b/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/tools/SegmentStoragePoint.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.test.tools; import java.lang.annotation.ElementType; diff --git a/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/tools/SpanAssert.java b/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/tools/SpanAssert.java index 52a1c235c91d..d79b5d3b7f2d 100644 --- a/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/tools/SpanAssert.java +++ b/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/tools/SpanAssert.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.test.tools; import org.hamcrest.CoreMatchers; diff --git a/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/tools/TracingSegmentRunner.java b/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/tools/TracingSegmentRunner.java index c2d0148da9bb..0626f36d017c 100644 --- a/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/tools/TracingSegmentRunner.java +++ b/apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/tools/TracingSegmentRunner.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.agent.test.tools; import java.lang.reflect.Field; @@ -54,9 +53,11 @@ protected Object createTest() throws Exception { return targetObject; } - @Override protected Statement withAfters(FrameworkMethod method, Object target, final Statement statement) { + @Override + protected Statement withAfters(FrameworkMethod method, Object target, final Statement statement) { return new Statement() { - @Override public void evaluate() throws Throwable { + @Override + public void evaluate() throws Throwable { if (field != null) { try { tracingData = new SegmentStorage(); diff --git a/apm-sniffer/apm-test-tools/src/test/java/org/apache/skywalking/apm/plugin/ArbitrarySetTest.java b/apm-sniffer/apm-test-tools/src/test/java/org/apache/skywalking/apm/plugin/ArbitrarySetTest.java index 36a585a2ae18..2c5c2a7a954f 100644 --- a/apm-sniffer/apm-test-tools/src/test/java/org/apache/skywalking/apm/plugin/ArbitrarySetTest.java +++ b/apm-sniffer/apm-test-tools/src/test/java/org/apache/skywalking/apm/plugin/ArbitrarySetTest.java @@ -41,13 +41,9 @@ import java.util.concurrent.TimeUnit; /** - * Benchmark Mode Cnt Score Error Units - * ArbitrarySetTest.array thrpt 10 2360.500 ± 138.279 ops/ms - * ArbitrarySetTest.arrayList thrpt 10 1080.005 ± 225.897 ops/ms - * ArbitrarySetTest.linkedList thrpt 10 188.007 ± 11.739 ops/ms - * ArbitrarySetTest.treeMap thrpt 10 214.384 ± 27.816 ops/ms - * - * @author kezhenxu94 + * Benchmark Mode Cnt Score Error Units ArbitrarySetTest.array thrpt 10 2360.500 + * ± 138.279 ops/ms ArbitrarySetTest.arrayList thrpt 10 1080.005 ± 225.897 ops/ms ArbitrarySetTest.linkedList + * thrpt 10 188.007 ± 11.739 ops/ms ArbitrarySetTest.treeMap thrpt 10 214.384 ± 27.816 ops/ms */ @BenchmarkMode(Mode.Throughput) @OutputTimeUnit(TimeUnit.MILLISECONDS) diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/pom.xml b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/pom.xml index 9e5abf8896e3..9a7075e5906e 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/pom.xml +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-toolkit-activation org.apache.skywalking diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v1/x/PrintTraceIdInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v1/x/PrintTraceIdInterceptor.java index 6ea4d80431de..2cd18d8f7d0b 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v1/x/PrintTraceIdInterceptor.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v1/x/PrintTraceIdInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.activation.log.log4j.v1.x; import java.lang.reflect.Method; @@ -25,22 +24,22 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; -/** - * Created by wusheng on 2016/12/7. - */ public class PrintTraceIdInterceptor implements InstanceMethodsAroundInterceptor { - @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + @Override + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { } - @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + @Override + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { return "TID:" + ContextManager.getGlobalTraceId(); } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { } diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v1/x/TraceIdPatternConverterActivation.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v1/x/TraceIdPatternConverterActivation.java index 5a05fe13c2b8..03e6896349d3 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v1/x/TraceIdPatternConverterActivation.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v1/x/TraceIdPatternConverterActivation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.activation.log.log4j.v1.x; import net.bytebuddy.description.method.MethodDescription; @@ -30,12 +29,9 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; /** - * Active the toolkit class "TraceIdPatternConverter". - * Should not dependency or import any class in "skywalking-toolkit-log4j-1.x" module. - * Activation's classloader is diff from "TraceIdPatternConverter", - * using direct will trigger classloader issue. - * - * @author wusheng + * Active the toolkit class "TraceIdPatternConverter". Should not dependency or import any class in + * "skywalking-toolkit-log4j-1.x" module. Activation's classloader is diff from "TraceIdPatternConverter", using direct + * will trigger classloader issue. */ public class TraceIdPatternConverterActivation extends ClassInstanceMethodsEnhancePluginDefine { @@ -77,7 +73,8 @@ public String getMethodsInterceptor() { return INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/pom.xml b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/pom.xml index 414239e0ec89..2863fe1ca8d6 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/pom.xml +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-toolkit-activation org.apache.skywalking diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/TraceIdConverterActivation.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/TraceIdConverterActivation.java index f3cd62795380..0771bca146ea 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/TraceIdConverterActivation.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/TraceIdConverterActivation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.activation.log.log4j.v2.x; import net.bytebuddy.description.method.MethodDescription; @@ -29,11 +28,6 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; - -/** - * @author xuhe - */ - public class TraceIdConverterActivation extends ClassInstanceMethodsEnhancePluginDefine { private static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.toolkit.activation.log.log4j.v2.x.TraceIdConverterMethodInterceptor"; @@ -47,7 +41,7 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/TraceIdConverterMethodInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/TraceIdConverterMethodInterceptor.java index 64599b499602..425a54e1f4c1 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/TraceIdConverterMethodInterceptor.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/TraceIdConverterMethodInterceptor.java @@ -25,16 +25,11 @@ import java.lang.reflect.Method; -/** - * @author xuhe - */ - public class TraceIdConverterMethodInterceptor implements InstanceMethodsAroundInterceptor { - @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { String tid = ""; //Async Thread, where ContextManager is not active @@ -51,13 +46,13 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { return ret; } @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { } } diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/async/AsyncLoggerConfigInstrumentation.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/async/AsyncLoggerConfigInstrumentation.java index 26624d33667d..1901e9072add 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/async/AsyncLoggerConfigInstrumentation.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/async/AsyncLoggerConfigInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.activation.log.log4j.v2.x.async; import net.bytebuddy.description.method.MethodDescription; @@ -30,11 +29,9 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; /** - * Instrument to intercept AsyncLoggerConfig of log4j2, . - * Finally I choose populateLazilyInitializedFields as the intercept point, which all versions of AsyncAppender will actually work with - * What's more, I choose callAppenders as the intercept point before, while it never works after log4j2 2.11.1+ - * - * @author xuhe + * Instrument to intercept AsyncLoggerConfig of log4j2, . Finally I choose populateLazilyInitializedFields as the + * intercept point, which all versions of AsyncAppender will actually work with What's more, I choose callAppenders as + * the intercept point before, while it never works after log4j2 2.11.1+ */ public class AsyncLoggerConfigInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -50,7 +47,7 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/async/AsyncLoggerConfigMethodInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/async/AsyncLoggerConfigMethodInterceptor.java index 7cae70ce13cb..187872ae6750 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/async/AsyncLoggerConfigMethodInterceptor.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/async/AsyncLoggerConfigMethodInterceptor.java @@ -27,16 +27,13 @@ /** *

Pass the global trace Id into the _sw field of Lo4jLogEvent instance after enhancing

- * - * @author xuhe */ public class AsyncLoggerConfigMethodInterceptor implements InstanceMethodsAroundInterceptor { - @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { if (allArguments[0] instanceof EnhancedInstance) { EnhancedInstance instances = (EnhancedInstance) allArguments[0]; instances.setSkyWalkingDynamicField(ContextManager.getGlobalTraceId()); @@ -44,13 +41,13 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { return ret; } @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { } } diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/async/Log4jLogEventConstructorInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/async/Log4jLogEventConstructorInterceptor.java index cb150421baad..98230b1c0ad2 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/async/Log4jLogEventConstructorInterceptor.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/async/Log4jLogEventConstructorInterceptor.java @@ -22,11 +22,9 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor; /** - * Log4jLogEvent implements LogEvent, - * which is a message in the Disruptor Array of the AsyncLoggerConfigDisruptor.class, appended by AsyncLoggerConfig.class. - * The Log4jLogEvent is enhanced to carry the tid in the synchronization thread using `dynamicField`. - * - * @author xuhe + * Log4jLogEvent implements LogEvent, which is a message in the Disruptor Array of the AsyncLoggerConfigDisruptor.class, + * appended by AsyncLoggerConfig.class. The Log4jLogEvent is enhanced to carry the tid in the synchronization thread + * using `dynamicField`. */ public class Log4jLogEventConstructorInterceptor implements InstanceConstructorInterceptor { diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/async/Log4jLogEventInstrumentation.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/async/Log4jLogEventInstrumentation.java index 0654bc9ad648..c09b08272b11 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/async/Log4jLogEventInstrumentation.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/async/Log4jLogEventInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.activation.log.log4j.v2.x.async; import net.bytebuddy.description.method.MethodDescription; @@ -29,18 +28,14 @@ import static net.bytebuddy.matcher.ElementMatchers.any; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; - /** * Enhance all the Log4jLogEvent instance so that it can carries the trace id in _sw field - * - * @author xuhe */ - public class Log4jLogEventInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { - return new ConstructorInterceptPoint[]{ + return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { @Override public ElementMatcher getConstructorMatcher() { diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/async/RingBufferLogEventInstrumentation.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/async/RingBufferLogEventInstrumentation.java index cba7f9c32748..5365f3e60ba4 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/async/RingBufferLogEventInstrumentation.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/async/RingBufferLogEventInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.activation.log.log4j.v2.x.async; import net.bytebuddy.description.method.MethodDescription; @@ -29,14 +28,11 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; - -/** - * @author songxiaoyue - */ public class RingBufferLogEventInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.toolkit.activation.log.log4j.v2.x.async.RingBufferLogEventMethodInterceptor"; private static final String ENHANCE_CLASS = "org.apache.logging.log4j.core.async.RingBufferLogEvent"; private static final String ENHANCE_METHOD = "setMessage"; + @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; @@ -44,7 +40,7 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/async/RingBufferLogEventMethodInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/async/RingBufferLogEventMethodInterceptor.java index e5fffb8da878..cd0f658f667f 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/async/RingBufferLogEventMethodInterceptor.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/async/RingBufferLogEventMethodInterceptor.java @@ -27,27 +27,24 @@ /** *

Pass the global trace Id into the _sw field of RingBufferLogEvent instance after enhancing

- * - * @author songxiaoyue */ public class RingBufferLogEventMethodInterceptor implements InstanceMethodsAroundInterceptor { - @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { objInst.setSkyWalkingDynamicField(ContextManager.getGlobalTraceId()); } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { return ret; } @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { } } diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/pom.xml b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/pom.xml index 14c0bb8e73f1..c9a384f37cb7 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/pom.xml +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-toolkit-activation org.apache.skywalking diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/LogbackPatternConverterActivation.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/LogbackPatternConverterActivation.java index b9d59b544cec..d8597bae61fc 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/LogbackPatternConverterActivation.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/LogbackPatternConverterActivation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.activation.log.logback.v1.x; import net.bytebuddy.description.method.MethodDescription; @@ -32,12 +31,11 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; /** - * Active the toolkit class "org.apache.skywalking.apm.toolkit.log.logback.v1.x.LogbackPatternConverter". - * Should not dependency or import any class in "skywalking-toolkit-logback-1.x" module. - * Activation's classloader is diff from "org.apache.skywalking.apm.toolkit.log.logback.v1.x.LogbackPatternConverter", - * using direct will trigger classloader issue. + * Active the toolkit class "org.apache.skywalking.apm.toolkit.log.logback.v1.x.LogbackPatternConverter". Should not + * dependency or import any class in "skywalking-toolkit-logback-1.x" module. Activation's classloader is diff from + * "org.apache.skywalking.apm.toolkit.log.logback.v1.x.LogbackPatternConverter", using direct will trigger classloader + * issue. *

- * Created by wusheng on 2016/12/7. */ public class LogbackPatternConverterActivation extends ClassInstanceMethodsEnhancePluginDefine { @@ -71,7 +69,7 @@ public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { - return named(ENHANCE_METHOD).and(takesArgumentWithType(0,"ch.qos.logback.classic.spi.ILoggingEvent")); + return named(ENHANCE_METHOD).and(takesArgumentWithType(0, "ch.qos.logback.classic.spi.ILoggingEvent")); } @Override @@ -79,7 +77,8 @@ public String getMethodsInterceptor() { return INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/PrintTraceIdInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/PrintTraceIdInterceptor.java index a39f90908161..d323e0498eec 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/PrintTraceIdInterceptor.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/PrintTraceIdInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.activation.log.logback.v1.x; import org.apache.skywalking.apm.agent.core.context.ContextManager; @@ -26,18 +25,17 @@ import java.lang.reflect.Method; -/** - * Created by wusheng on 2016/12/7. - */ public class PrintTraceIdInterceptor implements InstanceMethodsAroundInterceptor { - @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + @Override + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { } - @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + @Override + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { if (!ContextManager.isActive()) { if (allArguments[0] instanceof EnhancedInstance) { String tid = (String) ((EnhancedInstance) allArguments[0]).getSkyWalkingDynamicField(); @@ -49,7 +47,8 @@ public class PrintTraceIdInterceptor implements InstanceMethodsAroundInterceptor return "TID:" + ContextManager.getGlobalTraceId(); } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { } diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/async/AsyncAppenderBaseInstrumentation.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/async/AsyncAppenderBaseInstrumentation.java index 817e4e50c2fa..c90f48cba899 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/async/AsyncAppenderBaseInstrumentation.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/async/AsyncAppenderBaseInstrumentation.java @@ -28,10 +28,6 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * @author zhaoyuguang - */ - public class AsyncAppenderBaseInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @@ -40,7 +36,7 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/async/AsyncAppenderBaseMethodInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/async/AsyncAppenderBaseMethodInterceptor.java index af9f52af361a..a2d740bf18f4 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/async/AsyncAppenderBaseMethodInterceptor.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/async/AsyncAppenderBaseMethodInterceptor.java @@ -25,16 +25,11 @@ import java.lang.reflect.Method; -/** - * @author zhaoyuguang - */ - public class AsyncAppenderBaseMethodInterceptor implements InstanceMethodsAroundInterceptor { - @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { if (allArguments[0] instanceof EnhancedInstance) { EnhancedInstance instances = (EnhancedInstance) allArguments[0]; instances.setSkyWalkingDynamicField(ContextManager.getGlobalTraceId()); @@ -42,13 +37,13 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { return ret; } @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { } } diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/async/LoggingEventConstructorInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/async/LoggingEventConstructorInterceptor.java index 45fdb2ec6405..873c1da1f877 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/async/LoggingEventConstructorInterceptor.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/async/LoggingEventConstructorInterceptor.java @@ -22,11 +22,8 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor; /** - * LoggingEvent implements ILoggingEvent, - * which is a message in the blockingQueue of the AsyncAppenderBase.class. - * The LoggingEvent is enhanced to carry the tid in the synchronization thread using `dynamicField`. - * - * @author zhaoyuguang + * LoggingEvent implements ILoggingEvent, which is a message in the blockingQueue of the AsyncAppenderBase.class. The + * LoggingEvent is enhanced to carry the tid in the synchronization thread using `dynamicField`. */ public class LoggingEventConstructorInterceptor implements InstanceConstructorInterceptor { diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/async/LoggingEventInstrumentation.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/async/LoggingEventInstrumentation.java index fd1dcd8e9fb8..69704a22996a 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/async/LoggingEventInstrumentation.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/async/LoggingEventInstrumentation.java @@ -28,14 +28,10 @@ import static net.bytebuddy.matcher.ElementMatchers.any; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * @author zhaoyuguang - */ - public class LoggingEventInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { - return new ConstructorInterceptPoint[]{ + return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { @Override public ElementMatcher getConstructorMatcher() { diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/logstash/TcpSocketAppenderActivation.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/logstash/TcpSocketAppenderActivation.java index 543dd7a33777..76ad327ee25b 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/logstash/TcpSocketAppenderActivation.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/logstash/TcpSocketAppenderActivation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.activation.log.logback.v1.x.logstash; import net.bytebuddy.description.method.MethodDescription; @@ -32,8 +31,6 @@ /** * enhance the method prepareForDeferredProcessing of the logstash logback class "net.logstash.logback.appender.LogstashTcpSocketAppender". - * - * @author wuxingye */ public class TcpSocketAppenderActivation extends ClassInstanceMethodsEnhancePluginDefine { @@ -65,7 +62,8 @@ public String getMethodsInterceptor() { return INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/logstash/TcpSocketAppenderInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/logstash/TcpSocketAppenderInterceptor.java index 9f7b7cd21bb5..1205d48a86d7 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/logstash/TcpSocketAppenderInterceptor.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/logstash/TcpSocketAppenderInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.activation.log.logback.v1.x.logstash; import ch.qos.logback.classic.spi.ILoggingEvent; @@ -26,25 +25,26 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; -/** - * @author wuxingye - */ public class TcpSocketAppenderInterceptor implements InstanceMethodsAroundInterceptor { - @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - ILoggingEvent event = (ILoggingEvent)allArguments[0]; - if (event != null && event.getLoggerContextVO() != null && event.getLoggerContextVO().getPropertyMap() != null) { + @Override + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { + ILoggingEvent event = (ILoggingEvent) allArguments[0]; + if (event != null && event.getLoggerContextVO() != null && event.getLoggerContextVO() + .getPropertyMap() != null) { event.getLoggerContextVO().getPropertyMap().put("TID", ContextManager.getGlobalTraceId()); } } - @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + @Override + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { } diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/mdc/MDCConverterActivation.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/mdc/MDCConverterActivation.java index 98127412a49a..5f26bbe8310b 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/mdc/MDCConverterActivation.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/mdc/MDCConverterActivation.java @@ -31,7 +31,6 @@ /** * Support MDC https://logback.qos.ch/manual/mdc.html - * @author: zhangkewei */ public class MDCConverterActivation extends ClassInstanceMethodsEnhancePluginDefine { @@ -50,7 +49,7 @@ public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { - return named(ENHANCE_METHOD).and(takesArgumentWithType(0,"ch.qos.logback.classic.spi.ILoggingEvent")); + return named(ENHANCE_METHOD).and(takesArgumentWithType(0, "ch.qos.logback.classic.spi.ILoggingEvent")); } @Override @@ -58,7 +57,8 @@ public String getMethodsInterceptor() { return INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/mdc/PrintMDCTraceIdInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/mdc/PrintMDCTraceIdInterceptor.java index 1a11dfdab330..7b92da4b34d9 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/mdc/PrintMDCTraceIdInterceptor.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/mdc/PrintMDCTraceIdInterceptor.java @@ -25,17 +25,16 @@ import java.lang.reflect.Method; -/** - * @author zhangkewei - */ public class PrintMDCTraceIdInterceptor implements InstanceMethodsAroundInterceptor { - @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + @Override + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { } - @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + @Override + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { if (!ContextManager.isActive()) { if (allArguments[0] instanceof EnhancedInstance) { String tid = (String) ((EnhancedInstance) allArguments[0]).getSkyWalkingDynamicField(); @@ -47,7 +46,8 @@ public class PrintMDCTraceIdInterceptor implements InstanceMethodsAroundIntercep return "TID:" + ContextManager.getGlobalTraceId(); } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { } diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/pom.xml b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/pom.xml index 9f6f16190d9d..0d6a8926cf5d 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/pom.xml +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-toolkit-activation org.apache.skywalking diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/continuation/ActivateInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/continuation/ActivateInterceptor.java index 6ef74310706a..c5732eb54ec0 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/continuation/ActivateInterceptor.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/continuation/ActivateInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.activation.opentracing.continuation; import java.lang.reflect.Method; @@ -27,20 +26,23 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; public class ActivateInterceptor implements InstanceMethodsAroundInterceptor { - @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + @Override + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { } - @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + @Override + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { Object contextSnapshot = objInst.getSkyWalkingDynamicField(); if (contextSnapshot != null) { - ContextManager.continued((ContextSnapshot)contextSnapshot); + ContextManager.continued((ContextSnapshot) contextSnapshot); } return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { } diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/continuation/ConstructorInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/continuation/ConstructorInterceptor.java index 446abdae6d66..01c7a783afba 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/continuation/ConstructorInterceptor.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/continuation/ConstructorInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.activation.opentracing.continuation; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/continuation/SkywalkingContinuationActivation.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/continuation/SkywalkingContinuationActivation.java index c1f6fd8602a4..1fcae47f98ac 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/continuation/SkywalkingContinuationActivation.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/continuation/SkywalkingContinuationActivation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.activation.opentracing.continuation; import net.bytebuddy.description.method.MethodDescription; @@ -33,12 +32,10 @@ /** * {@link SkywalkingContinuationActivation} defines two interceptors to enhance the methods and constructor in class * SkywalkingContinuation. - * - * 1. The ConstructorInterceptor - * interceptor enhance the constructor. - * - * 2. The ActivateInterceptor - * interceptor enhance the activate. + *

+ * 1. The ConstructorInterceptor interceptor enhance the constructor. + *

+ * 2. The ActivateInterceptor interceptor enhance the activate. */ public class SkywalkingContinuationActivation extends ClassInstanceMethodsEnhancePluginDefine { @@ -55,11 +52,13 @@ protected ClassMatch enhanceClass() { public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { - @Override public ElementMatcher getConstructorMatcher() { + @Override + public ElementMatcher getConstructorMatcher() { return any(); } - @Override public String getConstructorInterceptor() { + @Override + public String getConstructorInterceptor() { return CONSTRUCTOR_INTERCEPTOR; } } @@ -70,15 +69,18 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named("activate"); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return ACTIVATE_METHOD_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/span/ConstructorWithSpanBuilderInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/span/ConstructorWithSpanBuilderInterceptor.java index e486f27fc009..fc35aaf32f8d 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/span/ConstructorWithSpanBuilderInterceptor.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/span/ConstructorWithSpanBuilderInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.activation.opentracing.span; import org.apache.skywalking.apm.agent.core.context.tag.Tags; @@ -32,7 +31,7 @@ public class ConstructorWithSpanBuilderInterceptor implements InstanceConstructo @Override public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { - SkywalkingSpanBuilder spanBuilder = (SkywalkingSpanBuilder)allArguments[0]; + SkywalkingSpanBuilder spanBuilder = (SkywalkingSpanBuilder) allArguments[0]; AbstractSpan span; if (spanBuilder.isEntry()) { diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/span/ConstructorWithTracerInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/span/ConstructorWithTracerInterceptor.java index 4695bf7c9b7f..c7141e2115e3 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/span/ConstructorWithTracerInterceptor.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/span/ConstructorWithTracerInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.activation.opentracing.span; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/span/SkywalkingSpanActivation.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/span/SkywalkingSpanActivation.java index ce85be5d7632..55ec89dadd7f 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/span/SkywalkingSpanActivation.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/span/SkywalkingSpanActivation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.activation.opentracing.span; import java.util.Map; @@ -35,24 +34,20 @@ /** * {@link SkywalkingSpanActivation} defines five interceptors to enhance the methods and constructor in class * SkywalkingSpan. - * - * 1. The ConstructorWithSpanBuilderInterceptor - * interceptor enhance the constructor with SkywalkingSpanBuilder - * argument. - * - * 2. The ConstructorWithTracerInterceptor - * interceptor enhance the constructor with SkywalkingTracer - * argument. - * - * 3. The SpanFinishInterceptor - * interceptor enhance the finish method that the first argument type is {@link Long} - * - * 4. The SpanLogInterceptor - * interceptor enhance the log method that the first argument type is {@link Long} and the second - * argument type is {@link Map} - * - * 5. The SpanSetOperationNameInterceptor - * interceptor enhance the setOperationName method + *

+ * 1. The ConstructorWithSpanBuilderInterceptor interceptor enhance the constructor with + * SkywalkingSpanBuilder argument. + *

+ * 2. The ConstructorWithTracerInterceptor interceptor enhance the constructor with + * SkywalkingTracer argument. + *

+ * 3. The SpanFinishInterceptor interceptor enhance the finish method that the first argument + * type is {@link Long} + *

+ * 4. The SpanLogInterceptor interceptor enhance the log method that the first argument type + * is {@link Long} and the second argument type is {@link Map} + *

+ * 5. The SpanSetOperationNameInterceptor interceptor enhance the setOperationName method **/ public class SkywalkingSpanActivation extends ClassInstanceMethodsEnhancePluginDefine { @@ -154,15 +149,18 @@ public boolean isOverrideArgs() { } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named("setTag").and(takesArgument(0, String.class)).and(takesArgument(1, String.class)); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return SET_TAG_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/span/SpanFinishInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/span/SpanFinishInterceptor.java index 966d353378a7..c1dd3778cef4 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/span/SpanFinishInterceptor.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/span/SpanFinishInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.activation.opentracing.span; import java.lang.reflect.Method; @@ -28,15 +27,15 @@ public class SpanFinishInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { - AbstractSpan abstractSpan = (AbstractSpan)objInst.getSkyWalkingDynamicField(); + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { + AbstractSpan abstractSpan = (AbstractSpan) objInst.getSkyWalkingDynamicField(); if (abstractSpan != null) { ContextManager.stopSpan(abstractSpan); } diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/span/SpanLogInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/span/SpanLogInterceptor.java index 63c5d8a60f92..0b8bd35637ac 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/span/SpanLogInterceptor.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/span/SpanLogInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.activation.opentracing.span; import java.lang.reflect.Method; @@ -26,22 +25,19 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; -/** - * Created by xin on 2017/7/10. - */ public class SpanLogInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { - AbstractSpan abstractSpan = (AbstractSpan)objInst.getSkyWalkingDynamicField(); + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { + AbstractSpan abstractSpan = (AbstractSpan) objInst.getSkyWalkingDynamicField(); if (abstractSpan != null) { - abstractSpan.log(Long.parseLong(allArguments[0].toString()), (Map)allArguments[1]); + abstractSpan.log(Long.parseLong(allArguments[0].toString()), (Map) allArguments[1]); } return ret; } diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/span/SpanSetOperationNameInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/span/SpanSetOperationNameInterceptor.java index 971ba79718cb..1c1a4f43e9d0 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/span/SpanSetOperationNameInterceptor.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/span/SpanSetOperationNameInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.activation.opentracing.span; import java.lang.reflect.Method; @@ -27,15 +26,15 @@ public class SpanSetOperationNameInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { - AbstractSpan tracingSpan = (AbstractSpan)objInst.getSkyWalkingDynamicField(); + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { + AbstractSpan tracingSpan = (AbstractSpan) objInst.getSkyWalkingDynamicField(); if (tracingSpan != null) { tracingSpan.setOperationName(allArguments[0].toString()); } diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/span/SpanSetTagInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/span/SpanSetTagInterceptor.java index a5a8a6b4d0c4..857e8f74e347 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/span/SpanSetTagInterceptor.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/span/SpanSetTagInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.activation.opentracing.span; import io.opentracing.tag.Tags; @@ -29,13 +28,13 @@ public class SpanSetTagInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { AbstractSpan activeSpan = ContextManager.activeSpan(); String tagKey = String.valueOf(allArguments[0]); String tagValue = String.valueOf(allArguments[1]); diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/tracer/SkywalkingTracerActivation.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/tracer/SkywalkingTracerActivation.java index da26fbafb6ee..14d22a694ddd 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/tracer/SkywalkingTracerActivation.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/tracer/SkywalkingTracerActivation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.activation.opentracing.tracer; import net.bytebuddy.description.method.MethodDescription; @@ -30,14 +29,12 @@ import static net.bytebuddy.matcher.ElementMatchers.named; /** - * {@link SkywalkingTracerActivation} defines two interceptors to enhance the methods in - * class SkywalkingTracer. - * - * 1. The SkywalkingTracerInjectInterceptor - * interceptor enhance the extract method - * - * 2. The SkywalkingTracerExtractInterceptor - * interceptor enhance the inject method + * {@link SkywalkingTracerActivation} defines two interceptors to enhance the methods in class + * SkywalkingTracer. + *

+ * 1. The SkywalkingTracerInjectInterceptor interceptor enhance the extract method + *

+ * 2. The SkywalkingTracerExtractInterceptor interceptor enhance the inject method **/ public class SkywalkingTracerActivation extends ClassInstanceMethodsEnhancePluginDefine { @@ -45,39 +42,48 @@ public class SkywalkingTracerActivation extends ClassInstanceMethodsEnhancePlugi private static final String INJECT_INTERCEPTOR = "org.apache.skywalking.apm.toolkit.activation.opentracing.tracer.SkywalkingTracerInjectInterceptor"; private static final String EXTRACT_INTERCEPTOR = "org.apache.skywalking.apm.toolkit.activation.opentracing.tracer.SkywalkingTracerExtractInterceptor"; - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); } - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named("inject"); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return INJECT_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named("extract"); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return EXTRACT_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/tracer/SkywalkingTracerExtractInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/tracer/SkywalkingTracerExtractInterceptor.java index 99ff9358a717..038f67962341 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/tracer/SkywalkingTracerExtractInterceptor.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/tracer/SkywalkingTracerExtractInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.activation.opentracing.tracer; import io.opentracing.propagation.Format; @@ -35,14 +34,14 @@ public class SkywalkingTracerExtractInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { Format format = (Format) allArguments[0]; if (Format.Builtin.TEXT_MAP.equals(format) || Format.Builtin.HTTP_HEADERS.equals(format)) { TextMap textMapCarrier = (TextMap) allArguments[1]; @@ -67,7 +66,7 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { } } diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/tracer/SkywalkingTracerInjectInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/tracer/SkywalkingTracerInjectInterceptor.java index fd9e071703b6..6af0e3c226bf 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/tracer/SkywalkingTracerInjectInterceptor.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/tracer/SkywalkingTracerInjectInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.activation.opentracing.tracer; import io.opentracing.propagation.Format; @@ -31,17 +30,17 @@ public class SkywalkingTracerInjectInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { - Format format = (Format)allArguments[1]; + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { + Format format = (Format) allArguments[1]; if (Format.Builtin.TEXT_MAP.equals(format) || Format.Builtin.HTTP_HEADERS.equals(format)) { - TextMap carrier = (TextMap)allArguments[2]; + TextMap carrier = (TextMap) allArguments[2]; ContextCarrier contextCarrier = new ContextCarrier(); ContextManager.inject(contextCarrier); CarrierItem next = contextCarrier.items(); diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/test/java/org/apache/skywalking/apm/toolkit/activation/opentracing/SkywalkingSpanActivationTest.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/test/java/org/apache/skywalking/apm/toolkit/activation/opentracing/SkywalkingSpanActivationTest.java index 37b15516735f..d5a672c1a862 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/test/java/org/apache/skywalking/apm/toolkit/activation/opentracing/SkywalkingSpanActivationTest.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/test/java/org/apache/skywalking/apm/toolkit/activation/opentracing/SkywalkingSpanActivationTest.java @@ -108,8 +108,14 @@ public void setUp() { spanBuilder = new SkywalkingSpanBuilder("test").withTag(Tags.COMPONENT.getKey(), "test"); constructorWithSpanBuilderInterceptor = new ConstructorWithSpanBuilderInterceptor(); spanLogInterceptor = new SpanLogInterceptor(); - logArgument = new Object[] {111111111L, event}; - logArgumentType = new Class[] {long.class, HashMap.class}; + logArgument = new Object[] { + 111111111L, + event + }; + logArgumentType = new Class[] { + long.class, + HashMap.class + }; setOperationNameInterceptor = new SpanSetOperationNameInterceptor(); setOperationNameArgument = new Object[] {"testOperationName"}; @@ -166,7 +172,8 @@ public void testCreateExitSpanWithoutPeer() throws Throwable { @Test public void testCreateExitSpanWithPeer() throws Throwable { spanBuilder.withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_CLIENT) - .withTag(Tags.PEER_HOST_IPV4.getKey(), "127.0.0.1").withTag(Tags.PEER_PORT.getKey(), "8080"); + .withTag(Tags.PEER_HOST_IPV4.getKey(), "127.0.0.1") + .withTag(Tags.PEER_PORT.getKey(), "8080"); startSpan(); stopSpan(); @@ -188,7 +195,8 @@ private TraceSegment assertTraceSemgnets() { @Test public void testInject() throws Throwable { spanBuilder.withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_CLIENT) - .withTag(Tags.PEER_HOST_IPV4.getKey(), "127.0.0.1").withTag(Tags.PEER_PORT.getKey(), 8080); + .withTag(Tags.PEER_HOST_IPV4.getKey(), "127.0.0.1") + .withTag(Tags.PEER_PORT.getKey(), 8080); startSpan(); final Map values = new HashMap(); @@ -205,8 +213,11 @@ public void put(String key, String value) { }; - injectInterceptor.afterMethod(enhancedInstance, null, - new Object[] {new TextMapContext(), Format.Builtin.TEXT_MAP, carrier}, null, null); + injectInterceptor.afterMethod(enhancedInstance, null, new Object[] { + new TextMapContext(), + Format.Builtin.TEXT_MAP, + carrier + }, null, null); String[] parts = values.get(SW6CarrierItem.HEADER_NAME).split("-", 9); Assert.assertEquals("0", parts[3]); @@ -218,7 +229,8 @@ public void put(String key, String value) { @Test public void testExtractWithValidateContext() throws Throwable { spanBuilder.withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_CLIENT) - .withTag(Tags.PEER_HOST_IPV4.getKey(), "127.0.0.1").withTag(Tags.PEER_PORT.getKey(), 8080); + .withTag(Tags.PEER_HOST_IPV4.getKey(), "127.0.0.1") + .withTag(Tags.PEER_PORT.getKey(), 8080); startSpan(); final Map values = new HashMap(); TextMap carrier = new TextMap() { @@ -236,8 +248,10 @@ public void put(String key, String value) { values.put(SW6CarrierItem.HEADER_NAME, "1-NDM0LjEyLjEyMTIz-MS4zNDMuMjIy-3-1-1-IzEyNy4wLjAuMTo4MDgw-Iy9wb3J0YWwv-Iy90ZXN0RW50cnlTcGFu"); - extractInterceptor.afterMethod(enhancedInstance, null, - new Object[] {Format.Builtin.TEXT_MAP, carrier}, new Class[] {}, null); + extractInterceptor.afterMethod(enhancedInstance, null, new Object[] { + Format.Builtin.TEXT_MAP, + carrier + }, new Class[] {}, null); stopSpan(); TraceSegment tracingSegment = assertTraceSemgnets(); @@ -255,7 +269,8 @@ public void put(String key, String value) { @Test public void testExtractWithInValidateContext() throws Throwable { spanBuilder.withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_CLIENT) - .withTag(Tags.PEER_HOST_IPV4.getKey(), "127.0.0.1").withTag(Tags.PEER_PORT.getKey(), 8080); + .withTag(Tags.PEER_HOST_IPV4.getKey(), "127.0.0.1") + .withTag(Tags.PEER_PORT.getKey(), 8080); startSpan(); final Map values = new HashMap(); @@ -274,8 +289,10 @@ public void put(String key, String value) { values.put(SW6CarrierItem.HEADER_NAME, "aaaaaaaa|3|#192.168.1.8:18002|#/portal/|#/testEntrySpan|1.234.444"); - extractInterceptor.afterMethod(enhancedInstance, null, - new Object[] {Format.Builtin.TEXT_MAP, carrier}, new Class[] {}, null); + extractInterceptor.afterMethod(enhancedInstance, null, new Object[] { + Format.Builtin.TEXT_MAP, + carrier + }, new Class[] {}, null); stopSpan(); TraceSegment tracingSegment = assertTraceSemgnets(); @@ -342,8 +359,7 @@ private void startSpan(MockEnhancedInstance enhancedInstance) throws Throwable { constructorWithSpanBuilderInterceptor.onConstruct(enhancedInstance, new Object[] {spanBuilder}); spanLogInterceptor.afterMethod(enhancedInstance, null, logArgument, logArgumentType, null); - setOperationNameInterceptor.afterMethod(enhancedInstance, SkywalkingSpan.class.getMethod("setOperationName", String.class), - setOperationNameArgument, setOperationNameArgumentType, null); + setOperationNameInterceptor.afterMethod(enhancedInstance, SkywalkingSpan.class.getMethod("setOperationName", String.class), setOperationNameArgument, setOperationNameArgumentType, null); } private class MockEnhancedInstance implements EnhancedInstance { diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/pom.xml b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/pom.xml index ae444b3548d4..c96de32c26ee 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/pom.xml +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-toolkit-activation org.apache.skywalking diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanActivation.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanActivation.java index 3e8b87db45ed..9303969d6a15 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanActivation.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanActivation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.activation.trace; import net.bytebuddy.description.method.MethodDescription; @@ -32,10 +31,8 @@ import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType; /** - * {@link TraceAnnotationActivation} enhance the tag method of ActiveSpan - * by ActiveSpanTagInterceptor. - * - * @author zhangxin + * {@link TraceAnnotationActivation} enhance the tag method of ActiveSpan by + * ActiveSpanTagInterceptor. */ public class ActiveSpanActivation extends ClassStaticMethodsEnhancePluginDefine { @@ -55,100 +52,115 @@ public class ActiveSpanActivation extends ClassStaticMethodsEnhancePluginDefine private static final String INFO_INTERCEPTOR_METHOD_NAME = "info"; private static final String INFO_INTERCEPTOR_CLASS = "org.apache.skywalking.apm.toolkit.activation.trace.ActiveSpanInfoInterceptor"; - - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public StaticMethodsInterceptPoint[] getStaticMethodsInterceptPoints() { + @Override + public StaticMethodsInterceptPoint[] getStaticMethodsInterceptPoints() { return new StaticMethodsInterceptPoint[] { new StaticMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return named(TAG_INTERCEPTOR_METHOD_NAME); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return TAG_INTERCEPTOR_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new StaticMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named(DEBUG_INTERCEPTOR_METHOD_NAME) - .and(takesArgumentWithType(0, "java.lang.String")); + @Override + public ElementMatcher getMethodsMatcher() { + return named(DEBUG_INTERCEPTOR_METHOD_NAME).and(takesArgumentWithType(0, "java.lang.String")); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return DEBUG_INTERCEPTOR_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new StaticMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named(INFO_INTERCEPTOR_METHOD_NAME) - .and(takesArgumentWithType(0, "java.lang.String")); + @Override + public ElementMatcher getMethodsMatcher() { + return named(INFO_INTERCEPTOR_METHOD_NAME).and(takesArgumentWithType(0, "java.lang.String")); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return INFO_INTERCEPTOR_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new StaticMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named(ERROR_INTERCEPTOR_METHOD_NAME) - .and(takesArgumentWithType(0, "java.lang.Throwable")); + @Override + public ElementMatcher getMethodsMatcher() { + return named(ERROR_INTERCEPTOR_METHOD_NAME).and(takesArgumentWithType(0, "java.lang.Throwable")); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return ERROR_THROWABLE_INTERCEPTOR_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new StaticMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named(ERROR_INTERCEPTOR_METHOD_NAME) - .and(takesArgumentWithType(0, "java.lang.String")); + @Override + public ElementMatcher getMethodsMatcher() { + return named(ERROR_INTERCEPTOR_METHOD_NAME).and(takesArgumentWithType(0, "java.lang.String")); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return ERROR_MSG_INTERCEPTOR_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new StaticMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named(ERROR_INTERCEPTOR_METHOD_NAME) - .and(takesArguments(0)); + @Override + public ElementMatcher getMethodsMatcher() { + return named(ERROR_INTERCEPTOR_METHOD_NAME).and(takesArguments(0)); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return ERROR_INTERCEPTOR_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_CLASS); } } diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanDebugInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanDebugInterceptor.java index 54b5bce33f92..b7f9fd21ee4e 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanDebugInterceptor.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanDebugInterceptor.java @@ -27,12 +27,10 @@ import java.util.HashMap; import java.util.Map; -/** - * @author caoyixiong - */ public class ActiveSpanDebugInterceptor implements StaticMethodsAroundInterceptor { - @Override public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, - MethodInterceptResult result) { + @Override + public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + MethodInterceptResult result) { AbstractSpan activeSpan = null; try { activeSpan = ContextManager.activeSpan(); @@ -45,14 +43,15 @@ public class ActiveSpanDebugInterceptor implements StaticMethodsAroundIntercepto } } - @Override public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, - Object ret) { + @Override + public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + Object ret) { return ret; } @Override public void handleMethodException(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, - Throwable t) { + Throwable t) { } } diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanErrorInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanErrorInterceptor.java index 9dd0363c13d7..4c8e64c43d0d 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanErrorInterceptor.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanErrorInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.activation.trace; import org.apache.skywalking.apm.agent.core.context.ContextManager; @@ -26,12 +25,10 @@ import java.lang.reflect.Method; -/** - * @author caoyixiong - */ public class ActiveSpanErrorInterceptor implements StaticMethodsAroundInterceptor { - @Override public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, - MethodInterceptResult result) { + @Override + public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + MethodInterceptResult result) { AbstractSpan activeSpan = null; try { activeSpan = ContextManager.activeSpan(); @@ -40,14 +37,15 @@ public class ActiveSpanErrorInterceptor implements StaticMethodsAroundIntercepto } } - @Override public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, - Object ret) { + @Override + public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + Object ret) { return ret; } @Override public void handleMethodException(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, - Throwable t) { + Throwable t) { } } \ No newline at end of file diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanErrorMsgInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanErrorMsgInterceptor.java index 647b2f9746c3..6ba6c146bd36 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanErrorMsgInterceptor.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanErrorMsgInterceptor.java @@ -27,12 +27,10 @@ import java.util.HashMap; import java.util.Map; -/** - * @author caoyixiong - */ public class ActiveSpanErrorMsgInterceptor implements StaticMethodsAroundInterceptor { - @Override public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, - MethodInterceptResult result) { + @Override + public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + MethodInterceptResult result) { AbstractSpan activeSpan = null; try { activeSpan = ContextManager.activeSpan(); @@ -46,14 +44,15 @@ public class ActiveSpanErrorMsgInterceptor implements StaticMethodsAroundInterce } } - @Override public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, - Object ret) { + @Override + public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + Object ret) { return ret; } @Override public void handleMethodException(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, - Throwable t) { + Throwable t) { } } \ No newline at end of file diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanErrorThrowableInteceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanErrorThrowableInteceptor.java index e22f18b82abc..709dba6ddabb 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanErrorThrowableInteceptor.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanErrorThrowableInteceptor.java @@ -25,12 +25,10 @@ import java.lang.reflect.Method; -/** - * @author caoyixiong - */ public class ActiveSpanErrorThrowableInteceptor implements StaticMethodsAroundInterceptor { - @Override public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, - MethodInterceptResult result) { + @Override + public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + MethodInterceptResult result) { AbstractSpan activeSpan = null; try { activeSpan = ContextManager.activeSpan(); @@ -40,14 +38,15 @@ public class ActiveSpanErrorThrowableInteceptor implements StaticMethodsAroundIn } } - @Override public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, - Object ret) { + @Override + public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + Object ret) { return ret; } @Override public void handleMethodException(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, - Throwable t) { + Throwable t) { } } diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanInfoInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanInfoInterceptor.java index ddcb27ecd01b..1123f663ea84 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanInfoInterceptor.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanInfoInterceptor.java @@ -27,12 +27,10 @@ import java.util.HashMap; import java.util.Map; -/** - * @author caoyixiong - */ public class ActiveSpanInfoInterceptor implements StaticMethodsAroundInterceptor { - @Override public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, - MethodInterceptResult result) { + @Override + public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + MethodInterceptResult result) { AbstractSpan activeSpan = null; try { activeSpan = ContextManager.activeSpan(); @@ -45,14 +43,15 @@ public class ActiveSpanInfoInterceptor implements StaticMethodsAroundInterceptor } } - @Override public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, - Object ret) { + @Override + public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + Object ret) { return ret; } @Override public void handleMethodException(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, - Throwable t) { + Throwable t) { } } diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanTagInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanTagInterceptor.java index a3bb93facecb..26ee0e5aef8f 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanTagInterceptor.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanTagInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.activation.trace; import java.lang.reflect.Method; @@ -27,7 +26,8 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; public class ActiveSpanTagInterceptor implements StaticMethodsAroundInterceptor { - @Override public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + @Override + public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, MethodInterceptResult result) { try { AbstractSpan activeSpan = ContextManager.activeSpan(); @@ -36,7 +36,8 @@ public class ActiveSpanTagInterceptor implements StaticMethodsAroundInterceptor } } - @Override public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + @Override + public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, Object ret) { return ret; } diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/CallableOrRunnableActivation.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/CallableOrRunnableActivation.java index 99266d5195b9..60dd5d3066e1 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/CallableOrRunnableActivation.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/CallableOrRunnableActivation.java @@ -24,14 +24,14 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; -import static net.bytebuddy.matcher.ElementMatchers.*; +import static net.bytebuddy.matcher.ElementMatchers.any; +import static net.bytebuddy.matcher.ElementMatchers.named; +import static net.bytebuddy.matcher.ElementMatchers.takesArguments; import static org.apache.skywalking.apm.agent.core.plugin.match.ClassAnnotationMatch.byClassAnnotationMatch; /** * {@link CallableOrRunnableActivation} presents that skywalking intercepts all Class with annotation * "org.skywalking.apm.toolkit.trace.TraceCrossThread" and method named "call" or "run". - * - * @author carlvine500 lican */ public class CallableOrRunnableActivation extends ClassInstanceMethodsEnhancePluginDefine { @@ -42,14 +42,17 @@ public class CallableOrRunnableActivation extends ClassInstanceMethodsEnhancePlu private static final String RUN_METHOD_NAME = "run"; private static final String GET_METHOD_NAME = "get"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { - @Override public ElementMatcher getConstructorMatcher() { + @Override + public ElementMatcher getConstructorMatcher() { return any(); } - @Override public String getConstructorInterceptor() { + @Override + public String getConstructorInterceptor() { return INIT_METHOD_INTERCEPTOR; } } @@ -60,24 +63,27 @@ public class CallableOrRunnableActivation extends ClassInstanceMethodsEnhancePlu public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return (named(CALL_METHOD_NAME).and(takesArguments(0))) - .or(named(RUN_METHOD_NAME).and(takesArguments(0))) - .or(named(GET_METHOD_NAME).and(takesArguments(0))); + @Override + public ElementMatcher getMethodsMatcher() { + return (named(CALL_METHOD_NAME).and(takesArguments(0))).or(named(RUN_METHOD_NAME).and(takesArguments(0))) + .or(named(GET_METHOD_NAME).and(takesArguments(0))); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return CALL_METHOD_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byClassAnnotationMatch(new String[] {ANNOTATION_NAME}); } diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/CallableOrRunnableConstructInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/CallableOrRunnableConstructInterceptor.java index b0a18129c186..031e30e10a0c 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/CallableOrRunnableConstructInterceptor.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/CallableOrRunnableConstructInterceptor.java @@ -14,15 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.apm.toolkit.activation.trace; import org.apache.skywalking.apm.agent.core.context.ContextManager; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor; -/** - * @author carlvine500 - */ public class CallableOrRunnableConstructInterceptor implements InstanceConstructorInterceptor { @Override public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/CallableOrRunnableInvokeInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/CallableOrRunnableInvokeInterceptor.java index 5fd19e497c9a..b4f66d8605e0 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/CallableOrRunnableInvokeInterceptor.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/CallableOrRunnableInvokeInterceptor.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.apm.toolkit.activation.trace; import org.apache.skywalking.apm.agent.core.context.ContextManager; @@ -24,15 +25,12 @@ import java.lang.reflect.Method; -/** - * @author carlvine500 - */ public class CallableOrRunnableInvokeInterceptor implements InstanceMethodsAroundInterceptor { @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { ContextManager.createLocalSpan("Thread/" + objInst.getClass().getName() + "/" + method.getName()); - ContextSnapshot cachedObjects = (ContextSnapshot)objInst.getSkyWalkingDynamicField(); + ContextSnapshot cachedObjects = (ContextSnapshot) objInst.getSkyWalkingDynamicField(); if (cachedObjects != null) { ContextManager.continued(cachedObjects); } @@ -47,7 +45,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TagAnnotationActivation.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TagAnnotationActivation.java index bc11ca0e6f80..fcab17bf237a 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TagAnnotationActivation.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TagAnnotationActivation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.activation.trace; import net.bytebuddy.description.method.MethodDescription; @@ -36,8 +35,6 @@ /** * Intercepts all methods annotated with {@link org.apache.skywalking.apm.toolkit.trace.Tag} - * - * @author kezhenxu94 */ public class TagAnnotationActivation extends ClassInstanceMethodsEnhancePluginDefine { @@ -53,7 +50,7 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new DeclaredInstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { @@ -75,13 +72,8 @@ public boolean isOverrideArgs() { @Override protected ClassMatch enhanceClass() { - return and( - not(byMethodAnnotationMatch(TRACE_ANNOTATION)), + return and(not(byMethodAnnotationMatch(TRACE_ANNOTATION)), - or( - byMethodAnnotationMatch(TAGS_ANNOTATION), - byMethodAnnotationMatch(TAG_ANNOTATION) - ) - ); + or(byMethodAnnotationMatch(TAGS_ANNOTATION), byMethodAnnotationMatch(TAG_ANNOTATION))); } } diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TagAnnotationMethodInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TagAnnotationMethodInterceptor.java index 4332af172398..50bcf333385a 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TagAnnotationMethodInterceptor.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TagAnnotationMethodInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.activation.trace; import java.lang.reflect.Method; @@ -32,17 +31,10 @@ import org.apache.skywalking.apm.toolkit.trace.Tag; import org.apache.skywalking.apm.toolkit.trace.Tags; -/** - * @author kezhenxu94 - */ public class TagAnnotationMethodInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod( - final EnhancedInstance objInst, - final Method method, - final Object[] allArguments, - final Class[] argumentsTypes, - final MethodInterceptResult result) { + public void beforeMethod(final EnhancedInstance objInst, final Method method, final Object[] allArguments, + final Class[] argumentsTypes, final MethodInterceptResult result) { if (!ContextManager.isActive()) { return; @@ -69,22 +61,14 @@ private void tagSpan(final AbstractSpan span, final Tag tag, final Map[] argumentsTypes, - final Object ret) { + public Object afterMethod(final EnhancedInstance objInst, final Method method, final Object[] allArguments, + final Class[] argumentsTypes, final Object ret) { return ret; } @Override - public void handleMethodException( - final EnhancedInstance objInst, - final Method method, - final Object[] allArguments, - final Class[] argumentsTypes, - final Throwable t) { + public void handleMethodException(final EnhancedInstance objInst, final Method method, final Object[] allArguments, + final Class[] argumentsTypes, final Throwable t) { if (ContextManager.isActive()) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceAnnotationActivation.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceAnnotationActivation.java index 753881d5af92..fa70702d847c 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceAnnotationActivation.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceAnnotationActivation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.activation.trace; import net.bytebuddy.description.method.MethodDescription; @@ -34,37 +33,41 @@ /** * {@link TraceAnnotationActivation} enhance all method that annotated with org.apache.skywalking.apm.toolkit.trace.annotation.Trace * by TraceAnnotationMethodInterceptor. - * - * @author zhangxin */ public class TraceAnnotationActivation extends ClassInstanceMethodsEnhancePluginDefine { public static final String TRACE_ANNOTATION_METHOD_INTERCEPTOR = "org.apache.skywalking.apm.toolkit.activation.trace.TraceAnnotationMethodInterceptor"; public static final String TRACE_ANNOTATION = "org.apache.skywalking.apm.toolkit.trace.Trace"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new DeclaredInstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { + @Override + public ElementMatcher getMethodsMatcher() { return isAnnotatedWith(named(TRACE_ANNOTATION)); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return TRACE_ANNOTATION_METHOD_INTERCEPTOR; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } }; } - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return MethodAnnotationMatch.byMethodAnnotationMatch(TRACE_ANNOTATION); } } diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceAnnotationMethodInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceAnnotationMethodInterceptor.java index 565f128d9651..04de351ad7f2 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceAnnotationMethodInterceptor.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceAnnotationMethodInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.activation.trace; import java.lang.reflect.Method; @@ -37,10 +36,8 @@ /** * {@link TraceAnnotationMethodInterceptor} create a local span and set the operation name which fetch from - * org.apache.skywalking.apm.toolkit.trace.annotation.Trace.operationName. if the fetch value is blank string, and - * the operation name will be the method name. - * - * @author zhangxin + * org.apache.skywalking.apm.toolkit.trace.annotation.Trace.operationName. if the fetch value is blank + * string, and the operation name will be the method name. */ public class TraceAnnotationMethodInterceptor implements InstanceMethodsAroundInterceptor { @Override @@ -80,7 +77,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceContextActivation.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceContextActivation.java index 7d4655671496..33dcc70995c3 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceContextActivation.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceContextActivation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.activation.trace; import net.bytebuddy.description.method.MethodDescription; @@ -29,12 +28,10 @@ import static net.bytebuddy.matcher.ElementMatchers.named; /** - * Active the toolkit class "TraceContext". - * Should not dependency or import any class in "skywalking-toolkit-trace-context" module. - * Activation's classloader is diff from "TraceContext", - * using direct will trigger classloader issue. + * Active the toolkit class "TraceContext". Should not dependency or import any class in + * "skywalking-toolkit-trace-context" module. Activation's classloader is diff from "TraceContext", using direct will + * trigger classloader issue. *

- * Created by xin on 2016/12/15. */ public class TraceContextActivation extends ClassStaticMethodsEnhancePluginDefine { @@ -68,7 +65,8 @@ public String getMethodsInterceptor() { return INTERCEPT_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceContextInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceContextInterceptor.java index ac14001d5248..ae271bce6737 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceContextInterceptor.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceContextInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.activation.trace; import java.lang.reflect.Method; @@ -30,7 +29,8 @@ public class TraceContextInterceptor implements StaticMethodsAroundInterceptor { private ILog logger = LogManager.getLogger(TraceContextInterceptor.class); - @Override public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + @Override + public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, MethodInterceptResult result) { result.defineReturnValue(ContextManager.getGlobalTraceId()); } diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/test/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanTest.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/test/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanTest.java index de53303c6a6f..dc80a4c59ff1 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/test/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanTest.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/test/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanTest.java @@ -15,14 +15,20 @@ * limitations under the License. */ - package org.apache.skywalking.apm.toolkit.activation.trace; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.List; import org.apache.skywalking.apm.agent.core.context.trace.AbstractTracingSpan; import org.apache.skywalking.apm.agent.core.context.trace.TraceSegment; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; import org.apache.skywalking.apm.agent.test.helper.SegmentHelper; -import org.apache.skywalking.apm.agent.test.tools.*; +import org.apache.skywalking.apm.agent.test.tools.AgentServiceRule; +import org.apache.skywalking.apm.agent.test.tools.SegmentStorage; +import org.apache.skywalking.apm.agent.test.tools.SegmentStoragePoint; +import org.apache.skywalking.apm.agent.test.tools.SpanAssert; +import org.apache.skywalking.apm.agent.test.tools.TracingSegmentRunner; import org.apache.skywalking.apm.toolkit.trace.ActiveSpan; import org.apache.skywalking.apm.toolkit.trace.Trace; import org.junit.Before; @@ -33,17 +39,10 @@ import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.modules.junit4.PowerMockRunnerDelegate; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.util.List; - import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -/** - * @author caoyixiong - */ @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(TracingSegmentRunner.class) public class ActiveSpanTest { @@ -54,7 +53,6 @@ public class ActiveSpanTest { private ActiveSpanErrorThrowableInteceptor activeSpanErrorThrowableInteceptor; private ActiveSpanInfoInterceptor activeSpanInfoInterceptor; - @Mock private EnhancedInstance enhancedInstance; @Rule @@ -76,11 +74,11 @@ public void setUp() throws Exception { activeSpanErrorThrowableInteceptor = new ActiveSpanErrorThrowableInteceptor(); activeSpanInfoInterceptor = new ActiveSpanInfoInterceptor(); - tagParametersMsg = new Object[]{"testMsgValue"}; - tagParameterTypesMsg = new Class[]{String.class}; + tagParametersMsg = new Object[] {"testMsgValue"}; + tagParameterTypesMsg = new Class[] {String.class}; - tagParametersThrowable = new Object[]{new RuntimeException("test-Throwable")}; - tagParameterTypesThrowable = new Class[]{Throwable.class}; + tagParametersThrowable = new Object[] {new RuntimeException("test-Throwable")}; + tagParameterTypesThrowable = new Class[] {Throwable.class}; } @Test diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/test/java/org/apache/skywalking/apm/toolkit/activation/trace/CallableOrRunnableInterceptorTest.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/test/java/org/apache/skywalking/apm/toolkit/activation/trace/CallableOrRunnableInterceptorTest.java index 8c4cd87d8c4f..ce3f59de9cfa 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/test/java/org/apache/skywalking/apm/toolkit/activation/trace/CallableOrRunnableInterceptorTest.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/test/java/org/apache/skywalking/apm/toolkit/activation/trace/CallableOrRunnableInterceptorTest.java @@ -63,7 +63,8 @@ public Object getSkyWalkingDynamicField() { return object; } - @Override public void setSkyWalkingDynamicField(Object value) { + @Override + public void setSkyWalkingDynamicField(Object value) { this.object = value; } }; @@ -81,7 +82,8 @@ public void setUp() throws NoSuchMethodException { callableCallInterceptor = new CallableOrRunnableInvokeInterceptor(); Callable call = new Callable() { - @Override public String call() throws Exception { + @Override + public String call() throws Exception { return null; } }; diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/test/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceAnnotationTest.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/test/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceAnnotationTest.java index 51043e8ad1c4..86b9a4a25ba3 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/test/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceAnnotationTest.java +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/test/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceAnnotationTest.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.activation.trace; import java.lang.reflect.Method; @@ -66,8 +65,14 @@ public class TraceAnnotationTest { public void setUp() throws Exception { methodInterceptor = new TraceAnnotationMethodInterceptor(); tagInterceptor = new ActiveSpanTagInterceptor(); - tagParameters = new Object[] {"testTagKey", "testTagValue"}; - tagParameterTypes = new Class[] {String.class, String.class}; + tagParameters = new Object[] { + "testTagKey", + "testTagValue" + }; + tagParameterTypes = new Class[] { + String.class, + String.class + }; } @Test @@ -104,7 +109,8 @@ public void testTrace() throws Throwable { assertThat(spans.size(), is(1)); AbstractTracingSpan tracingSpan = spans.get(0); - assertThat(tracingSpan.getOperationName(), is(TestAnnotationMethodClass.class.getName() + "." + withOperationNameMethod.getName() + "()")); + assertThat(tracingSpan.getOperationName(), is(TestAnnotationMethodClass.class.getName() + "." + withOperationNameMethod + .getName() + "()")); SpanAssert.assertLogSize(tracingSpan, 0); SpanAssert.assertTagSize(tracingSpan, 0); } diff --git a/apm-sniffer/apm-toolkit-activation/pom.xml b/apm-sniffer/apm-toolkit-activation/pom.xml index e8a88b29b532..e88a0bece043 100644 --- a/apm-sniffer/apm-toolkit-activation/pom.xml +++ b/apm-sniffer/apm-toolkit-activation/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-sniffer org.apache.skywalking @@ -113,12 +114,16 @@ - + - + - - + + diff --git a/apm-sniffer/bootstrap-plugins/jdk-http-plugin/pom.xml b/apm-sniffer/bootstrap-plugins/jdk-http-plugin/pom.xml index a2d1ae823f9c..89956327b4de 100755 --- a/apm-sniffer/bootstrap-plugins/jdk-http-plugin/pom.xml +++ b/apm-sniffer/bootstrap-plugins/jdk-http-plugin/pom.xml @@ -16,7 +16,8 @@ ~ --> - + org.apache.skywalking bootstrap-plugins diff --git a/apm-sniffer/bootstrap-plugins/jdk-http-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/http/HttpClientNewInstanceInterceptor.java b/apm-sniffer/bootstrap-plugins/jdk-http-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/http/HttpClientNewInstanceInterceptor.java index 22716dfb27f7..bc39d307d29c 100644 --- a/apm-sniffer/bootstrap-plugins/jdk-http-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/http/HttpClientNewInstanceInterceptor.java +++ b/apm-sniffer/bootstrap-plugins/jdk-http-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/http/HttpClientNewInstanceInterceptor.java @@ -24,19 +24,17 @@ import java.lang.reflect.Method; -/** - * @author lican - */ public class HttpClientNewInstanceInterceptor implements StaticMethodsAroundInterceptor { - @Override - public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, MethodInterceptResult result) { + public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + MethodInterceptResult result) { } @Override - public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, Object ret) { + public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + Object ret) { if (ret instanceof EnhancedInstance) { ((EnhancedInstance) ret).setSkyWalkingDynamicField(allArguments[4]); } @@ -44,7 +42,8 @@ public Object afterMethod(Class clazz, Method method, Object[] allArguments, Cla } @Override - public void handleMethodException(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, Throwable t) { + public void handleMethodException(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + Throwable t) { } } \ No newline at end of file diff --git a/apm-sniffer/bootstrap-plugins/jdk-http-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/http/HttpClientParseHttpInterceptor.java b/apm-sniffer/bootstrap-plugins/jdk-http-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/http/HttpClientParseHttpInterceptor.java index f73dabe27946..b2f2d3c83d30 100644 --- a/apm-sniffer/bootstrap-plugins/jdk-http-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/http/HttpClientParseHttpInterceptor.java +++ b/apm-sniffer/bootstrap-plugins/jdk-http-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/http/HttpClientParseHttpInterceptor.java @@ -29,22 +29,17 @@ import java.lang.reflect.Method; -/** - * @author lican - */ public class HttpClientParseHttpInterceptor implements InstanceMethodsAroundInterceptor { - @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { } - @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { + Object ret) throws Throwable { MessageHeader responseHeader = (MessageHeader) allArguments[0]; String statusLine = responseHeader.getValue(0); Integer responseCode = parseResponseCode(statusLine); @@ -59,19 +54,16 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { AbstractSpan span = ContextManager.activeSpan(); span.errorOccurred().log(t); } - /** * 

-     * HTTP/1.0 200 OK
-     * HTTP/1.0 401 Unauthorized
+     * HTTP/1.0 200 OK HTTP/1.0 401 Unauthorized
      *
- * It will return 200 and 401 respectively. - * Returns -1 if no code can be discerned + * It will return 200 and 401 respectively. Returns -1 if no code can be discerned */ private Integer parseResponseCode(String statusLine) { if (!StringUtil.isEmpty(statusLine)) { @@ -86,5 +78,4 @@ private Integer parseResponseCode(String statusLine) { return -1; } - } \ No newline at end of file diff --git a/apm-sniffer/bootstrap-plugins/jdk-http-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/http/HttpClientWriteRequestInterceptor.java b/apm-sniffer/bootstrap-plugins/jdk-http-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/http/HttpClientWriteRequestInterceptor.java index 52142f99e7bc..c041a470b034 100644 --- a/apm-sniffer/bootstrap-plugins/jdk-http-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/http/HttpClientWriteRequestInterceptor.java +++ b/apm-sniffer/bootstrap-plugins/jdk-http-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/http/HttpClientWriteRequestInterceptor.java @@ -35,15 +35,11 @@ import java.net.HttpURLConnection; import java.net.URL; -/** - * @author lican - */ public class HttpClientWriteRequestInterceptor implements InstanceMethodsAroundInterceptor { - @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { HttpURLConnection connection = (HttpURLConnection) objInst.getSkyWalkingDynamicField(); MessageHeader headers = (MessageHeader) allArguments[0]; URL url = connection.getURL(); @@ -60,16 +56,15 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } } - @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { + Object ret) throws Throwable { return ret; } @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { AbstractSpan span = ContextManager.activeSpan(); span.errorOccurred().log(t); } diff --git a/apm-sniffer/bootstrap-plugins/jdk-http-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/http/HttpsClientNewInstanceInterceptor.java b/apm-sniffer/bootstrap-plugins/jdk-http-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/http/HttpsClientNewInstanceInterceptor.java index e8385e0ab2ba..c46bc3078e68 100644 --- a/apm-sniffer/bootstrap-plugins/jdk-http-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/http/HttpsClientNewInstanceInterceptor.java +++ b/apm-sniffer/bootstrap-plugins/jdk-http-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/http/HttpsClientNewInstanceInterceptor.java @@ -24,19 +24,17 @@ import java.lang.reflect.Method; -/** - * @author lican - */ public class HttpsClientNewInstanceInterceptor implements StaticMethodsAroundInterceptor { - @Override - public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, MethodInterceptResult result) { + public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + MethodInterceptResult result) { } @Override - public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, Object ret) { + public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + Object ret) { if (ret instanceof EnhancedInstance) { ((EnhancedInstance) ret).setSkyWalkingDynamicField(allArguments[6]); } @@ -44,7 +42,8 @@ public Object afterMethod(Class clazz, Method method, Object[] allArguments, Cla } @Override - public void handleMethodException(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, Throwable t) { + public void handleMethodException(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + Throwable t) { } } \ No newline at end of file diff --git a/apm-sniffer/bootstrap-plugins/jdk-http-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/http/define/HttpClientInstrumentation.java b/apm-sniffer/bootstrap-plugins/jdk-http-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/http/define/HttpClientInstrumentation.java index 4d549f70b47e..2a4614c986a2 100644 --- a/apm-sniffer/bootstrap-plugins/jdk-http-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/http/define/HttpClientInstrumentation.java +++ b/apm-sniffer/bootstrap-plugins/jdk-http-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/http/define/HttpClientInstrumentation.java @@ -32,9 +32,6 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments; import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType; -/** - * @author lican - */ public class HttpClientInstrumentation extends ClassEnhancePluginDefine { private static final String ENHANCE_HTTP_CLASS = "sun.net.www.http.HttpClient"; @@ -58,62 +55,62 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{new DeclaredInstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named(AFTER_METHOD); - } - - @Override - public String getMethodsInterceptor() { - return INTERCEPT_PARSE_HTTP_CLASS; - } - - @Override - public boolean isOverrideArgs() { - return false; - } - }, new DeclaredInstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named(BEFORE_METHOD).and(takesArguments(2).or(takesArguments(1))); - } - - @Override - public String getMethodsInterceptor() { - return INTERCEPT_WRITE_REQUEST_CLASS; + return new InstanceMethodsInterceptPoint[] { + new DeclaredInstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named(AFTER_METHOD); + } + + @Override + public String getMethodsInterceptor() { + return INTERCEPT_PARSE_HTTP_CLASS; + } + + @Override + public boolean isOverrideArgs() { + return false; + } + }, + new DeclaredInstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named(BEFORE_METHOD).and(takesArguments(2).or(takesArguments(1))); + } + + @Override + public String getMethodsInterceptor() { + return INTERCEPT_WRITE_REQUEST_CLASS; + } + + @Override + public boolean isOverrideArgs() { + return false; + } } - - @Override - public boolean isOverrideArgs() { - return false; - } - } }; } @Override public StaticMethodsInterceptPoint[] getStaticMethodsInterceptPoints() { - return new StaticMethodsInterceptPoint[]{new StaticMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named(NEW_INSTANCE_METHOD) - .and(takesArguments(5) - .and(takesArgumentWithType(0, "java.net.URL")) - .and(takesArgumentWithType(4, "sun.net.www.protocol.http.HttpURLConnection")) - ); - } - - @Override - public String getMethodsInterceptor() { - return INTERCEPT_HTTP_NEW_INSTANCE_CLASS; + return new StaticMethodsInterceptPoint[] { + new StaticMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named(NEW_INSTANCE_METHOD).and(takesArguments(5).and(takesArgumentWithType(0, "java.net.URL")) + .and(takesArgumentWithType(4, "sun.net.www.protocol.http.HttpURLConnection"))); + } + + @Override + public String getMethodsInterceptor() { + return INTERCEPT_HTTP_NEW_INSTANCE_CLASS; + } + + @Override + public boolean isOverrideArgs() { + return false; + } } - - @Override - public boolean isOverrideArgs() { - return false; - } - } }; } @@ -122,7 +119,6 @@ protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_HTTP_CLASS); } - @Override public boolean isBootstrapInstrumentation() { return true; diff --git a/apm-sniffer/bootstrap-plugins/jdk-http-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/http/define/HttpsClientInstrumentation.java b/apm-sniffer/bootstrap-plugins/jdk-http-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/http/define/HttpsClientInstrumentation.java index ea85c0994111..ac883ddad10e 100644 --- a/apm-sniffer/bootstrap-plugins/jdk-http-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/http/define/HttpsClientInstrumentation.java +++ b/apm-sniffer/bootstrap-plugins/jdk-http-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/http/define/HttpsClientInstrumentation.java @@ -31,9 +31,6 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments; import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType; -/** - * @author lican - */ public class HttpsClientInstrumentation extends ClassEnhancePluginDefine { private static final String ENHANCE_HTTPS_CLASS = "sun.net.www.protocol.https.HttpsClient"; @@ -42,7 +39,6 @@ public class HttpsClientInstrumentation extends ClassEnhancePluginDefine { private static final String INTERCEPT_HTTPS_NEW_INSTANCE_CLASS = "org.apache.skywalking.apm.plugin.jdk.http.HttpsClientNewInstanceInterceptor"; - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; @@ -55,27 +51,25 @@ public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { @Override public StaticMethodsInterceptPoint[] getStaticMethodsInterceptPoints() { - return new StaticMethodsInterceptPoint[]{new StaticMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named(NEW_INSTANCE_METHOD) - .and(takesArguments(7) - .and(takesArgumentWithType(0, "javax.net.ssl.SSLSocketFactory")) - .and(takesArgumentWithType(3, "java.net.Proxy")) - .and(takesArgumentWithType(6, "sun.net.www.protocol.http.HttpURLConnection")) - ); - } - - @Override - public String getMethodsInterceptor() { - return INTERCEPT_HTTPS_NEW_INSTANCE_CLASS; + return new StaticMethodsInterceptPoint[] { + new StaticMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named(NEW_INSTANCE_METHOD).and(takesArguments(7).and(takesArgumentWithType(0, "javax.net.ssl.SSLSocketFactory")) + .and(takesArgumentWithType(3, "java.net.Proxy")) + .and(takesArgumentWithType(6, "sun.net.www.protocol.http.HttpURLConnection"))); + } + + @Override + public String getMethodsInterceptor() { + return INTERCEPT_HTTPS_NEW_INSTANCE_CLASS; + } + + @Override + public boolean isOverrideArgs() { + return false; + } } - - @Override - public boolean isOverrideArgs() { - return false; - } - } }; } @@ -84,7 +78,6 @@ protected ClassMatch enhanceClass() { return NameMatch.byName(ENHANCE_HTTPS_CLASS); } - @Override public boolean isBootstrapInstrumentation() { return true; diff --git a/apm-sniffer/bootstrap-plugins/jdk-threading-plugin/pom.xml b/apm-sniffer/bootstrap-plugins/jdk-threading-plugin/pom.xml index 548e6fef2c4f..1de94db82a1e 100755 --- a/apm-sniffer/bootstrap-plugins/jdk-threading-plugin/pom.xml +++ b/apm-sniffer/bootstrap-plugins/jdk-threading-plugin/pom.xml @@ -16,7 +16,8 @@ ~ --> - + org.apache.skywalking bootstrap-plugins diff --git a/apm-sniffer/bootstrap-plugins/jdk-threading-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/threading/ThreadingConfig.java b/apm-sniffer/bootstrap-plugins/jdk-threading-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/threading/ThreadingConfig.java index 97145a6c72c1..fb4736fe7e09 100644 --- a/apm-sniffer/bootstrap-plugins/jdk-threading-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/threading/ThreadingConfig.java +++ b/apm-sniffer/bootstrap-plugins/jdk-threading-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/threading/ThreadingConfig.java @@ -30,9 +30,6 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.PrefixMatch.nameStartsWith; -/** - * @author kezhenxu94 - */ public class ThreadingConfig { private static final ILog LOGGER = LogManager.getLogger(ThreadingConfig.class); diff --git a/apm-sniffer/bootstrap-plugins/jdk-threading-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/threading/ThreadingConstructorInterceptor.java b/apm-sniffer/bootstrap-plugins/jdk-threading-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/threading/ThreadingConstructorInterceptor.java index 3ca000e6c4de..5c0e95e7ed35 100644 --- a/apm-sniffer/bootstrap-plugins/jdk-threading-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/threading/ThreadingConstructorInterceptor.java +++ b/apm-sniffer/bootstrap-plugins/jdk-threading-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/threading/ThreadingConstructorInterceptor.java @@ -22,9 +22,6 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor; -/** - * @author kezhenxu94 - */ public class ThreadingConstructorInterceptor implements InstanceConstructorInterceptor { @Override diff --git a/apm-sniffer/bootstrap-plugins/jdk-threading-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/threading/ThreadingMethodInterceptor.java b/apm-sniffer/bootstrap-plugins/jdk-threading-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/threading/ThreadingMethodInterceptor.java index c1607daac0eb..587b1058b96f 100644 --- a/apm-sniffer/bootstrap-plugins/jdk-threading-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/threading/ThreadingMethodInterceptor.java +++ b/apm-sniffer/bootstrap-plugins/jdk-threading-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/threading/ThreadingMethodInterceptor.java @@ -28,18 +28,11 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; -/** - * @author kezhenxu94 - */ public class ThreadingMethodInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod( - final EnhancedInstance objInst, - final Method method, - final Object[] allArguments, - final Class[] argumentsTypes, - final MethodInterceptResult result) { + public void beforeMethod(final EnhancedInstance objInst, final Method method, final Object[] allArguments, + final Class[] argumentsTypes, final MethodInterceptResult result) { AbstractSpan span = ContextManager.createLocalSpan(generateOperationName(objInst, method)); span.setComponent(ComponentsDefine.JDK_THREADING); @@ -53,12 +46,8 @@ public void beforeMethod( } @Override - public Object afterMethod( - final EnhancedInstance objInst, - final Method method, - final Object[] allArguments, - final Class[] argumentsTypes, - final Object ret) { + public Object afterMethod(final EnhancedInstance objInst, final Method method, final Object[] allArguments, + final Class[] argumentsTypes, final Object ret) { final Object storedField = objInst.getSkyWalkingDynamicField(); if (storedField != null) { @@ -69,12 +58,8 @@ public Object afterMethod( } @Override - public void handleMethodException( - final EnhancedInstance objInst, - final Method method, - final Object[] allArguments, - final Class[] argumentsTypes, - final Throwable t) { + public void handleMethodException(final EnhancedInstance objInst, final Method method, final Object[] allArguments, + final Class[] argumentsTypes, final Throwable t) { if (ContextManager.isActive()) { ContextManager.activeSpan().errorOccurred().log(t); diff --git a/apm-sniffer/bootstrap-plugins/jdk-threading-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/threading/define/CallableInstrumentation.java b/apm-sniffer/bootstrap-plugins/jdk-threading-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/threading/define/CallableInstrumentation.java index a32560e8a209..38e683764b91 100644 --- a/apm-sniffer/bootstrap-plugins/jdk-threading-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/threading/define/CallableInstrumentation.java +++ b/apm-sniffer/bootstrap-plugins/jdk-threading-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/threading/define/CallableInstrumentation.java @@ -34,9 +34,6 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments; import static org.apache.skywalking.apm.agent.core.plugin.match.HierarchyMatch.byHierarchyMatch; -/** - * @author kezhenxu94 - */ public class CallableInstrumentation extends ClassEnhancePluginDefine { private static final String CALLABLE_CLASS = "java.util.concurrent.Callable"; private static final String CALLABLE_CLASS_INTERCEPTOR = "org.apache.skywalking.apm.plugin.jdk.threading.ThreadingConstructorInterceptor"; @@ -57,7 +54,7 @@ protected ClassMatch enhanceClass() { @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { - return new ConstructorInterceptPoint[]{ + return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { @Override public ElementMatcher getConstructorMatcher() { @@ -74,7 +71,7 @@ public String getConstructorInterceptor() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { diff --git a/apm-sniffer/bootstrap-plugins/jdk-threading-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/threading/define/RunnableInstrumentation.java b/apm-sniffer/bootstrap-plugins/jdk-threading-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/threading/define/RunnableInstrumentation.java index c77e256d55a9..117c93516cb2 100644 --- a/apm-sniffer/bootstrap-plugins/jdk-threading-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/threading/define/RunnableInstrumentation.java +++ b/apm-sniffer/bootstrap-plugins/jdk-threading-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/threading/define/RunnableInstrumentation.java @@ -34,9 +34,6 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments; import static org.apache.skywalking.apm.agent.core.plugin.match.HierarchyMatch.byHierarchyMatch; -/** - * @author kezhenxu94 - */ public class RunnableInstrumentation extends ClassEnhancePluginDefine { private static final String RUNNABLE_CLASS = "java.lang.Runnable"; private static final String RUNNABLE_CLASS_INTERCEPTOR = "org.apache.skywalking.apm.plugin.jdk.threading.ThreadingConstructorInterceptor"; @@ -57,7 +54,7 @@ protected ClassMatch enhanceClass() { @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { - return new ConstructorInterceptPoint[]{ + return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { @Override public ElementMatcher getConstructorMatcher() { @@ -74,7 +71,7 @@ public String getConstructorInterceptor() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { diff --git a/apm-sniffer/bootstrap-plugins/pom.xml b/apm-sniffer/bootstrap-plugins/pom.xml index 0449f044e659..ffa4834db266 100644 --- a/apm-sniffer/bootstrap-plugins/pom.xml +++ b/apm-sniffer/bootstrap-plugins/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-sniffer org.apache.skywalking @@ -32,8 +33,9 @@ ${shade.package}.${shade.net.bytebuddy.source} UTF-8 - - ${project.build.directory}${sdk.plugin.related.dir}/../../../../skywalking-agent + + ${project.build.directory}${sdk.plugin.related.dir}/../../../../skywalking-agent + ${agent.package.dest.dir}/bootstrap-plugins 1.0b3 @@ -101,12 +103,16 @@ - + - + - - + + diff --git a/apm-sniffer/optional-plugins/customize-enhance-plugin/pom.xml b/apm-sniffer/optional-plugins/customize-enhance-plugin/pom.xml index e41d1486d542..b5ff192cffed 100644 --- a/apm-sniffer/optional-plugins/customize-enhance-plugin/pom.xml +++ b/apm-sniffer/optional-plugins/customize-enhance-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + org.apache.skywalking optional-plugins diff --git a/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/conf/CustomizeConfiguration.java b/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/conf/CustomizeConfiguration.java index 24c9c50ded5b..11ab13c6036e 100644 --- a/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/conf/CustomizeConfiguration.java +++ b/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/conf/CustomizeConfiguration.java @@ -18,38 +18,39 @@ package org.apache.skywalking.apm.plugin.customize.conf; +import java.io.File; +import java.io.IOException; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; import net.bytebuddy.matcher.ElementMatcher; import org.apache.skywalking.apm.agent.core.conf.Config; import org.apache.skywalking.apm.agent.core.logging.api.ILog; import org.apache.skywalking.apm.agent.core.logging.api.LogManager; import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassEnhancePluginDefine; +import org.apache.skywalking.apm.agent.core.util.MethodUtil; import org.apache.skywalking.apm.plugin.customize.constants.Constants; import org.apache.skywalking.apm.plugin.customize.util.CustomizeUtil; -import org.apache.skywalking.apm.agent.core.util.MethodUtil; import org.apache.skywalking.apm.util.StringUtil; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.xml.sax.SAXException; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import java.io.File; -import java.io.IOException; -import java.lang.reflect.Method; -import java.util.*; - -import static net.bytebuddy.matcher.ElementMatchers.*; +import static net.bytebuddy.matcher.ElementMatchers.named; +import static net.bytebuddy.matcher.ElementMatchers.takesArgument; +import static net.bytebuddy.matcher.ElementMatchers.takesArguments; import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType; /** - * The CustomizeConfiguration class is the core class for - * parsing custom enhanced configuration files, - * parsing configuration files, - * and converting content into plugins for loading into the kernel. - * - * @author zhaoyuguang + * The CustomizeConfiguration class is the core class for parsing custom enhanced configuration files, parsing + * configuration files, and converting content into plugins for loading into the kernel. */ public enum CustomizeConfiguration { @@ -59,8 +60,7 @@ public enum CustomizeConfiguration { private static final ILog logger = LogManager.getLogger(CustomizeConfiguration.class); /** - * The load method is resolver configuration file, - * and parse it to kernel. + * The load method is resolver configuration file, and parse it to kernel. */ public void load() { try { @@ -73,8 +73,7 @@ public void load() { /** * Resolver custom enhancement file method total entry. * - * @return configurations is a bridge resolver method and parse method, - * mainly used for decoupling. + * @return configurations is a bridge resolver method and parse method, mainly used for decoupling. * @throws ParserConfigurationException link {@link ParserConfigurationException} * @throws IOException link {@link IOException} * @throws SAXException link {@link SAXException} @@ -118,7 +117,9 @@ private void resolverClassNodeList(NodeList classNodeList, List configuration = resolverMethodNodeDesc(className, methodDesc); if (configuration != null) { customizeMethods.add(configuration); @@ -133,31 +134,38 @@ private void resolverClassNodeList(NodeList classNodeList, List resolverMethodNodeDesc(String className, Node methodDesc) { Map configuration = new HashMap(); if (methodDesc.getAttributes().getNamedItem(Constants.XML_ELEMENT_OPERATION_NAME) != null) { - MethodConfiguration.setOperationName(configuration, methodDesc.getAttributes().getNamedItem(Constants.XML_ELEMENT_OPERATION_NAME).getNodeValue()); + MethodConfiguration.setOperationName(configuration, methodDesc.getAttributes() + .getNamedItem(Constants.XML_ELEMENT_OPERATION_NAME) + .getNodeValue()); } if (methodDesc.getAttributes().getNamedItem(Constants.XML_ELEMENT_CLOSE_BEFORE_METHOD) != null) { - MethodConfiguration.setCloseBeforeMethod(configuration, Boolean.valueOf(methodDesc.getAttributes().getNamedItem(Constants.XML_ELEMENT_CLOSE_BEFORE_METHOD).getNodeValue())); + MethodConfiguration.setCloseBeforeMethod(configuration, Boolean.valueOf(methodDesc.getAttributes() + .getNamedItem(Constants.XML_ELEMENT_CLOSE_BEFORE_METHOD) + .getNodeValue())); } else { MethodConfiguration.setCloseBeforeMethod(configuration, false); } if (methodDesc.getAttributes().getNamedItem(Constants.XML_ELEMENT_CLOSE_AFTER_METHOD) != null) { - MethodConfiguration.setCloseAfterMethod(configuration, Boolean.valueOf(methodDesc.getAttributes().getNamedItem(Constants.XML_ELEMENT_CLOSE_AFTER_METHOD).getNodeValue())); + MethodConfiguration.setCloseAfterMethod(configuration, Boolean.valueOf(methodDesc.getAttributes() + .getNamedItem(Constants.XML_ELEMENT_CLOSE_AFTER_METHOD) + .getNodeValue())); } else { MethodConfiguration.setCloseAfterMethod(configuration, false); } if (methodDesc.getAttributes().getNamedItem(Constants.XML_ELEMENT_METHOD_IS_STATIC) != null) { - MethodConfiguration.setStatic(configuration, Boolean.valueOf(methodDesc.getAttributes().getNamedItem(Constants.XML_ELEMENT_METHOD_IS_STATIC).getNodeValue())); + MethodConfiguration.setStatic(configuration, Boolean.valueOf(methodDesc.getAttributes() + .getNamedItem(Constants.XML_ELEMENT_METHOD_IS_STATIC) + .getNodeValue())); } setAdvancedField(configuration, methodDesc); - return resolverClassAndMethod(className, - methodDesc.getAttributes().getNamedItem(Constants.XML_ELEMENT_METHOD).getNodeValue(), - configuration); + return resolverClassAndMethod(className, methodDesc.getAttributes() + .getNamedItem(Constants.XML_ELEMENT_METHOD) + .getNodeValue(), configuration); } /** @@ -175,27 +183,30 @@ private void setAdvancedField(Map configuration, Node methodNode MethodConfiguration.addOperationNameSuffixes(configuration, methodContentNode.getTextContent()); } if (Constants.XML_ELEMENT_TAG.equals(methodContentNode.getNodeName())) { - MethodConfiguration.addTag(configuration, methodContentNode.getAttributes().getNamedItem(Constants.XML_ELEMENT_KEY).getNodeValue(), methodContentNode.getTextContent()); + MethodConfiguration.addTag(configuration, methodContentNode.getAttributes() + .getNamedItem(Constants.XML_ELEMENT_KEY) + .getNodeValue(), methodContentNode.getTextContent()); } if (Constants.XML_ELEMENT_LOG.equals(methodContentNode.getNodeName())) { - MethodConfiguration.addLog(configuration, methodContentNode.getAttributes().getNamedItem(Constants.XML_ELEMENT_KEY).getNodeValue(), methodContentNode.getTextContent()); + MethodConfiguration.addLog(configuration, methodContentNode.getAttributes() + .getNamedItem(Constants.XML_ELEMENT_KEY) + .getNodeValue(), methodContentNode.getTextContent()); } } } } /** - * Parse class and method, - * if no error log is printed in this JVM, and return null. - * primitive desc impl by {@link CustomizeUtil} - * At the bottom, the default operation name is added. + * Parse class and method, if no error log is printed in this JVM, and return null. primitive desc impl by {@link + * CustomizeUtil} At the bottom, the default operation name is added. * * @param className class name. * @param methodDesc method desc. * @param configuration {@link MethodConfiguration}. * @return configuration of method. */ - private Map resolverClassAndMethod(String className, String methodDesc, Map configuration) { + private Map resolverClassAndMethod(String className, String methodDesc, + Map configuration) { try { int openParen = methodDesc.indexOf(Constants.LEFT_PARENTHESIS); int closeParen = methodDesc.indexOf(Constants.RIGHT_PARENTHESIS); @@ -218,8 +229,7 @@ private Map resolverClassAndMethod(String className, String meth /** * Put the plugin configuration into the kernel according to the configuration. * - * @param configurations is a bridge resolver method and parse method, - * mainly used for decoupling. + * @param configurations is a bridge resolver method and parse method, mainly used for decoupling. */ private void parse(List> configurations) { init(); @@ -246,7 +256,6 @@ private void addContextMethodConfiguration(Map configuration) { getMethodConfigurations().put(MethodConfiguration.getMethod(configuration), configuration); } - /** * The private method for get the configuration of this method. * @@ -266,7 +275,8 @@ private void addContextEnhanceClass(Map configuration) { String key = CustomizeUtil.generateClassDesc(MethodConfiguration.getClz(configuration), MethodConfiguration.isStatic(configuration)); HashMap enhanceClasses = getEnhanceClasses(); ElementMatcher matcher = enhanceClasses.get(key); - enhanceClasses.put(key, matcher == null ? parserMethodsMatcher(configuration) : ((ElementMatcher.Junction) matcher).or(parserMethodsMatcher(configuration))); + enhanceClasses.put(key, matcher == null ? parserMethodsMatcher(configuration) : ((ElementMatcher.Junction) matcher) + .or(parserMethodsMatcher(configuration))); } /** @@ -280,10 +290,8 @@ private ElementMatcher parserMethodsMatcher(Map configuration) { ElementMatcher matcher = named(MethodConfiguration.getMethodName(configuration)).and(takesArguments(arguments.length)); if (arguments.length > 0) { for (int i = 0; i < arguments.length; i++) { - matcher = ((ElementMatcher.Junction) matcher).and( - CustomizeUtil.isJavaClass(arguments[i]) ? - takesArgument(i, CustomizeUtil.getJavaClass(arguments[i])) : - takesArgumentWithType(i, arguments[i])); + matcher = ((ElementMatcher.Junction) matcher).and(CustomizeUtil.isJavaClass(arguments[i]) ? takesArgument(i, CustomizeUtil + .getJavaClass(arguments[i])) : takesArgumentWithType(i, arguments[i])); } } return matcher; @@ -293,9 +301,8 @@ private ElementMatcher parserMethodsMatcher(Map configuration) { * Get InterceptPoints, the input dimension is class and is static. * * @param enhanceClass Real enhancement class - * @param isStatic Is it static, because static or not, - * logic is different in the SkyWalking kernel, - * so this dimension is abstracted out. + * @param isStatic Is it static, because static or not, logic is different in the SkyWalking kernel, so this + * dimension is abstracted out. * @return all the interceptPoints. */ public ElementMatcher getInterceptPoints(String enhanceClass, boolean isStatic) { diff --git a/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/conf/MethodConfiguration.java b/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/conf/MethodConfiguration.java index 07c7442edecf..89d544b88c95 100644 --- a/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/conf/MethodConfiguration.java +++ b/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/conf/MethodConfiguration.java @@ -27,8 +27,6 @@ /** * Default custom enhancement configuration. - * - * @author zhaoyuguang */ public class MethodConfiguration { diff --git a/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/constants/Constants.java b/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/constants/Constants.java index 34fe8d9ffe8b..b9f18634d56d 100644 --- a/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/constants/Constants.java +++ b/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/constants/Constants.java @@ -20,8 +20,6 @@ /** * The constant of customize enhance. - * - * @author zhaoyuguang */ public class Constants { diff --git a/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/define/CustomizeInstanceInstrumentation.java b/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/define/CustomizeInstanceInstrumentation.java index fa58017668a9..b0cd6e5d0bce 100644 --- a/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/define/CustomizeInstanceInstrumentation.java +++ b/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/define/CustomizeInstanceInstrumentation.java @@ -29,8 +29,6 @@ /** * The instance of customize instrumentation. - * - * @author zhaoyuguang */ public class CustomizeInstanceInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @@ -52,7 +50,7 @@ public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { if (matcher == null) { return new InstanceMethodsInterceptPoint[0]; } else { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { diff --git a/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/define/CustomizeStaticInstrumentation.java b/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/define/CustomizeStaticInstrumentation.java index 5fd41476fa3a..f1f478e718c2 100644 --- a/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/define/CustomizeStaticInstrumentation.java +++ b/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/define/CustomizeStaticInstrumentation.java @@ -28,8 +28,6 @@ /** * The static of customize instrumentation. - * - * @author zhaoyuguang */ public class CustomizeStaticInstrumentation extends ClassStaticMethodsEnhancePluginDefine { @@ -45,7 +43,7 @@ public StaticMethodsInterceptPoint[] getStaticMethodsInterceptPoints() { if (matcher == null) { return new StaticMethodsInterceptPoint[0]; } else { - return new StaticMethodsInterceptPoint[]{ + return new StaticMethodsInterceptPoint[] { new StaticMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { diff --git a/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/interceptor/BaseInterceptorMethods.java b/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/interceptor/BaseInterceptorMethods.java index b878038537c4..e7fb2362f40b 100644 --- a/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/interceptor/BaseInterceptorMethods.java +++ b/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/interceptor/BaseInterceptorMethods.java @@ -31,10 +31,6 @@ import java.util.List; import java.util.Map; -/** - * @author zhaoyuguang - */ - class BaseInterceptorMethods { void beforeMethod(Method method, Object[] allArguments) { diff --git a/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/interceptor/CustomizeInstanceInterceptor.java b/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/interceptor/CustomizeInstanceInterceptor.java index e9bf07a6ceff..96f069b58f78 100644 --- a/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/interceptor/CustomizeInstanceInterceptor.java +++ b/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/interceptor/CustomizeInstanceInterceptor.java @@ -24,24 +24,23 @@ import java.lang.reflect.Method; -/** - * @author zhaoyuguang - */ - public class CustomizeInstanceInterceptor extends BaseInterceptorMethods implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { super.beforeMethod(method, allArguments); } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { super.afterMethod(method); return ret; } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { super.handleMethodException(t); } } diff --git a/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/interceptor/CustomizeStaticInterceptor.java b/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/interceptor/CustomizeStaticInterceptor.java index 68975c339cd1..96dc4f8c542c 100644 --- a/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/interceptor/CustomizeStaticInterceptor.java +++ b/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/interceptor/CustomizeStaticInterceptor.java @@ -23,24 +23,23 @@ import java.lang.reflect.Method; -/** - * @author zhaoyuguang - */ - public class CustomizeStaticInterceptor extends BaseInterceptorMethods implements StaticMethodsAroundInterceptor { @Override - public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, MethodInterceptResult result) { + public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + MethodInterceptResult result) { super.beforeMethod(method, allArguments); } @Override - public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, Object ret) { + public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + Object ret) { super.afterMethod(method); return ret; } @Override - public void handleMethodException(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, Throwable t) { + public void handleMethodException(Class clazz, Method method, Object[] allArguments, Class[] parameterTypes, + Throwable t) { super.handleMethodException(t); } } diff --git a/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/loader/CustomizeInstrumentationLoader.java b/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/loader/CustomizeInstrumentationLoader.java index 43a265980733..c9078acd7434 100644 --- a/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/loader/CustomizeInstrumentationLoader.java +++ b/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/loader/CustomizeInstrumentationLoader.java @@ -33,10 +33,7 @@ import java.util.Set; /** - * The customize instrumentation plugin loader, - * so implements {@link InstrumentationLoader} - * - * @author zhaoyuguang + * The customize instrumentation plugin loader, so implements {@link InstrumentationLoader} */ public class CustomizeInstrumentationLoader implements InstrumentationLoader { @@ -51,13 +48,15 @@ public List load(AgentClassLoader classLoader) try { for (String enhanceClass : enhanceClasses) { String[] classDesc = CustomizeUtil.getClassDesc(enhanceClass); - AbstractClassEnhancePluginDefine plugin = (AbstractClassEnhancePluginDefine) Class.forName( - Boolean.valueOf(classDesc[1]) ? CustomizeStaticInstrumentation.class.getName() : CustomizeInstanceInstrumentation.class.getName(), - true, classLoader).getConstructor(String.class).newInstance(classDesc[0]); + AbstractClassEnhancePluginDefine plugin = (AbstractClassEnhancePluginDefine) Class.forName(Boolean.valueOf(classDesc[1]) ? CustomizeStaticInstrumentation.class + .getName() : CustomizeInstanceInstrumentation.class.getName(), true, classLoader) + .getConstructor(String.class) + .newInstance(classDesc[0]); instrumentations.add(plugin); } } catch (Exception e) { - logger.error(e, "InstrumentationLoader loader is error, spi loader is {}", CustomizeInstrumentationLoader.class.getName()); + logger.error(e, "InstrumentationLoader loader is error, spi loader is {}", CustomizeInstrumentationLoader.class + .getName()); } return instrumentations; } diff --git a/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/util/CustomizeUtil.java b/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/util/CustomizeUtil.java index 617f58cd300f..6bfde4b1b2c1 100644 --- a/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/util/CustomizeUtil.java +++ b/apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/util/CustomizeUtil.java @@ -21,10 +21,6 @@ import java.util.HashMap; import java.util.Map; -/** - * @author zhaoyuguang - */ - public class CustomizeUtil { private static final Map JAVA_CLASS = new HashMap(); @@ -53,7 +49,8 @@ public static Class getJavaClass(String className) { public static String generateOperationName(String className, String methodName, String[] parameterTypes) { StringBuilder operationName = new StringBuilder(className + "." + methodName + "("); for (int i = 0; i < parameterTypes.length; i++) { - operationName.append(CustomizeUtil.isJavaClass(parameterTypes[i]) ? CustomizeUtil.getJavaClass(parameterTypes[i]).getName() : parameterTypes[i]); + operationName.append(CustomizeUtil.isJavaClass(parameterTypes[i]) ? CustomizeUtil.getJavaClass(parameterTypes[i]) + .getName() : parameterTypes[i]); if (i < (parameterTypes.length - 1)) { operationName.append(","); } diff --git a/apm-sniffer/optional-plugins/customize-enhance-plugin/src/test/java/org/apache/skywalking/apm/plugin/customize/util/CustomizeExpressionTest.java b/apm-sniffer/optional-plugins/customize-enhance-plugin/src/test/java/org/apache/skywalking/apm/plugin/customize/util/CustomizeExpressionTest.java index 0bd0bc41fb12..592c262ce605 100644 --- a/apm-sniffer/optional-plugins/customize-enhance-plugin/src/test/java/org/apache/skywalking/apm/plugin/customize/util/CustomizeExpressionTest.java +++ b/apm-sniffer/optional-plugins/customize-enhance-plugin/src/test/java/org/apache/skywalking/apm/plugin/customize/util/CustomizeExpressionTest.java @@ -27,10 +27,6 @@ import java.util.List; import java.util.Map; -/** - * @author zhaoyuguang - */ - public class CustomizeExpressionTest { @Test @@ -72,7 +68,11 @@ private static Object[] init() { User user2 = new User(101, "sw0", m2); List l1 = new ArrayList(); l1.add("c"); - Order order = new Order(999, "uuid", l1, user2, "open_id", new Object[]{0, 3, "2"}); + Order order = new Order(999, "uuid", l1, user2, "open_id", new Object[] { + 0, + 3, + "2" + }); allArguments[5] = order; return allArguments; } diff --git a/apm-sniffer/optional-plugins/customize-enhance-plugin/src/test/java/org/apache/skywalking/apm/plugin/customize/util/CustomizeUtilTest.java b/apm-sniffer/optional-plugins/customize-enhance-plugin/src/test/java/org/apache/skywalking/apm/plugin/customize/util/CustomizeUtilTest.java index 9e7ea1abf47f..d50e37720da1 100644 --- a/apm-sniffer/optional-plugins/customize-enhance-plugin/src/test/java/org/apache/skywalking/apm/plugin/customize/util/CustomizeUtilTest.java +++ b/apm-sniffer/optional-plugins/customize-enhance-plugin/src/test/java/org/apache/skywalking/apm/plugin/customize/util/CustomizeUtilTest.java @@ -21,10 +21,6 @@ import org.junit.Assert; import org.junit.Test; -/** - * @author zhaoyuguang - */ - public class CustomizeUtilTest { @Test diff --git a/apm-sniffer/optional-plugins/gson-2.8.x-plugin/pom.xml b/apm-sniffer/optional-plugins/gson-2.8.x-plugin/pom.xml index 8389dd9958f2..17a30d99c463 100644 --- a/apm-sniffer/optional-plugins/gson-2.8.x-plugin/pom.xml +++ b/apm-sniffer/optional-plugins/gson-2.8.x-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + 4.0.0 org.apache.skywalking diff --git a/apm-sniffer/optional-plugins/gson-2.8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/gson/GsonFromJsonInterceptor.java b/apm-sniffer/optional-plugins/gson-2.8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/gson/GsonFromJsonInterceptor.java index f3434f666a33..311287833692 100644 --- a/apm-sniffer/optional-plugins/gson-2.8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/gson/GsonFromJsonInterceptor.java +++ b/apm-sniffer/optional-plugins/gson-2.8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/gson/GsonFromJsonInterceptor.java @@ -28,15 +28,10 @@ import java.lang.reflect.Method; - -/** - * @author withlin - */ public class GsonFromJsonInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { AbstractSpan span = ContextManager.createLocalSpan("Gson/FromJson"); span.setComponent(ComponentsDefine.GSON); @@ -46,18 +41,16 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, - Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, - Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } \ No newline at end of file diff --git a/apm-sniffer/optional-plugins/gson-2.8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/gson/GsonToJsonInterceptor.java b/apm-sniffer/optional-plugins/gson-2.8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/gson/GsonToJsonInterceptor.java index 50dd9aa171e1..da4fabb25573 100644 --- a/apm-sniffer/optional-plugins/gson-2.8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/gson/GsonToJsonInterceptor.java +++ b/apm-sniffer/optional-plugins/gson-2.8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/gson/GsonToJsonInterceptor.java @@ -28,14 +28,10 @@ import java.lang.reflect.Method; -/** - * @author withlin - */ public class GsonToJsonInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) throws Throwable { AbstractSpan span = ContextManager.createLocalSpan("Gson/ToJson"); span.setComponent(ComponentsDefine.GSON); @@ -45,18 +41,16 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, - Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, - Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/optional-plugins/gson-2.8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/gson/define/GsonFromJsonInstrumentation.java b/apm-sniffer/optional-plugins/gson-2.8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/gson/define/GsonFromJsonInstrumentation.java index dc3933975822..55b1f0616ad6 100644 --- a/apm-sniffer/optional-plugins/gson-2.8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/gson/define/GsonFromJsonInstrumentation.java +++ b/apm-sniffer/optional-plugins/gson-2.8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/gson/define/GsonFromJsonInstrumentation.java @@ -29,10 +29,6 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType; - -/** - * @author withlin - */ public class GsonFromJsonInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { public static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.gson.GsonFromJsonInterceptor"; public static final String ENHANCE_CLASS = "com.google.gson.Gson"; @@ -47,17 +43,18 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named(ENHANCE_METHOD_DISPATCH) - .and(takesArgumentWithType(0,"com.google.gson.stream.JsonReader")); + @Override + public ElementMatcher getMethodsMatcher() { + return named(ENHANCE_METHOD_DISPATCH).and(takesArgumentWithType(0, "com.google.gson.stream.JsonReader")); } - - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return INTERCEPTOR_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } diff --git a/apm-sniffer/optional-plugins/gson-2.8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/gson/define/GsonToJsonInstrumentation.java b/apm-sniffer/optional-plugins/gson-2.8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/gson/define/GsonToJsonInstrumentation.java index b12bfdfc203d..10e6f261474f 100644 --- a/apm-sniffer/optional-plugins/gson-2.8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/gson/define/GsonToJsonInstrumentation.java +++ b/apm-sniffer/optional-plugins/gson-2.8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/gson/define/GsonToJsonInstrumentation.java @@ -29,10 +29,6 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType; - -/** - * @author withlin - */ public class GsonToJsonInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { public static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.gson.GsonToJsonInterceptor"; public static final String ENHANCE_CLASS = "com.google.gson.Gson"; @@ -47,25 +43,25 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named(ENHANCE_METHOD) - .and(takesArgumentWithType(2,"com.google.gson.stream.JsonWriter")); + @Override + public ElementMatcher getMethodsMatcher() { + return named(ENHANCE_METHOD).and(takesArgumentWithType(2, "com.google.gson.stream.JsonWriter")); } - - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return INTERCEPTOR_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } }, new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { - return named(ENHANCE_METHOD) - .and(takesArgumentWithType(1,"com.google.gson.stream.JsonWriter")); + return named(ENHANCE_METHOD).and(takesArgumentWithType(1, "com.google.gson.stream.JsonWriter")); } @Override diff --git a/apm-sniffer/optional-plugins/gson-2.8.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/gson/GsonFromJsonInterceptorTest.java b/apm-sniffer/optional-plugins/gson-2.8.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/gson/GsonFromJsonInterceptorTest.java index f08d7df6dd44..a6baaaa1f0e3 100644 --- a/apm-sniffer/optional-plugins/gson-2.8.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/gson/GsonFromJsonInterceptorTest.java +++ b/apm-sniffer/optional-plugins/gson-2.8.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/gson/GsonFromJsonInterceptorTest.java @@ -37,8 +37,6 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; - - @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(TracingSegmentRunner.class) public class GsonFromJsonInterceptorTest { @@ -55,9 +53,6 @@ public class GsonFromJsonInterceptorTest { private Class[] argumentType; - - - @Before public void setUp() { gsonFromJsonInterceptor = new GsonFromJsonInterceptor(); diff --git a/apm-sniffer/optional-plugins/gson-2.8.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/gson/GsonToJsonInterceptorTest.java b/apm-sniffer/optional-plugins/gson-2.8.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/gson/GsonToJsonInterceptorTest.java index ce4b68c3c587..b76bfa00590c 100644 --- a/apm-sniffer/optional-plugins/gson-2.8.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/gson/GsonToJsonInterceptorTest.java +++ b/apm-sniffer/optional-plugins/gson-2.8.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/gson/GsonToJsonInterceptorTest.java @@ -37,7 +37,6 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; - @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(TracingSegmentRunner.class) public class GsonToJsonInterceptorTest { @@ -54,9 +53,6 @@ public class GsonToJsonInterceptorTest { private Class[] argumentType; - - - @Before public void setUp() { gsonToJsonInterceptor = new GsonToJsonInterceptor(); diff --git a/apm-sniffer/optional-plugins/kotlin-coroutine-plugin/src/main/java/org/apache/skywalking/apm/plugin/kotlin/coroutine/DispatcherInterceptor.java b/apm-sniffer/optional-plugins/kotlin-coroutine-plugin/src/main/java/org/apache/skywalking/apm/plugin/kotlin/coroutine/DispatcherInterceptor.java index 27eb41e2b176..2f9348e25c57 100644 --- a/apm-sniffer/optional-plugins/kotlin-coroutine-plugin/src/main/java/org/apache/skywalking/apm/plugin/kotlin/coroutine/DispatcherInterceptor.java +++ b/apm-sniffer/optional-plugins/kotlin-coroutine-plugin/src/main/java/org/apache/skywalking/apm/plugin/kotlin/coroutine/DispatcherInterceptor.java @@ -26,17 +26,20 @@ public class DispatcherInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, MethodInterceptResult result) { + public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + MethodInterceptResult result) { // Wrapping runnable with current context snapshot allArguments[1] = TracingRunnable.wrapOrNot((Runnable) allArguments[1]); } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) { return ret; } @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + Class[] argumentsTypes, Throwable t) { } } diff --git a/apm-sniffer/optional-plugins/kotlin-coroutine-plugin/src/main/java/org/apache/skywalking/apm/plugin/kotlin/coroutine/TracingRunnable.java b/apm-sniffer/optional-plugins/kotlin-coroutine-plugin/src/main/java/org/apache/skywalking/apm/plugin/kotlin/coroutine/TracingRunnable.java index ef8f2a47f835..9d23f5e6dc88 100644 --- a/apm-sniffer/optional-plugins/kotlin-coroutine-plugin/src/main/java/org/apache/skywalking/apm/plugin/kotlin/coroutine/TracingRunnable.java +++ b/apm-sniffer/optional-plugins/kotlin-coroutine-plugin/src/main/java/org/apache/skywalking/apm/plugin/kotlin/coroutine/TracingRunnable.java @@ -24,11 +24,10 @@ import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; /** - * {@link Runnable} wrapper with trace context snapshot, it will create span - * with context snapshot around {@link Runnable} runs. + * {@link Runnable} wrapper with trace context snapshot, it will create span with context snapshot around {@link + * Runnable} runs. *

- * A class implementation will be cheaper cost than lambda with captured - * variables implementation. + * A class implementation will be cheaper cost than lambda with captured variables implementation. */ class TracingRunnable implements Runnable { private static final String COROUTINE = "/Kotlin/Coroutine"; @@ -42,13 +41,10 @@ private TracingRunnable(ContextSnapshot snapshot, Runnable delegate) { } /** - * Wrap {@link Runnable} by {@link TracingRunnable} if active trace context - * existed. + * Wrap {@link Runnable} by {@link TracingRunnable} if active trace context existed. * * @param delegate {@link Runnable} to wrap. - * - * @return Wrapped {@link TracingRunnable} or original {@link Runnable} if - * trace context not existed. + * @return Wrapped {@link TracingRunnable} or original {@link Runnable} if trace context not existed. */ public static Runnable wrapOrNot(Runnable delegate) { // Just wrap continuation with active trace context diff --git a/apm-sniffer/optional-plugins/kotlin-coroutine-plugin/src/main/java/org/apache/skywalking/apm/plugin/kotlin/coroutine/define/DispatcherInstrumentation.java b/apm-sniffer/optional-plugins/kotlin-coroutine-plugin/src/main/java/org/apache/skywalking/apm/plugin/kotlin/coroutine/define/DispatcherInstrumentation.java index 7c37eb317b8e..0931a8b92dde 100644 --- a/apm-sniffer/optional-plugins/kotlin-coroutine-plugin/src/main/java/org/apache/skywalking/apm/plugin/kotlin/coroutine/define/DispatcherInstrumentation.java +++ b/apm-sniffer/optional-plugins/kotlin-coroutine-plugin/src/main/java/org/apache/skywalking/apm/plugin/kotlin/coroutine/define/DispatcherInstrumentation.java @@ -46,13 +46,12 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { - return named(ENHANCE_METHOD_DISPATCH) - .and(takesArgumentWithType(0, "kotlin.coroutines.CoroutineContext")) - .and(takesArgumentWithType(1, "java.lang.Runnable")); + return named(ENHANCE_METHOD_DISPATCH).and(takesArgumentWithType(0, "kotlin.coroutines.CoroutineContext")) + .and(takesArgumentWithType(1, "java.lang.Runnable")); } @Override diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/pom.xml b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/pom.xml index cbbd9b91d876..de77f5a9c6bc 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/pom.xml +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/pom.xml @@ -17,33 +17,34 @@ ~ --> - -4.0.0 + + 4.0.0 - - org.apache.skywalking - optional-spring-cloud - 7.0.0-SNAPSHOT - + + org.apache.skywalking + optional-spring-cloud + 7.0.0-SNAPSHOT + -apm-spring-cloud-gateway-2.x-plugin -jar + apm-spring-cloud-gateway-2.x-plugin + jar -gateway-2.x-plugin -http://maven.apache.org + gateway-2.x-plugin + http://maven.apache.org - - 2.1.1.RELEASE - 1.8 - + + 2.1.1.RELEASE + 1.8 + - - - org.springframework.cloud - spring-cloud-starter-gateway - ${spring-cloud-starter-gateway.version} - provided - - + + + org.springframework.cloud + spring-cloud-starter-gateway + ${spring-cloud-starter-gateway.version} + provided + + diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/FilteringWebHandlerInterceptor.java b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/FilteringWebHandlerInterceptor.java index 427e982bc771..adb958fb5198 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/FilteringWebHandlerInterceptor.java +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/FilteringWebHandlerInterceptor.java @@ -36,17 +36,13 @@ import org.springframework.web.server.ServerWebExchange; import reactor.core.publisher.Mono; - -/** - * @author songxiaoyue - */ public class FilteringWebHandlerInterceptor implements InstanceMethodsAroundInterceptor { private static final String SPRING_CLOUD_GATEWAY_ROUTE_PREFIX = "GATEWAY/"; @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { EnhancedInstance instance = NettyRoutingFilterInterceptor.getInstance(allArguments[0]); if (instance == null) { return; @@ -65,8 +61,8 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { EnhancedInstance instance = NettyRoutingFilterInterceptor.getInstance(allArguments[0]); if (instance == null) { return ret; @@ -81,7 +77,7 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA HttpStatus statusCode = exchange.getResponse().getStatusCode(); if (statusCode == HttpStatus.TOO_MANY_REQUESTS) { AbstractSpan localSpan = ContextManager.createLocalSpan(swTransmitter.getOperationName()); - Tags.STATUS_CODE.set(localSpan,statusCode.toString()); + Tags.STATUS_CODE.set(localSpan, statusCode.toString()); SpanLayer.asHttp(localSpan); localSpan.setComponent(ComponentsDefine.SPRING_CLOUD_GATEWAY); ContextManager.continued(swTransmitter.getSnapshot()); @@ -90,10 +86,9 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA }); } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { } } diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/HttpClientOperationsHeadersInterceptor.java b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/HttpClientOperationsHeadersInterceptor.java index 55117853f63d..4c9ee91bfb93 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/HttpClientOperationsHeadersInterceptor.java +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/HttpClientOperationsHeadersInterceptor.java @@ -26,22 +26,18 @@ import java.lang.reflect.Method; - -/** - * @author zhaoyuguang - */ public class HttpClientOperationsHeadersInterceptor implements InstanceMethodsAroundInterceptor { private static final ILog logger = LogManager.getLogger(HttpClientOperationsHeadersInterceptor.class); @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { Object transmitter = ((EnhancedInstance) allArguments[0]).getSkyWalkingDynamicField(); if (transmitter != null) { objInst.setSkyWalkingDynamicField(transmitter); @@ -50,9 +46,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { } } diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/HttpClientOperationsSendInterceptor.java b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/HttpClientOperationsSendInterceptor.java index 2c5746e77e63..301dfe64dcc0 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/HttpClientOperationsSendInterceptor.java +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/HttpClientOperationsSendInterceptor.java @@ -36,15 +36,11 @@ import java.lang.reflect.Method; import java.net.InetSocketAddress; - -/** - * @author zhaoyuguang - */ public class HttpClientOperationsSendInterceptor implements InstanceMethodsAroundInterceptor { @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { SWTransmitter transmitter = (SWTransmitter) objInst.getSkyWalkingDynamicField(); if (transmitter != null) { HttpClientRequest request = (HttpClientRequest) objInst; @@ -75,15 +71,14 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/HttpClientOperationsStatusInterceptor.java b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/HttpClientOperationsStatusInterceptor.java index 6324308b84a1..a60986132bec 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/HttpClientOperationsStatusInterceptor.java +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/HttpClientOperationsStatusInterceptor.java @@ -28,20 +28,16 @@ import java.lang.reflect.Method; - -/** - * @author zhaoyuguang - */ public class HttpClientOperationsStatusInterceptor implements InstanceMethodsAroundInterceptor { @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { } @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { + Object ret) throws Throwable { SWTransmitter transmitter = (SWTransmitter) objInst.getSkyWalkingDynamicField(); if (transmitter != null) { @@ -57,7 +53,7 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/NettyRoutingFilterInterceptor.java b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/NettyRoutingFilterInterceptor.java index 21180dbedbd8..70422773a54b 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/NettyRoutingFilterInterceptor.java +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/NettyRoutingFilterInterceptor.java @@ -28,17 +28,11 @@ import org.springframework.web.server.adapter.DefaultServerWebExchange; import java.lang.reflect.Method; - - -/** - * @author zhaoyuguang - */ public class NettyRoutingFilterInterceptor implements InstanceMethodsAroundInterceptor { - @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { EnhancedInstance instance = NettyRoutingFilterInterceptor.getInstance(allArguments[0]); if (instance != null) { SWTransmitter swTransmitter = (SWTransmitter) instance.getSkyWalkingDynamicField(); @@ -47,18 +41,17 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { if (ContextManager.getRuntimeContext().get(Constants.SPRING_CLOUD_GATEWAY_TRANSMITTER) != null) { ContextManager.getRuntimeContext().remove(Constants.SPRING_CLOUD_GATEWAY_TRANSMITTER); } return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { } public static EnhancedInstance getInstance(Object o) { @@ -71,7 +64,6 @@ public static EnhancedInstance getInstance(Object o) { return instance; } - private static EnhancedInstance getEnhancedInstance(ServerWebExchangeDecorator serverWebExchangeDecorator) { Object o = serverWebExchangeDecorator.getDelegate(); if (o instanceof ServerWebExchangeDecorator) { diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/context/Constants.java b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/context/Constants.java index 441932db59ae..614b441c5e88 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/context/Constants.java +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/context/Constants.java @@ -18,10 +18,6 @@ package org.apache.skywalking.apm.plugin.spring.cloud.gateway.v21x.context; -/** - * @author zhaoyuguang - */ - public interface Constants { String SPRING_CLOUD_GATEWAY_TRANSMITTER = "spring.cloud.gateway.transmitter"; } diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/context/SWTransmitter.java b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/context/SWTransmitter.java index 216dd229265e..ac4f61aaeb7c 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/context/SWTransmitter.java +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/context/SWTransmitter.java @@ -21,10 +21,6 @@ import org.apache.skywalking.apm.agent.core.context.ContextSnapshot; import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan; -/** - * @author zhaoyuguang - */ - public class SWTransmitter { private AbstractSpan spanGateway; diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/define/DefaultHttpHeadersInstrumentation.java b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/define/DefaultHttpHeadersInstrumentation.java index 6ac17bba382b..4fc43a73e63d 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/define/DefaultHttpHeadersInstrumentation.java +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/define/DefaultHttpHeadersInstrumentation.java @@ -28,20 +28,19 @@ import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * @author zhaoyuguang - */ - public class DefaultHttpHeadersInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[] { new ConstructorInterceptPoint() { - @Override public ElementMatcher getConstructorMatcher() { + @Override + public ElementMatcher getConstructorMatcher() { return takesArgumentWithType(0, "io.netty.handler.codec.DefaultHeaders"); } - @Override public String getConstructorInterceptor() { + @Override + public String getConstructorInterceptor() { return "org.apache.skywalking.apm.plugin.spring.cloud.gateway.v21x.DefaultHttpHeadersInterceptor"; } } diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/define/FilteringWebHandlerInstrumentation.java b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/define/FilteringWebHandlerInstrumentation.java index 575db139c04f..3aaf02d64173 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/define/FilteringWebHandlerInstrumentation.java +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/define/FilteringWebHandlerInstrumentation.java @@ -28,9 +28,6 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * @author songxiaoyue - */ public class FilteringWebHandlerInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @Override @@ -40,7 +37,7 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/define/HttpClientOperationsInstrumentation.java b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/define/HttpClientOperationsInstrumentation.java index 8b1c4880de2e..35605ecce04a 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/define/HttpClientOperationsInstrumentation.java +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/define/HttpClientOperationsInstrumentation.java @@ -29,19 +29,16 @@ import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * @author zhaoyuguang - */ - public class HttpClientOperationsInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { - @Override public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { @@ -57,7 +54,8 @@ public String getMethodsInterceptor() { public boolean isOverrideArgs() { return false; } - },new InstanceMethodsInterceptPoint() { + }, + new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { return named("send").and(takesArgumentWithType(0, "org.reactivestreams.Publisher")); @@ -89,7 +87,7 @@ public boolean isOverrideArgs() { return false; } }, - }; + }; } @Override diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/define/NettyRoutingFilterInstrumentation.java b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/define/NettyRoutingFilterInstrumentation.java index 8f055727410a..9339b27b773e 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/define/NettyRoutingFilterInstrumentation.java +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/gateway-2.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/cloud/gateway/v21x/define/NettyRoutingFilterInstrumentation.java @@ -29,10 +29,6 @@ import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * @author zhaoyuguang - */ - public class NettyRoutingFilterInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @Override @@ -42,7 +38,7 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { @@ -69,6 +65,9 @@ public ClassMatch enhanceClass() { @Override protected final String[] witnessClasses() { - return new String[]{"org.springframework.cloud.gateway.handler.FilteringWebHandler", "reactor.netty.http.client.HttpClientOperations"}; + return new String[] { + "org.springframework.cloud.gateway.handler.FilteringWebHandler", + "reactor.netty.http.client.HttpClientOperations" + }; } } diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/pom.xml b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/pom.xml index b0dde5206f2a..9c2be72476aa 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/pom.xml +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/optional-spring-cloud/pom.xml @@ -17,7 +17,8 @@ ~ --> - + 4.0.0 diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml b/apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml index c3a36af4a918..a5974aa39c8c 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml @@ -17,7 +17,8 @@ ~ --> - + optional-plugins org.apache.skywalking diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/pom.xml b/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/pom.xml index 6e1971d248b6..ccea20b0f352 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/pom.xml +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + optional-spring-plugins org.apache.skywalking diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/AbstractSpringBeanInstrumentation.java b/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/AbstractSpringBeanInstrumentation.java index 179b44a35b0e..940c25990b5b 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/AbstractSpringBeanInstrumentation.java +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/AbstractSpringBeanInstrumentation.java @@ -35,22 +35,28 @@ public abstract class AbstractSpringBeanInstrumentation extends ClassInstanceMet public static final String INTERCEPT_GET_SKYWALKING_DYNAMIC_FIELD_METHOD = "getSkyWalkingDynamicField"; public static final String INTERCEPT_SET_SKYWALKING_DYNAMIC_FIELD_METHOD = "setSkyWalkingDynamicField"; - @Override public final ConstructorInterceptPoint[] getConstructorsInterceptPoints() { + @Override + public final ConstructorInterceptPoint[] getConstructorsInterceptPoints() { return new ConstructorInterceptPoint[0]; } - @Override public final InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { + @Override + public final InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { return new InstanceMethodsInterceptPoint[] { new DeclaredInstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return isPublic().and(not(isDeclaredBy(Object.class)).and(not(named(INTERCEPT_GET_SKYWALKING_DYNAMIC_FIELD_METHOD))).and(not(named(INTERCEPT_SET_SKYWALKING_DYNAMIC_FIELD_METHOD)))); + @Override + public ElementMatcher getMethodsMatcher() { + return isPublic().and(not(isDeclaredBy(Object.class)).and(not(named(INTERCEPT_GET_SKYWALKING_DYNAMIC_FIELD_METHOD))) + .and(not(named(INTERCEPT_SET_SKYWALKING_DYNAMIC_FIELD_METHOD)))); } - @Override public String getMethodsInterceptor() { + @Override + public String getMethodsInterceptor() { return INTERCEPTOR_CLASS; } - @Override public boolean isOverrideArgs() { + @Override + public boolean isOverrideArgs() { return false; } } diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/SpringAnnotationInterceptor.java b/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/SpringAnnotationInterceptor.java index ad66e1d216ec..fcb4ca97e8f0 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/SpringAnnotationInterceptor.java +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/SpringAnnotationInterceptor.java @@ -39,7 +39,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA return ret; } - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, + @Override + public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/bean/SpringBeanInstrumentation.java b/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/bean/SpringBeanInstrumentation.java index 8aa5b227731e..845a5a8f7623 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/bean/SpringBeanInstrumentation.java +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/bean/SpringBeanInstrumentation.java @@ -23,14 +23,12 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.ClassAnnotationMatch.byClassAnnotationMatch; -/** - * - */ public class SpringBeanInstrumentation extends AbstractSpringBeanInstrumentation { public static final String ENHANCE_ANNOTATION = "org.springframework.context.annotation.Bean"; - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byClassAnnotationMatch(new String[] {ENHANCE_ANNOTATION}); } } diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/component/SpringComponentInstrumentation.java b/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/component/SpringComponentInstrumentation.java index eac6bb0c4ae5..8cf8f685b381 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/component/SpringComponentInstrumentation.java +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/component/SpringComponentInstrumentation.java @@ -27,7 +27,8 @@ public class SpringComponentInstrumentation extends AbstractSpringBeanInstrument public static final String ENHANCE_ANNOTATION = "org.springframework.stereotype.Component"; - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byClassAnnotationMatch(new String[] {ENHANCE_ANNOTATION}); } } diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/repository/SpringRepositoryInstrumentation.java b/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/repository/SpringRepositoryInstrumentation.java index d91637e0e60a..6f7cfa200aa2 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/repository/SpringRepositoryInstrumentation.java +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/repository/SpringRepositoryInstrumentation.java @@ -27,7 +27,8 @@ public class SpringRepositoryInstrumentation extends AbstractSpringBeanInstrumen public static final String ENHANCE_ANNOTATION = "org.springframework.stereotype.Repository"; - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byClassAnnotationMatch(new String[] {ENHANCE_ANNOTATION}); } } diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/services/SpringServicesInstrumentation.java b/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/services/SpringServicesInstrumentation.java index 759097ab3bc1..0a3f454df93a 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/services/SpringServicesInstrumentation.java +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/services/SpringServicesInstrumentation.java @@ -27,7 +27,8 @@ public class SpringServicesInstrumentation extends AbstractSpringBeanInstrumenta public static final String ENHANCE_ANNOTATION = "org.springframework.stereotype.Service"; - @Override protected ClassMatch enhanceClass() { + @Override + protected ClassMatch enhanceClass() { return byClassAnnotationMatch(new String[] {ENHANCE_ANNOTATION}); } } diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/spring-tx-plugin/pom.xml b/apm-sniffer/optional-plugins/optional-spring-plugins/spring-tx-plugin/pom.xml index df4ccfafac5f..abcbdd8584d5 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/spring-tx-plugin/pom.xml +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/spring-tx-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + optional-spring-plugins org.apache.skywalking diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/spring-tx-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/transaction/EndTransactionMethodInterceptor.java b/apm-sniffer/optional-plugins/optional-spring-plugins/spring-tx-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/transaction/EndTransactionMethodInterceptor.java index f3ea9df55ec1..6bd470054472 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/spring-tx-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/transaction/EndTransactionMethodInterceptor.java +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/spring-tx-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/transaction/EndTransactionMethodInterceptor.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.spring.transaction; import org.apache.skywalking.apm.agent.core.context.ContextManager; @@ -28,13 +29,10 @@ import java.lang.reflect.Method; -/** - * @author zhaoyuguang - */ public class EndTransactionMethodInterceptor implements InstanceMethodsAroundInterceptor { @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { AbstractSpan span = ContextManager.createLocalSpan(Constants.OPERATION_NAME_SPRING_TRANSACTION_PREFIX + method.getName()); TransactionStatus status = (TransactionStatus) allArguments[0]; span.tag(Constants.TAG_SPRING_TRANSACTION_IS_NEW_TRANSACTION, String.valueOf(status.isNewTransaction())); @@ -46,14 +44,14 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } } diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/spring-tx-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/transaction/GetTransactionMethodInterceptor.java b/apm-sniffer/optional-plugins/optional-spring-plugins/spring-tx-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/transaction/GetTransactionMethodInterceptor.java index 64059b9da217..6521d13ce8b3 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/spring-tx-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/transaction/GetTransactionMethodInterceptor.java +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/spring-tx-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/transaction/GetTransactionMethodInterceptor.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.spring.transaction; import org.apache.skywalking.apm.agent.core.conf.Config; @@ -29,20 +30,18 @@ import java.lang.reflect.Method; -/** - * @author zhaoyuguang - */ public class GetTransactionMethodInterceptor implements InstanceMethodsAroundInterceptor { @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { if (allArguments[0] == null) { AbstractSpan span = ContextManager.createLocalSpan(Constants.OPERATION_NAME_SPRING_TRANSACTION_NO_TRANSACTION_DEFINITION_GIVEN); span.setComponent(ComponentsDefine.SPRING_TX); return; } TransactionDefinition definition = (TransactionDefinition) allArguments[0]; - AbstractSpan span = ContextManager.createLocalSpan(Constants.OPERATION_NAME_SPRING_TRANSACTION_GET_TRANSACTION_METHOD + buildOperationName(definition.getName())); + AbstractSpan span = ContextManager.createLocalSpan(Constants.OPERATION_NAME_SPRING_TRANSACTION_GET_TRANSACTION_METHOD + buildOperationName(definition + .getName())); span.tag(Constants.TAG_SPRING_TRANSACTION_ISOLATION_LEVEL, String.valueOf(definition.getIsolationLevel())); span.tag(Constants.TAG_SPRING_TRANSACTION_PROPAGATION_BEHAVIOR, String.valueOf(definition.getPropagationBehavior())); span.tag(Constants.TAG_SPRING_TRANSACTION_TIMEOUT, String.valueOf(definition.getTimeout())); @@ -51,14 +50,14 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { ContextManager.activeSpan().errorOccurred().log(t); } diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/spring-tx-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/transaction/context/Constants.java b/apm-sniffer/optional-plugins/optional-spring-plugins/spring-tx-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/transaction/context/Constants.java index 69bab44282f5..afa434370fb8 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/spring-tx-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/transaction/context/Constants.java +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/spring-tx-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/transaction/context/Constants.java @@ -15,15 +15,12 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.plugin.spring.transaction.context; import org.apache.skywalking.apm.agent.core.context.tag.AbstractTag; import org.apache.skywalking.apm.agent.core.context.tag.Tags; -/** - * @author zhaoyuguang - */ - public interface Constants { String OPERATION_NAME_SPRING_TRANSACTION_PREFIX = "TX/"; String OPERATION_NAME_SPRING_TRANSACTION_GET_TRANSACTION_METHOD = OPERATION_NAME_SPRING_TRANSACTION_PREFIX + "get/"; diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/spring-tx-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/transaction/define/AbstractPlatformTransactionManagerInstrumentation.java b/apm-sniffer/optional-plugins/optional-spring-plugins/spring-tx-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/transaction/define/AbstractPlatformTransactionManagerInstrumentation.java index 5b1372a47ad9..18ff0c37b5c2 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/spring-tx-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/transaction/define/AbstractPlatformTransactionManagerInstrumentation.java +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/spring-tx-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/transaction/define/AbstractPlatformTransactionManagerInstrumentation.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.apm.plugin.spring.transaction.define; import net.bytebuddy.description.method.MethodDescription; @@ -26,9 +27,6 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * @author zhaoyuguang - */ public class AbstractPlatformTransactionManagerInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { @Override @@ -38,7 +36,7 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { @@ -54,7 +52,8 @@ public String getMethodsInterceptor() { public boolean isOverrideArgs() { return false; } - }, new InstanceMethodsInterceptPoint() { + }, + new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { return named("commit").or(named("rollback")); diff --git a/apm-sniffer/optional-plugins/pom.xml b/apm-sniffer/optional-plugins/pom.xml index a7c62dc93608..c4d3f72c015f 100644 --- a/apm-sniffer/optional-plugins/pom.xml +++ b/apm-sniffer/optional-plugins/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm-sniffer org.apache.skywalking @@ -32,8 +33,9 @@ ${shade.package}.${shade.net.bytebuddy.source} UTF-8 - - ${project.build.directory}${sdk.plugin.related.dir}/../../../../skywalking-agent + + ${project.build.directory}${sdk.plugin.related.dir}/../../../../skywalking-agent + ${agent.package.dest.dir}/optional-plugins 1.0b3 @@ -105,12 +107,16 @@ - + - + - - + + diff --git a/apm-sniffer/optional-plugins/trace-ignore-plugin/pom.xml b/apm-sniffer/optional-plugins/trace-ignore-plugin/pom.xml index ec0c569cb576..ecf56648d037 100644 --- a/apm-sniffer/optional-plugins/trace-ignore-plugin/pom.xml +++ b/apm-sniffer/optional-plugins/trace-ignore-plugin/pom.xml @@ -16,7 +16,8 @@ ~ --> - + optional-plugins org.apache.skywalking diff --git a/apm-sniffer/optional-plugins/trace-ignore-plugin/src/main/java/org/apache/skywalking/apm/plugin/trace/ignore/TraceIgnoreExtendService.java b/apm-sniffer/optional-plugins/trace-ignore-plugin/src/main/java/org/apache/skywalking/apm/plugin/trace/ignore/TraceIgnoreExtendService.java index d77090401faf..2bb72735a723 100644 --- a/apm-sniffer/optional-plugins/trace-ignore-plugin/src/main/java/org/apache/skywalking/apm/plugin/trace/ignore/TraceIgnoreExtendService.java +++ b/apm-sniffer/optional-plugins/trace-ignore-plugin/src/main/java/org/apache/skywalking/apm/plugin/trace/ignore/TraceIgnoreExtendService.java @@ -30,9 +30,6 @@ import org.apache.skywalking.apm.plugin.trace.ignore.matcher.TracePathMatcher; import org.apache.skywalking.apm.util.StringUtil; -/** - * @author liujc [liujunc1993@163.com], kanro - */ @OverrideImplementor(ContextManagerExtendService.class) public class TraceIgnoreExtendService extends ContextManagerExtendService { @@ -42,7 +39,7 @@ public class TraceIgnoreExtendService extends ContextManagerExtendService { private TracePathMatcher pathMatcher = new FastPathMatcher(); - private String[] patterns = new String[]{}; + private String[] patterns = new String[] {}; @Override public void boot() { diff --git a/apm-sniffer/optional-plugins/trace-ignore-plugin/src/main/java/org/apache/skywalking/apm/plugin/trace/ignore/conf/IgnoreConfig.java b/apm-sniffer/optional-plugins/trace-ignore-plugin/src/main/java/org/apache/skywalking/apm/plugin/trace/ignore/conf/IgnoreConfig.java index f317ac2b43ca..3fe5b29c4d42 100644 --- a/apm-sniffer/optional-plugins/trace-ignore-plugin/src/main/java/org/apache/skywalking/apm/plugin/trace/ignore/conf/IgnoreConfig.java +++ b/apm-sniffer/optional-plugins/trace-ignore-plugin/src/main/java/org/apache/skywalking/apm/plugin/trace/ignore/conf/IgnoreConfig.java @@ -18,19 +18,13 @@ package org.apache.skywalking.apm.plugin.trace.ignore.conf; -/** - * - * @author liujc [liujunc1993@163.com] - * - */ public class IgnoreConfig { public static class Trace { /** - * If the operation name of the first span is matching, this segment should be ignored - * /path/? Match any single character - * /path/* Match any number of characters - * /path/** Match any number of characters and support multilevel directories + * If the operation name of the first span is matching, this segment should be ignored /path/? Match any + * single character /path/* Match any number of characters /path/** Match any number of characters and + * support multilevel directories */ public static String IGNORE_PATH = ""; } diff --git a/apm-sniffer/optional-plugins/trace-ignore-plugin/src/main/java/org/apache/skywalking/apm/plugin/trace/ignore/conf/IgnoreConfigInitializer.java b/apm-sniffer/optional-plugins/trace-ignore-plugin/src/main/java/org/apache/skywalking/apm/plugin/trace/ignore/conf/IgnoreConfigInitializer.java index 86240f09c8d2..4dfe32485abb 100644 --- a/apm-sniffer/optional-plugins/trace-ignore-plugin/src/main/java/org/apache/skywalking/apm/plugin/trace/ignore/conf/IgnoreConfigInitializer.java +++ b/apm-sniffer/optional-plugins/trace-ignore-plugin/src/main/java/org/apache/skywalking/apm/plugin/trace/ignore/conf/IgnoreConfigInitializer.java @@ -18,16 +18,20 @@ package org.apache.skywalking.apm.plugin.trace.ignore.conf; -import java.io.*; -import java.util.*; -import org.apache.skywalking.apm.agent.core.boot.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.InputStream; +import java.util.Map; +import java.util.Properties; +import org.apache.skywalking.apm.agent.core.boot.AgentPackageNotFoundException; +import org.apache.skywalking.apm.agent.core.boot.AgentPackagePath; import org.apache.skywalking.apm.agent.core.conf.ConfigNotFoundException; -import org.apache.skywalking.apm.agent.core.logging.api.*; -import org.apache.skywalking.apm.util.*; +import org.apache.skywalking.apm.agent.core.logging.api.ILog; +import org.apache.skywalking.apm.agent.core.logging.api.LogManager; +import org.apache.skywalking.apm.util.ConfigInitializer; +import org.apache.skywalking.apm.util.PropertyPlaceholderHelper; -/** - * @author liujc [liujunc1993@163.com] - */ public class IgnoreConfigInitializer { private static final ILog LOGGER = LogManager.getLogger(IgnoreConfigInitializer.class); private static final String CONFIG_FILE_NAME = "/config/apm-trace-ignore-plugin.config"; @@ -47,7 +51,7 @@ public static void initialize() { Properties properties = new Properties(); properties.load(configFileStream); for (String key : properties.stringPropertyNames()) { - String value = (String)properties.get(key); + String value = (String) properties.get(key); properties.put(key, PropertyPlaceholderHelper.INSTANCE.replacePlaceholders(value, properties)); } ConfigInitializer.initialize(properties, IgnoreConfig.class); diff --git a/apm-sniffer/optional-plugins/trace-ignore-plugin/src/main/java/org/apache/skywalking/apm/plugin/trace/ignore/matcher/FastPathMatcher.java b/apm-sniffer/optional-plugins/trace-ignore-plugin/src/main/java/org/apache/skywalking/apm/plugin/trace/ignore/matcher/FastPathMatcher.java index 0d7c206e3cc6..4e9154208e88 100644 --- a/apm-sniffer/optional-plugins/trace-ignore-plugin/src/main/java/org/apache/skywalking/apm/plugin/trace/ignore/matcher/FastPathMatcher.java +++ b/apm-sniffer/optional-plugins/trace-ignore-plugin/src/main/java/org/apache/skywalking/apm/plugin/trace/ignore/matcher/FastPathMatcher.java @@ -18,9 +18,6 @@ package org.apache.skywalking.apm.plugin.trace.ignore.matcher; -/** - * @author kanro - */ public class FastPathMatcher implements TracePathMatcher { @Override public boolean match(String pattern, String path) { diff --git a/apm-sniffer/optional-plugins/trace-ignore-plugin/src/main/java/org/apache/skywalking/apm/plugin/trace/ignore/matcher/TracePathMatcher.java b/apm-sniffer/optional-plugins/trace-ignore-plugin/src/main/java/org/apache/skywalking/apm/plugin/trace/ignore/matcher/TracePathMatcher.java index bd98dfda8d7a..ad39434ee329 100644 --- a/apm-sniffer/optional-plugins/trace-ignore-plugin/src/main/java/org/apache/skywalking/apm/plugin/trace/ignore/matcher/TracePathMatcher.java +++ b/apm-sniffer/optional-plugins/trace-ignore-plugin/src/main/java/org/apache/skywalking/apm/plugin/trace/ignore/matcher/TracePathMatcher.java @@ -18,11 +18,6 @@ package org.apache.skywalking.apm.plugin.trace.ignore.matcher; -/** - * - * @author liujc [liujunc1993@163.com] - * - */ public interface TracePathMatcher { boolean match(String pattern, String path); diff --git a/apm-sniffer/optional-plugins/trace-ignore-plugin/src/test/java/org/apache/skywalking/apm/plugin/trace/ignore/TraceIgnoreTest.java b/apm-sniffer/optional-plugins/trace-ignore-plugin/src/test/java/org/apache/skywalking/apm/plugin/trace/ignore/TraceIgnoreTest.java index f0ffa4e6c6ab..69dbb4aeec91 100644 --- a/apm-sniffer/optional-plugins/trace-ignore-plugin/src/test/java/org/apache/skywalking/apm/plugin/trace/ignore/TraceIgnoreTest.java +++ b/apm-sniffer/optional-plugins/trace-ignore-plugin/src/test/java/org/apache/skywalking/apm/plugin/trace/ignore/TraceIgnoreTest.java @@ -37,9 +37,6 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -/** - * @author liujc [liujunc1993@163.com] - */ public class TraceIgnoreTest { @Rule @@ -70,7 +67,7 @@ public void testTraceIgnore() { public void testTraceIgnoreConfigOverridingFromSystemEnv() throws IllegalAccessException { Properties properties = new Properties(); properties.put("trace.ignore_path", "${SW_AGENT_TRACE_IGNORE_PATH:/path/eureka/**}"); - properties.put("trace.ignore_path", PropertyPlaceholderHelper.INSTANCE.replacePlaceholders((String)properties.get("trace.ignore_path"), properties)); + properties.put("trace.ignore_path", PropertyPlaceholderHelper.INSTANCE.replacePlaceholders((String) properties.get("trace.ignore_path"), properties)); ConfigInitializer.initialize(properties, IgnoreConfig.class); assertThat(IgnoreConfig.Trace.IGNORE_PATH, is("path_test")); } diff --git a/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/pom.xml b/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/pom.xml index 772083ba62bf..3b6c419611a4 100644 --- a/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/pom.xml +++ b/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + 4.0.0 org.apache.skywalking diff --git a/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/zookeeper/ClientCnxnInterceptor.java b/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/zookeeper/ClientCnxnInterceptor.java index e19f0d6401cc..4334d95396ad 100644 --- a/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/zookeeper/ClientCnxnInterceptor.java +++ b/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/zookeeper/ClientCnxnInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.zookeeper; import org.apache.jute.Record; @@ -41,16 +40,13 @@ import java.util.Collections; import java.util.List; -/** - * @author zhaoyuguang - */ public class ClientCnxnInterceptor implements InstanceMethodsAroundInterceptor, InstanceConstructorInterceptor { private static final ILog logger = LogManager.getLogger(ClientCnxnInterceptor.class); @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { String peer = (String) objInst.getSkyWalkingDynamicField(); RequestHeader header = (RequestHeader) allArguments[0]; String operationName = ZooOpt.getOperationName(header.getType()); @@ -62,15 +58,15 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { ContextManager.stopSpan(); return ret; } @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { AbstractSpan span = ContextManager.activeSpan(); span.errorOccurred(); span.log(t); @@ -82,8 +78,7 @@ public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { try { Field field = StaticHostProvider.class.getDeclaredField("serverAddresses"); field.setAccessible(true); - @SuppressWarnings("unchecked") - List serverAddresses = (List) field.get(hostProvider); + @SuppressWarnings("unchecked") List serverAddresses = (List) field.get(hostProvider); List addresses = new ArrayList(); for (InetSocketAddress address : serverAddresses) { addresses.add(address.getHostName() + ":" + address.getPort()); diff --git a/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/zookeeper/EventThreadMethodInterceptor.java b/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/zookeeper/EventThreadMethodInterceptor.java index 64184003e756..c9ce30c9a030 100644 --- a/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/zookeeper/EventThreadMethodInterceptor.java +++ b/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/zookeeper/EventThreadMethodInterceptor.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.zookeeper; import org.apache.skywalking.apm.agent.core.context.ContextManager; @@ -31,19 +30,17 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; -/** - * @author zhaoyuguang - */ public class EventThreadMethodInterceptor implements InstanceMethodsAroundInterceptor { @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { if (isWatchedEvent(allArguments[0])) { Field field = allArguments[0].getClass().getDeclaredField("event"); field.setAccessible(true); WatchedEvent event = (WatchedEvent) field.get(allArguments[0]); - AbstractSpan span = ContextManager.createEntrySpan("Zookeeper/WatchedEvent/" + event.getType().name(), null); + AbstractSpan span = ContextManager.createEntrySpan("Zookeeper/WatchedEvent/" + event.getType() + .name(), null); ZooOpt.setTags(span, event); span.setComponent(ComponentsDefine.ZOOKEEPER); Tags.DB_TYPE.set(span, "Zookeeper"); @@ -51,8 +48,8 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr } @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { + public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, + Object ret) throws Throwable { if (isWatchedEvent(allArguments[0])) { ContextManager.stopSpan(); } @@ -61,13 +58,14 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { + Class[] argumentsTypes, Throwable t) { if (isWatchedEvent(allArguments[0])) { ContextManager.activeSpan().errorOccurred().log(t); } } private boolean isWatchedEvent(Object event) { - return event != null && "org.apache.zookeeper.ClientCnxn$WatcherSetEventPair".equals(event.getClass().getName()); + return event != null && "org.apache.zookeeper.ClientCnxn$WatcherSetEventPair".equals(event.getClass() + .getName()); } } diff --git a/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/zookeeper/ZooOpt.java b/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/zookeeper/ZooOpt.java index 0f96f8503caa..8d51813685bf 100644 --- a/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/zookeeper/ZooOpt.java +++ b/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/zookeeper/ZooOpt.java @@ -18,20 +18,28 @@ package org.apache.skywalking.apm.plugin.zookeeper; +import java.util.HashMap; +import java.util.Map; import org.apache.jute.Record; import org.apache.skywalking.apm.agent.core.context.tag.AbstractTag; import org.apache.skywalking.apm.agent.core.context.tag.Tags; import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan; import org.apache.zookeeper.WatchedEvent; import org.apache.zookeeper.ZooDefs; -import org.apache.zookeeper.proto.*; - -import java.util.HashMap; -import java.util.Map; +import org.apache.zookeeper.proto.CheckVersionRequest; +import org.apache.zookeeper.proto.CreateRequest; +import org.apache.zookeeper.proto.DeleteRequest; +import org.apache.zookeeper.proto.ExistsRequest; +import org.apache.zookeeper.proto.GetACLRequest; +import org.apache.zookeeper.proto.GetChildren2Request; +import org.apache.zookeeper.proto.GetChildrenRequest; +import org.apache.zookeeper.proto.GetDataRequest; +import org.apache.zookeeper.proto.GetMaxChildrenRequest; +import org.apache.zookeeper.proto.SetACLRequest; +import org.apache.zookeeper.proto.SetDataRequest; +import org.apache.zookeeper.proto.SetMaxChildrenRequest; +import org.apache.zookeeper.proto.SyncRequest; -/** - * @author zhaoyuguang - */ class ZooOpt { private static final Map OPTS = new HashMap<>(); @@ -70,10 +78,9 @@ static String getOperationName(Integer opCode) { } /** - * Add the tag attribute only for the implementation of the Request suffix - * except ConnectRequest.class because no very important attributes - * except GetSASLRequest.class because no very important attributes - * except SetSASLRequest.class because no very important attributes + * Add the tag attribute only for the implementation of the Request suffix except ConnectRequest.class because no + * very important attributes except GetSASLRequest.class because no very important attributes except + * SetSASLRequest.class because no very important attributes * * @param span SkyWalking AbstractSpan.class * @param record Zookeeper Record.class diff --git a/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/zookeeper/define/ClientCnxnInstrumentation.java b/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/zookeeper/define/ClientCnxnInstrumentation.java index 6bdd7408636b..d5a0a8909104 100644 --- a/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/zookeeper/define/ClientCnxnInstrumentation.java +++ b/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/zookeeper/define/ClientCnxnInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.zookeeper.define; import net.bytebuddy.description.method.MethodDescription; @@ -31,9 +30,6 @@ import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * @author zhaoyuguang - */ public class ClientCnxnInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "org.apache.zookeeper.ClientCnxn"; @@ -59,13 +55,12 @@ public String getConstructorInterceptor() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { - return named("queuePacket") - .and(takesArgumentWithType(0,"org.apache.zookeeper.proto.RequestHeader")) - .and(takesArgumentWithType(2,"org.apache.jute.Record")); + return named("queuePacket").and(takesArgumentWithType(0, "org.apache.zookeeper.proto.RequestHeader")) + .and(takesArgumentWithType(2, "org.apache.jute.Record")); } @Override diff --git a/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/zookeeper/define/EventThreadInstrumentation.java b/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/zookeeper/define/EventThreadInstrumentation.java index 6847c3ed2ee5..042711aeb4fc 100644 --- a/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/zookeeper/define/EventThreadInstrumentation.java +++ b/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/zookeeper/define/EventThreadInstrumentation.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.plugin.zookeeper.define; import net.bytebuddy.description.method.MethodDescription; @@ -30,9 +29,6 @@ import static org.apache.skywalking.apm.agent.core.plugin.bytebuddy.ArgumentTypeNameMatch.takesArgumentWithType; import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; -/** - * @author zhaoyuguang - */ public class EventThreadInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { private static final String ENHANCE_CLASS = "org.apache.zookeeper.ClientCnxn$EventThread"; @@ -46,11 +42,11 @@ public ConstructorInterceptPoint[] getConstructorsInterceptPoints() { @Override public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ + return new InstanceMethodsInterceptPoint[] { new InstanceMethodsInterceptPoint() { @Override public ElementMatcher getMethodsMatcher() { - return named("processEvent").and(takesArgumentWithType(0,"java.lang.Object")); + return named("processEvent").and(takesArgumentWithType(0, "java.lang.Object")); } @Override diff --git a/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/zookeeper/ClientCnxnInterceptorTest.java b/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/zookeeper/ClientCnxnInterceptorTest.java index fc3c36d68cd1..6aa4c4c2e72b 100644 --- a/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/zookeeper/ClientCnxnInterceptorTest.java +++ b/apm-sniffer/optional-plugins/zookeeper-3.4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/zookeeper/ClientCnxnInterceptorTest.java @@ -50,9 +50,6 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -/** - * @author zhaoyuguang - */ @RunWith(PowerMockRunner.class) @PowerMockRunnerDelegate(TracingSegmentRunner.class) public class ClientCnxnInterceptorTest { @@ -82,7 +79,10 @@ public void setSkyWalkingDynamicField(Object value) { } } - @SuppressWarnings({"rawtypes", "unchecked"}) + @SuppressWarnings({ + "rawtypes", + "unchecked" + }) @Before public void setUp() throws Exception { instance = new MockInstance(); @@ -95,10 +95,17 @@ public void testInterceptor() throws Throwable { List serverAddresses = new ArrayList(); serverAddresses.add(address); StaticHostProvider provider = new StaticHostProvider(serverAddresses); - interceptor.onConstruct(instance, new Object[]{null, provider}); + interceptor.onConstruct(instance, new Object[] { + null, + provider + }); RequestHeader header = new RequestHeader(1, 1); CreateRequest createRequest = new CreateRequest("/path", null, null, 0); - interceptor.beforeMethod(instance, null, new Object[]{header, null, createRequest}, null, null); + interceptor.beforeMethod(instance, null, new Object[] { + header, + null, + createRequest + }, null, null); interceptor.afterMethod(instance, null, null, null, null); MatcherAssert.assertThat((String) instance.getSkyWalkingDynamicField(), Is.is("localhost:2800;")); TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0); diff --git a/apm-sniffer/pom.xml b/apm-sniffer/pom.xml index 8d156f5d88c7..b4326078ed4f 100644 --- a/apm-sniffer/pom.xml +++ b/apm-sniffer/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm org.apache.skywalking diff --git a/apm-webapp/pom.xml b/apm-webapp/pom.xml index b291d8f0f547..5f7abf100763 100644 --- a/apm-webapp/pom.xml +++ b/apm-webapp/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm org.apache.skywalking diff --git a/apm-webapp/src/main/java/org/apache/skywalking/apm/webapp/ApplicationStartUp.java b/apm-webapp/src/main/java/org/apache/skywalking/apm/webapp/ApplicationStartUp.java index f8f3dde22ec5..875ee135bc6f 100644 --- a/apm-webapp/src/main/java/org/apache/skywalking/apm/webapp/ApplicationStartUp.java +++ b/apm-webapp/src/main/java/org/apache/skywalking/apm/webapp/ApplicationStartUp.java @@ -30,5 +30,5 @@ public class ApplicationStartUp extends SpringBootServletInitializer { public static void main(String[] args) { SpringApplication.run(ApplicationStartUp.class, args); } - + } diff --git a/apm-webapp/src/main/java/org/apache/skywalking/apm/webapp/proxy/MvcConfig.java b/apm-webapp/src/main/java/org/apache/skywalking/apm/webapp/proxy/MvcConfig.java index e01431abd032..973d75071831 100644 --- a/apm-webapp/src/main/java/org/apache/skywalking/apm/webapp/proxy/MvcConfig.java +++ b/apm-webapp/src/main/java/org/apache/skywalking/apm/webapp/proxy/MvcConfig.java @@ -24,31 +24,17 @@ /** * Additional MVC Configuration. - * - * @author gaohongtao */ @Configuration public class MvcConfig extends WebMvcConfigurerAdapter { @Override public void addResourceHandlers(final ResourceHandlerRegistry registry) { - registry - .addResourceHandler("/index.html") - .addResourceLocations("classpath:/public/index.html"); - registry - .addResourceHandler("/css/**") - .addResourceLocations("classpath:/public/css/"); - registry - .addResourceHandler("/img/**") - .addResourceLocations("classpath:/public/img/"); - registry - .addResourceHandler("/js/**") - .addResourceLocations("classpath:/public/js/"); - registry - .addResourceHandler("/favicon.ico") - .addResourceLocations("classpath:/public/favicon.ico"); - registry - .addResourceHandler("/logo.png") - .addResourceLocations("classpath:/public/logo.png"); + registry.addResourceHandler("/index.html").addResourceLocations("classpath:/public/index.html"); + registry.addResourceHandler("/css/**").addResourceLocations("classpath:/public/css/"); + registry.addResourceHandler("/img/**").addResourceLocations("classpath:/public/img/"); + registry.addResourceHandler("/js/**").addResourceLocations("classpath:/public/js/"); + registry.addResourceHandler("/favicon.ico").addResourceLocations("classpath:/public/favicon.ico"); + registry.addResourceHandler("/logo.png").addResourceLocations("classpath:/public/logo.png"); } } \ No newline at end of file diff --git a/apm-webapp/src/main/java/org/apache/skywalking/apm/webapp/proxy/NotFoundHandler.java b/apm-webapp/src/main/java/org/apache/skywalking/apm/webapp/proxy/NotFoundHandler.java index 183bc5cc93c7..2ac55c9ba5f4 100644 --- a/apm-webapp/src/main/java/org/apache/skywalking/apm/webapp/proxy/NotFoundHandler.java +++ b/apm-webapp/src/main/java/org/apache/skywalking/apm/webapp/proxy/NotFoundHandler.java @@ -17,6 +17,8 @@ package org.apache.skywalking.apm.webapp.proxy; +import java.io.IOException; +import java.nio.charset.Charset; import org.slf4j.LoggerFactory; import org.springframework.core.io.ClassPathResource; import org.springframework.http.HttpStatus; @@ -27,24 +29,21 @@ import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.servlet.NoHandlerFoundException; -import java.io.IOException; -import java.nio.charset.Charset; - /** * NotFoundHandler handles the single page application url routing. - * - * @author gaohongtao */ @ControllerAdvice public class NotFoundHandler { @ExceptionHandler(NoHandlerFoundException.class) public ResponseEntity renderDefaultPage() { try { - String body = StreamUtils.copyToString(new ClassPathResource("/public/index.html").getInputStream(), Charset.defaultCharset()); + String body = StreamUtils.copyToString(new ClassPathResource("/public/index.html").getInputStream(), Charset + .defaultCharset()); return ResponseEntity.ok().contentType(MediaType.TEXT_HTML).body(body); } catch (final IOException e) { LoggerFactory.getLogger(NotFoundHandler.class).error("err", e); - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("There was an error completing the action."); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body("There was an error completing the action."); } } } diff --git a/apm-webapp/src/main/java/org/apache/skywalking/apm/webapp/proxy/RewritePathFilter.java b/apm-webapp/src/main/java/org/apache/skywalking/apm/webapp/proxy/RewritePathFilter.java index 83450aa7c6d8..24f0331a1673 100644 --- a/apm-webapp/src/main/java/org/apache/skywalking/apm/webapp/proxy/RewritePathFilter.java +++ b/apm-webapp/src/main/java/org/apache/skywalking/apm/webapp/proxy/RewritePathFilter.java @@ -27,8 +27,6 @@ /** * Rewrite url to rewritePath - * - * @author gaohongtao */ @Component @ConfigurationProperties(prefix = "collector") @@ -37,7 +35,7 @@ public class RewritePathFilter extends ZuulFilter { private static final String REQUEST_URI = "requestURI"; private static final int ORDER = PRE_DECORATION_FILTER_ORDER + 2; - + private String path; public String getPath() { diff --git a/apm-webapp/src/main/resources/logback-spring.xml b/apm-webapp/src/main/resources/logback-spring.xml index 3e017a7762e2..e73214ff0625 100644 --- a/apm-webapp/src/main/resources/logback-spring.xml +++ b/apm-webapp/src/main/resources/logback-spring.xml @@ -17,10 +17,10 @@ ~ --> - + - + - + \ No newline at end of file diff --git a/apm-webapp/src/test/java/org/apache/skywalking/apm/webapp/ApplicationContextTest.java b/apm-webapp/src/test/java/org/apache/skywalking/apm/webapp/ApplicationContextTest.java index 288daec2ed9c..127ce2453ac0 100644 --- a/apm-webapp/src/test/java/org/apache/skywalking/apm/webapp/ApplicationContextTest.java +++ b/apm-webapp/src/test/java/org/apache/skywalking/apm/webapp/ApplicationContextTest.java @@ -22,9 +22,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -/** - * @author kezhenxu94 - */ @SpringBootTest @RunWith(SpringRunner.class) public class ApplicationContextTest { diff --git a/apm-webapp/src/test/java/org/apache/skywalking/apm/webapp/NotFoundHandlerTest.java b/apm-webapp/src/test/java/org/apache/skywalking/apm/webapp/NotFoundHandlerTest.java index 5eac560df7f5..8a253cd56dbb 100644 --- a/apm-webapp/src/test/java/org/apache/skywalking/apm/webapp/NotFoundHandlerTest.java +++ b/apm-webapp/src/test/java/org/apache/skywalking/apm/webapp/NotFoundHandlerTest.java @@ -17,6 +17,7 @@ package org.apache.skywalking.apm.webapp; +import java.io.IOException; import org.apache.skywalking.apm.webapp.proxy.NotFoundHandler; import org.junit.Before; import org.junit.Test; @@ -30,17 +31,15 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import java.io.IOException; - import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -/** - * @author kezhenxu94 - */ @RunWith(PowerMockRunner.class) -@PrepareForTest(value = {NotFoundHandler.class, ClassPathResource.class}) +@PrepareForTest(value = { + NotFoundHandler.class, + ClassPathResource.class +}) public class NotFoundHandlerTest { @Mock private NotFoundHandler notFoundHandler; @@ -55,9 +54,7 @@ public void shouldInternalErrorWhenIndexPageIsMissing() throws Exception { ClassPathResource mockIndexResource = mock(ClassPathResource.class); when(mockIndexResource.getInputStream()).thenThrow(new IOException()); - PowerMockito.whenNew(ClassPathResource.class) - .withArguments("/public/index.html") - .thenReturn(mockIndexResource); + PowerMockito.whenNew(ClassPathResource.class).withArguments("/public/index.html").thenReturn(mockIndexResource); when(notFoundHandler.renderDefaultPage()).thenCallRealMethod(); ResponseEntity response = notFoundHandler.renderDefaultPage(); diff --git a/apm-webapp/src/test/java/org/apache/skywalking/apm/webapp/WebAppTest.java b/apm-webapp/src/test/java/org/apache/skywalking/apm/webapp/WebAppTest.java index 483327a77c0e..e0b1e1d5aa0d 100644 --- a/apm-webapp/src/test/java/org/apache/skywalking/apm/webapp/WebAppTest.java +++ b/apm-webapp/src/test/java/org/apache/skywalking/apm/webapp/WebAppTest.java @@ -36,9 +36,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -/** - * @author kezhenxu94 - */ @WebMvcTest @RunWith(SpringRunner.class) public class WebAppTest { @@ -52,9 +49,9 @@ public void shouldGetStaticResources() throws Exception { when(notFoundHandler.renderDefaultPage()).thenCallRealMethod(); mvc.perform(get("/index.html")) - .andDo(print()) - .andExpect(status().isOk()) - .andExpect(content().string(containsString("SkyWalking"))); + .andDo(print()) + .andExpect(status().isOk()) + .andExpect(content().string(containsString("SkyWalking"))); verify(notFoundHandler, never()).renderDefaultPage(); } @@ -63,9 +60,7 @@ public void shouldGetStaticResources() throws Exception { public void shouldRedirectToIndexWhenResourcesIsAbsent() throws Exception { when(notFoundHandler.renderDefaultPage()).thenCallRealMethod(); - mvc.perform(get("/absent.html")) - .andDo(print()) - .andExpect(status().isOk()); + mvc.perform(get("/absent.html")).andDo(print()).andExpect(status().isOk()); verify(notFoundHandler, only()).renderDefaultPage(); } diff --git a/codeStyle.xml b/codeStyle.xml index e37294356b0d..420bdf3de1f1 100644 --- a/codeStyle.xml +++ b/codeStyle.xml @@ -1,146 +1,104 @@ - - - - - \ No newline at end of file diff --git a/dist-material/log4j2.xml b/dist-material/log4j2.xml index 6f0e2acb1c99..5d09ef223093 100644 --- a/dist-material/log4j2.xml +++ b/dist-material/log4j2.xml @@ -23,12 +23,12 @@ + filePattern="${log-path}/skywalking-oap-server-%d{yyyy-MM-dd}-%i.log"> %d - %c - %L [%t] %-5p %x - %m%n - + diff --git a/docker/ui/Dockerfile.ui b/docker/ui/Dockerfile.ui index a52a148b8811..ee12624aea34 100644 --- a/docker/ui/Dockerfile.ui +++ b/docker/ui/Dockerfile.ui @@ -1,40 +1,40 @@ # Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FROM openjdk:8u181-jdk-stretch - -ENV DIST_NAME=apache-skywalking-apm-bin \ + # or more contributor license agreements. See the NOTICE file + # distributed with this work for additional information + # regarding copyright ownership. The ASF licenses this file + # to you under the Apache License, Version 2.0 (the + # "License"); you may not use this file except in compliance + # with the License. You may obtain a copy of the License at + # + # http://www.apache.org/licenses/LICENSE-2.0 + # + # Unless required by applicable law or agreed to in writing, software + # distributed under the License is distributed on an "AS IS" BASIS, + # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + # See the License for the specific language governing permissions and + # limitations under the License. + + FROM openjdk:8u181-jdk-stretch + + ENV DIST_NAME=apache-skywalking-apm-bin \ JAVA_OPTS=" -Xms256M " \ SW_OAP_ADDRESS="127.0.0.1:12800" \ SW_TIMEOUT="20000" -COPY "$DIST_NAME.tar.gz" / + COPY "$DIST_NAME.tar.gz" / -RUN set -ex; \ + RUN set -ex; \ tar -xzf "$DIST_NAME.tar.gz"; \ rm -rf "$DIST_NAME.tar.gz"; \ rm -rf "$DIST_NAME/config"; \ rm -rf "$DIST_NAME/bin"; rm -rf "$DIST_NAME/oap-libs"; rm -rf "$DIST_NAME/agent"; \ mv "$DIST_NAME" skywalking; -WORKDIR skywalking + WORKDIR skywalking -COPY docker-entrypoint.sh . -COPY logback.xml webapp/ + COPY docker-entrypoint.sh . + COPY logback.xml webapp/ -EXPOSE 8080 + EXPOSE 8080 -ENTRYPOINT ["bash", "docker-entrypoint.sh"] \ No newline at end of file + ENTRYPOINT ["bash", "docker-entrypoint.sh"] \ No newline at end of file diff --git a/docker/ui/logback.xml b/docker/ui/logback.xml index 834036d7bf27..c9490a87b2f5 100644 --- a/docker/ui/logback.xml +++ b/docker/ui/logback.xml @@ -17,5 +17,5 @@ ~ --> - + \ No newline at end of file diff --git a/docs/en/guides/Java-Plugin-Development-Guide.md b/docs/en/guides/Java-Plugin-Development-Guide.md index 3094627bd495..0d5d1ea9b62b 100644 --- a/docs/en/guides/Java-Plugin-Development-Guide.md +++ b/docs/en/guides/Java-Plugin-Development-Guide.md @@ -279,9 +279,7 @@ As an interceptor for an instance method, the interceptor implements /** * 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. diff --git a/oap-server/exporter/pom.xml b/oap-server/exporter/pom.xml index 2188a95decda..bc581432c2c1 100644 --- a/oap-server/exporter/pom.xml +++ b/oap-server/exporter/pom.xml @@ -17,7 +17,8 @@ ~ --> - + oap-server org.apache.skywalking @@ -51,10 +52,12 @@ protobuf-java directly, you will be transitively depending on the protobuf-java version that grpc depends on. --> - com.google.protobuf:protoc:${com.google.protobuf.protoc.version}:exe:${os.detected.classifier} + + com.google.protobuf:protoc:${com.google.protobuf.protoc.version}:exe:${os.detected.classifier} grpc-java - io.grpc:protoc-gen-grpc-java:${protoc-gen-grpc-java.plugin.version}:exe:${os.detected.classifier} + + io.grpc:protoc-gen-grpc-java:${protoc-gen-grpc-java.plugin.version}:exe:${os.detected.classifier} diff --git a/oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/MetricFormatter.java b/oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/MetricFormatter.java index ec19b083e63c..1060a7a122c5 100644 --- a/oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/MetricFormatter.java +++ b/oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/MetricFormatter.java @@ -18,14 +18,13 @@ package org.apache.skywalking.oap.server.exporter.provider; -import lombok.*; -import org.apache.skywalking.oap.server.core.analysis.metrics.*; -import org.apache.skywalking.oap.server.core.cache.*; +import lombok.Setter; +import org.apache.skywalking.oap.server.core.analysis.metrics.MetricsMetaInfo; +import org.apache.skywalking.oap.server.core.cache.EndpointInventoryCache; +import org.apache.skywalking.oap.server.core.cache.ServiceInstanceInventoryCache; +import org.apache.skywalking.oap.server.core.cache.ServiceInventoryCache; import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine; -/** - * @author wusheng - */ @Setter public class MetricFormatter { private ServiceInventoryCache serviceInventoryCache; diff --git a/oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporter.java b/oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporter.java index 3114d6b78b07..e0980194de65 100644 --- a/oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporter.java +++ b/oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporter.java @@ -20,22 +20,35 @@ import io.grpc.ManagedChannel; import io.grpc.stub.StreamObserver; -import java.util.*; +import java.util.HashSet; +import java.util.List; +import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import lombok.*; +import lombok.AccessLevel; +import lombok.Getter; import org.apache.skywalking.apm.commons.datacarrier.DataCarrier; import org.apache.skywalking.apm.commons.datacarrier.consumer.IConsumer; -import org.apache.skywalking.oap.server.core.analysis.metrics.*; -import org.apache.skywalking.oap.server.core.exporter.*; -import org.apache.skywalking.oap.server.exporter.grpc.*; +import org.apache.skywalking.oap.server.core.analysis.metrics.DoubleValueHolder; +import org.apache.skywalking.oap.server.core.analysis.metrics.IntValueHolder; +import org.apache.skywalking.oap.server.core.analysis.metrics.LongValueHolder; +import org.apache.skywalking.oap.server.core.analysis.metrics.Metrics; +import org.apache.skywalking.oap.server.core.analysis.metrics.MetricsMetaInfo; +import org.apache.skywalking.oap.server.core.analysis.metrics.MultiIntValuesHolder; +import org.apache.skywalking.oap.server.core.analysis.metrics.WithMetadata; +import org.apache.skywalking.oap.server.core.exporter.ExportEvent; +import org.apache.skywalking.oap.server.core.exporter.MetricValuesExportService; +import org.apache.skywalking.oap.server.exporter.grpc.ExportMetricValue; +import org.apache.skywalking.oap.server.exporter.grpc.ExportResponse; +import org.apache.skywalking.oap.server.exporter.grpc.MetricExportServiceGrpc; +import org.apache.skywalking.oap.server.exporter.grpc.SubscriptionReq; +import org.apache.skywalking.oap.server.exporter.grpc.SubscriptionsResp; +import org.apache.skywalking.oap.server.exporter.grpc.ValueType; import org.apache.skywalking.oap.server.exporter.provider.MetricFormatter; import org.apache.skywalking.oap.server.library.client.grpc.GRPCClient; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author wusheng - */ public class GRPCExporter extends MetricFormatter implements MetricValuesExportService, IConsumer { private static final Logger logger = LoggerFactory.getLogger(GRPCExporter.class); @@ -57,11 +70,12 @@ public GRPCExporter(GRPCExporterSetting setting) { subscriptionSet = new HashSet<>(); } - @Override public void export(ExportEvent event) { + @Override + public void export(ExportEvent event) { if (ExportEvent.EventType.TOTAL == event.getType()) { Metrics metrics = event.getMetrics(); if (metrics instanceof WithMetadata) { - MetricsMetaInfo meta = ((WithMetadata)metrics).getMeta(); + MetricsMetaInfo meta = ((WithMetadata) metrics).getMeta(); if (subscriptionSet.size() == 0 || subscriptionSet.contains(meta.getMetricsName())) { exportBuffer.produce(new ExportData(meta, metrics)); } @@ -70,55 +84,62 @@ public GRPCExporter(GRPCExporterSetting setting) { } public void initSubscriptionList() { - SubscriptionsResp subscription = blockingStub.withDeadlineAfter(10, TimeUnit.SECONDS).subscription(SubscriptionReq.newBuilder().build()); + SubscriptionsResp subscription = blockingStub.withDeadlineAfter(10, TimeUnit.SECONDS) + .subscription(SubscriptionReq.newBuilder().build()); subscription.getMetricNamesList().forEach(subscriptionSet::add); logger.debug("Get exporter subscription list, {}", subscriptionSet); } - @Override public void init() { + @Override + public void init() { } - @Override public void consume(List data) { + @Override + public void consume(List data) { if (data.size() == 0) { return; } ExportStatus status = new ExportStatus(); - StreamObserver streamObserver = exportServiceFutureStub.withDeadlineAfter(10, TimeUnit.SECONDS).export( - new StreamObserver() { - @Override public void onNext(ExportResponse response) { - - } - - @Override public void onError(Throwable throwable) { - status.done(); - } - - @Override public void onCompleted() { - status.done(); - } - } - ); + StreamObserver streamObserver = exportServiceFutureStub.withDeadlineAfter(10, TimeUnit.SECONDS) + .export(new StreamObserver() { + @Override + public void onNext( + ExportResponse response) { + + } + + @Override + public void onError( + Throwable throwable) { + status.done(); + } + + @Override + public void onCompleted() { + status.done(); + } + }); AtomicInteger exportNum = new AtomicInteger(); data.forEach(row -> { ExportMetricValue.Builder builder = ExportMetricValue.newBuilder(); Metrics metrics = row.getMetrics(); if (metrics instanceof LongValueHolder) { - long value = ((LongValueHolder)metrics).getValue(); + long value = ((LongValueHolder) metrics).getValue(); builder.setLongValue(value); builder.setType(ValueType.LONG); } else if (metrics instanceof IntValueHolder) { - long value = ((IntValueHolder)metrics).getValue(); + long value = ((IntValueHolder) metrics).getValue(); builder.setLongValue(value); builder.setType(ValueType.LONG); } else if (metrics instanceof DoubleValueHolder) { - double value = ((DoubleValueHolder)metrics).getValue(); + double value = ((DoubleValueHolder) metrics).getValue(); builder.setDoubleValue(value); builder.setType(ValueType.DOUBLE); } else if (metrics instanceof MultiIntValuesHolder) { - int[] values = ((MultiIntValuesHolder)metrics).getValues(); + int[] values = ((MultiIntValuesHolder) metrics).getValues(); for (int value : values) { builder.addLongValues(value); } @@ -157,21 +178,23 @@ public void initSubscriptionList() { } if (sleepTime > 2000L) { - logger.warn("Export {} metrics to {}:{}, wait {} milliseconds.", - exportNum.get(), setting.getTargetHost(), setting.getTargetPort(), sleepTime); + logger.warn("Export {} metrics to {}:{}, wait {} milliseconds.", exportNum.get(), setting.getTargetHost(), setting + .getTargetPort(), sleepTime); cycle = 2000L; } } - logger.debug("Exported {} metrics to {}:{} in {} milliseconds.", - exportNum.get(), setting.getTargetHost(), setting.getTargetPort(), sleepTime); + logger.debug("Exported {} metrics to {}:{} in {} milliseconds.", exportNum.get(), setting.getTargetHost(), setting + .getTargetPort(), sleepTime); } - @Override public void onError(List data, Throwable t) { + @Override + public void onError(List data, Throwable t) { logger.error(t.getMessage(), t); } - @Override public void onExit() { + @Override + public void onExit() { } diff --git a/oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporterProvider.java b/oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporterProvider.java index c0fa7a0e8fa6..b7875ee39d14 100644 --- a/oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporterProvider.java +++ b/oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporterProvider.java @@ -19,40 +19,51 @@ package org.apache.skywalking.oap.server.exporter.provider.grpc; import org.apache.skywalking.oap.server.core.CoreModule; -import org.apache.skywalking.oap.server.core.cache.*; -import org.apache.skywalking.oap.server.core.exporter.*; -import org.apache.skywalking.oap.server.library.module.*; +import org.apache.skywalking.oap.server.core.cache.EndpointInventoryCache; +import org.apache.skywalking.oap.server.core.cache.ServiceInstanceInventoryCache; +import org.apache.skywalking.oap.server.core.cache.ServiceInventoryCache; +import org.apache.skywalking.oap.server.core.exporter.ExporterModule; +import org.apache.skywalking.oap.server.core.exporter.MetricValuesExportService; +import org.apache.skywalking.oap.server.library.module.ModuleConfig; +import org.apache.skywalking.oap.server.library.module.ModuleDefine; +import org.apache.skywalking.oap.server.library.module.ModuleProvider; +import org.apache.skywalking.oap.server.library.module.ModuleServiceHolder; +import org.apache.skywalking.oap.server.library.module.ModuleStartException; +import org.apache.skywalking.oap.server.library.module.ServiceNotProvidedException; -/** - * @author wusheng - */ public class GRPCExporterProvider extends ModuleProvider { private GRPCExporterSetting setting; private GRPCExporter exporter; - @Override public String name() { + @Override + public String name() { return "grpc"; } - @Override public Class module() { + @Override + public Class module() { return ExporterModule.class; } - @Override public ModuleConfig createConfigBeanIfAbsent() { + @Override + public ModuleConfig createConfigBeanIfAbsent() { setting = new GRPCExporterSetting(); return setting; } - @Override public void prepare() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void prepare() throws ServiceNotProvidedException, ModuleStartException { exporter = new GRPCExporter(setting); this.registerServiceImplementation(MetricValuesExportService.class, exporter); } - @Override public void start() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void start() throws ServiceNotProvidedException, ModuleStartException { } - @Override public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleStartException { ModuleServiceHolder serviceHolder = getManager().find(CoreModule.NAME).provider(); exporter.setServiceInventoryCache(serviceHolder.getService(ServiceInventoryCache.class)); exporter.setServiceInstanceInventoryCache(serviceHolder.getService(ServiceInstanceInventoryCache.class)); @@ -61,7 +72,8 @@ public class GRPCExporterProvider extends ModuleProvider { exporter.initSubscriptionList(); } - @Override public String[] requiredModules() { + @Override + public String[] requiredModules() { return new String[] {CoreModule.NAME}; } } diff --git a/oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporterSetting.java b/oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporterSetting.java index 41b58464106e..74eaa483a77d 100644 --- a/oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporterSetting.java +++ b/oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporterSetting.java @@ -18,12 +18,10 @@ package org.apache.skywalking.oap.server.exporter.provider.grpc; -import lombok.*; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.oap.server.library.module.ModuleConfig; -/** - * @author wusheng - */ @Setter @Getter public class GRPCExporterSetting extends ModuleConfig { diff --git a/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/ExporterMockReceiver.java b/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/ExporterMockReceiver.java index e0b307cca6b7..06dce2a23487 100644 --- a/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/ExporterMockReceiver.java +++ b/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/ExporterMockReceiver.java @@ -19,7 +19,11 @@ package org.apache.skywalking.oap.server.exporter.provider.grpc; import io.grpc.stub.StreamObserver; -import org.apache.skywalking.oap.server.exporter.grpc.*; +import org.apache.skywalking.oap.server.exporter.grpc.ExportMetricValue; +import org.apache.skywalking.oap.server.exporter.grpc.ExportResponse; +import org.apache.skywalking.oap.server.exporter.grpc.MetricExportServiceGrpc; +import org.apache.skywalking.oap.server.exporter.grpc.SubscriptionReq; +import org.apache.skywalking.oap.server.exporter.grpc.SubscriptionsResp; import org.apache.skywalking.oap.server.library.server.ServerException; import org.apache.skywalking.oap.server.library.server.grpc.GRPCHandler; import org.apache.skywalking.oap.server.library.server.grpc.GRPCServer; @@ -59,7 +63,10 @@ public void onCompleted() { @Override public void subscription(SubscriptionReq request, StreamObserver responseObserver) { responseObserver.onNext(SubscriptionsResp.newBuilder() - .addMetricNames("all_p99").addMetricNames("service_cpm").addMetricNames("endpoint_sla").build()); + .addMetricNames("all_p99") + .addMetricNames("service_cpm") + .addMetricNames("endpoint_sla") + .build()); responseObserver.onCompleted(); } } diff --git a/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporterProviderTest.java b/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporterProviderTest.java index 97f0741ea581..6590728e94f0 100644 --- a/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporterProviderTest.java +++ b/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporterProviderTest.java @@ -18,26 +18,32 @@ package org.apache.skywalking.oap.server.exporter.provider.grpc; +import java.util.Iterator; +import java.util.ServiceLoader; import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.cache.EndpointInventoryCache; import org.apache.skywalking.oap.server.core.cache.ServiceInstanceInventoryCache; import org.apache.skywalking.oap.server.core.cache.ServiceInventoryCache; import org.apache.skywalking.oap.server.core.exporter.ExporterModule; -import org.apache.skywalking.oap.server.library.module.*; +import org.apache.skywalking.oap.server.library.module.ModuleManager; +import org.apache.skywalking.oap.server.library.module.ModuleProvider; +import org.apache.skywalking.oap.server.library.module.ModuleProviderHolder; +import org.apache.skywalking.oap.server.library.module.ModuleServiceHolder; +import org.apache.skywalking.oap.server.library.module.ModuleStartException; +import org.apache.skywalking.oap.server.library.module.ServiceNotProvidedException; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; import org.powermock.reflect.Whitebox; -import java.util.Iterator; -import java.util.ServiceLoader; - -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; -/** - * Created by dengming, 2019.04.20 - */ @Ignore public class GRPCExporterProviderTest { @@ -77,7 +83,6 @@ public void module() { assertEquals(ExporterModule.class, grpcExporterProvider.module()); } - @Test public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleStartException { GRPCExporter exporter = mock(GRPCExporter.class); @@ -85,7 +90,6 @@ public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleSta ModuleManager manager = mock(ModuleManager.class); ModuleProviderHolder providerHolder = mock(ModuleProviderHolder.class); - ModuleServiceHolder serviceHolder = mock(ModuleServiceHolder.class); when(manager.find(CoreModule.NAME)).thenReturn(providerHolder); diff --git a/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporterTest.java b/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporterTest.java index 5c0d50dea920..f3241208ae8f 100644 --- a/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporterTest.java +++ b/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporterTest.java @@ -19,7 +19,11 @@ package org.apache.skywalking.oap.server.exporter.provider.grpc; import io.grpc.testing.GrpcServerRule; -import org.apache.skywalking.oap.server.core.analysis.metrics.*; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import org.apache.skywalking.oap.server.core.analysis.metrics.MetricsMetaInfo; +import org.apache.skywalking.oap.server.core.analysis.metrics.WithMetadata; import org.apache.skywalking.oap.server.core.exporter.ExportEvent; import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine; import org.apache.skywalking.oap.server.exporter.grpc.MetricExportServiceGrpc; @@ -28,13 +32,6 @@ import org.junit.Test; import org.powermock.reflect.Whitebox; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; - -/** - * Created by dengming, 2019.04.20 - */ public class GRPCExporterTest { private GRPCExporter exporter; @@ -64,7 +61,8 @@ public void export() { } public static class MockExporterMetrics extends MockMetrics implements WithMetadata { - @Override public MetricsMetaInfo getMeta() { + @Override + public MetricsMetaInfo getMeta() { return new MetricsMetaInfo("mock-metrics", DefaultScopeDefine.ALL); } } @@ -87,7 +85,6 @@ public void consume() { exporter.consume(Collections.emptyList()); } - @Test public void onError() { Exception e = new IllegalArgumentException("some something wrong"); diff --git a/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockDoubleValueMetrics.java b/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockDoubleValueMetrics.java index 0bb524635d0a..f41741646563 100644 --- a/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockDoubleValueMetrics.java +++ b/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockDoubleValueMetrics.java @@ -20,9 +20,6 @@ import org.apache.skywalking.oap.server.core.analysis.metrics.DoubleValueHolder; -/** - * Created by dengming, 2019.04.20 - */ public class MockDoubleValueMetrics extends MockMetrics implements DoubleValueHolder { @Override public double getValue() { diff --git a/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockIntValueMetrics.java b/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockIntValueMetrics.java index 919aed46696b..c9dd65e0f325 100644 --- a/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockIntValueMetrics.java +++ b/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockIntValueMetrics.java @@ -20,9 +20,6 @@ import org.apache.skywalking.oap.server.core.analysis.metrics.IntValueHolder; -/** - * Created by dengming, 2019.04.20 - */ public class MockIntValueMetrics extends MockMetrics implements IntValueHolder { @Override public int getValue() { diff --git a/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockLongValueMetrics.java b/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockLongValueMetrics.java index e6abd78ab534..2902c76e08c5 100644 --- a/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockLongValueMetrics.java +++ b/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockLongValueMetrics.java @@ -20,9 +20,6 @@ import org.apache.skywalking.oap.server.core.analysis.metrics.LongValueHolder; -/** - * Created by dengming, 2019.04.20 - */ public class MockLongValueMetrics extends MockMetrics implements LongValueHolder { @Override public long getValue() { diff --git a/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockMetricExportServiceImpl.java b/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockMetricExportServiceImpl.java index b4d64c81f2db..6cad2cf88a55 100644 --- a/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockMetricExportServiceImpl.java +++ b/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockMetricExportServiceImpl.java @@ -23,16 +23,13 @@ import org.apache.skywalking.oap.server.exporter.grpc.SubscriptionReq; import org.apache.skywalking.oap.server.exporter.grpc.SubscriptionsResp; -/** - * Created by dengming, 2019.04.20 - */ public class MockMetricExportServiceImpl extends MetricExportServiceGrpc.MetricExportServiceImplBase { @Override public void subscription(SubscriptionReq request, StreamObserver responseObserver) { SubscriptionsResp resp = SubscriptionsResp.newBuilder() - .addMetricNames("first") - .addMetricNames("second") - .build(); + .addMetricNames("first") + .addMetricNames("second") + .build(); responseObserver.onNext(resp); responseObserver.onCompleted(); } diff --git a/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockMetrics.java b/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockMetrics.java index b56c9f3a4ca2..2ad80c6b2126 100644 --- a/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockMetrics.java +++ b/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/MockMetrics.java @@ -21,9 +21,6 @@ import org.apache.skywalking.oap.server.core.analysis.metrics.Metrics; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -/** - * Created by dengming, 2019.04.20 - */ public class MockMetrics extends Metrics { @Override diff --git a/oap-server/oal-grammar/pom.xml b/oap-server/oal-grammar/pom.xml index 14f51cd0394d..a0afc4ce740d 100755 --- a/oap-server/oal-grammar/pom.xml +++ b/oap-server/oal-grammar/pom.xml @@ -17,7 +17,8 @@ ~ --> - + oap-server org.apache.skywalking diff --git a/oap-server/oal-rt/pom.xml b/oap-server/oal-rt/pom.xml index 163c9e42531d..6937cef3a5ae 100755 --- a/oap-server/oal-rt/pom.xml +++ b/oap-server/oal-rt/pom.xml @@ -17,7 +17,8 @@ ~ --> - + oap-server org.apache.skywalking diff --git a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/OALRuntime.java b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/OALRuntime.java index 0562d38ffe73..33d6fa32c231 100644 --- a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/OALRuntime.java +++ b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/OALRuntime.java @@ -74,8 +74,6 @@ /** * OAL Runtime is the class generation engine, which load the generated classes from OAL scrip definitions. This runtime * is loaded dynamically. - * - * @author wusheng */ public class OALRuntime implements OALEngine { private static final Logger logger = LoggerFactory.getLogger(OALRuntime.class); @@ -90,10 +88,22 @@ public class OALRuntime implements OALEngine { private static final String DISPATCHER_INTERFACE = "org.apache.skywalking.oap.server.core.analysis.SourceDispatcher"; private static final String SOURCE_PACKAGE = "org.apache.skywalking.oap.server.core.source."; private static final String METRICS_STREAM_PROCESSOR = "org.apache.skywalking.oap.server.core.analysis.worker.MetricsStreamProcessor"; - private static final String[] METRICS_CLASS_METHODS = - {"id", "hashCode", "remoteHashCode", "equals", "serialize", "deserialize", "getMeta", "toHour", "toDay", "toMonth"}; - private static final String[] METRICS_BUILDER_CLASS_METHODS = - {"data2Map", "map2Data"}; + private static final String[] METRICS_CLASS_METHODS = { + "id", + "hashCode", + "remoteHashCode", + "equals", + "serialize", + "deserialize", + "getMeta", + "toHour", + "toDay", + "toMonth" + }; + private static final String[] METRICS_BUILDER_CLASS_METHODS = { + "data2Map", + "map2Data" + }; private final ClassPool classPool; private ClassLoader currentClassLoader; private Configuration configuration; @@ -115,15 +125,18 @@ public OALRuntime() { openEngineDebug = !StringUtil.isEmpty(System.getenv("SW_OAL_ENGINE_DEBUG")); } - @Override public void setStreamListener(StreamAnnotationListener listener) throws ModuleStartException { + @Override + public void setStreamListener(StreamAnnotationListener listener) throws ModuleStartException { this.streamAnnotationListener = listener; } - @Override public void setDispatcherListener(DispatcherDetectorListener listener) throws ModuleStartException { + @Override + public void setDispatcherListener(DispatcherDetectorListener listener) throws ModuleStartException { dispatcherDetectorListener = listener; } - @Override public void start(ClassLoader currentClassLoader) throws ModuleStartException, OALCompileException { + @Override + public void start(ClassLoader currentClassLoader) throws ModuleStartException, OALCompileException { prepareRTTempFolder(); this.currentClassLoader = currentClassLoader; @@ -152,7 +165,8 @@ public OALRuntime() { this.generateClassAtRuntime(oalScripts); } - @Override public void notifyAllListeners() throws ModuleStartException { + @Override + public void notifyAllListeners() throws ModuleStartException { metricsClasses.forEach(streamAnnotationListener::notify); for (Class dispatcherClass : dispatcherClasses) { try { @@ -183,10 +197,6 @@ private void generateClassAtRuntime(OALScripts oalScripts) throws OALCompileExce /** * Generate metrics class, and inject it to classloader - * - * @param metricsStmt - * @return - * @throws OALCompileException */ private Class generateMetricsClass(AnalysisResult metricsStmt) throws OALCompileException { String className = metricsClassName(metricsStmt, false); @@ -226,7 +236,8 @@ private Class generateMetricsClass(AnalysisResult metricsStmt) throws OALCompile */ for (SourceColumn field : metricsStmt.getFieldsFromSource()) { try { - CtField newField = CtField.make("private " + field.getType().getName() + " " + field.getFieldName() + ";", metricsClass); + CtField newField = CtField.make("private " + field.getType() + .getName() + " " + field.getFieldName() + ";", metricsClass); metricsClass.addField(newField); @@ -302,9 +313,6 @@ private Class generateMetricsClass(AnalysisResult metricsStmt) throws OALCompile /** * Generate metrics class builder and inject it to classloader - * - * @param metricsStmt - * @throws OALCompileException */ private void generateMetricsBuilderClass(AnalysisResult metricsStmt) throws OALCompileException { String className = metricsBuilderClassName(metricsStmt, false); @@ -353,8 +361,6 @@ private void generateMetricsBuilderClass(AnalysisResult metricsStmt) throws OALC /** * Generate SourceDispatcher class and inject it to classloader - * - * @throws OALCompileException */ private Class generateDispatcherClass(String scopeName, DispatcherContext dispatcherContext) throws OALCompileException { @@ -373,9 +379,8 @@ private Class generateDispatcherClass(String scopeName, SignatureAttribute.ClassSignature dispatcherSignature = new SignatureAttribute.ClassSignature(null, null, // Set interface and its generic params new SignatureAttribute.ClassType[] { - new SignatureAttribute.ClassType(SourceDispatcher.class.getCanonicalName(), - new SignatureAttribute.TypeArgument[] {new SignatureAttribute.TypeArgument(new SignatureAttribute.ClassType(sourceClassName))} - )}); + new SignatureAttribute.ClassType(SourceDispatcher.class.getCanonicalName(), new SignatureAttribute.TypeArgument[] {new SignatureAttribute.TypeArgument(new SignatureAttribute.ClassType(sourceClassName))}) + }); dispatcherClass.setGenericSignature(dispatcherSignature.encode()); } catch (NotFoundException e) { diff --git a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/output/AllDispatcherContext.java b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/output/AllDispatcherContext.java index 1a406ad867b0..15f04d3ec3a3 100644 --- a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/output/AllDispatcherContext.java +++ b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/output/AllDispatcherContext.java @@ -18,8 +18,10 @@ package org.apache.skywalking.oal.rt.output; -import java.util.*; -import lombok.*; +import java.util.HashMap; +import java.util.Map; +import lombok.Getter; +import lombok.Setter; @Getter @Setter diff --git a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/output/DispatcherContext.java b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/output/DispatcherContext.java index be54da60f546..f5c046bd23b2 100644 --- a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/output/DispatcherContext.java +++ b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/output/DispatcherContext.java @@ -18,8 +18,10 @@ package org.apache.skywalking.oal.rt.output; -import java.util.*; -import lombok.*; +import java.util.ArrayList; +import java.util.List; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.oal.rt.parser.AnalysisResult; @Getter diff --git a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/AnalysisResult.java b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/AnalysisResult.java index 89f468803ff9..b55796fa5c51 100644 --- a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/AnalysisResult.java +++ b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/AnalysisResult.java @@ -18,8 +18,11 @@ package org.apache.skywalking.oal.rt.parser; -import java.util.*; -import lombok.*; +import java.util.LinkedList; +import java.util.List; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.Setter; @Getter(AccessLevel.PUBLIC) @Setter(AccessLevel.PUBLIC) @@ -117,7 +120,8 @@ public void generateSerializeFields() { serializeFields.addLongField(sourceColumn.getFieldName()); break; default: - throw new IllegalStateException("Unexpected field type [" + type + "] of source sourceColumn [" + sourceColumn.getFieldName() + "]"); + throw new IllegalStateException("Unexpected field type [" + type + "] of source sourceColumn [" + sourceColumn + .getFieldName() + "]"); } } @@ -140,7 +144,8 @@ public void generateSerializeFields() { serializeFields.addIntKeyLongValueHashMapField(column.getFieldName()); break; default: - throw new IllegalStateException("Unexpected field type [" + type + "] of persistence column [" + column.getFieldName() + "]"); + throw new IllegalStateException("Unexpected field type [" + type + "] of persistence column [" + column + .getFieldName() + "]"); } } } diff --git a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/Argument.java b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/Argument.java index 2c62829ac931..7519706e78ee 100644 --- a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/Argument.java +++ b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/Argument.java @@ -23,8 +23,6 @@ /** * Function argument. - * - * @author hongtaogao */ @Getter @RequiredArgsConstructor diff --git a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/ConditionExpression.java b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/ConditionExpression.java index e5385672eee1..cdcfe8a2f166 100644 --- a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/ConditionExpression.java +++ b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/ConditionExpression.java @@ -18,7 +18,9 @@ package org.apache.skywalking.oal.rt.parser; -import lombok.*; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.Setter; @Getter(AccessLevel.PUBLIC) @Setter(AccessLevel.PUBLIC) diff --git a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/DataColumn.java b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/DataColumn.java index 0a2c0b898476..02e71cb64ef5 100644 --- a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/DataColumn.java +++ b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/DataColumn.java @@ -18,7 +18,9 @@ package org.apache.skywalking.oal.rt.parser; -import lombok.*; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.oal.rt.util.ClassMethodUtil; @Getter(AccessLevel.PUBLIC) diff --git a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/DeepAnalysis.java b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/DeepAnalysis.java index 99622fab0272..344b7aacd41b 100644 --- a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/DeepAnalysis.java +++ b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/DeepAnalysis.java @@ -19,10 +19,15 @@ package org.apache.skywalking.oal.rt.parser; import java.lang.annotation.Annotation; -import java.lang.reflect.*; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Parameter; import java.util.List; import org.apache.skywalking.oal.rt.util.ClassMethodUtil; -import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.*; +import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.Arg; +import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.ConstOne; +import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.Entrance; +import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.SourceFrom; import org.apache.skywalking.oap.server.core.storage.annotation.Column; public class DeepAnalysis { @@ -30,7 +35,8 @@ public AnalysisResult analysis(AnalysisResult result) { // 1. Set sub package name by source.metrics result.setPackageName(result.getSourceName().toLowerCase()); - Class metricsClass = MetricsHolder.find(result.getAggregationFunctionName()); + Class metricsClass = MetricsHolder.find(result + .getAggregationFunctionName()); String metricsClassSimpleName = metricsClass.getSimpleName(); result.setMetricsClassName(metricsClassSimpleName); diff --git a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/DisableCollection.java b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/DisableCollection.java index 17539ccf0f03..517ec1fcbc63 100644 --- a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/DisableCollection.java +++ b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/DisableCollection.java @@ -18,12 +18,10 @@ package org.apache.skywalking.oal.rt.parser; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import lombok.Getter; -/** - * @author wusheng - */ @Getter public class DisableCollection { private List allDisableSources = new ArrayList<>(); diff --git a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/EntryMethod.java b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/EntryMethod.java index 7660ad943787..f716a442ac97 100644 --- a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/EntryMethod.java +++ b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/EntryMethod.java @@ -18,8 +18,11 @@ package org.apache.skywalking.oal.rt.parser; -import java.util.*; -import lombok.*; +import java.util.ArrayList; +import java.util.List; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.oal.rt.util.ClassMethodUtil; @Getter(AccessLevel.PUBLIC) @@ -38,9 +41,8 @@ void addArg(Class parameterType, Argument arg) { addArg(parameterType, arg.getType(), arg.getText()); return; } - addArg(parameterType, arg.getType(), parameterType.equals(boolean.class) - ? "source." + ClassMethodUtil.toIsMethod(arg.getText()) + "()" - : "source." + ClassMethodUtil.toGetMethod(arg.getText()) + "()"); + addArg(parameterType, arg.getType(), parameterType.equals(boolean.class) ? "source." + ClassMethodUtil.toIsMethod(arg + .getText()) + "()" : "source." + ClassMethodUtil.toGetMethod(arg.getText()) + "()"); } void addArg(Class parameterType, String expression) { diff --git a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/MetricsHolder.java b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/MetricsHolder.java index af32d0efbc1b..e0836479aee2 100644 --- a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/MetricsHolder.java +++ b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/MetricsHolder.java @@ -21,7 +21,8 @@ import com.google.common.collect.ImmutableSet; import com.google.common.reflect.ClassPath; import java.io.IOException; -import java.util.*; +import java.util.HashMap; +import java.util.Map; import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.MetricsFunction; public class MetricsHolder { @@ -35,12 +36,13 @@ public static void init() throws IOException { if (aClass.isAnnotationPresent(MetricsFunction.class)) { MetricsFunction metricsFunction = aClass.getAnnotation(MetricsFunction.class); - REGISTER.put(metricsFunction.functionName(), (Class)aClass); + REGISTER.put(metricsFunction.functionName(), (Class) aClass); } } } - public static Class find(String functionName) { + public static Class find( + String functionName) { String func = functionName; Class metricsClass = REGISTER.get(func); if (metricsClass == null) { diff --git a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/OALListener.java b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/OALListener.java index 06112e56877d..2b3ca0b82294 100644 --- a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/OALListener.java +++ b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/OALListener.java @@ -48,7 +48,8 @@ public void exitAggregationStatement(@NotNull OALParser.AggregationStatementCont current = null; } - @Override public void enterSource(OALParser.SourceContext ctx) { + @Override + public void enterSource(OALParser.SourceContext ctx) { current.setSourceName(ctx.getText()); current.setSourceScopeId(DefaultScopeDefine.valueOf(metricsNameFormat(ctx.getText()))); } @@ -58,33 +59,40 @@ public void enterSourceAttribute(OALParser.SourceAttributeContext ctx) { current.setSourceAttribute(ctx.getText()); } - @Override public void enterVariable(OALParser.VariableContext ctx) { + @Override + public void enterVariable(OALParser.VariableContext ctx) { } - @Override public void exitVariable(OALParser.VariableContext ctx) { + @Override + public void exitVariable(OALParser.VariableContext ctx) { current.setVarName(ctx.getText()); current.setMetricsName(metricsNameFormat(ctx.getText())); current.setTableName(ctx.getText().toLowerCase()); } - @Override public void enterFunctionName(OALParser.FunctionNameContext ctx) { + @Override + public void enterFunctionName(OALParser.FunctionNameContext ctx) { current.setAggregationFunctionName(ctx.getText()); } - @Override public void enterFilterStatement(OALParser.FilterStatementContext ctx) { + @Override + public void enterFilterStatement(OALParser.FilterStatementContext ctx) { conditionExpression = new ConditionExpression(); } - @Override public void exitFilterStatement(OALParser.FilterStatementContext ctx) { + @Override + public void exitFilterStatement(OALParser.FilterStatementContext ctx) { current.addFilterExpressionsParserResult(conditionExpression); conditionExpression = null; } - @Override public void enterFuncParamExpression(OALParser.FuncParamExpressionContext ctx) { + @Override + public void enterFuncParamExpression(OALParser.FuncParamExpressionContext ctx) { conditionExpression = new ConditionExpression(); } - @Override public void exitFuncParamExpression(OALParser.FuncParamExpressionContext ctx) { + @Override + public void exitFuncParamExpression(OALParser.FuncParamExpressionContext ctx) { current.addFuncConditionExpression(conditionExpression); conditionExpression = null; } @@ -92,47 +100,58 @@ public void enterSourceAttribute(OALParser.SourceAttributeContext ctx) { ///////////// // Expression //////////// - @Override public void enterConditionAttribute(OALParser.ConditionAttributeContext ctx) { + @Override + public void enterConditionAttribute(OALParser.ConditionAttributeContext ctx) { conditionExpression.setAttribute(ctx.getText()); } - @Override public void enterBooleanMatch(OALParser.BooleanMatchContext ctx) { + @Override + public void enterBooleanMatch(OALParser.BooleanMatchContext ctx) { conditionExpression.setExpressionType("booleanMatch"); } - @Override public void enterStringMatch(OALParser.StringMatchContext ctx) { + @Override + public void enterStringMatch(OALParser.StringMatchContext ctx) { conditionExpression.setExpressionType("stringMatch"); } - @Override public void enterGreaterMatch(OALParser.GreaterMatchContext ctx) { + @Override + public void enterGreaterMatch(OALParser.GreaterMatchContext ctx) { conditionExpression.setExpressionType("greaterMatch"); } - @Override public void enterGreaterEqualMatch(OALParser.GreaterEqualMatchContext ctx) { + @Override + public void enterGreaterEqualMatch(OALParser.GreaterEqualMatchContext ctx) { conditionExpression.setExpressionType("greaterEqualMatch"); } - @Override public void enterLessMatch(OALParser.LessMatchContext ctx) { + @Override + public void enterLessMatch(OALParser.LessMatchContext ctx) { conditionExpression.setExpressionType("lessMatch"); } - @Override public void enterLessEqualMatch(OALParser.LessEqualMatchContext ctx) { + @Override + public void enterLessEqualMatch(OALParser.LessEqualMatchContext ctx) { conditionExpression.setExpressionType("lessEqualMatch"); } - @Override public void enterBooleanConditionValue(OALParser.BooleanConditionValueContext ctx) { + @Override + public void enterBooleanConditionValue(OALParser.BooleanConditionValueContext ctx) { enterConditionValue(ctx.getText()); } - @Override public void enterStringConditionValue(OALParser.StringConditionValueContext ctx) { + @Override + public void enterStringConditionValue(OALParser.StringConditionValueContext ctx) { enterConditionValue(ctx.getText()); } - @Override public void enterEnumConditionValue(OALParser.EnumConditionValueContext ctx) { + @Override + public void enterEnumConditionValue(OALParser.EnumConditionValueContext ctx) { enterConditionValue(ctx.getText()); } - @Override public void enterNumberConditionValue(OALParser.NumberConditionValueContext ctx) { + @Override + public void enterNumberConditionValue(OALParser.NumberConditionValueContext ctx) { enterConditionValue(ctx.getText()); } @@ -148,7 +167,8 @@ private void enterConditionValue(String value) { // Expression end. //////////// - @Override public void enterLiteralExpression(OALParser.LiteralExpressionContext ctx) { + @Override + public void enterLiteralExpression(OALParser.LiteralExpressionContext ctx) { if (ctx.IDENTIFIER() == null) { current.addFuncArg(new Argument(EntryMethod.LITERAL_TYPE, ctx.getText())); return; @@ -167,10 +187,9 @@ private String metricsNameFormat(String source) { /** * Disable source - * - * @param ctx */ - @Override public void enterDisableSource(OALParser.DisableSourceContext ctx) { + @Override + public void enterDisableSource(OALParser.DisableSourceContext ctx) { collection.add(ctx.getText()); } diff --git a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/OALScripts.java b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/OALScripts.java index 8af71be04686..08deadd94313 100644 --- a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/OALScripts.java +++ b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/OALScripts.java @@ -18,8 +18,9 @@ package org.apache.skywalking.oal.rt.parser; -import java.util.*; -import lombok.*; +import java.util.LinkedList; +import java.util.List; +import lombok.Getter; @Getter public class OALScripts { diff --git a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/PersistenceColumns.java b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/PersistenceColumns.java index 52bb5888d8ee..d47b7e0c4bdd 100644 --- a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/PersistenceColumns.java +++ b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/PersistenceColumns.java @@ -18,7 +18,8 @@ package org.apache.skywalking.oal.rt.parser; -import java.util.*; +import java.util.LinkedList; +import java.util.List; public class PersistenceColumns { private List stringFields = new LinkedList<>(); diff --git a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/PersistenceField.java b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/PersistenceField.java index c126ef0e2ad5..015cebb3ac4f 100644 --- a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/PersistenceField.java +++ b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/PersistenceField.java @@ -18,7 +18,9 @@ package org.apache.skywalking.oal.rt.parser; -import lombok.*; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.oal.rt.util.ClassMethodUtil; @Getter(AccessLevel.PUBLIC) diff --git a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/ScriptParser.java b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/ScriptParser.java index 70ff752b1516..82c09d4deb95 100644 --- a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/ScriptParser.java +++ b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/ScriptParser.java @@ -20,14 +20,15 @@ import java.io.IOException; import java.io.Reader; -import org.antlr.v4.runtime.*; -import org.antlr.v4.runtime.tree.*; -import org.apache.skywalking.oal.rt.grammar.*; +import org.antlr.v4.runtime.CharStreams; +import org.antlr.v4.runtime.CommonTokenStream; +import org.antlr.v4.runtime.tree.ParseTree; +import org.antlr.v4.runtime.tree.ParseTreeWalker; +import org.apache.skywalking.oal.rt.grammar.OALLexer; +import org.apache.skywalking.oal.rt.grammar.OALParser; /** * Script reader and parser. - * - * @author wusheng */ public class ScriptParser { private OALLexer lexer; diff --git a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/SourceColumn.java b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/SourceColumn.java index bb8b07d2ca8d..59d442abda50 100644 --- a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/SourceColumn.java +++ b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/SourceColumn.java @@ -19,7 +19,9 @@ package org.apache.skywalking.oal.rt.parser; import java.util.Objects; -import lombok.*; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.oal.rt.util.ClassMethodUtil; @Getter(AccessLevel.PUBLIC) @@ -74,31 +76,25 @@ public void setTypeName(String typeName) { this.typeName = typeName; } - @Override public String toString() { - return "SourceColumn{" + - "fieldName='" + fieldName + '\'' + - ", columnName='" + columnName + '\'' + - ", type=" + type + - ", isID=" + isID + - '}'; + @Override + public String toString() { + return "SourceColumn{" + "fieldName='" + fieldName + '\'' + ", columnName='" + columnName + '\'' + ", type=" + type + ", isID=" + isID + '}'; } - @Override public boolean equals(Object o) { + @Override + public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - SourceColumn column = (SourceColumn)o; - return isID == column.isID && - Objects.equals(fieldName, column.fieldName) && - Objects.equals(columnName, column.columnName) && - Objects.equals(type, column.type) && - Objects.equals(typeName, column.typeName) && - Objects.equals(fieldSetter, column.fieldSetter) && - Objects.equals(fieldGetter, column.fieldGetter); + SourceColumn column = (SourceColumn) o; + return isID == column.isID && Objects.equals(fieldName, column.fieldName) && Objects.equals(columnName, column.columnName) && Objects + .equals(type, column.type) && Objects.equals(typeName, column.typeName) && Objects.equals(fieldSetter, column.fieldSetter) && Objects + .equals(fieldGetter, column.fieldGetter); } - @Override public int hashCode() { + @Override + public int hashCode() { return Objects.hash(fieldName, columnName, type, typeName, isID, fieldSetter, fieldGetter); } } diff --git a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/SourceColumnsFactory.java b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/SourceColumnsFactory.java index 0830a1a17280..12f1cac706ae 100644 --- a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/SourceColumnsFactory.java +++ b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/SourceColumnsFactory.java @@ -23,16 +23,14 @@ import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine; import org.apache.skywalking.oap.server.core.source.ScopeDefaultColumn; -/** - * @author wusheng - */ public class SourceColumnsFactory { public static List getColumns(String source) { List sourceColumns = new ArrayList<>(); List columns = DefaultScopeDefine.getDefaultColumns(source); for (ScopeDefaultColumn defaultColumn : columns) { - sourceColumns.add(new SourceColumn(defaultColumn.getFieldName(), defaultColumn.getColumnName(), defaultColumn.getType(), defaultColumn.isID())); + sourceColumns.add(new SourceColumn(defaultColumn.getFieldName(), defaultColumn.getColumnName(), defaultColumn + .getType(), defaultColumn.isID())); } return sourceColumns; } diff --git a/oap-server/oal-rt/src/main/resources/code-templates/dispatcher/dispatch.ftl b/oap-server/oal-rt/src/main/resources/code-templates/dispatcher/dispatch.ftl index 89a365028fd0..39ad6f485fde 100644 --- a/oap-server/oal-rt/src/main/resources/code-templates/dispatcher/dispatch.ftl +++ b/oap-server/oal-rt/src/main/resources/code-templates/dispatcher/dispatch.ftl @@ -1,6 +1,6 @@ public void dispatch(org.apache.skywalking.oap.server.core.source.Source source) { - org.apache.skywalking.oap.server.core.source.${source} _source = (org.apache.skywalking.oap.server.core.source.${source})source; - <#list metrics as metrics> - do${metrics.metricsName}(_source); - +org.apache.skywalking.oap.server.core.source.${source} _source = (org.apache.skywalking.oap.server.core.source.${source})source; +<#list metrics as metrics> + do${metrics.metricsName}(_source); + } \ No newline at end of file diff --git a/oap-server/oal-rt/src/main/resources/code-templates/dispatcher/doMetrics.ftl b/oap-server/oal-rt/src/main/resources/code-templates/dispatcher/doMetrics.ftl index 5f7091157e98..3b9f470a631f 100644 --- a/oap-server/oal-rt/src/main/resources/code-templates/dispatcher/doMetrics.ftl +++ b/oap-server/oal-rt/src/main/resources/code-templates/dispatcher/doMetrics.ftl @@ -1,26 +1,26 @@ private void do${metricsName}(org.apache.skywalking.oap.server.core.source.${sourceName} source) { - org.apache.skywalking.oal.rt.metrics.${metricsName}Metrics metrics = new org.apache.skywalking.oal.rt.metrics.${metricsName}Metrics(); +org.apache.skywalking.oal.rt.metrics.${metricsName}Metrics metrics = new org.apache.skywalking.oal.rt.metrics.${metricsName}Metrics(); - <#if filterExpressions??> - <#list filterExpressions as filterExpression> - if (!new org.apache.skywalking.oap.server.core.analysis.metrics.expression.${filterExpression.expressionObject}().match(${filterExpression.left}, ${filterExpression.right})) { - return; - } - - - - metrics.setTimeBucket(source.getTimeBucket()); - <#list fieldsFromSource as field> - metrics.${field.fieldSetter}(source.${field.fieldGetter}()); +<#if filterExpressions??> + <#list filterExpressions as filterExpression> + if (!new org.apache.skywalking.oap.server.core.analysis.metrics.expression.${filterExpression.expressionObject}().match(${filterExpression.left}, ${filterExpression.right})) { + return; + } - metrics.${entryMethod.methodName}( - <#list entryMethod.argsExpressions as arg> - <#if entryMethod.argTypes[arg_index] < 3> - ${arg} - <#else> - new org.apache.skywalking.oap.server.core.analysis.metrics.expression.${arg.expressionObject}().match(${arg.left}, ${arg.right}) - <#if arg_has_next>, - ); + + +metrics.setTimeBucket(source.getTimeBucket()); +<#list fieldsFromSource as field> + metrics.${field.fieldSetter}(source.${field.fieldGetter}()); + +metrics.${entryMethod.methodName}( +<#list entryMethod.argsExpressions as arg> + <#if entryMethod.argTypes[arg_index] < 3> + ${arg} + <#else> + new org.apache.skywalking.oap.server.core.analysis.metrics.expression.${arg.expressionObject}().match(${arg.left}, ${arg.right}) + <#if arg_has_next>, +); - org.apache.skywalking.oap.server.core.analysis.worker.MetricsStreamProcessor.getInstance().in(metrics); +org.apache.skywalking.oap.server.core.analysis.worker.MetricsStreamProcessor.getInstance().in(metrics); } diff --git a/oap-server/oal-rt/src/main/resources/code-templates/metrics-builder/data2Map.ftl b/oap-server/oal-rt/src/main/resources/code-templates/metrics-builder/data2Map.ftl index 8dc79ade72c1..b4032c7779ce 100644 --- a/oap-server/oal-rt/src/main/resources/code-templates/metrics-builder/data2Map.ftl +++ b/oap-server/oal-rt/src/main/resources/code-templates/metrics-builder/data2Map.ftl @@ -1,31 +1,31 @@ public java.util.Map data2Map(org.apache.skywalking.oap.server.core.storage.StorageData input) { - org.apache.skywalking.oal.rt.metrics.${metricsName}Metrics storageData = (org.apache.skywalking.oal.rt.metrics.${metricsName}Metrics)input; - java.util.Map map = new java.util.HashMap(); - <#list fieldsFromSource as field> - <#if field.typeName == "long"> - map.put((Object)"${field.columnName}", new Long(storageData.${field.fieldGetter}())); - <#elseif field.typeName == "int"> - map.put((Object)"${field.columnName}", new Integer(storageData.${field.fieldGetter}())); - <#elseif field.typeName == "double"> - map.put((Object)"${field.columnName}", new Double(storageData.${field.fieldGetter}())); - <#elseif field.typeName == "float"> - map.put((Object)"${field.columnName}", new Float(storageData.${field.fieldGetter}())); - <#else> - map.put((Object)"${field.columnName}", storageData.${field.fieldGetter}()); - - - <#list persistentFields as field> - <#if field.typeName == "long"> - map.put((Object)"${field.columnName}", new Long(storageData.${field.fieldGetter}())); - <#elseif field.typeName == "int"> - map.put((Object)"${field.columnName}", new Integer(storageData.${field.fieldGetter}())); - <#elseif field.typeName == "double"> - map.put((Object)"${field.columnName}", new Double(storageData.${field.fieldGetter}())); - <#elseif field.typeName == "float"> - map.put((Object)"${field.columnName}", new Float(storageData.${field.fieldGetter}())); - <#else> - map.put((Object)"${field.columnName}", storageData.${field.fieldGetter}()); - - - return map; +org.apache.skywalking.oal.rt.metrics.${metricsName}Metrics storageData = (org.apache.skywalking.oal.rt.metrics.${metricsName}Metrics)input; +java.util.Map map = new java.util.HashMap(); +<#list fieldsFromSource as field> + <#if field.typeName == "long"> + map.put((Object)"${field.columnName}", new Long(storageData.${field.fieldGetter}())); + <#elseif field.typeName == "int"> + map.put((Object)"${field.columnName}", new Integer(storageData.${field.fieldGetter}())); + <#elseif field.typeName == "double"> + map.put((Object)"${field.columnName}", new Double(storageData.${field.fieldGetter}())); + <#elseif field.typeName == "float"> + map.put((Object)"${field.columnName}", new Float(storageData.${field.fieldGetter}())); + <#else> + map.put((Object)"${field.columnName}", storageData.${field.fieldGetter}()); + + +<#list persistentFields as field> + <#if field.typeName == "long"> + map.put((Object)"${field.columnName}", new Long(storageData.${field.fieldGetter}())); + <#elseif field.typeName == "int"> + map.put((Object)"${field.columnName}", new Integer(storageData.${field.fieldGetter}())); + <#elseif field.typeName == "double"> + map.put((Object)"${field.columnName}", new Double(storageData.${field.fieldGetter}())); + <#elseif field.typeName == "float"> + map.put((Object)"${field.columnName}", new Float(storageData.${field.fieldGetter}())); + <#else> + map.put((Object)"${field.columnName}", storageData.${field.fieldGetter}()); + + +return map; } \ No newline at end of file diff --git a/oap-server/oal-rt/src/main/resources/code-templates/metrics-builder/map2Data.ftl b/oap-server/oal-rt/src/main/resources/code-templates/metrics-builder/map2Data.ftl index 1dfbf45ac811..68f48e07f025 100644 --- a/oap-server/oal-rt/src/main/resources/code-templates/metrics-builder/map2Data.ftl +++ b/oap-server/oal-rt/src/main/resources/code-templates/metrics-builder/map2Data.ftl @@ -1,22 +1,22 @@ public org.apache.skywalking.oap.server.core.storage.StorageData map2Data(java.util.Map dbMap) { - org.apache.skywalking.oal.rt.metrics.${metricsName}Metrics metrics = new org.apache.skywalking.oal.rt.metrics.${metricsName}Metrics(); - <#list fieldsFromSource as field> - <#if field.typeName == "long" || field.typeName == "int" || field.typeName == "double" || field.typeName == "float"> - metrics.${field.fieldSetter}(((Number)dbMap.get("${field.columnName}")).${field.typeName}Value()); - <#elseif field.typeName == "java.lang.String"> - metrics.${field.fieldSetter}((String)dbMap.get("${field.columnName}")); - <#else> - metrics.${field.fieldSetter}(new ${field.typeName}((String)dbMap.get("${field.columnName}"))); - - - <#list persistentFields as field> - <#if field.typeName == "long" || field.typeName == "int" || field.typeName == "double" || field.typeName == "float"> - metrics.${field.fieldSetter}(((Number)dbMap.get("${field.columnName}")).${field.typeName}Value()); - <#elseif field.typeName == "java.lang.String"> - metrics.${field.fieldSetter}((String)dbMap.get("${field.columnName}")); - <#else> - metrics.${field.fieldSetter}(new ${field.typeName}((String)dbMap.get("${field.columnName}"))); - - - return metrics; +org.apache.skywalking.oal.rt.metrics.${metricsName}Metrics metrics = new org.apache.skywalking.oal.rt.metrics.${metricsName}Metrics(); +<#list fieldsFromSource as field> + <#if field.typeName == "long" || field.typeName == "int" || field.typeName == "double" || field.typeName == "float"> + metrics.${field.fieldSetter}(((Number)dbMap.get("${field.columnName}")).${field.typeName}Value()); + <#elseif field.typeName == "java.lang.String"> + metrics.${field.fieldSetter}((String)dbMap.get("${field.columnName}")); + <#else> + metrics.${field.fieldSetter}(new ${field.typeName}((String)dbMap.get("${field.columnName}"))); + + +<#list persistentFields as field> + <#if field.typeName == "long" || field.typeName == "int" || field.typeName == "double" || field.typeName == "float"> + metrics.${field.fieldSetter}(((Number)dbMap.get("${field.columnName}")).${field.typeName}Value()); + <#elseif field.typeName == "java.lang.String"> + metrics.${field.fieldSetter}((String)dbMap.get("${field.columnName}")); + <#else> + metrics.${field.fieldSetter}(new ${field.typeName}((String)dbMap.get("${field.columnName}"))); + + +return metrics; } \ No newline at end of file diff --git a/oap-server/oal-rt/src/main/resources/code-templates/metrics/deserialize.ftl b/oap-server/oal-rt/src/main/resources/code-templates/metrics/deserialize.ftl index c66ec50863ee..de5c4d089a25 100644 --- a/oap-server/oal-rt/src/main/resources/code-templates/metrics/deserialize.ftl +++ b/oap-server/oal-rt/src/main/resources/code-templates/metrics/deserialize.ftl @@ -1,26 +1,26 @@ public void deserialize(org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData remoteData) { - <#list serializeFields.stringFields as field> - ${field.setter}(remoteData.getDataStrings(${field?index})); - +<#list serializeFields.stringFields as field> + ${field.setter}(remoteData.getDataStrings(${field?index})); + - <#list serializeFields.longFields as field> - ${field.setter}(remoteData.getDataLongs(${field?index})); - +<#list serializeFields.longFields as field> + ${field.setter}(remoteData.getDataLongs(${field?index})); + - <#list serializeFields.doubleFields as field> - ${field.setter}(remoteData.getDataDoubles(${field?index})); - +<#list serializeFields.doubleFields as field> + ${field.setter}(remoteData.getDataDoubles(${field?index})); + - <#list serializeFields.intFields as field> - ${field.setter}(remoteData.getDataIntegers(${field?index})); - +<#list serializeFields.intFields as field> + ${field.setter}(remoteData.getDataIntegers(${field?index})); + - java.util.Iterator iterator; - <#list serializeFields.intKeyLongValueHashMapFields as field> - iterator = remoteData.getDataLists(${field?index}).getValueList().iterator(); - while (iterator.hasNext()) { - org.apache.skywalking.oap.server.core.remote.grpc.proto.IntKeyLongValuePair element = (org.apache.skywalking.oap.server.core.remote.grpc.proto.IntKeyLongValuePair)(iterator.next()); - super.${field.getter}().put(new Integer(element.getKey()), new org.apache.skywalking.oap.server.core.analysis.metrics.IntKeyLongValue(element.getKey(), element.getValue())); - } - +java.util.Iterator iterator; +<#list serializeFields.intKeyLongValueHashMapFields as field> + iterator = remoteData.getDataLists(${field?index}).getValueList().iterator(); + while (iterator.hasNext()) { + org.apache.skywalking.oap.server.core.remote.grpc.proto.IntKeyLongValuePair element = (org.apache.skywalking.oap.server.core.remote.grpc.proto.IntKeyLongValuePair)(iterator.next()); + super.${field.getter}().put(new Integer(element.getKey()), new org.apache.skywalking.oap.server.core.analysis.metrics.IntKeyLongValue(element.getKey(), element.getValue())); + } + } \ No newline at end of file diff --git a/oap-server/oal-rt/src/main/resources/code-templates/metrics/equals.ftl b/oap-server/oal-rt/src/main/resources/code-templates/metrics/equals.ftl index 15f9e1752f74..37daf9ac1b7a 100644 --- a/oap-server/oal-rt/src/main/resources/code-templates/metrics/equals.ftl +++ b/oap-server/oal-rt/src/main/resources/code-templates/metrics/equals.ftl @@ -1,25 +1,25 @@ public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; +if (this == obj) +return true; +if (obj == null) +return false; +if (getClass() != obj.getClass()) +return false; - org.apache.skywalking.oal.rt.metrics.${metricsName}Metrics metrics = (org.apache.skywalking.oal.rt.metrics.${metricsName}Metrics)obj; - <#list fieldsFromSource as sourceField> - <#if sourceField.isID()> - <#if sourceField.getTypeName() == "java.lang.String"> - if (!${sourceField.fieldName}.equals(metrics.${sourceField.fieldName})) - <#else> - if (${sourceField.fieldName} != metrics.${sourceField.fieldName}) - - return false; +org.apache.skywalking.oal.rt.metrics.${metricsName}Metrics metrics = (org.apache.skywalking.oal.rt.metrics.${metricsName}Metrics)obj; +<#list fieldsFromSource as sourceField> + <#if sourceField.isID()> + <#if sourceField.getTypeName() == "java.lang.String"> + if (!${sourceField.fieldName}.equals(metrics.${sourceField.fieldName})) + <#else> + if (${sourceField.fieldName} != metrics.${sourceField.fieldName}) - - - if (getTimeBucket() != metrics.getTimeBucket()) return false; + + + +if (getTimeBucket() != metrics.getTimeBucket()) +return false; - return true; +return true; } \ No newline at end of file diff --git a/oap-server/oal-rt/src/main/resources/code-templates/metrics/getMeta.ftl b/oap-server/oal-rt/src/main/resources/code-templates/metrics/getMeta.ftl index bc7f39e2675c..37034a15e815 100644 --- a/oap-server/oal-rt/src/main/resources/code-templates/metrics/getMeta.ftl +++ b/oap-server/oal-rt/src/main/resources/code-templates/metrics/getMeta.ftl @@ -1,3 +1,3 @@ public org.apache.skywalking.oap.server.core.analysis.metrics.MetricsMetaInfo getMeta() { - return new org.apache.skywalking.oap.server.core.analysis.metrics.MetricsMetaInfo("${varName}", ${sourceScopeId}<#if (fieldsFromSource?size>0) ><#list fieldsFromSource as field><#if field.isID()>, ${field.fieldName}); +return new org.apache.skywalking.oap.server.core.analysis.metrics.MetricsMetaInfo("${varName}", ${sourceScopeId}<#if (fieldsFromSource?size>0) ><#list fieldsFromSource as field><#if field.isID()>, ${field.fieldName}); } \ No newline at end of file diff --git a/oap-server/oal-rt/src/main/resources/code-templates/metrics/hashCode.ftl b/oap-server/oal-rt/src/main/resources/code-templates/metrics/hashCode.ftl index ed901e75da45..2e1f898b9119 100644 --- a/oap-server/oal-rt/src/main/resources/code-templates/metrics/hashCode.ftl +++ b/oap-server/oal-rt/src/main/resources/code-templates/metrics/hashCode.ftl @@ -1,14 +1,14 @@ public int hashCode() { - int result = 17; - <#list fieldsFromSource as sourceField> - <#if sourceField.isID()> - <#if sourceField.getTypeName() == "java.lang.String"> - result = 31 * result + ${sourceField.fieldName}.hashCode(); - <#else> - result += Const.ID_SPLIT + ${sourceField.fieldName}; - +int result = 17; +<#list fieldsFromSource as sourceField> + <#if sourceField.isID()> + <#if sourceField.getTypeName() == "java.lang.String"> + result = 31 * result + ${sourceField.fieldName}.hashCode(); + <#else> + result += Const.ID_SPLIT + ${sourceField.fieldName}; - - result = 31 * result + (int)getTimeBucket(); - return result; + + +result = 31 * result + (int)getTimeBucket(); +return result; } \ No newline at end of file diff --git a/oap-server/oal-rt/src/main/resources/code-templates/metrics/id.ftl b/oap-server/oal-rt/src/main/resources/code-templates/metrics/id.ftl index 00cd1c8557e0..a626f441acf4 100644 --- a/oap-server/oal-rt/src/main/resources/code-templates/metrics/id.ftl +++ b/oap-server/oal-rt/src/main/resources/code-templates/metrics/id.ftl @@ -1,13 +1,13 @@ public String id() { - String splitJointId = String.valueOf(getTimeBucket()); - <#list fieldsFromSource as sourceField> - <#if sourceField.isID()> - <#if sourceField.getTypeName() == "java.lang.String"> - splitJointId += org.apache.skywalking.oap.server.core.Const.ID_SPLIT + ${sourceField.fieldName}; - <#else> - splitJointId += org.apache.skywalking.oap.server.core.Const.ID_SPLIT + String.valueOf(${sourceField.fieldName}); - +String splitJointId = String.valueOf(getTimeBucket()); +<#list fieldsFromSource as sourceField> + <#if sourceField.isID()> + <#if sourceField.getTypeName() == "java.lang.String"> + splitJointId += org.apache.skywalking.oap.server.core.Const.ID_SPLIT + ${sourceField.fieldName}; + <#else> + splitJointId += org.apache.skywalking.oap.server.core.Const.ID_SPLIT + String.valueOf(${sourceField.fieldName}); - - return splitJointId; + + +return splitJointId; } \ No newline at end of file diff --git a/oap-server/oal-rt/src/main/resources/code-templates/metrics/remoteHashCode.ftl b/oap-server/oal-rt/src/main/resources/code-templates/metrics/remoteHashCode.ftl index 9d75ab356f87..96b1b262d487 100644 --- a/oap-server/oal-rt/src/main/resources/code-templates/metrics/remoteHashCode.ftl +++ b/oap-server/oal-rt/src/main/resources/code-templates/metrics/remoteHashCode.ftl @@ -1,13 +1,13 @@ public int remoteHashCode() { - int result = 17; - <#list fieldsFromSource as sourceField> - <#if sourceField.isID()> - <#if sourceField.getTypeName() == "java.lang.String"> - result = 31 * result + ${sourceField.fieldName}.hashCode(); - <#else> - result += org.apache.skywalking.oap.server.core.Const.ID_SPLIT + ${sourceField.fieldName}; - +int result = 17; +<#list fieldsFromSource as sourceField> + <#if sourceField.isID()> + <#if sourceField.getTypeName() == "java.lang.String"> + result = 31 * result + ${sourceField.fieldName}.hashCode(); + <#else> + result += org.apache.skywalking.oap.server.core.Const.ID_SPLIT + ${sourceField.fieldName}; - - return result; + + +return result; } \ No newline at end of file diff --git a/oap-server/oal-rt/src/main/resources/code-templates/metrics/serialize.ftl b/oap-server/oal-rt/src/main/resources/code-templates/metrics/serialize.ftl index a65b610c66cd..731f29213992 100644 --- a/oap-server/oal-rt/src/main/resources/code-templates/metrics/serialize.ftl +++ b/oap-server/oal-rt/src/main/resources/code-templates/metrics/serialize.ftl @@ -1,30 +1,30 @@ public org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData.Builder serialize() { - org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData.Builder remoteBuilder = org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData.newBuilder(); - <#list serializeFields.stringFields as field> - remoteBuilder.addDataStrings(${field.getter}()); - +org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData.Builder remoteBuilder = org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData.newBuilder(); +<#list serializeFields.stringFields as field> + remoteBuilder.addDataStrings(${field.getter}()); + - <#list serializeFields.longFields as field> - remoteBuilder.addDataLongs(${field.getter}()); - +<#list serializeFields.longFields as field> + remoteBuilder.addDataLongs(${field.getter}()); + - <#list serializeFields.doubleFields as field> - remoteBuilder.addDataDoubles(${field.getter}()); - +<#list serializeFields.doubleFields as field> + remoteBuilder.addDataDoubles(${field.getter}()); + - <#list serializeFields.intFields as field> - remoteBuilder.addDataIntegers(${field.getter}()); - - java.util.Iterator iterator; - org.apache.skywalking.oap.server.core.remote.grpc.proto.DataIntLongPairList.Builder pairListBuilder; - <#list serializeFields.intKeyLongValueHashMapFields as field> - iterator = super.${field.getter}().values().iterator(); - pairListBuilder = org.apache.skywalking.oap.server.core.remote.grpc.proto.DataIntLongPairList.newBuilder(); - while (iterator.hasNext()) { - pairListBuilder.addValue(((org.apache.skywalking.oap.server.core.analysis.metrics.IntKeyLongValue)(iterator.next())).serialize()); - } - remoteBuilder.addDataLists(pairListBuilder); - +<#list serializeFields.intFields as field> + remoteBuilder.addDataIntegers(${field.getter}()); + +java.util.Iterator iterator; +org.apache.skywalking.oap.server.core.remote.grpc.proto.DataIntLongPairList.Builder pairListBuilder; +<#list serializeFields.intKeyLongValueHashMapFields as field> + iterator = super.${field.getter}().values().iterator(); + pairListBuilder = org.apache.skywalking.oap.server.core.remote.grpc.proto.DataIntLongPairList.newBuilder(); + while (iterator.hasNext()) { + pairListBuilder.addValue(((org.apache.skywalking.oap.server.core.analysis.metrics.IntKeyLongValue)(iterator.next())).serialize()); + } + remoteBuilder.addDataLists(pairListBuilder); + - return remoteBuilder; +return remoteBuilder; } \ No newline at end of file diff --git a/oap-server/oal-rt/src/main/resources/code-templates/metrics/toDay.ftl b/oap-server/oal-rt/src/main/resources/code-templates/metrics/toDay.ftl index 8dcd474d5b67..0a7204e3be1b 100644 --- a/oap-server/oal-rt/src/main/resources/code-templates/metrics/toDay.ftl +++ b/oap-server/oal-rt/src/main/resources/code-templates/metrics/toDay.ftl @@ -1,26 +1,26 @@ public org.apache.skywalking.oap.server.core.analysis.metrics.Metrics toDay() { - org.apache.skywalking.oal.rt.metrics.${metricsName}Metrics metrics = new org.apache.skywalking.oal.rt.metrics.${metricsName}Metrics(); - <#list fieldsFromSource as field> - <#if field.columnName == "time_bucket"> - metrics.setTimeBucket(toTimeBucketInDay()); - <#elseif field.typeName == "java.lang.String" || field.typeName == "long" || field.typeName == "int" || field.typeName == "double" || field.typeName == "float"> - metrics.${field.fieldSetter}(this.${field.fieldGetter}()); - <#else> - ${field.typeName} newValue = new ${field.typeName}(); - newValue.copyFrom(this.${field.fieldGetter}()); - metrics.${field.fieldSetter}(newValue); - - - <#list persistentFields as field> - <#if field.columnName == "time_bucket"> - metrics.setTimeBucket(toTimeBucketInDay()); - <#elseif field.typeName == "java.lang.String" || field.typeName == "long" || field.typeName == "int" || field.typeName == "double" || field.typeName == "float"> - metrics.${field.fieldSetter}(this.${field.fieldGetter}()); - <#else> - ${field.typeName} newValue = new ${field.typeName}(); - newValue.copyFrom(this.${field.fieldGetter}()); - metrics.${field.fieldSetter}(newValue); - - - return metrics; +org.apache.skywalking.oal.rt.metrics.${metricsName}Metrics metrics = new org.apache.skywalking.oal.rt.metrics.${metricsName}Metrics(); +<#list fieldsFromSource as field> + <#if field.columnName == "time_bucket"> + metrics.setTimeBucket(toTimeBucketInDay()); + <#elseif field.typeName == "java.lang.String" || field.typeName == "long" || field.typeName == "int" || field.typeName == "double" || field.typeName == "float"> + metrics.${field.fieldSetter}(this.${field.fieldGetter}()); + <#else> + ${field.typeName} newValue = new ${field.typeName}(); + newValue.copyFrom(this.${field.fieldGetter}()); + metrics.${field.fieldSetter}(newValue); + + +<#list persistentFields as field> + <#if field.columnName == "time_bucket"> + metrics.setTimeBucket(toTimeBucketInDay()); + <#elseif field.typeName == "java.lang.String" || field.typeName == "long" || field.typeName == "int" || field.typeName == "double" || field.typeName == "float"> + metrics.${field.fieldSetter}(this.${field.fieldGetter}()); + <#else> + ${field.typeName} newValue = new ${field.typeName}(); + newValue.copyFrom(this.${field.fieldGetter}()); + metrics.${field.fieldSetter}(newValue); + + +return metrics; } \ No newline at end of file diff --git a/oap-server/oal-rt/src/main/resources/code-templates/metrics/toHour.ftl b/oap-server/oal-rt/src/main/resources/code-templates/metrics/toHour.ftl index 1328eb9305f2..abf24c122c31 100644 --- a/oap-server/oal-rt/src/main/resources/code-templates/metrics/toHour.ftl +++ b/oap-server/oal-rt/src/main/resources/code-templates/metrics/toHour.ftl @@ -1,26 +1,26 @@ public org.apache.skywalking.oap.server.core.analysis.metrics.Metrics toHour() { - org.apache.skywalking.oal.rt.metrics.${metricsName}Metrics metrics = new org.apache.skywalking.oal.rt.metrics.${metricsName}Metrics(); - <#list fieldsFromSource as field> - <#if field.columnName == "time_bucket"> - metrics.setTimeBucket(toTimeBucketInHour()); - <#elseif field.typeName == "java.lang.String" || field.typeName == "long" || field.typeName == "int" || field.typeName == "double" || field.typeName == "float"> - metrics.${field.fieldSetter}(this.${field.fieldGetter}()); - <#else> - ${field.typeName} newValue = new ${field.typeName}(); - newValue.copyFrom(this.${field.fieldGetter}()); - metrics.${field.fieldSetter}(newValue); - - - <#list persistentFields as field> - <#if field.columnName == "time_bucket"> - metrics.setTimeBucket(toTimeBucketInHour()); - <#elseif field.typeName == "java.lang.String" || field.typeName == "long" || field.typeName == "int" || field.typeName == "double" || field.typeName == "float"> - metrics.${field.fieldSetter}(this.${field.fieldGetter}()); - <#else> - ${field.typeName} newValue = new ${field.typeName}(); - newValue.copyFrom(this.${field.fieldGetter}()); - metrics.${field.fieldSetter}(newValue); - - - return metrics; +org.apache.skywalking.oal.rt.metrics.${metricsName}Metrics metrics = new org.apache.skywalking.oal.rt.metrics.${metricsName}Metrics(); +<#list fieldsFromSource as field> + <#if field.columnName == "time_bucket"> + metrics.setTimeBucket(toTimeBucketInHour()); + <#elseif field.typeName == "java.lang.String" || field.typeName == "long" || field.typeName == "int" || field.typeName == "double" || field.typeName == "float"> + metrics.${field.fieldSetter}(this.${field.fieldGetter}()); + <#else> + ${field.typeName} newValue = new ${field.typeName}(); + newValue.copyFrom(this.${field.fieldGetter}()); + metrics.${field.fieldSetter}(newValue); + + +<#list persistentFields as field> + <#if field.columnName == "time_bucket"> + metrics.setTimeBucket(toTimeBucketInHour()); + <#elseif field.typeName == "java.lang.String" || field.typeName == "long" || field.typeName == "int" || field.typeName == "double" || field.typeName == "float"> + metrics.${field.fieldSetter}(this.${field.fieldGetter}()); + <#else> + ${field.typeName} newValue = new ${field.typeName}(); + newValue.copyFrom(this.${field.fieldGetter}()); + metrics.${field.fieldSetter}(newValue); + + +return metrics; } \ No newline at end of file diff --git a/oap-server/oal-rt/src/main/resources/code-templates/metrics/toMonth.ftl b/oap-server/oal-rt/src/main/resources/code-templates/metrics/toMonth.ftl index b0363857e745..252f91cb3f33 100644 --- a/oap-server/oal-rt/src/main/resources/code-templates/metrics/toMonth.ftl +++ b/oap-server/oal-rt/src/main/resources/code-templates/metrics/toMonth.ftl @@ -1,26 +1,26 @@ public org.apache.skywalking.oap.server.core.analysis.metrics.Metrics toMonth() { - org.apache.skywalking.oal.rt.metrics.${metricsName}Metrics metrics = new org.apache.skywalking.oal.rt.metrics.${metricsName}Metrics(); - <#list fieldsFromSource as field> - <#if field.columnName == "time_bucket"> - metrics.setTimeBucket(toTimeBucketInMonth()); - <#elseif field.typeName == "java.lang.String" || field.typeName == "long" || field.typeName == "int" || field.typeName == "double" || field.typeName == "float"> - metrics.${field.fieldSetter}(this.${field.fieldGetter}()); - <#else> - ${field.typeName} newValue = new ${field.typeName}(); - newValue.copyFrom(this.${field.fieldGetter}()); - metrics.${field.fieldSetter}(newValue); - - - <#list persistentFields as field> - <#if field.columnName == "time_bucket"> - metrics.setTimeBucket(toTimeBucketInMonth()); - <#elseif field.typeName == "java.lang.String" || field.typeName == "long" || field.typeName == "int" || field.typeName == "double" || field.typeName == "float"> - metrics.${field.fieldSetter}(this.${field.fieldGetter}()); - <#else> - ${field.typeName} newValue = new ${field.typeName}(); - newValue.copyFrom(this.${field.fieldGetter}()); - metrics.${field.fieldSetter}(newValue); - - - return metrics; +org.apache.skywalking.oal.rt.metrics.${metricsName}Metrics metrics = new org.apache.skywalking.oal.rt.metrics.${metricsName}Metrics(); +<#list fieldsFromSource as field> + <#if field.columnName == "time_bucket"> + metrics.setTimeBucket(toTimeBucketInMonth()); + <#elseif field.typeName == "java.lang.String" || field.typeName == "long" || field.typeName == "int" || field.typeName == "double" || field.typeName == "float"> + metrics.${field.fieldSetter}(this.${field.fieldGetter}()); + <#else> + ${field.typeName} newValue = new ${field.typeName}(); + newValue.copyFrom(this.${field.fieldGetter}()); + metrics.${field.fieldSetter}(newValue); + + +<#list persistentFields as field> + <#if field.columnName == "time_bucket"> + metrics.setTimeBucket(toTimeBucketInMonth()); + <#elseif field.typeName == "java.lang.String" || field.typeName == "long" || field.typeName == "int" || field.typeName == "double" || field.typeName == "float"> + metrics.${field.fieldSetter}(this.${field.fieldGetter}()); + <#else> + ${field.typeName} newValue = new ${field.typeName}(); + newValue.copyFrom(this.${field.fieldGetter}()); + metrics.${field.fieldSetter}(newValue); + + +return metrics; } \ No newline at end of file diff --git a/oap-server/oal-rt/src/test/java/org/apache/skywalking/oal/rt/parser/ScriptParserTest.java b/oap-server/oal-rt/src/test/java/org/apache/skywalking/oal/rt/parser/ScriptParserTest.java index 0ee0c17c1489..226e39146911 100644 --- a/oap-server/oal-rt/src/test/java/org/apache/skywalking/oal/rt/parser/ScriptParserTest.java +++ b/oap-server/oal-rt/src/test/java/org/apache/skywalking/oal/rt/parser/ScriptParserTest.java @@ -44,10 +44,7 @@ public static void clear() { @Test public void testParse() throws IOException { - ScriptParser parser = ScriptParser.createFromScriptText( - "Endpoint_avg = from(Endpoint.latency).longAvg(); //comment test" + "\n" + - "Service_avg = from(Service.latency).longAvg()" - ); + ScriptParser parser = ScriptParser.createFromScriptText("Endpoint_avg = from(Endpoint.latency).longAvg(); //comment test" + "\n" + "Service_avg = from(Service.latency).longAvg()"); List results = parser.parse().getMetricsStmts(); Assert.assertEquals(2, results.size()); @@ -67,9 +64,7 @@ public void testParse() throws IOException { @Test public void testParse2() throws IOException { - ScriptParser parser = ScriptParser.createFromScriptText( - "Endpoint_percent = from(Endpoint.*).percent(status == true);" - ); + ScriptParser parser = ScriptParser.createFromScriptText("Endpoint_percent = from(Endpoint.*).percent(status == true);"); List results = parser.parse().getMetricsStmts(); AnalysisResult endpointPercent = results.get(0); @@ -84,9 +79,7 @@ public void testParse2() throws IOException { @Test public void testParse3() throws IOException { - ScriptParser parser = ScriptParser.createFromScriptText( - "Endpoint_percent = from(Endpoint.*).filter(status == true).filter(name == \"/product/abc\").longAvg();" - ); + ScriptParser parser = ScriptParser.createFromScriptText("Endpoint_percent = from(Endpoint.*).filter(status == true).filter(name == \"/product/abc\").longAvg();"); List results = parser.parse().getMetricsStmts(); AnalysisResult endpointPercent = results.get(0); @@ -111,12 +104,7 @@ public void testParse3() throws IOException { @Test public void testParse4() throws IOException { - ScriptParser parser = ScriptParser.createFromScriptText( - "service_response_s1_summary = from(Service.latency).filter(latency > 1000).sum();" + "\n" + - "service_response_s2_summary = from(Service.latency).filter(latency < 2000).sum();" + "\n" + - "service_response_s3_summary = from(Service.latency).filter(latency >= 3000).sum();" + "\n" + - "service_response_s4_summary = from(Service.latency).filter(latency <= 4000).sum();" - ); + ScriptParser parser = ScriptParser.createFromScriptText("service_response_s1_summary = from(Service.latency).filter(latency > 1000).sum();" + "\n" + "service_response_s2_summary = from(Service.latency).filter(latency < 2000).sum();" + "\n" + "service_response_s3_summary = from(Service.latency).filter(latency >= 3000).sum();" + "\n" + "service_response_s4_summary = from(Service.latency).filter(latency <= 4000).sum();"); List results = parser.parse().getMetricsStmts(); AnalysisResult responseSummary = results.get(0); @@ -166,8 +154,7 @@ public void testParse4() throws IOException { @Test public void testDisable() throws IOException { - ScriptParser parser = ScriptParser.createFromScriptText( - "disable(segment);"); + ScriptParser parser = ScriptParser.createFromScriptText("disable(segment);"); DisableCollection collection = parser.parse().getDisableCollection(); List sources = collection.getAllDisableSources(); Assert.assertEquals(1, sources.size()); diff --git a/oap-server/oal-rt/src/test/resources/expectedFiles/MetricsImplementorExpected.java b/oap-server/oal-rt/src/test/resources/expectedFiles/MetricsImplementorExpected.java index e133fd5ac35e..af0a6d6b7f0a 100644 --- a/oap-server/oal-rt/src/test/resources/expectedFiles/MetricsImplementorExpected.java +++ b/oap-server/oal-rt/src/test/resources/expectedFiles/MetricsImplementorExpected.java @@ -18,46 +18,58 @@ package org.apache.skywalking.oap.server.core.analysis.generated.service.serviceavg; -import java.util.*; -import lombok.*; +import java.util.HashMap; +import java.util.Map; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.oap.server.core.Const; import org.apache.skywalking.oap.server.core.analysis.Stream; -import org.apache.skywalking.oap.server.core.analysis.metrics.*; +import org.apache.skywalking.oap.server.core.analysis.metrics.LongAvgMetrics; +import org.apache.skywalking.oap.server.core.analysis.metrics.Metrics; +import org.apache.skywalking.oap.server.core.analysis.metrics.MetricsMetaInfo; +import org.apache.skywalking.oap.server.core.analysis.metrics.WithMetadata; import org.apache.skywalking.oap.server.core.analysis.worker.MetricsStreamProcessor; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; import org.apache.skywalking.oap.server.core.storage.StorageBuilder; -import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.annotation.Column; +import org.apache.skywalking.oap.server.core.storage.annotation.IDColumn; /** * This class is auto generated. Please don't change this class manually. - * - * @author Observability Analysis Language code generator */ @Stream(name = "service_avg", scopeId = 1, builder = ServiceAvgMetrics.Builder.class, processor = MetricsStreamProcessor.class) public class ServiceAvgMetrics extends LongAvgMetrics implements WithMetadata { - @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; + @Setter + @Getter + @Column(columnName = "entity_id") + @IDColumn + private java.lang.String entityId; - @Override public String id() { + @Override + public String id() { String splitJointId = String.valueOf(getTimeBucket()); splitJointId += Const.ID_SPLIT + entityId; return splitJointId; } - @Override public int hashCode() { + @Override + public int hashCode() { int result = 17; result = 31 * result + entityId.hashCode(); - result = 31 * result + (int)getTimeBucket(); + result = 31 * result + (int) getTimeBucket(); return result; } - @Override public int remoteHashCode() { + @Override + public int remoteHashCode() { int result = 17; result = 31 * result + entityId.hashCode(); return result; } - @Override public boolean equals(Object obj) { + @Override + public boolean equals(Object obj) { if (this == obj) return true; if (obj == null) @@ -65,7 +77,7 @@ public class ServiceAvgMetrics extends LongAvgMetrics implements WithMetadata { if (getClass() != obj.getClass()) return false; - ServiceAvgMetrics metrics = (ServiceAvgMetrics)obj; + ServiceAvgMetrics metrics = (ServiceAvgMetrics) obj; if (!entityId.equals(metrics.entityId)) return false; @@ -75,7 +87,8 @@ public class ServiceAvgMetrics extends LongAvgMetrics implements WithMetadata { return true; } - @Override public RemoteData.Builder serialize() { + @Override + public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); remoteBuilder.addDataStrings(getEntityId()); remoteBuilder.addDataStrings(getStringField()); @@ -84,13 +97,13 @@ public class ServiceAvgMetrics extends LongAvgMetrics implements WithMetadata { remoteBuilder.addDataLongs(getValue()); remoteBuilder.addDataLongs(getTimeBucket()); - remoteBuilder.addDataIntegers(getCount()); return remoteBuilder; } - @Override public void deserialize(RemoteData remoteData) { + @Override + public void deserialize(RemoteData remoteData) { setEntityId(remoteData.getDataStrings(0)); setStringField(remoteData.getDataStrings(1)); @@ -98,13 +111,12 @@ public class ServiceAvgMetrics extends LongAvgMetrics implements WithMetadata { setValue(remoteData.getDataLongs(1)); setTimeBucket(remoteData.getDataLongs(2)); - setCount(remoteData.getDataIntegers(0)); - } - @Override public MetricsMetaInfo getMeta() { + @Override + public MetricsMetaInfo getMeta() { return new MetricsMetaInfo("generate_metrics", 1, entityId); } @@ -146,7 +158,8 @@ public Metrics toMonth() { public static class Builder implements StorageBuilder { - @Override public Map data2Map(ServiceAvgMetrics storageData) { + @Override + public Map data2Map(ServiceAvgMetrics storageData) { Map map = new HashMap<>(); map.put("entity_id", storageData.getEntityId()); map.put("summation", storageData.getSummation()); @@ -157,14 +170,15 @@ public static class Builder implements StorageBuilder { return map; } - @Override public ServiceAvgMetrics map2Data(Map dbMap) { + @Override + public ServiceAvgMetrics map2Data(Map dbMap) { ServiceAvgMetrics metrics = new ServiceAvgMetrics(); - metrics.setEntityId((String)dbMap.get("entity_id")); - metrics.setSummation(((Number)dbMap.get("summation")).longValue()); - metrics.setCount(((Number)dbMap.get("count")).intValue()); - metrics.setValue(((Number)dbMap.get("value")).longValue()); - metrics.setTimeBucket(((Number)dbMap.get("time_bucket")).longValue()); - metrics.setStringField((String)dbMap.get("string_field")); + metrics.setEntityId((String) dbMap.get("entity_id")); + metrics.setSummation(((Number) dbMap.get("summation")).longValue()); + metrics.setCount(((Number) dbMap.get("count")).intValue()); + metrics.setValue(((Number) dbMap.get("value")).longValue()); + metrics.setTimeBucket(((Number) dbMap.get("time_bucket")).longValue()); + metrics.setStringField((String) dbMap.get("string_field")); return metrics; } } diff --git a/oap-server/oal-rt/src/test/resources/expectedFiles/ServiceDispatcherExpected.java b/oap-server/oal-rt/src/test/resources/expectedFiles/ServiceDispatcherExpected.java index 5145f08f7d0f..20969c29b2e1 100644 --- a/oap-server/oal-rt/src/test/resources/expectedFiles/ServiceDispatcherExpected.java +++ b/oap-server/oal-rt/src/test/resources/expectedFiles/ServiceDispatcherExpected.java @@ -19,18 +19,18 @@ package org.apache.skywalking.oap.server.core.analysis.generated.service; import org.apache.skywalking.oap.server.core.analysis.SourceDispatcher; +import org.apache.skywalking.oap.server.core.analysis.metrics.expression.EqualMatch; +import org.apache.skywalking.oap.server.core.analysis.metrics.expression.GreaterMatch; import org.apache.skywalking.oap.server.core.analysis.worker.MetricsStreamProcessor; -import org.apache.skywalking.oap.server.core.analysis.metrics.expression.*; -import org.apache.skywalking.oap.server.core.source.*; +import org.apache.skywalking.oap.server.core.source.Service; /** * This class is auto generated. Please don't change this class manually. - * - * @author Observability Analysis Language code generator */ public class ServiceDispatcher implements SourceDispatcher { - @Override public void dispatch(Service source) { + @Override + public void dispatch(Service source) { doServiceAvg(source); } diff --git a/oap-server/pom.xml b/oap-server/pom.xml index 0a1db6667094..8f8d6e5a6277 100755 --- a/oap-server/pom.xml +++ b/oap-server/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm org.apache.skywalking diff --git a/oap-server/server-alarm-plugin/pom.xml b/oap-server/server-alarm-plugin/pom.xml index 362902d845dc..740c370c0e3a 100644 --- a/oap-server/server-alarm-plugin/pom.xml +++ b/oap-server/server-alarm-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + oap-server org.apache.skywalking diff --git a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmCore.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmCore.java index 5a4525e7ebfa..019b0313f9a0 100644 --- a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmCore.java +++ b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmCore.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; - import org.apache.skywalking.oap.server.core.alarm.AlarmCallback; import org.apache.skywalking.oap.server.core.alarm.AlarmMessage; import org.joda.time.LocalDateTime; @@ -33,8 +32,6 @@ /** * Alarm core includes metrics values in certain time windows based on alarm settings. By using its internal timer * trigger and the alarm rules to decides whether send the alarm to database and webhook(s) - * - * @author wusheng */ public class AlarmCore { private static final Logger logger = LoggerFactory.getLogger(AlarmCore.class); diff --git a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmMessageFormatter.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmMessageFormatter.java index a209b0cb8c10..1c64549347f8 100644 --- a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmMessageFormatter.java +++ b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmMessageFormatter.java @@ -24,12 +24,10 @@ /** * This is a formatter especially for alarm message. - * + *

* Format string in alarm-settings.yml, such as: - * + *

* - Successful rate of endpoint {name} is lower than 75% - * - * @author wusheng */ public class AlarmMessageFormatter { private List formatSegments; diff --git a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmModuleProvider.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmModuleProvider.java index 5cdfcf7f07b8..55736005780a 100644 --- a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmModuleProvider.java +++ b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmModuleProvider.java @@ -18,13 +18,19 @@ package org.apache.skywalking.oap.server.core.alarm.provider; -import java.io.*; - +import java.io.FileNotFoundException; +import java.io.Reader; import org.apache.skywalking.oap.server.configuration.api.ConfigurationModule; import org.apache.skywalking.oap.server.configuration.api.DynamicConfigurationService; import org.apache.skywalking.oap.server.core.CoreModule; -import org.apache.skywalking.oap.server.core.alarm.*; -import org.apache.skywalking.oap.server.library.module.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmModule; +import org.apache.skywalking.oap.server.core.alarm.AlarmStandardPersistence; +import org.apache.skywalking.oap.server.core.alarm.MetricsNotify; +import org.apache.skywalking.oap.server.library.module.ModuleConfig; +import org.apache.skywalking.oap.server.library.module.ModuleDefine; +import org.apache.skywalking.oap.server.library.module.ModuleProvider; +import org.apache.skywalking.oap.server.library.module.ModuleStartException; +import org.apache.skywalking.oap.server.library.module.ServiceNotProvidedException; import org.apache.skywalking.oap.server.library.util.ResourceUtils; public class AlarmModuleProvider extends ModuleProvider { @@ -32,19 +38,23 @@ public class AlarmModuleProvider extends ModuleProvider { private NotifyHandler notifyHandler; private AlarmRulesWatcher alarmRulesWatcher; - @Override public String name() { + @Override + public String name() { return "default"; } - @Override public Class module() { + @Override + public Class module() { return AlarmModule.class; } - @Override public ModuleConfig createConfigBeanIfAbsent() { + @Override + public ModuleConfig createConfigBeanIfAbsent() { return new AlarmSettings(); } - @Override public void prepare() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void prepare() throws ServiceNotProvidedException, ModuleStartException { Reader applicationReader; try { applicationReader = ResourceUtils.read("alarm-settings.yml"); @@ -61,16 +71,24 @@ public class AlarmModuleProvider extends ModuleProvider { this.registerServiceImplementation(MetricsNotify.class, notifyHandler); } - @Override public void start() throws ServiceNotProvidedException, ModuleStartException { - DynamicConfigurationService dynamicConfigurationService = getManager().find(ConfigurationModule.NAME).provider().getService(DynamicConfigurationService.class); + @Override + public void start() throws ServiceNotProvidedException, ModuleStartException { + DynamicConfigurationService dynamicConfigurationService = getManager().find(ConfigurationModule.NAME) + .provider() + .getService(DynamicConfigurationService.class); dynamicConfigurationService.registerConfigChangeWatcher(alarmRulesWatcher); } - @Override public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleStartException { notifyHandler.initCache(getManager()); } - @Override public String[] requiredModules() { - return new String[] {CoreModule.NAME, ConfigurationModule.NAME}; + @Override + public String[] requiredModules() { + return new String[] { + CoreModule.NAME, + ConfigurationModule.NAME + }; } } diff --git a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRule.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRule.java index 5b2afd1684d0..df0cc96f72ec 100644 --- a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRule.java +++ b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRule.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.Objects; - import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Builder; @@ -29,9 +28,6 @@ import lombok.Setter; import lombok.ToString; -/** - * @author wusheng - */ @Builder @NoArgsConstructor @AllArgsConstructor @@ -63,16 +59,10 @@ public boolean equals(final Object o) { final AlarmRule alarmRule = (AlarmRule) o; - return period == alarmRule.period - && count == alarmRule.count - && silencePeriod == alarmRule.silencePeriod - && Objects.equals(alarmRuleName, alarmRule.alarmRuleName) - && Objects.equals(metricsName, alarmRule.metricsName) - && Objects.equals(includeNames, alarmRule.includeNames) - && Objects.equals(excludeNames, alarmRule.excludeNames) - && Objects.equals(threshold, alarmRule.threshold) - && Objects.equals(op, alarmRule.op) - && Objects.equals(message, alarmRule.message); + return period == alarmRule.period && count == alarmRule.count && silencePeriod == alarmRule.silencePeriod && Objects + .equals(alarmRuleName, alarmRule.alarmRuleName) && Objects.equals(metricsName, alarmRule.metricsName) && Objects + .equals(includeNames, alarmRule.includeNames) && Objects.equals(excludeNames, alarmRule.excludeNames) && Objects + .equals(threshold, alarmRule.threshold) && Objects.equals(op, alarmRule.op) && Objects.equals(message, alarmRule.message); } @Override diff --git a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRulesWatcher.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRulesWatcher.java index e9443771b014..1af2daea11cf 100644 --- a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRulesWatcher.java +++ b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRulesWatcher.java @@ -36,7 +36,6 @@ * this class is responsible for monitoring the configuration and parsing them * into {@link Rules} and {@link #runningContext}. * - * @author kezhenxu94 * @since 6.5.0 */ @Slf4j diff --git a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/NotifyHandler.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/NotifyHandler.java index 8fbedcb8c206..ed354e5cab9b 100644 --- a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/NotifyHandler.java +++ b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/NotifyHandler.java @@ -18,12 +18,25 @@ package org.apache.skywalking.oap.server.core.alarm.provider; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import org.apache.skywalking.oap.server.core.CoreModule; -import org.apache.skywalking.oap.server.core.alarm.*; -import org.apache.skywalking.oap.server.core.analysis.metrics.*; -import org.apache.skywalking.oap.server.core.cache.*; -import org.apache.skywalking.oap.server.core.register.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmCallback; +import org.apache.skywalking.oap.server.core.alarm.EndpointMetaInAlarm; +import org.apache.skywalking.oap.server.core.alarm.MetaInAlarm; +import org.apache.skywalking.oap.server.core.alarm.MetricsNotify; +import org.apache.skywalking.oap.server.core.alarm.ServiceInstanceMetaInAlarm; +import org.apache.skywalking.oap.server.core.alarm.ServiceMetaInAlarm; +import org.apache.skywalking.oap.server.core.analysis.metrics.Metrics; +import org.apache.skywalking.oap.server.core.analysis.metrics.MetricsMetaInfo; +import org.apache.skywalking.oap.server.core.analysis.metrics.WithMetadata; +import org.apache.skywalking.oap.server.core.cache.EndpointInventoryCache; +import org.apache.skywalking.oap.server.core.cache.ServiceInstanceInventoryCache; +import org.apache.skywalking.oap.server.core.cache.ServiceInventoryCache; +import org.apache.skywalking.oap.server.core.register.EndpointInventory; +import org.apache.skywalking.oap.server.core.register.ServiceInstanceInventory; +import org.apache.skywalking.oap.server.core.register.ServiceInventory; import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine; import org.apache.skywalking.oap.server.library.module.ModuleManager; @@ -40,14 +53,14 @@ public NotifyHandler(AlarmRulesWatcher alarmRulesWatcher) { core = new AlarmCore(alarmRulesWatcher); } - @Override public void notify(Metrics metrics) { - WithMetadata withMetadata = (WithMetadata)metrics; + @Override + public void notify(Metrics metrics) { + WithMetadata withMetadata = (WithMetadata) metrics; MetricsMetaInfo meta = withMetadata.getMeta(); int scope = meta.getScope(); - if (!DefaultScopeDefine.inServiceCatalog(scope) - && !DefaultScopeDefine.inServiceInstanceCatalog(scope) - && !DefaultScopeDefine.inEndpointCatalog(scope)) { + if (!DefaultScopeDefine.inServiceCatalog(scope) && !DefaultScopeDefine.inServiceInstanceCatalog(scope) && !DefaultScopeDefine + .inEndpointCatalog(scope)) { return; } @@ -102,7 +115,11 @@ public void init(AlarmCallback... callbacks) { public void initCache(ModuleManager moduleManager) { serviceInventoryCache = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInventoryCache.class); - serviceInstanceInventoryCache = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInstanceInventoryCache.class); - endpointInventoryCache = moduleManager.find(CoreModule.NAME).provider().getService(EndpointInventoryCache.class); + serviceInstanceInventoryCache = moduleManager.find(CoreModule.NAME) + .provider() + .getService(ServiceInstanceInventoryCache.class); + endpointInventoryCache = moduleManager.find(CoreModule.NAME) + .provider() + .getService(EndpointInventoryCache.class); } } diff --git a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/Rules.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/Rules.java index 0e7e581a7eed..087e88d239dd 100644 --- a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/Rules.java +++ b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/Rules.java @@ -18,8 +18,12 @@ package org.apache.skywalking.oap.server.core.alarm.provider; -import java.util.*; -import lombok.*; +import java.util.ArrayList; +import java.util.List; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; @Setter(AccessLevel.PUBLIC) @Getter(AccessLevel.PUBLIC) diff --git a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RulesReader.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RulesReader.java index 74fb9dac1cfa..ba24c99ce30a 100644 --- a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RulesReader.java +++ b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RulesReader.java @@ -18,14 +18,16 @@ package org.apache.skywalking.oap.server.core.alarm.provider; -import java.io.*; -import java.util.*; +import java.io.InputStream; +import java.io.Reader; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import org.yaml.snakeyaml.Yaml; /** * Rule Reader parses the given `alarm-settings.yml` config file, to the target {@link Rules}. - * - * @author wusheng */ public class RulesReader { private Map yamlData; @@ -44,38 +46,39 @@ public Rules readRules() { Rules rules = new Rules(); if (Objects.nonNull(yamlData)) { - Map rulesData = (Map)yamlData.get("rules"); + Map rulesData = (Map) yamlData.get("rules"); if (rulesData != null) { rules.setRules(new ArrayList<>()); rulesData.forEach((k, v) -> { - if (((String)k).endsWith("_rule")) { + if (((String) k).endsWith("_rule")) { AlarmRule alarmRule = new AlarmRule(); - alarmRule.setAlarmRuleName((String)k); - Map settings = (Map)v; + alarmRule.setAlarmRuleName((String) k); + Map settings = (Map) v; Object metricsName = settings.get("metrics-name"); if (metricsName == null) { throw new IllegalArgumentException("metrics-name can't be null"); } - alarmRule.setMetricsName((String)metricsName); - alarmRule.setIncludeNames((ArrayList)settings.getOrDefault("include-names", new ArrayList(0))); - alarmRule.setExcludeNames((ArrayList)settings.getOrDefault("exclude-names", new ArrayList(0))); + alarmRule.setMetricsName((String) metricsName); + alarmRule.setIncludeNames((ArrayList) settings.getOrDefault("include-names", new ArrayList(0))); + alarmRule.setExcludeNames((ArrayList) settings.getOrDefault("exclude-names", new ArrayList(0))); alarmRule.setThreshold(settings.get("threshold").toString()); - alarmRule.setOp((String)settings.get("op")); - alarmRule.setPeriod((Integer)settings.getOrDefault("period", 1)); - alarmRule.setCount((Integer)settings.getOrDefault("count", 1)); - alarmRule.setSilencePeriod((Integer)settings.getOrDefault("silence-period", -1)); - alarmRule.setMessage((String)settings.getOrDefault("message", "Alarm caused by Rule " + alarmRule.getAlarmRuleName())); + alarmRule.setOp((String) settings.get("op")); + alarmRule.setPeriod((Integer) settings.getOrDefault("period", 1)); + alarmRule.setCount((Integer) settings.getOrDefault("count", 1)); + alarmRule.setSilencePeriod((Integer) settings.getOrDefault("silence-period", -1)); + alarmRule.setMessage((String) settings.getOrDefault("message", "Alarm caused by Rule " + alarmRule + .getAlarmRuleName())); rules.getRules().add(alarmRule); } }); } - List webhooks = (List)yamlData.get("webhooks"); + List webhooks = (List) yamlData.get("webhooks"); if (webhooks != null) { rules.setWebhooks(new ArrayList<>()); webhooks.forEach(url -> { - rules.getWebhooks().add((String)url); + rules.getWebhooks().add((String) url); }); } } diff --git a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRule.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRule.java index 84bde8868bba..5310abd75cd4 100644 --- a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRule.java +++ b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRule.java @@ -18,30 +18,31 @@ package org.apache.skywalking.oap.server.core.alarm.provider; +import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.locks.ReentrantLock; import lombok.RequiredArgsConstructor; import lombok.ToString; import lombok.extern.slf4j.Slf4j; import org.apache.skywalking.oap.server.core.alarm.AlarmMessage; import org.apache.skywalking.oap.server.core.alarm.MetaInAlarm; -import org.apache.skywalking.oap.server.core.analysis.metrics.*; +import org.apache.skywalking.oap.server.core.analysis.metrics.DoubleValueHolder; +import org.apache.skywalking.oap.server.core.analysis.metrics.IntValueHolder; +import org.apache.skywalking.oap.server.core.analysis.metrics.LongValueHolder; +import org.apache.skywalking.oap.server.core.analysis.metrics.Metrics; +import org.apache.skywalking.oap.server.core.analysis.metrics.MultiIntValuesHolder; import org.apache.skywalking.oap.server.library.util.CollectionUtils; import org.joda.time.LocalDateTime; import org.joda.time.Minutes; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.locks.ReentrantLock; - /** * RunningRule represents each rule in running status. Based on the {@link AlarmRule} definition, - * - * @author wusheng */ @Slf4j public class RunningRule { @@ -175,8 +176,6 @@ public List check() { /** * A metrics window, based on AlarmRule#period. This window slides with time, just keeps the recent N(period) * buckets. - * - * @author wusheng */ public class Window { private LocalDateTime endTime; @@ -365,16 +364,16 @@ private LinkedList transformValues(final LinkedList val } switch (valueType) { case LONG: - r.add(new TraceLogMetric(m.getTimeBucket(), new Number[] {((LongValueHolder)m).getValue()})); + r.add(new TraceLogMetric(m.getTimeBucket(), new Number[] {((LongValueHolder) m).getValue()})); break; case INT: - r.add(new TraceLogMetric(m.getTimeBucket(), new Number[] {((IntValueHolder)m).getValue()})); + r.add(new TraceLogMetric(m.getTimeBucket(), new Number[] {((IntValueHolder) m).getValue()})); break; case DOUBLE: - r.add(new TraceLogMetric(m.getTimeBucket(), new Number[] {((DoubleValueHolder)m).getValue()})); + r.add(new TraceLogMetric(m.getTimeBucket(), new Number[] {((DoubleValueHolder) m).getValue()})); break; case MULTI_INTS: - int[] iArr = ((MultiIntValuesHolder)m).getValues(); + int[] iArr = ((MultiIntValuesHolder) m).getValues(); r.add(new TraceLogMetric(m.getTimeBucket(), Arrays.stream(iArr).boxed().toArray(Number[]::new))); break; } diff --git a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/Threshold.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/Threshold.java index 9906b89a3442..61eef4e1c99d 100644 --- a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/Threshold.java +++ b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/Threshold.java @@ -21,9 +21,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * @author wusheng - */ public class Threshold { private static final Logger logger = LoggerFactory.getLogger(Threshold.class); private static final String NONE_THRESHOLD = "-"; diff --git a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/WebhookCallback.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/WebhookCallback.java index 6b04ac08eadf..f0fe0414bf8d 100644 --- a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/WebhookCallback.java +++ b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/WebhookCallback.java @@ -18,13 +18,12 @@ package org.apache.skywalking.oap.server.core.alarm.provider; +import com.google.gson.Gson; +import io.netty.handler.codec.http.HttpHeaderValues; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; import java.util.List; - -import com.google.gson.Gson; -import io.netty.handler.codec.http.HttpHeaderValues; import org.apache.http.HttpHeaders; import org.apache.http.HttpStatus; import org.apache.http.StatusLine; @@ -41,8 +40,6 @@ /** * Use SkyWalking alarm webhook API call a remote endpoints. - * - * @author wusheng */ public class WebhookCallback implements AlarmCallback { private static final Logger logger = LoggerFactory.getLogger(WebhookCallback.class); @@ -57,9 +54,10 @@ public class WebhookCallback implements AlarmCallback { public WebhookCallback(AlarmRulesWatcher alarmRulesWatcher) { this.alarmRulesWatcher = alarmRulesWatcher; requestConfig = RequestConfig.custom() - .setConnectTimeout(HTTP_CONNECT_TIMEOUT) - .setConnectionRequestTimeout(HTTP_CONNECTION_REQUEST_TIMEOUT) - .setSocketTimeout(HTTP_SOCKET_TIMEOUT).build(); + .setConnectTimeout(HTTP_CONNECT_TIMEOUT) + .setConnectionRequestTimeout(HTTP_CONNECTION_REQUEST_TIMEOUT) + .setSocketTimeout(HTTP_SOCKET_TIMEOUT) + .build(); } @Override diff --git a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmCoreTest.java b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmCoreTest.java index 91402b5fc5d4..c1081bd1abaa 100644 --- a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmCoreTest.java +++ b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmCoreTest.java @@ -32,8 +32,6 @@ /** * Alarm core is the trigger, which should run once per minute, also run after the first quarter in one single minute. - * - * @author wusheng */ public class AlarmCoreTest { /** @@ -61,7 +59,8 @@ public void testTriggerTimePoint() throws InterruptedException { final boolean[] isAdd = {true}; PowerMockito.doAnswer(new Answer() { - @Override public Object answer(InvocationOnMock mock) throws Throwable { + @Override + public Object answer(InvocationOnMock mock) throws Throwable { if (isAdd[0]) { checkTime.add(LocalDateTime.now()); } diff --git a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmMessageFormatterTest.java b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmMessageFormatterTest.java index 05dcc986f6d9..659147db9234 100644 --- a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmMessageFormatterTest.java +++ b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmMessageFormatterTest.java @@ -19,7 +19,8 @@ package org.apache.skywalking.oap.server.core.alarm.provider; import org.apache.skywalking.oap.server.core.alarm.MetaInAlarm; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; public class AlarmMessageFormatterTest { @Test @@ -27,27 +28,33 @@ public void testStringFormatWithNoArg() { AlarmMessageFormatter formatter = new AlarmMessageFormatter("abc words {sdf"); String message = formatter.format(new MetaInAlarm() { - @Override public String getScope() { + @Override + public String getScope() { return "SERVICE"; } - @Override public int getScopeId() { + @Override + public int getScopeId() { return -1; } - @Override public String getName() { + @Override + public String getName() { return null; } - @Override public String getMetricsName() { + @Override + public String getMetricsName() { return null; } - @Override public int getId0() { + @Override + public int getId0() { return 0; } - @Override public int getId1() { + @Override + public int getId1() { return 0; } }); @@ -60,27 +67,33 @@ public void testStringFormatWithArg() { AlarmMessageFormatter formatter = new AlarmMessageFormatter("abc} words {name} - {id} .. {"); String message = formatter.format(new MetaInAlarm() { - @Override public String getScope() { + @Override + public String getScope() { return "SERVICE"; } - @Override public int getScopeId() { + @Override + public int getScopeId() { return -1; } - @Override public String getName() { + @Override + public String getName() { return "service"; } - @Override public String getMetricsName() { + @Override + public String getMetricsName() { return null; } - @Override public int getId0() { + @Override + public int getId0() { return 1290; } - @Override public int getId1() { + @Override + public int getId1() { return 0; } }); diff --git a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmModuleProviderTest.java b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmModuleProviderTest.java index 264036cbbcdc..e2fee8f9fcf3 100644 --- a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmModuleProviderTest.java +++ b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmModuleProviderTest.java @@ -15,8 +15,11 @@ * limitations under the License. * */ + package org.apache.skywalking.oap.server.core.alarm.provider; +import java.util.Iterator; +import java.util.ServiceLoader; import org.apache.skywalking.oap.server.configuration.api.ConfigurationModule; import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.alarm.AlarmModule; @@ -25,16 +28,12 @@ import org.junit.Test; import org.powermock.reflect.Whitebox; -import java.util.Iterator; -import java.util.ServiceLoader; - -import static org.junit.Assert.*; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; -/** - * Created by dengming, 2019.04.22 - */ public class AlarmModuleProviderTest { private AlarmModuleProvider moduleProvider; @@ -77,6 +76,9 @@ public void notifyAfterCompleted() throws Exception { @Test public void requiredModules() { String[] modules = moduleProvider.requiredModules(); - assertArrayEquals(new String[]{CoreModule.NAME, ConfigurationModule.NAME}, modules); + assertArrayEquals(new String[] { + CoreModule.NAME, + ConfigurationModule.NAME + }, modules); } } \ No newline at end of file diff --git a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRuleInitTest.java b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRuleInitTest.java index 8a6434f705e4..a86f57443944 100644 --- a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRuleInitTest.java +++ b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRuleInitTest.java @@ -25,8 +25,9 @@ public class AlarmRuleInitTest { @Test public void testInit() { - RulesReader reader = new RulesReader(this.getClass().getClassLoader() - .getResourceAsStream("alarm-settings.yml")); + RulesReader reader = new RulesReader(this.getClass() + .getClassLoader() + .getResourceAsStream("alarm-settings.yml")); Rules rules = reader.readRules(); List ruleList = rules.getRules(); diff --git a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRulesWatcherTest.java b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRulesWatcherTest.java index 8535c1d3a702..4dbe5b51a87c 100644 --- a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRulesWatcherTest.java +++ b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmRulesWatcherTest.java @@ -18,6 +18,10 @@ package org.apache.skywalking.oap.server.core.alarm.provider; +import java.io.IOException; +import java.io.Reader; +import java.util.ArrayList; +import java.util.Arrays; import org.apache.skywalking.oap.server.configuration.api.ConfigChangeWatcher; import org.apache.skywalking.oap.server.library.util.ResourceUtils; import org.junit.Before; @@ -25,45 +29,37 @@ import org.mockito.MockitoAnnotations; import org.mockito.Spy; -import java.io.IOException; -import java.io.Reader; -import java.util.ArrayList; -import java.util.Arrays; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.spy; -/** - * @author kezhenxu94 - */ public class AlarmRulesWatcherTest { @Spy private AlarmRulesWatcher alarmRulesWatcher = new AlarmRulesWatcher(new Rules(), null); private AlarmRule.AlarmRuleBuilder rulePrototypeBuilder = AlarmRule.builder() - .alarmRuleName("name1") - .count(1) - .includeNames(new ArrayList() { - { - add("1"); - add("2"); - } - }) - .excludeNames(new ArrayList() { - { - add("3"); - add("4"); - } - }) - .message("test") - .metricsName("metrics1") - .op(">") - .period(1) - .silencePeriod(2) - .threshold("2"); + .alarmRuleName("name1") + .count(1) + .includeNames(new ArrayList() { + { + add("1"); + add("2"); + } + }) + .excludeNames(new ArrayList() { + { + add("3"); + add("4"); + } + }) + .message("test") + .metricsName("metrics1") + .op(">") + .period(1) + .silencePeriod(2) + .threshold("2"); @Before public void setUp() { @@ -120,10 +116,10 @@ public void shouldKeepExistedRunningRuleIfAlarmRuleExists() { assertEquals(1, alarmRulesWatcher.getRunningContext().size()); assertEquals(2, alarmRulesWatcher.getRunningContext().get(rule.getMetricsName()).size()); - assertEquals( - "The same alarm rule should map to the same existed running rule", - runningRule, alarmRulesWatcher.getRunningContext().get(rule.getMetricsName()).get(0) - ); + assertEquals("The same alarm rule should map to the same existed running rule", runningRule, alarmRulesWatcher.getRunningContext() + .get(rule + .getMetricsName()) + .get(0)); } @Test @@ -147,10 +143,10 @@ public void shouldRemoveRunningRuleIfAlarmRuleIsRemoved() { assertEquals(1, alarmRulesWatcher.getRunningContext().size()); assertEquals(1, alarmRulesWatcher.getRunningContext().get(rule.getMetricsName()).size()); - assertNotEquals( - "The new alarm rule should map to a different running rule", - runningRule, alarmRulesWatcher.getRunningContext().get(rule.getMetricsName()).get(0) - ); + assertNotEquals("The new alarm rule should map to a different running rule", runningRule, alarmRulesWatcher.getRunningContext() + .get(rule + .getMetricsName()) + .get(0)); } @Test @@ -167,12 +163,12 @@ public void shouldReplaceRunningRuleIfAlarmRulesAreReplaced() { Rules updatedRules = new Rules(); // replace the original alarm rules - updatedRules.getRules().addAll( - Arrays.asList( - ruleBuilder.alarmRuleName("name2").metricsName("metrics2").build(), - ruleBuilder.alarmRuleName("name3").metricsName("metrics3").build() - ) - ); + updatedRules.getRules() + .addAll(Arrays.asList(ruleBuilder.alarmRuleName("name2") + .metricsName("metrics2") + .build(), ruleBuilder.alarmRuleName("name3") + .metricsName("metrics3") + .build())); alarmRulesWatcher.notify(updatedRules); diff --git a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/NotifyHandlerTest.java b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/NotifyHandlerTest.java index e36c201f7460..cd211f45b4f9 100644 --- a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/NotifyHandlerTest.java +++ b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/NotifyHandlerTest.java @@ -20,26 +20,45 @@ import com.google.common.collect.Lists; import org.apache.skywalking.oap.server.core.CoreModule; -import org.apache.skywalking.oap.server.core.alarm.*; -import org.apache.skywalking.oap.server.core.analysis.metrics.*; -import org.apache.skywalking.oap.server.core.cache.*; -import org.apache.skywalking.oap.server.core.register.*; +import org.apache.skywalking.oap.server.core.alarm.AlarmMessage; +import org.apache.skywalking.oap.server.core.alarm.EndpointMetaInAlarm; +import org.apache.skywalking.oap.server.core.alarm.MetaInAlarm; +import org.apache.skywalking.oap.server.core.alarm.ServiceInstanceMetaInAlarm; +import org.apache.skywalking.oap.server.core.alarm.ServiceMetaInAlarm; +import org.apache.skywalking.oap.server.core.analysis.metrics.Metrics; +import org.apache.skywalking.oap.server.core.analysis.metrics.MetricsMetaInfo; +import org.apache.skywalking.oap.server.core.analysis.metrics.WithMetadata; +import org.apache.skywalking.oap.server.core.cache.EndpointInventoryCache; +import org.apache.skywalking.oap.server.core.cache.ServiceInstanceInventoryCache; +import org.apache.skywalking.oap.server.core.cache.ServiceInventoryCache; +import org.apache.skywalking.oap.server.core.register.EndpointInventory; +import org.apache.skywalking.oap.server.core.register.ServiceInstanceInventory; +import org.apache.skywalking.oap.server.core.register.ServiceInventory; import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine; -import org.apache.skywalking.oap.server.library.module.*; -import org.junit.*; +import org.apache.skywalking.oap.server.library.module.ModuleManager; +import org.apache.skywalking.oap.server.library.module.ModuleProviderHolder; +import org.apache.skywalking.oap.server.library.module.ModuleServiceHolder; +import org.junit.Before; +import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.powermock.api.mockito.PowerMockito; -import org.powermock.core.classloader.annotations.*; +import org.powermock.core.classloader.annotations.PowerMockIgnore; +import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import static junit.framework.TestCase.*; -import static org.mockito.Mockito.*; +import static junit.framework.TestCase.assertEquals; +import static junit.framework.TestCase.assertNotNull; +import static junit.framework.TestCase.assertTrue; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.anyString; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; -/** - * Created by dengming, 2019.04.22 - */ @RunWith(PowerMockRunner.class) @PowerMockIgnore("javax.management.*") @PrepareForTest(DefaultScopeDefine.class) diff --git a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/OPTest.java b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/OPTest.java index f26f99940921..35db8dcfae6e 100644 --- a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/OPTest.java +++ b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/OPTest.java @@ -22,9 +22,6 @@ import static org.junit.Assert.assertTrue; -/** - * @author kezhenxu94 - */ public class OPTest { @Test public void test() { diff --git a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRuleTest.java b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRuleTest.java index 016a855b3f49..ef57dff8003e 100644 --- a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRuleTest.java +++ b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRuleTest.java @@ -19,22 +19,29 @@ package org.apache.skywalking.oap.server.core.alarm.provider; import com.google.common.collect.Lists; -import java.util.*; -import org.apache.skywalking.oap.server.core.alarm.*; -import org.apache.skywalking.oap.server.core.analysis.metrics.*; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import org.apache.skywalking.oap.server.core.alarm.AlarmCallback; +import org.apache.skywalking.oap.server.core.alarm.AlarmMessage; +import org.apache.skywalking.oap.server.core.alarm.MetaInAlarm; +import org.apache.skywalking.oap.server.core.analysis.metrics.IntValueHolder; +import org.apache.skywalking.oap.server.core.analysis.metrics.Metrics; +import org.apache.skywalking.oap.server.core.analysis.metrics.MultiIntValuesHolder; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine; import org.joda.time.LocalDateTime; -import org.joda.time.format.*; -import org.junit.*; +import org.joda.time.format.DateTimeFormat; +import org.joda.time.format.DateTimeFormatter; +import org.junit.Assert; +import org.junit.Test; import org.powermock.reflect.Whitebox; /** * Running rule is the core of how does alarm work. - * + *

* So in this test, we need to simulate a lot of scenario to see the reactions. - * - * @author wusheng */ public class RunningRuleTest { private static DateTimeFormatter TIME_BUCKET_FORMATTER = DateTimeFormat.forPattern("yyyyMMddHHmm"); @@ -99,7 +106,8 @@ public void testAlarm() { // check at 201808301442 alarmMessages = runningRule.check(); Assert.assertEquals(1, alarmMessages.size()); - Assert.assertEquals("Successful rate of endpoint Service_123 is lower than 75%", alarmMessages.get(0).getAlarmMessage()); + Assert.assertEquals("Successful rate of endpoint Service_123 is lower than 75%", alarmMessages.get(0) + .getAlarmMessage()); } @Test @@ -135,7 +143,8 @@ public void testMultipleValuesAlarm() { // check at 201808301442 alarmMessages = runningRule.check(); Assert.assertEquals(1, alarmMessages.size()); - Assert.assertEquals("response percentile of endpoint Service_123 is lower than expected values", alarmMessages.get(0).getAlarmMessage()); + Assert.assertEquals("response percentile of endpoint Service_123 is lower than expected values", alarmMessages.get(0) + .getAlarmMessage()); } @Test @@ -154,7 +163,8 @@ public void testNoAlarm() { final boolean[] isAlarm = {false}; AlarmCallback assertCallback = new AlarmCallback() { - @Override public void doAlarm(List alarmMessage) { + @Override + public void doAlarm(List alarmMessage) { isAlarm[0] = true; } }; @@ -252,36 +262,44 @@ public void testExclude() { private MetaInAlarm getMetaInAlarm(int id) { return new MetaInAlarm() { - @Override public String getScope() { + @Override + public String getScope() { return "SERVICE"; } - @Override public int getScopeId() { + @Override + public int getScopeId() { return DefaultScopeDefine.SERVICE; } - @Override public String getName() { + @Override + public String getName() { return "Service_" + id; } - @Override public String getMetricsName() { + @Override + public String getMetricsName() { return "endpoint_percent"; } - @Override public int getId0() { + @Override + public int getId0() { return id; } - @Override public int getId1() { + @Override + public int getId1() { return 0; } - @Override public boolean equals(Object o) { - MetaInAlarm target = (MetaInAlarm)o; + @Override + public boolean equals(Object o) { + MetaInAlarm target = (MetaInAlarm) o; return id == target.getId0(); } - @Override public int hashCode() { + @Override + public int hashCode() { return Objects.hash(id); } }; @@ -305,39 +323,48 @@ private Metrics getMultipleValueMetrics(long timeBucket, int... values) { private class MockMetrics extends Metrics implements IntValueHolder { private int value; - @Override public String id() { + @Override + public String id() { return null; } - @Override public void combine(Metrics metrics) { + @Override + public void combine(Metrics metrics) { } - @Override public void calculate() { + @Override + public void calculate() { } - @Override public Metrics toHour() { + @Override + public Metrics toHour() { return null; } - @Override public Metrics toDay() { + @Override + public Metrics toDay() { return null; } - @Override public Metrics toMonth() { + @Override + public Metrics toMonth() { return null; } - @Override public int getValue() { + @Override + public int getValue() { return value; } - @Override public void deserialize(RemoteData remoteData) { + @Override + public void deserialize(RemoteData remoteData) { } - @Override public RemoteData.Builder serialize() { + @Override + public RemoteData.Builder serialize() { return null; } @@ -345,7 +372,8 @@ public void setValue(int value) { this.value = value; } - @Override public int remoteHashCode() { + @Override + public int remoteHashCode() { return 0; } } @@ -357,43 +385,53 @@ public void setValues(int[] values) { this.values = values; } - @Override public String id() { + @Override + public String id() { return null; } - @Override public void combine(Metrics metrics) { + @Override + public void combine(Metrics metrics) { } - @Override public void calculate() { + @Override + public void calculate() { } - @Override public Metrics toHour() { + @Override + public Metrics toHour() { return null; } - @Override public Metrics toDay() { + @Override + public Metrics toDay() { return null; } - @Override public Metrics toMonth() { + @Override + public Metrics toMonth() { return null; } - @Override public int[] getValues() { + @Override + public int[] getValues() { return values; } - @Override public int remoteHashCode() { + @Override + public int remoteHashCode() { return 0; } - @Override public void deserialize(RemoteData remoteData) { + @Override + public void deserialize(RemoteData remoteData) { } - @Override public RemoteData.Builder serialize() { + @Override + public RemoteData.Builder serialize() { return null; } } diff --git a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/ThresholdTest.java b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/ThresholdTest.java index 913f001233c0..2e435ef666c6 100644 --- a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/ThresholdTest.java +++ b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/ThresholdTest.java @@ -23,9 +23,6 @@ import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; -/** - * Created by dengming, 2019.04.27 - */ public class ThresholdTest { @Test @@ -45,7 +42,12 @@ public void setType() { public void setTypeMultipleValues() { Threshold threshold = new Threshold("my-rule", "75,80, 90, -"); threshold.setType(MetricsValueType.MULTI_INTS); - assertArrayEquals(new Object[] {75, 80, 90, null}, threshold.getIntValuesThreshold()); + assertArrayEquals(new Object[] { + 75, + 80, + 90, + null + }, threshold.getIntValuesThreshold()); } diff --git a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/WebhookCallbackTest.java b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/WebhookCallbackTest.java index 6bc84ae990ef..1514855593c2 100644 --- a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/WebhookCallbackTest.java +++ b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/WebhookCallbackTest.java @@ -18,6 +18,14 @@ package org.apache.skywalking.oap.server.core.alarm.provider; +import com.google.gson.Gson; +import com.google.gson.JsonArray; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.InetSocketAddress; +import java.util.ArrayList; +import java.util.List; import javax.servlet.Servlet; import javax.servlet.ServletConfig; import javax.servlet.ServletException; @@ -25,15 +33,6 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.net.InetSocketAddress; -import java.util.ArrayList; -import java.util.List; - -import com.google.gson.Gson; -import com.google.gson.JsonArray; import org.apache.skywalking.oap.server.core.alarm.AlarmMessage; import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine; import org.eclipse.jetty.server.Server; @@ -100,17 +99,19 @@ public void testWebhook() { Assert.assertTrue(isSuccess); } - @Override public void init(ServletConfig config) throws ServletException { + @Override + public void init(ServletConfig config) throws ServletException { } - @Override public ServletConfig getServletConfig() { + @Override + public ServletConfig getServletConfig() { return null; } @Override public void service(ServletRequest request, ServletResponse response) throws ServletException, IOException { - HttpServletRequest httpServletRequest = (HttpServletRequest)request; + HttpServletRequest httpServletRequest = (HttpServletRequest) request; if (httpServletRequest.getContentType().equals("application/json")) { InputStream inputStream = request.getInputStream(); ByteArrayOutputStream out = new ByteArrayOutputStream(); @@ -123,20 +124,22 @@ public void service(ServletRequest request, ServletResponse response) throws Ser JsonArray elements = new Gson().fromJson(new String(out.toByteArray()), JsonArray.class); if (elements.size() == 2) { - ((HttpServletResponse)response).setStatus(200); + ((HttpServletResponse) response).setStatus(200); isSuccess = true; return; } - ((HttpServletResponse)response).setStatus(500); + ((HttpServletResponse) response).setStatus(500); } } - @Override public String getServletInfo() { + @Override + public String getServletInfo() { return null; } - @Override public void destroy() { + @Override + public void destroy() { } diff --git a/oap-server/server-bootstrap/pom.xml b/oap-server/server-bootstrap/pom.xml index 573a9f267744..a0c8a69d2da2 100644 --- a/oap-server/server-bootstrap/pom.xml +++ b/oap-server/server-bootstrap/pom.xml @@ -17,7 +17,8 @@ ~ --> - + oap-server org.apache.skywalking diff --git a/oap-server/server-bootstrap/src/main/java/org/apache/skywalking/oap/server/starter/OAPServerBootstrap.java b/oap-server/server-bootstrap/src/main/java/org/apache/skywalking/oap/server/starter/OAPServerBootstrap.java index 3c0b022b6062..361442711081 100644 --- a/oap-server/server-bootstrap/src/main/java/org/apache/skywalking/oap/server/starter/OAPServerBootstrap.java +++ b/oap-server/server-bootstrap/src/main/java/org/apache/skywalking/oap/server/starter/OAPServerBootstrap.java @@ -28,10 +28,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng - * @author kezhenxu94 - */ public class OAPServerBootstrap { private static final Logger logger = LoggerFactory.getLogger(OAPServerBootstrap.class); @@ -46,10 +42,12 @@ public static void start() { ApplicationConfiguration applicationConfiguration = configLoader.load(); manager.init(applicationConfiguration); - manager.find(TelemetryModule.NAME).provider().getService(MetricsCreator.class).createGauge("uptime", - "oap server start up time", MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE) - // Set uptime to second - .setValue(System.currentTimeMillis() / 1000d); + manager.find(TelemetryModule.NAME) + .provider() + .getService(MetricsCreator.class) + .createGauge("uptime", "oap server start up time", MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE) + // Set uptime to second + .setValue(System.currentTimeMillis() / 1000d); if (RunningMode.isInitMode()) { logger.info("OAP starts up in init mode successfully, exit now..."); diff --git a/oap-server/server-bootstrap/src/main/java/org/apache/skywalking/oap/server/starter/config/ApplicationConfigLoader.java b/oap-server/server-bootstrap/src/main/java/org/apache/skywalking/oap/server/starter/config/ApplicationConfigLoader.java index 64dc7cf0078c..9ea3773a76c3 100644 --- a/oap-server/server-bootstrap/src/main/java/org/apache/skywalking/oap/server/starter/config/ApplicationConfigLoader.java +++ b/oap-server/server-bootstrap/src/main/java/org/apache/skywalking/oap/server/starter/config/ApplicationConfigLoader.java @@ -18,6 +18,10 @@ package org.apache.skywalking.oap.server.starter.config; +import java.io.FileNotFoundException; +import java.io.Reader; +import java.util.Map; +import java.util.Properties; import org.apache.skywalking.apm.util.PropertyPlaceholderHelper; import org.apache.skywalking.oap.server.library.module.ApplicationConfiguration; import org.apache.skywalking.oap.server.library.util.CollectionUtils; @@ -26,18 +30,11 @@ import org.slf4j.LoggerFactory; import org.yaml.snakeyaml.Yaml; -import java.io.FileNotFoundException; -import java.io.Reader; -import java.util.Map; -import java.util.Properties; - /** * Initialize collector settings with following sources. Use application.yml as primary setting, and fix missing setting * by default settings in application-default.yml. - * + *

* At last, override setting by system.properties and system.envs if the key matches moduleName.provideName.settingKey. - * - * @author peng-yongsheng, wusheng */ public class ApplicationConfigLoader implements ConfigLoader { @@ -45,7 +42,8 @@ public class ApplicationConfigLoader implements ConfigLoader { T load() throws ConfigFileNotFoundException; } diff --git a/oap-server/server-bootstrap/src/main/resources/endpoint_naming_rules.properties b/oap-server/server-bootstrap/src/main/resources/endpoint_naming_rules.properties index aa5cb62f6d06..7fffa102b04d 100644 --- a/oap-server/server-bootstrap/src/main/resources/endpoint_naming_rules.properties +++ b/oap-server/server-bootstrap/src/main/resources/endpoint_naming_rules.properties @@ -15,5 +15,4 @@ # limitations under the License. # # - istio.mixer.v1.Mixer=.*/istio.mixer.v1.Mixer/.* \ No newline at end of file diff --git a/oap-server/server-bootstrap/src/main/resources/log4j2.xml b/oap-server/server-bootstrap/src/main/resources/log4j2.xml index 72dcf4319073..1f3ed39eacbe 100644 --- a/oap-server/server-bootstrap/src/main/resources/log4j2.xml +++ b/oap-server/server-bootstrap/src/main/resources/log4j2.xml @@ -35,7 +35,7 @@ - + diff --git a/oap-server/server-bootstrap/src/test/java/org/apache/skywalking/oap/server/starter/config/ApplicationConfigLoaderTestCase.java b/oap-server/server-bootstrap/src/test/java/org/apache/skywalking/oap/server/starter/config/ApplicationConfigLoaderTestCase.java index 9365db5c74da..e0a092b56884 100644 --- a/oap-server/server-bootstrap/src/test/java/org/apache/skywalking/oap/server/starter/config/ApplicationConfigLoaderTestCase.java +++ b/oap-server/server-bootstrap/src/test/java/org/apache/skywalking/oap/server/starter/config/ApplicationConfigLoaderTestCase.java @@ -18,23 +18,19 @@ package org.apache.skywalking.oap.server.starter.config; +import java.util.Properties; import org.apache.skywalking.oap.server.library.module.ApplicationConfiguration; import org.junit.Before; import org.junit.Test; -import java.util.Properties; - import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; -/** - * @author panjuan - */ public class ApplicationConfigLoaderTestCase { - + private ApplicationConfiguration applicationConfiguration; - + @Before public void setUp() throws ConfigFileNotFoundException { ApplicationConfigLoader configLoader = new ApplicationConfigLoader(); @@ -43,7 +39,8 @@ public void setUp() throws ConfigFileNotFoundException { @Test public void testLoadConfig() { - Properties providerConfig = applicationConfiguration.getModuleConfiguration("storage").getProviderConfiguration("mysql"); + Properties providerConfig = applicationConfiguration.getModuleConfiguration("storage") + .getProviderConfiguration("mysql"); assertThat(providerConfig.get("metadataQueryMaxSize"), is(5000)); assertThat(providerConfig.get("properties"), instanceOf(Properties.class)); Properties properties = (Properties) providerConfig.get("properties"); diff --git a/oap-server/server-cluster-plugin/cluster-consul-plugin/pom.xml b/oap-server/server-cluster-plugin/cluster-consul-plugin/pom.xml index 509cbe431da8..613d6c734f0c 100644 --- a/oap-server/server-cluster-plugin/cluster-consul-plugin/pom.xml +++ b/oap-server/server-cluster-plugin/cluster-consul-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + server-cluster-plugin org.apache.skywalking diff --git a/oap-server/server-cluster-plugin/cluster-consul-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ClusterModuleConsulConfig.java b/oap-server/server-cluster-plugin/cluster-consul-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ClusterModuleConsulConfig.java index 866c5caa82f9..6f2cd9a72e9f 100644 --- a/oap-server/server-cluster-plugin/cluster-consul-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ClusterModuleConsulConfig.java +++ b/oap-server/server-cluster-plugin/cluster-consul-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ClusterModuleConsulConfig.java @@ -18,16 +18,24 @@ package org.apache.skywalking.oap.server.cluster.plugin.consul; -import lombok.*; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.oap.server.library.module.ModuleConfig; -/** - * @author peng-yongsheng - */ class ClusterModuleConsulConfig extends ModuleConfig { - @Setter @Getter private String serviceName; - @Setter @Getter private String hostPort; - @Setter @Getter private String internalComHost; - @Getter @Setter private String aclToken; - @Setter @Getter private int internalComPort = -1; + @Setter + @Getter + private String serviceName; + @Setter + @Getter + private String hostPort; + @Setter + @Getter + private String internalComHost; + @Getter + @Setter + private String aclToken; + @Setter + @Getter + private int internalComPort = -1; } diff --git a/oap-server/server-cluster-plugin/cluster-consul-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ClusterModuleConsulProvider.java b/oap-server/server-cluster-plugin/cluster-consul-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ClusterModuleConsulProvider.java index 7f10bfcef177..d2b37e83bfb2 100644 --- a/oap-server/server-cluster-plugin/cluster-consul-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ClusterModuleConsulProvider.java +++ b/oap-server/server-cluster-plugin/cluster-consul-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ClusterModuleConsulProvider.java @@ -21,6 +21,8 @@ import com.google.common.net.HostAndPort; import com.orbitz.consul.Consul; import com.orbitz.consul.ConsulException; +import java.util.ArrayList; +import java.util.List; import org.apache.commons.lang3.StringUtils; import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.cluster.ClusterModule; @@ -34,13 +36,8 @@ import org.apache.skywalking.oap.server.library.util.ConnectStringParseException; import org.apache.skywalking.oap.server.library.util.ConnectUtils; -import java.util.ArrayList; -import java.util.List; - /** * Use consul to manage all service instances in SkyWalking cluster. - * - * @author peng-yongsheng */ public class ClusterModuleConsulProvider extends ModuleProvider { @@ -52,19 +49,23 @@ public ClusterModuleConsulProvider() { this.config = new ClusterModuleConsulConfig(); } - @Override public String name() { + @Override + public String name() { return "consul"; } - @Override public Class module() { + @Override + public Class module() { return ClusterModule.class; } - @Override public ModuleConfig createConfigBeanIfAbsent() { + @Override + public ModuleConfig createConfigBeanIfAbsent() { return config; } - @Override public void prepare() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void prepare() throws ServiceNotProvidedException, ModuleStartException { try { List

addressList = ConnectUtils.parse(config.getHostPort()); @@ -74,8 +75,8 @@ public ClusterModuleConsulProvider() { } Consul.Builder consulBuilder = Consul.builder() -// we should set this value or it will be blocked forever - .withConnectTimeoutMillis(3000); + // we should set this value or it will be blocked forever + .withConnectTimeoutMillis(3000); if (StringUtils.isNotEmpty(config.getAclToken())) { consulBuilder.withAclToken(config.getAclToken()); @@ -95,10 +96,12 @@ public ClusterModuleConsulProvider() { this.registerServiceImplementation(ClusterNodesQuery.class, coordinator); } - @Override public void start() { + @Override + public void start() { } - @Override public void notifyAfterCompleted() { + @Override + public void notifyAfterCompleted() { } @Override diff --git a/oap-server/server-cluster-plugin/cluster-consul-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ConsulCoordinator.java b/oap-server/server-cluster-plugin/cluster-consul-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ConsulCoordinator.java index f1ea9b91244e..58a04d1cd0a8 100644 --- a/oap-server/server-cluster-plugin/cluster-consul-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ConsulCoordinator.java +++ b/oap-server/server-cluster-plugin/cluster-consul-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ConsulCoordinator.java @@ -19,18 +19,22 @@ package org.apache.skywalking.oap.server.cluster.plugin.consul; import com.google.common.base.Strings; -import com.orbitz.consul.*; -import com.orbitz.consul.model.agent.*; +import com.orbitz.consul.AgentClient; +import com.orbitz.consul.Consul; +import com.orbitz.consul.HealthClient; +import com.orbitz.consul.model.agent.ImmutableRegistration; +import com.orbitz.consul.model.agent.Registration; import com.orbitz.consul.model.health.ServiceHealth; -import java.util.*; -import org.apache.skywalking.oap.server.core.cluster.*; +import java.util.ArrayList; +import java.util.List; +import org.apache.skywalking.oap.server.core.cluster.ClusterNodesQuery; +import org.apache.skywalking.oap.server.core.cluster.ClusterRegister; +import org.apache.skywalking.oap.server.core.cluster.RemoteInstance; +import org.apache.skywalking.oap.server.core.cluster.ServiceRegisterException; import org.apache.skywalking.oap.server.core.remote.client.Address; import org.apache.skywalking.oap.server.library.util.CollectionUtils; import org.apache.skywalking.oap.server.telemetry.api.TelemetryRelatedContext; -/** - * @author peng-yongsheng - */ public class ConsulCoordinator implements ClusterRegister, ClusterNodesQuery { private final Consul client; @@ -44,7 +48,8 @@ public ConsulCoordinator(ClusterModuleConsulConfig config, Consul client) { this.serviceName = config.getServiceName(); } - @Override public List queryRemoteNodes() { + @Override + public List queryRemoteNodes() { HealthClient healthClient = client.healthClient(); // Discover only "passing" nodes @@ -65,7 +70,8 @@ public ConsulCoordinator(ClusterModuleConsulConfig config, Consul client) { return remoteInstances; } - @Override public void registerRemote(RemoteInstance remoteInstance) throws ServiceRegisterException { + @Override + public void registerRemote(RemoteInstance remoteInstance) throws ServiceRegisterException { if (needUsingInternalAddr()) { remoteInstance = new RemoteInstance(new Address(config.getInternalComHost(), config.getInternalComPort(), true)); } @@ -76,12 +82,15 @@ public ConsulCoordinator(ClusterModuleConsulConfig config, Consul client) { TelemetryRelatedContext.INSTANCE.setId(selfAddress.toString()); Registration registration = ImmutableRegistration.builder() - .id(remoteInstance.getAddress().toString()) - .name(serviceName) - .address(remoteInstance.getAddress().getHost()) - .port(remoteInstance.getAddress().getPort()) - .check(Registration.RegCheck.grpc(remoteInstance.getAddress().getHost() + ":" + remoteInstance.getAddress().getPort(), 5)) // registers with a TTL of 5 seconds - .build(); + .id(remoteInstance.getAddress().toString()) + .name(serviceName) + .address(remoteInstance.getAddress().getHost()) + .port(remoteInstance.getAddress().getPort()) + .check(Registration.RegCheck.grpc(remoteInstance.getAddress() + .getHost() + ":" + remoteInstance + .getAddress() + .getPort(), 5)) // registers with a TTL of 5 seconds + .build(); agentClient.register(registration); } diff --git a/oap-server/server-cluster-plugin/cluster-consul-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ClusterModuleConsulProviderTest.java b/oap-server/server-cluster-plugin/cluster-consul-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ClusterModuleConsulProviderTest.java index 8a14d430d517..09302fa8521b 100644 --- a/oap-server/server-cluster-plugin/cluster-consul-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ClusterModuleConsulProviderTest.java +++ b/oap-server/server-cluster-plugin/cluster-consul-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ClusterModuleConsulProviderTest.java @@ -15,11 +15,14 @@ * limitations under the License. * */ + package org.apache.skywalking.oap.server.cluster.plugin.consul; import com.google.common.collect.Lists; import com.google.common.net.HostAndPort; import com.orbitz.consul.Consul; +import java.util.Collection; +import java.util.List; import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.cluster.ClusterModule; import org.apache.skywalking.oap.server.library.module.ModuleConfig; @@ -33,15 +36,16 @@ import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import java.util.Collection; -import java.util.List; - -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyCollection; +import static org.mockito.Mockito.anyLong; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; -/** - * Created by dengming, 2019.05.01 - */ @RunWith(PowerMockRunner.class) @PrepareForTest(Consul.class) @PowerMockIgnore("javax.management.*") @@ -94,9 +98,7 @@ public void prepare() throws Exception { List address = (List) addressCaptor.getValue(); assertEquals(2, address.size()); - assertEquals(Lists.newArrayList(HostAndPort.fromParts("10.0.0.1", 1000), - HostAndPort.fromParts("10.0.0.2", 1001) - ), address); + assertEquals(Lists.newArrayList(HostAndPort.fromParts("10.0.0.1", 1000), HostAndPort.fromParts("10.0.0.2", 1001)), address); } @Test @@ -137,6 +139,6 @@ public void notifyAfterCompleted() { @Test public void requiredModules() { String[] modules = provider.requiredModules(); - assertArrayEquals(new String[]{CoreModule.NAME}, modules); + assertArrayEquals(new String[] {CoreModule.NAME}, modules); } } \ No newline at end of file diff --git a/oap-server/server-cluster-plugin/cluster-consul-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ConsulCoordinatorTest.java b/oap-server/server-cluster-plugin/cluster-consul-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ConsulCoordinatorTest.java index d4954199c175..fef9a4b92e41 100644 --- a/oap-server/server-cluster-plugin/cluster-consul-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ConsulCoordinatorTest.java +++ b/oap-server/server-cluster-plugin/cluster-consul-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ConsulCoordinatorTest.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.oap.server.cluster.plugin.consul; import com.orbitz.consul.AgentClient; @@ -24,22 +25,23 @@ import com.orbitz.consul.model.agent.Registration; import com.orbitz.consul.model.health.Service; import com.orbitz.consul.model.health.ServiceHealth; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; import org.apache.skywalking.oap.server.core.cluster.RemoteInstance; import org.apache.skywalking.oap.server.core.remote.client.Address; import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; - -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; -/** - * Created by dengming, 2019.05.02 - */ public class ConsulCoordinatorTest { private Consul consul = mock(Consul.class); @@ -75,7 +77,6 @@ public void setUp() { when(consul.agentClient()).thenReturn(agentClient); } - @Test @SuppressWarnings("unchecked") public void queryRemoteNodesWithNonOrEmpty() { diff --git a/oap-server/server-cluster-plugin/cluster-consul-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ITClusterModuleConsulProviderFunctionalTest.java b/oap-server/server-cluster-plugin/cluster-consul-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ITClusterModuleConsulProviderFunctionalTest.java index 48a170ffba31..671064881751 100644 --- a/oap-server/server-cluster-plugin/cluster-consul-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ITClusterModuleConsulProviderFunctionalTest.java +++ b/oap-server/server-cluster-plugin/cluster-consul-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ITClusterModuleConsulProviderFunctionalTest.java @@ -23,6 +23,8 @@ import com.orbitz.consul.Consul; import com.orbitz.consul.model.agent.ImmutableRegistration; import com.orbitz.consul.model.agent.Registration; +import java.util.Collections; +import java.util.List; import org.apache.skywalking.apm.util.StringUtil; import org.apache.skywalking.oap.server.core.cluster.ClusterNodesQuery; import org.apache.skywalking.oap.server.core.cluster.ClusterRegister; @@ -34,16 +36,10 @@ import org.junit.Test; import org.powermock.reflect.Whitebox; -import java.util.Collections; -import java.util.List; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -/** - * @author zhangwei - */ public class ITClusterModuleConsulProviderFunctionalTest { private String consulAddress; @@ -73,8 +69,7 @@ public void registerRemote() throws Exception { @Test public void registerRemoteOfInternal() throws Exception { final String serviceName = "register_remote_internal"; - ModuleProvider provider = - createProvider(serviceName, "127.0.1.2", 1001); + ModuleProvider provider = createProvider(serviceName, "127.0.1.2", 1001); Address selfAddress = new Address("127.0.0.2", 1002, true); RemoteInstance instance = new RemoteInstance(selfAddress); @@ -169,7 +164,8 @@ private ClusterModuleConsulProvider createProvider(String serviceName) throws Ex return createProvider(serviceName, null, 0); } - private ClusterModuleConsulProvider createProvider(String serviceName, String internalComHost, int internalComPort) throws Exception { + private ClusterModuleConsulProvider createProvider(String serviceName, String internalComHost, + int internalComPort) throws Exception { ClusterModuleConsulProvider provider = new ClusterModuleConsulProvider(); ClusterModuleConsulConfig config = (ClusterModuleConsulConfig) provider.createConfigBeanIfAbsent(); @@ -202,11 +198,11 @@ private ClusterModuleConsulProvider createProvider(String serviceName, String in Whitebox.setInternalState(consulCoordinator, "selfAddress", remoteInstance.getAddress()); TelemetryRelatedContext.INSTANCE.setId(remoteInstance.getAddress().toString()); Registration registration = ImmutableRegistration.builder() - .id(remoteInstance.getAddress().toString()) - .name(serviceName) - .address(remoteInstance.getAddress().getHost()) - .port(remoteInstance.getAddress().getPort()) - .build(); + .id(remoteInstance.getAddress().toString()) + .name(serviceName) + .address(remoteInstance.getAddress().getHost()) + .port(remoteInstance.getAddress().getPort()) + .build(); agentClient.register(registration); }; @@ -231,7 +227,8 @@ private List queryRemoteNodes(ModuleProvider provider, int goals return queryRemoteNodes(provider, goals, 20); } - private List queryRemoteNodes(ModuleProvider provider, int goals, int cyclic) throws InterruptedException { + private List queryRemoteNodes(ModuleProvider provider, int goals, + int cyclic) throws InterruptedException { do { List instances = getClusterNodesQuery(provider).queryRemoteNodes(); if (instances.size() == goals) { @@ -239,7 +236,8 @@ private List queryRemoteNodes(ModuleProvider provider, int goals } else { Thread.sleep(1000); } - } while (--cyclic > 0); + } + while (--cyclic > 0); return Collections.EMPTY_LIST; } diff --git a/oap-server/server-cluster-plugin/cluster-etcd-plugin/pom.xml b/oap-server/server-cluster-plugin/cluster-etcd-plugin/pom.xml index d55a577319e0..118812809fd1 100644 --- a/oap-server/server-cluster-plugin/cluster-etcd-plugin/pom.xml +++ b/oap-server/server-cluster-plugin/cluster-etcd-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + server-cluster-plugin org.apache.skywalking diff --git a/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/ClusterModuleEtcdConfig.java b/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/ClusterModuleEtcdConfig.java index 7e593fce6bf5..bba372782d7b 100644 --- a/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/ClusterModuleEtcdConfig.java +++ b/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/ClusterModuleEtcdConfig.java @@ -22,14 +22,21 @@ import lombok.Setter; import org.apache.skywalking.oap.server.library.module.ModuleConfig; -/** - * @author Alan Lau - */ public class ClusterModuleEtcdConfig extends ModuleConfig { - @Setter @Getter private String serviceName; - @Setter @Getter private String hostPort; - @Setter @Getter private boolean isSSL; - @Setter @Getter private String internalComHost; - @Setter @Getter private int internalComPort = -1; + @Setter + @Getter + private String serviceName; + @Setter + @Getter + private String hostPort; + @Setter + @Getter + private boolean isSSL; + @Setter + @Getter + private String internalComHost; + @Setter + @Getter + private int internalComPort = -1; } diff --git a/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/ClusterModuleEtcdProvider.java b/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/ClusterModuleEtcdProvider.java index a900291e4530..71be800858ab 100644 --- a/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/ClusterModuleEtcdProvider.java +++ b/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/ClusterModuleEtcdProvider.java @@ -33,8 +33,6 @@ /** * etcd Provider. - * - * @author Alan Lau */ public class ClusterModuleEtcdProvider extends ModuleProvider { @@ -47,19 +45,23 @@ public ClusterModuleEtcdProvider() { this.config = new ClusterModuleEtcdConfig(); } - @Override public String name() { + @Override + public String name() { return "etcd"; } - @Override public Class module() { + @Override + public Class module() { return ClusterModule.class; } - @Override public ModuleConfig createConfigBeanIfAbsent() { + @Override + public ModuleConfig createConfigBeanIfAbsent() { return config; } - @Override public void prepare() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void prepare() throws ServiceNotProvidedException, ModuleStartException { List uris = EtcdUtils.parse(config); @@ -70,15 +72,18 @@ public ClusterModuleEtcdProvider() { this.registerServiceImplementation(ClusterNodesQuery.class, coordinator); } - @Override public void start() throws ServiceNotProvidedException { + @Override + public void start() throws ServiceNotProvidedException { } - @Override public void notifyAfterCompleted() throws ServiceNotProvidedException { + @Override + public void notifyAfterCompleted() throws ServiceNotProvidedException { } - @Override public String[] requiredModules() { + @Override + public String[] requiredModules() { return new String[] {CoreModule.NAME}; } } diff --git a/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/EtcdCoordinator.java b/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/EtcdCoordinator.java index 35984d30ba75..574adf6e1cb4 100644 --- a/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/EtcdCoordinator.java +++ b/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/EtcdCoordinator.java @@ -37,9 +37,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * @author Alan Lau - */ public class EtcdCoordinator implements ClusterRegister, ClusterNodesQuery { private static final Logger logger = LoggerFactory.getLogger(EtcdCoordinator.class); @@ -61,7 +58,8 @@ public EtcdCoordinator(ClusterModuleEtcdConfig config, EtcdClient client) { this.serviceName = config.getServiceName(); } - @Override public List queryRemoteNodes() { + @Override + public List queryRemoteNodes() { List res = new ArrayList<>(); try { @@ -87,7 +85,8 @@ public EtcdCoordinator(ClusterModuleEtcdConfig config, EtcdClient client) { return res; } - @Override public void registerRemote(RemoteInstance remoteInstance) throws ServiceRegisterException { + @Override + public void registerRemote(RemoteInstance remoteInstance) throws ServiceRegisterException { if (needUsingInternalAddr()) { remoteInstance = new RemoteInstance(new Address(config.getInternalComHost(), config.getInternalComPort(), true)); @@ -96,7 +95,10 @@ public EtcdCoordinator(ClusterModuleEtcdConfig config, EtcdClient client) { this.selfAddress = remoteInstance.getAddress(); TelemetryRelatedContext.INSTANCE.setId(selfAddress.toString()); - EtcdEndpoint endpoint = new EtcdEndpoint.Builder().serviceName(serviceName).host(selfAddress.getHost()).port(selfAddress.getPort()).build(); + EtcdEndpoint endpoint = new EtcdEndpoint.Builder().serviceName(serviceName) + .host(selfAddress.getHost()) + .port(selfAddress.getPort()) + .build(); try { client.putDir(serviceName).send(); String key = buildKey(serviceName, selfAddress, remoteInstance); @@ -126,7 +128,11 @@ private void renew(EtcdClient client, String key, String json) { } private String buildKey(String serviceName, Address address, RemoteInstance instance) { - return new StringBuilder(serviceName).append("/").append(address.getHost()).append("_").append(instance.hashCode()).toString(); + return new StringBuilder(serviceName).append("/") + .append(address.getHost()) + .append("_") + .append(instance.hashCode()) + .toString(); } private boolean needUsingInternalAddr() { diff --git a/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/EtcdEndpoint.java b/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/EtcdEndpoint.java index a0f51ea027d4..0479d07ea2e4 100644 --- a/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/EtcdEndpoint.java +++ b/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/EtcdEndpoint.java @@ -24,16 +24,20 @@ /** * an instance json to register to etcd. - * - * @author Alan Lau */ public class EtcdEndpoint implements Serializable { - @Setter @Getter private String serviceName; + @Setter + @Getter + private String serviceName; - @Setter @Getter private String host; + @Setter + @Getter + private String host; - @Setter @Getter private int port; + @Setter + @Getter + private int port; public EtcdEndpoint(Builder builder) { setServiceName(builder.serviceName); diff --git a/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/EtcdUtils.java b/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/EtcdUtils.java index 3cb2edbacf32..ad848e882737 100644 --- a/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/EtcdUtils.java +++ b/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/EtcdUtils.java @@ -26,9 +26,6 @@ import org.apache.skywalking.oap.server.library.util.ConnectStringParseException; import org.apache.skywalking.oap.server.library.util.ConnectUtils; -/** - * @author Alan Lau - */ public class EtcdUtils { public EtcdUtils() { @@ -39,7 +36,10 @@ public static List parse(ClusterModuleEtcdConfig config) throws ModuleStart try { List
addressList = ConnectUtils.parse(config.getHostPort()); for (Address address : addressList) { - uris.add(URI.create(new StringBuilder("http://").append(address.getHost()).append(":").append(address.getPort()).toString())); + uris.add(URI.create(new StringBuilder("http://").append(address.getHost()) + .append(":") + .append(address.getPort()) + .toString())); } } catch (ConnectStringParseException e) { throw new ModuleStartException(e.getMessage(), e); diff --git a/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/ClusterModuleEtcdProviderTest.java b/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/ClusterModuleEtcdProviderTest.java index 7cc1d792cbef..8415a77349c6 100644 --- a/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/ClusterModuleEtcdProviderTest.java +++ b/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/ClusterModuleEtcdProviderTest.java @@ -38,9 +38,6 @@ import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; -/** - * @author Alan Lau - */ @RunWith(PowerMockRunner.class) @PrepareForTest(EtcdUtils.class) @PowerMockIgnore("javax.management.*") diff --git a/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/EtcdCoordinatorTest.java b/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/EtcdCoordinatorTest.java index dd6b4ffd82f4..dd5c1575ae33 100644 --- a/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/EtcdCoordinatorTest.java +++ b/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/EtcdCoordinatorTest.java @@ -47,9 +47,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -/** - * @author Alan Lau - */ @RunWith(PowerMockRunner.class) @PrepareForTest(EtcdKeysResponse.class) @PowerMockIgnore("javax.management.*") @@ -70,7 +67,8 @@ public class EtcdCoordinatorTest { private static final String SERVICE_NAME = "my-service"; - private EtcdResponsePromise getPromise, putPromise; + private EtcdResponsePromise getPromise; + private EtcdResponsePromise putPromise; private EtcdKeysResponse response; @@ -94,9 +92,9 @@ public void setUp() throws Exception { client = new EtcdClient("http://10.0.0.1:1000", "http://10.0.0.2:2000"); coordinator = new EtcdCoordinator(etcdConfig, client); - putPromise = (EtcdResponsePromise)mock(EtcdResponsePromise.class); - getPromise = (EtcdResponsePromise)mock(EtcdResponsePromise.class); - putDirPromise = (EtcdResponsePromise)mock(EtcdResponsePromise.class); + putPromise = (EtcdResponsePromise) mock(EtcdResponsePromise.class); + getPromise = (EtcdResponsePromise) mock(EtcdResponsePromise.class); + putDirPromise = (EtcdResponsePromise) mock(EtcdResponsePromise.class); PowerMockito.when(client.putDir(anyString())).thenReturn(putDirRequest); PowerMockito.when(putDirRequest.ttl(anyInt())).thenReturn(putDirRequest); diff --git a/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/ITClusterEtcdPluginTest.java b/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/ITClusterEtcdPluginTest.java index c0fa3f8c42c5..0fd14b1bf547 100644 --- a/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/ITClusterEtcdPluginTest.java +++ b/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/ITClusterEtcdPluginTest.java @@ -34,9 +34,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -/** - * @author Alan Lau - */ public class ITClusterEtcdPluginTest { private static final Logger LOGGER = LoggerFactory.getLogger(ITClusterEtcdPluginTest.class); @@ -141,7 +138,10 @@ private void verifyRegistration(Address remoteAddress, EtcdEndpoint endpoint) { private EtcdEndpoint buildEndpoint(RemoteInstance instance) { Address address = instance.getAddress(); - EtcdEndpoint endpoint = new EtcdEndpoint.Builder().host(address.getHost()).port(address.getPort()).serviceName(SERVICE_NAME).build(); + EtcdEndpoint endpoint = new EtcdEndpoint.Builder().host(address.getHost()) + .port(address.getPort()) + .serviceName(SERVICE_NAME) + .build(); return endpoint; } diff --git a/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/ITClusterModuleEtcdProviderFunctionalTest.java b/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/ITClusterModuleEtcdProviderFunctionalTest.java index ceb442e7df5d..eb7a8e0ccb8f 100644 --- a/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/ITClusterModuleEtcdProviderFunctionalTest.java +++ b/oap-server/server-cluster-plugin/cluster-etcd-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/ITClusterModuleEtcdProviderFunctionalTest.java @@ -18,6 +18,8 @@ package org.apache.skywalking.oap.server.cluster.plugin.etcd; +import java.util.Collections; +import java.util.List; import mousio.etcd4j.EtcdClient; import org.apache.skywalking.apm.util.StringUtil; import org.apache.skywalking.oap.server.core.cluster.ClusterNodesQuery; @@ -30,16 +32,10 @@ import org.junit.Test; import org.powermock.reflect.Whitebox; -import java.util.Collections; -import java.util.List; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -/** - * @author zhangwei - */ public class ITClusterModuleEtcdProviderFunctionalTest { private String etcdAddress; @@ -71,8 +67,7 @@ public void registerRemote() throws Exception { @Test public void registerRemoteOfInternal() throws Exception { final String serviceName = "register_remote_internal"; - ModuleProvider provider = - createProvider(serviceName, "127.0.1.2", 1000); + ModuleProvider provider = createProvider(serviceName, "127.0.1.2", 1000); Address selfAddress = new Address("127.0.0.2", 1000, true); RemoteInstance instance = new RemoteInstance(selfAddress); @@ -166,7 +161,8 @@ private ClusterModuleEtcdProvider createProvider(String serviceName) throws Modu return createProvider(serviceName, null, 0); } - private ClusterModuleEtcdProvider createProvider(String serviceName, String internalComHost, int internalComPort) throws ModuleStartException { + private ClusterModuleEtcdProvider createProvider(String serviceName, String internalComHost, + int internalComPort) throws ModuleStartException { ClusterModuleEtcdProvider provider = new ClusterModuleEtcdProvider(); ClusterModuleEtcdConfig config = (ClusterModuleEtcdConfig) provider.createConfigBeanIfAbsent(); @@ -200,7 +196,8 @@ private List queryRemoteNodes(ModuleProvider provider, int goals return queryRemoteNodes(provider, goals, 20); } - private List queryRemoteNodes(ModuleProvider provider, int goals, int cyclic) throws InterruptedException { + private List queryRemoteNodes(ModuleProvider provider, int goals, + int cyclic) throws InterruptedException { do { List instances = getClusterNodesQuery(provider).queryRemoteNodes(); if (instances.size() == goals) { @@ -208,7 +205,8 @@ private List queryRemoteNodes(ModuleProvider provider, int goals } else { Thread.sleep(1000); } - } while (--cyclic > 0); + } + while (--cyclic > 0); return Collections.EMPTY_LIST; } diff --git a/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/pom.xml b/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/pom.xml index 865d42e0a90c..b0600adf7b0d 100644 --- a/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/pom.xml +++ b/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + server-cluster-plugin org.apache.skywalking diff --git a/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/ClusterModuleKubernetesConfig.java b/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/ClusterModuleKubernetesConfig.java index 84ca8bccdd90..986f3c1857dc 100644 --- a/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/ClusterModuleKubernetesConfig.java +++ b/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/ClusterModuleKubernetesConfig.java @@ -22,8 +22,6 @@ /** * The configuration of the module of cluster.kubernetes - * - * @author gaohongtao */ public class ClusterModuleKubernetesConfig extends ModuleConfig { private int watchTimeoutSeconds; diff --git a/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/ClusterModuleKubernetesProvider.java b/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/ClusterModuleKubernetesProvider.java index b7e304183bba..bb49ccd8bf9f 100644 --- a/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/ClusterModuleKubernetesProvider.java +++ b/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/ClusterModuleKubernetesProvider.java @@ -18,14 +18,18 @@ package org.apache.skywalking.oap.server.cluster.plugin.kubernetes; -import org.apache.skywalking.oap.server.cluster.plugin.kubernetes.dependencies.*; -import org.apache.skywalking.oap.server.core.cluster.*; -import org.apache.skywalking.oap.server.library.module.*; +import org.apache.skywalking.oap.server.cluster.plugin.kubernetes.dependencies.NamespacedPodListWatch; +import org.apache.skywalking.oap.server.cluster.plugin.kubernetes.dependencies.UidEnvSupplier; +import org.apache.skywalking.oap.server.core.cluster.ClusterModule; +import org.apache.skywalking.oap.server.core.cluster.ClusterNodesQuery; +import org.apache.skywalking.oap.server.core.cluster.ClusterRegister; +import org.apache.skywalking.oap.server.library.module.ModuleConfig; +import org.apache.skywalking.oap.server.library.module.ModuleDefine; +import org.apache.skywalking.oap.server.library.module.ModuleProvider; +import org.apache.skywalking.oap.server.library.module.ServiceNotProvidedException; /** * Use kubernetes to manage all instances in Skywalking cluster. - * - * @author gaohongtao */ public class ClusterModuleKubernetesProvider extends ModuleProvider { @@ -37,35 +41,41 @@ public ClusterModuleKubernetesProvider() { this.config = new ClusterModuleKubernetesConfig(); } - @Override public String name() { + @Override + public String name() { return "kubernetes"; } - @Override public Class module() { + @Override + public Class module() { return ClusterModule.class; } - @Override public ModuleConfig createConfigBeanIfAbsent() { + @Override + public ModuleConfig createConfigBeanIfAbsent() { return config; } - @Override public void prepare() throws ServiceNotProvidedException { - coordinator = new KubernetesCoordinator(getManager(), - new NamespacedPodListWatch(config.getNamespace(), config.getLabelSelector(), config.getWatchTimeoutSeconds()), - new UidEnvSupplier(config.getUidEnvName())); + @Override + public void prepare() throws ServiceNotProvidedException { + coordinator = new KubernetesCoordinator(getManager(), new NamespacedPodListWatch(config.getNamespace(), config.getLabelSelector(), config + .getWatchTimeoutSeconds()), new UidEnvSupplier(config.getUidEnvName())); this.registerServiceImplementation(ClusterRegister.class, coordinator); this.registerServiceImplementation(ClusterNodesQuery.class, coordinator); } - @Override public void start() { + @Override + public void start() { } - @Override public void notifyAfterCompleted() { + @Override + public void notifyAfterCompleted() { coordinator.start(); } - @Override public String[] requiredModules() { + @Override + public String[] requiredModules() { return new String[0]; } } diff --git a/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/Event.java b/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/Event.java index 35b6f066253f..103c826a607d 100644 --- a/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/Event.java +++ b/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/Event.java @@ -20,8 +20,6 @@ /** * The event of watch. - * - * @author gaohongtao */ public class Event { private final String type; diff --git a/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/KubernetesCoordinator.java b/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/KubernetesCoordinator.java index 2c78ceb5b720..9f3a8779b9db 100644 --- a/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/KubernetesCoordinator.java +++ b/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/KubernetesCoordinator.java @@ -18,24 +18,36 @@ package org.apache.skywalking.oap.server.cluster.plugin.kubernetes; -import com.google.common.util.concurrent.*; -import java.util.*; -import java.util.concurrent.*; +import com.google.common.util.concurrent.FutureCallback; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.ListeningExecutorService; +import com.google.common.util.concurrent.MoreExecutors; +import com.google.common.util.concurrent.ThreadFactoryBuilder; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.Callable; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; import java.util.function.Supplier; import javax.annotation.Nullable; import org.apache.skywalking.oap.server.core.CoreModule; -import org.apache.skywalking.oap.server.core.cluster.*; +import org.apache.skywalking.oap.server.core.cluster.ClusterNodesQuery; +import org.apache.skywalking.oap.server.core.cluster.ClusterRegister; +import org.apache.skywalking.oap.server.core.cluster.RemoteInstance; +import org.apache.skywalking.oap.server.core.cluster.ServiceRegisterException; import org.apache.skywalking.oap.server.core.config.ConfigService; import org.apache.skywalking.oap.server.core.remote.client.Address; import org.apache.skywalking.oap.server.library.module.ModuleDefineHolder; import org.apache.skywalking.oap.server.telemetry.api.TelemetryRelatedContext; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Read collector pod info from api-server of kubernetes, then using all containerIp list to construct the list of * {@link RemoteInstance}. - * - * @author gaohongtao */ public class KubernetesCoordinator implements ClusterRegister, ClusterNodesQuery { @@ -51,8 +63,8 @@ public class KubernetesCoordinator implements ClusterRegister, ClusterNodesQuery private volatile int port = -1; - KubernetesCoordinator(ModuleDefineHolder manager, - final ReusableWatch watch, final Supplier uidSupplier) { + KubernetesCoordinator(ModuleDefineHolder manager, final ReusableWatch watch, + final Supplier uidSupplier) { this.manager = manager; this.watch = watch; this.uid = uidSupplier.get(); @@ -60,12 +72,14 @@ public class KubernetesCoordinator implements ClusterRegister, ClusterNodesQuery } public void start() { - ExecutorService executorService = Executors.newSingleThreadExecutor(new ThreadFactoryBuilder() - .setDaemon(true).setNameFormat("Kubernetes-ApiServer-%s").build()); + ExecutorService executorService = Executors.newSingleThreadExecutor(new ThreadFactoryBuilder().setDaemon(true) + .setNameFormat("Kubernetes-ApiServer-%s") + .build()); submitTask(MoreExecutors.listeningDecorator(executorService), executorService); } - @Override public void registerRemote(RemoteInstance remoteInstance) throws ServiceRegisterException { + @Override + public void registerRemote(RemoteInstance remoteInstance) throws ServiceRegisterException { this.port = remoteInstance.getAddress().getPort(); } @@ -74,11 +88,13 @@ private void submitTask(final ListeningExecutorService service, final ExecutorSe ListenableFuture watchFuture = service.submit(newWatch()); Futures.addCallback(watchFuture, new FutureCallback() { - @Override public void onSuccess(@Nullable Object ignored) { + @Override + public void onSuccess(@Nullable Object ignored) { submitTask(service, executorService); } - @Override public void onFailure(@Nullable Throwable throwable) { + @Override + public void onFailure(@Nullable Throwable throwable) { logger.debug("Generate remote nodes error", throwable); submitTask(service, executorService); } @@ -101,7 +117,8 @@ private void generateRemoteNodes() { switch (event.getType()) { case "ADDED": case "MODIFIED": - cache.put(event.getUid(), new RemoteInstance(new Address(event.getHost(), port, event.getUid().equals(this.uid)))); + cache.put(event.getUid(), new RemoteInstance(new Address(event.getHost(), port, event.getUid() + .equals(this.uid)))); break; case "DELETED": cache.remove(event.getUid()); @@ -112,7 +129,8 @@ private void generateRemoteNodes() { } } - @Override public List queryRemoteNodes() { + @Override + public List queryRemoteNodes() { final List list = new ArrayList<>(); cache.values().forEach(instance -> { Address address = instance.getAddress(); diff --git a/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/ReusableWatch.java b/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/ReusableWatch.java index bbe5ea9f5245..67a4cfaf90fb 100644 --- a/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/ReusableWatch.java +++ b/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/ReusableWatch.java @@ -22,7 +22,6 @@ * This watch can init or reset internal state. * * @param event of watch - * @author gaohongtao */ public interface ReusableWatch extends Iterable { diff --git a/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/dependencies/NamespacedPodListWatch.java b/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/dependencies/NamespacedPodListWatch.java index 985deae51446..51d1125d819f 100644 --- a/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/dependencies/NamespacedPodListWatch.java +++ b/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/dependencies/NamespacedPodListWatch.java @@ -38,8 +38,6 @@ /** * Watch the api {@literal https://v1-9.docs.kubernetes.io/docs/reference/generated/kubernetes-api/v1.9/#watch-64}. - * - * @author gaohongtao */ public class NamespacedPodListWatch implements ReusableWatch { @@ -59,7 +57,8 @@ public NamespacedPodListWatch(final String namespace, final String labelSelector this.watchTimeoutSeconds = watchTimeoutSeconds; } - @Override public void initOrReset() { + @Override + public void initOrReset() { ApiClient client; try { client = Config.defaultClient(); @@ -70,29 +69,29 @@ public NamespacedPodListWatch(final String namespace, final String labelSelector Configuration.setDefaultApiClient(client); CoreV1Api api = new CoreV1Api(); try { - watch = Watch.createWatch( - client, - api.listNamespacedPodCall(namespace, null, null, null, - null, labelSelector, Integer.MAX_VALUE,null,null, Boolean.TRUE, - null, null), - new TypeToken>() { }.getType()); + watch = Watch.createWatch(client, api.listNamespacedPodCall(namespace, null, null, null, null, labelSelector, Integer.MAX_VALUE, null, null, Boolean.TRUE, null, null), new TypeToken>() { + }.getType()); } catch (final ApiException e) { logger.error("code:{} header:{} body:{}", e.getCode(), e.getResponseHeaders(), e.getResponseBody()); throw new RuntimeException(e.getMessage(), e); } } - @Override public Iterator iterator() { + @Override + public Iterator iterator() { final Iterator> watchItr = watch.iterator(); return new Iterator() { - @Override public boolean hasNext() { + @Override + public boolean hasNext() { return wrap(watchItr::hasNext, false); } - @Override public Event next() { + @Override + public Event next() { return wrap(() -> { final Watch.Response response = watchItr.next(); - return new Event(response.type, response.object.getMetadata().getUid(), response.object.getStatus().getPodIP()); + return new Event(response.type, response.object.getMetadata().getUid(), response.object.getStatus() + .getPodIP()); }, null); } diff --git a/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/dependencies/UidEnvSupplier.java b/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/dependencies/UidEnvSupplier.java index 9512c1fbc061..d444c835f40d 100644 --- a/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/dependencies/UidEnvSupplier.java +++ b/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/dependencies/UidEnvSupplier.java @@ -22,8 +22,6 @@ /** * Supply uid from environment variable. - * - * @author gaohongtao */ public class UidEnvSupplier implements Supplier { @@ -32,7 +30,9 @@ public class UidEnvSupplier implements Supplier { public UidEnvSupplier(final String uidEnvName) { this.uidEnvName = uidEnvName == null ? "" : uidEnvName; } - @Override public String get() { + + @Override + public String get() { return System.getenv(uidEnvName); } } diff --git a/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/KubernetesCoordinatorTest.java b/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/KubernetesCoordinatorTest.java index 982f4eb1d7aa..81a87f42d68f 100644 --- a/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/KubernetesCoordinatorTest.java +++ b/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/KubernetesCoordinatorTest.java @@ -19,12 +19,14 @@ package org.apache.skywalking.oap.server.cluster.plugin.kubernetes; import org.apache.skywalking.oap.server.cluster.plugin.kubernetes.fixture.PlainWatch; -import org.apache.skywalking.oap.server.core.*; +import org.apache.skywalking.oap.server.core.CoreModule; +import org.apache.skywalking.oap.server.core.CoreModuleConfig; import org.apache.skywalking.oap.server.core.cluster.RemoteInstance; import org.apache.skywalking.oap.server.core.config.ConfigService; import org.apache.skywalking.oap.server.core.remote.client.Address; import org.apache.skywalking.oap.server.library.module.ModuleDefineHolder; -import org.apache.skywalking.oap.server.testing.module.*; +import org.apache.skywalking.oap.server.testing.module.ModuleDefineTesting; +import org.apache.skywalking.oap.server.testing.module.ModuleManagerTesting; import org.junit.Test; import org.mockito.Mockito; @@ -44,7 +46,13 @@ public void assertAdded() throws InterruptedException { coordinator.registerRemote(new RemoteInstance(new Address("0.0.0.0", 8454, true))); watch.await(); assertThat(coordinator.queryRemoteNodes().size(), is(2)); - assertThat(coordinator.queryRemoteNodes().stream().filter(instance -> instance.getAddress().isSelf()).findFirst().get().getAddress().getHost(), is("10.0.0.1")); + assertThat(coordinator.queryRemoteNodes() + .stream() + .filter(instance -> instance.getAddress().isSelf()) + .findFirst() + .get() + .getAddress() + .getHost(), is("10.0.0.1")); } @Test @@ -55,7 +63,13 @@ public void assertModified() throws InterruptedException { coordinator.registerRemote(new RemoteInstance(new Address("0.0.0.0", 8454, true))); watch.await(); assertThat(coordinator.queryRemoteNodes().size(), is(2)); - assertThat(coordinator.queryRemoteNodes().stream().filter(instance -> instance.getAddress().isSelf()).findFirst().get().getAddress().getHost(), is("10.0.0.3")); + assertThat(coordinator.queryRemoteNodes() + .stream() + .filter(instance -> instance.getAddress().isSelf()) + .findFirst() + .get() + .getAddress() + .getHost(), is("10.0.0.3")); } @Test @@ -66,7 +80,13 @@ public void assertDeleted() throws InterruptedException { coordinator.registerRemote(new RemoteInstance(new Address("0.0.0.0", 8454, true))); watch.await(); assertThat(coordinator.queryRemoteNodes().size(), is(1)); - assertThat(coordinator.queryRemoteNodes().stream().filter(instance -> instance.getAddress().isSelf()).findFirst().get().getAddress().getHost(), is("10.0.0.1")); + assertThat(coordinator.queryRemoteNodes() + .stream() + .filter(instance -> instance.getAddress().isSelf()) + .findFirst() + .get() + .getAddress() + .getHost(), is("10.0.0.1")); } @Test @@ -77,7 +97,13 @@ public void assertError() throws InterruptedException { coordinator.registerRemote(new RemoteInstance(new Address("0.0.0.0", 8454, true))); watch.await(); assertThat(coordinator.queryRemoteNodes().size(), is(2)); - assertThat(coordinator.queryRemoteNodes().stream().filter(instance -> instance.getAddress().isSelf()).findFirst().get().getAddress().getHost(), is("10.0.0.1")); + assertThat(coordinator.queryRemoteNodes() + .stream() + .filter(instance -> instance.getAddress().isSelf()) + .findFirst() + .get() + .getAddress() + .getHost(), is("10.0.0.1")); } @Test @@ -87,7 +113,13 @@ public void assertModifiedInReceiverRole() throws InterruptedException { coordinator.start(); watch.await(); assertThat(coordinator.queryRemoteNodes().size(), is(2)); - assertThat(coordinator.queryRemoteNodes().stream().filter(instance -> instance.getAddress().isSelf()).findFirst().get().getAddress().getHost(), is("10.0.0.3")); + assertThat(coordinator.queryRemoteNodes() + .stream() + .filter(instance -> instance.getAddress().isSelf()) + .findFirst() + .get() + .getAddress() + .getHost(), is("10.0.0.3")); } @Test @@ -97,7 +129,13 @@ public void assertDeletedInReceiverRole() throws InterruptedException { coordinator.start(); watch.await(); assertThat(coordinator.queryRemoteNodes().size(), is(1)); - assertThat(coordinator.queryRemoteNodes().stream().filter(instance -> instance.getAddress().isSelf()).findFirst().get().getAddress().getHost(), is("10.0.0.1")); + assertThat(coordinator.queryRemoteNodes() + .stream() + .filter(instance -> instance.getAddress().isSelf()) + .findFirst() + .get() + .getAddress() + .getHost(), is("10.0.0.1")); } @Test @@ -107,7 +145,13 @@ public void assertErrorInReceiverRole() throws InterruptedException { coordinator.start(); watch.await(); assertThat(coordinator.queryRemoteNodes().size(), is(2)); - assertThat(coordinator.queryRemoteNodes().stream().filter(instance -> instance.getAddress().isSelf()).findFirst().get().getAddress().getHost(), is("10.0.0.1")); + assertThat(coordinator.queryRemoteNodes() + .stream() + .filter(instance -> instance.getAddress().isSelf()) + .findFirst() + .get() + .getAddress() + .getHost(), is("10.0.0.1")); } public ModuleDefineHolder getManager() { diff --git a/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/fixture/PlainWatch.java b/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/fixture/PlainWatch.java index effab3529e91..137a79319cd6 100644 --- a/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/fixture/PlainWatch.java +++ b/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/fixture/PlainWatch.java @@ -51,11 +51,12 @@ private PlainWatch(final List events, final int size) { this.size = size; } - @Override public void initOrReset() { + @Override + public void initOrReset() { final Iterator internal = events.subList(count, events.size()).iterator(); iterator = new Iterator() { public boolean hasNext() { - boolean result = count < size && internal.hasNext(); + boolean result = count < size && internal.hasNext(); if (!result) { latch.countDown(); } @@ -77,7 +78,8 @@ public void remove() { }; } - @Override public Iterator iterator() { + @Override + public Iterator iterator() { return iterator; } diff --git a/oap-server/server-cluster-plugin/cluster-nacos-plugin/pom.xml b/oap-server/server-cluster-plugin/cluster-nacos-plugin/pom.xml index e5232fa51912..525cffa8355b 100644 --- a/oap-server/server-cluster-plugin/cluster-nacos-plugin/pom.xml +++ b/oap-server/server-cluster-plugin/cluster-nacos-plugin/pom.xml @@ -16,7 +16,8 @@ ~ limitations under the License. ~ --> - + server-cluster-plugin org.apache.skywalking diff --git a/oap-server/server-cluster-plugin/cluster-nacos-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/ClusterModuleNacosConfig.java b/oap-server/server-cluster-plugin/cluster-nacos-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/ClusterModuleNacosConfig.java index d9f074672891..bbfe071c621b 100644 --- a/oap-server/server-cluster-plugin/cluster-nacos-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/ClusterModuleNacosConfig.java +++ b/oap-server/server-cluster-plugin/cluster-nacos-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/ClusterModuleNacosConfig.java @@ -22,11 +22,14 @@ import lombok.Setter; import org.apache.skywalking.oap.server.library.module.ModuleConfig; -/** - * @author caoyixiong - */ public class ClusterModuleNacosConfig extends ModuleConfig { - @Setter @Getter private String serviceName; - @Setter @Getter private String hostPort; - @Setter @Getter private String namespace = "public"; + @Setter + @Getter + private String serviceName; + @Setter + @Getter + private String hostPort; + @Setter + @Getter + private String namespace = "public"; } diff --git a/oap-server/server-cluster-plugin/cluster-nacos-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/ClusterModuleNacosProvider.java b/oap-server/server-cluster-plugin/cluster-nacos-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/ClusterModuleNacosProvider.java index 5c4d4f9a47a5..c73bea1f9ccb 100644 --- a/oap-server/server-cluster-plugin/cluster-nacos-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/ClusterModuleNacosProvider.java +++ b/oap-server/server-cluster-plugin/cluster-nacos-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/ClusterModuleNacosProvider.java @@ -21,17 +21,17 @@ import com.alibaba.nacos.api.PropertyKeyConst; import com.alibaba.nacos.api.naming.NamingFactory; import com.alibaba.nacos.api.naming.NamingService; +import java.util.Properties; import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.cluster.ClusterModule; import org.apache.skywalking.oap.server.core.cluster.ClusterNodesQuery; import org.apache.skywalking.oap.server.core.cluster.ClusterRegister; -import org.apache.skywalking.oap.server.library.module.*; - -import java.util.Properties; +import org.apache.skywalking.oap.server.library.module.ModuleConfig; +import org.apache.skywalking.oap.server.library.module.ModuleDefine; +import org.apache.skywalking.oap.server.library.module.ModuleProvider; +import org.apache.skywalking.oap.server.library.module.ModuleStartException; +import org.apache.skywalking.oap.server.library.module.ServiceNotProvidedException; -/** - * @author caoyixiong - */ public class ClusterModuleNacosProvider extends ModuleProvider { private final ClusterModuleNacosConfig config; @@ -84,6 +84,6 @@ public void notifyAfterCompleted() throws ServiceNotProvidedException { @Override public String[] requiredModules() { - return new String[]{CoreModule.NAME}; + return new String[] {CoreModule.NAME}; } } diff --git a/oap-server/server-cluster-plugin/cluster-nacos-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/NacosCoordinator.java b/oap-server/server-cluster-plugin/cluster-nacos-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/NacosCoordinator.java index f2f73ace7b74..4253d8f7c80f 100644 --- a/oap-server/server-cluster-plugin/cluster-nacos-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/NacosCoordinator.java +++ b/oap-server/server-cluster-plugin/cluster-nacos-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/NacosCoordinator.java @@ -21,17 +21,17 @@ import com.alibaba.nacos.api.exception.NacosException; import com.alibaba.nacos.api.naming.NamingService; import com.alibaba.nacos.api.naming.pojo.Instance; -import org.apache.skywalking.oap.server.core.cluster.*; +import java.util.ArrayList; +import java.util.List; +import org.apache.skywalking.oap.server.core.cluster.ClusterNodesQuery; +import org.apache.skywalking.oap.server.core.cluster.ClusterRegister; +import org.apache.skywalking.oap.server.core.cluster.RemoteInstance; +import org.apache.skywalking.oap.server.core.cluster.ServiceQueryException; +import org.apache.skywalking.oap.server.core.cluster.ServiceRegisterException; import org.apache.skywalking.oap.server.core.remote.client.Address; import org.apache.skywalking.oap.server.library.util.CollectionUtils; import org.apache.skywalking.oap.server.telemetry.api.TelemetryRelatedContext; -import java.util.ArrayList; -import java.util.List; - -/** - * @author caoyixiong - */ public class NacosCoordinator implements ClusterRegister, ClusterNodesQuery { private final NamingService namingService; diff --git a/oap-server/server-cluster-plugin/cluster-nacos-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/ClusterModuleNacosProviderTest.java b/oap-server/server-cluster-plugin/cluster-nacos-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/ClusterModuleNacosProviderTest.java index a58152ff1cfc..f489f93c054b 100644 --- a/oap-server/server-cluster-plugin/cluster-nacos-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/ClusterModuleNacosProviderTest.java +++ b/oap-server/server-cluster-plugin/cluster-nacos-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/ClusterModuleNacosProviderTest.java @@ -21,6 +21,7 @@ import com.alibaba.nacos.api.PropertyKeyConst; import com.alibaba.nacos.api.naming.NamingFactory; import com.alibaba.nacos.api.naming.NamingService; +import java.util.Properties; import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.cluster.ClusterModule; import org.apache.skywalking.oap.server.library.module.ModuleConfig; @@ -34,16 +35,11 @@ import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import java.util.Properties; - import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; -/** - * @author caoyixiong - */ @RunWith(PowerMockRunner.class) @PrepareForTest(NamingFactory.class) @PowerMockIgnore("javax.management.*") @@ -63,7 +59,6 @@ public void module() { assertEquals(ClusterModule.class, provider.module()); } - @Test public void createConfigBeanIfAbsent() { ModuleConfig moduleConfig = provider.createConfigBeanIfAbsent(); @@ -109,6 +104,6 @@ public void notifyAfterCompleted() { @Test public void requiredModules() { String[] modules = provider.requiredModules(); - assertArrayEquals(new String[]{CoreModule.NAME}, modules); + assertArrayEquals(new String[] {CoreModule.NAME}, modules); } } diff --git a/oap-server/server-cluster-plugin/cluster-nacos-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/ITClusterModuleNacosProviderFunctionalTest.java b/oap-server/server-cluster-plugin/cluster-nacos-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/ITClusterModuleNacosProviderFunctionalTest.java index 12200ffc79ac..724f221daade 100644 --- a/oap-server/server-cluster-plugin/cluster-nacos-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/ITClusterModuleNacosProviderFunctionalTest.java +++ b/oap-server/server-cluster-plugin/cluster-nacos-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/ITClusterModuleNacosProviderFunctionalTest.java @@ -19,6 +19,8 @@ package org.apache.skywalking.oap.server.cluster.plugin.nacos; import com.alibaba.nacos.api.naming.NamingService; +import java.util.Collections; +import java.util.List; import org.apache.skywalking.apm.util.StringUtil; import org.apache.skywalking.oap.server.core.cluster.ClusterNodesQuery; import org.apache.skywalking.oap.server.core.cluster.ClusterRegister; @@ -30,19 +32,12 @@ import org.junit.Test; import org.powermock.reflect.Whitebox; -import java.util.Collections; -import java.util.List; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -/** - * @author zhangwei - */ public class ITClusterModuleNacosProviderFunctionalTest { - private String nacosAddress; @Before @@ -173,7 +168,8 @@ private List queryRemoteNodes(ModuleProvider provider, int goals } else { Thread.sleep(1000); } - } while (--i > 0); + } + while (--i > 0); return Collections.EMPTY_LIST; } diff --git a/oap-server/server-cluster-plugin/cluster-nacos-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/NacosCoordinatorTest.java b/oap-server/server-cluster-plugin/cluster-nacos-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/NacosCoordinatorTest.java index f73eed57bcdf..71acb749be39 100644 --- a/oap-server/server-cluster-plugin/cluster-nacos-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/NacosCoordinatorTest.java +++ b/oap-server/server-cluster-plugin/cluster-nacos-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/NacosCoordinatorTest.java @@ -21,16 +21,15 @@ import com.alibaba.nacos.api.exception.NacosException; import com.alibaba.nacos.api.naming.NamingService; import com.alibaba.nacos.api.naming.pojo.Instance; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; import org.apache.skywalking.oap.server.core.cluster.RemoteInstance; import org.apache.skywalking.oap.server.core.remote.client.Address; import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyString; @@ -38,9 +37,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -/** - * @author caoyixiong - */ public class NacosCoordinatorTest { private NamingService namingService = mock(NamingService.class); private ClusterModuleNacosConfig nacosConfig = new ClusterModuleNacosConfig(); @@ -109,7 +105,8 @@ private void registerRemote(Address address) throws NacosException { ArgumentCaptor serviceNameArgumentCaptor = ArgumentCaptor.forClass(String.class); ArgumentCaptor hostArgumentCaptor = ArgumentCaptor.forClass(String.class); ArgumentCaptor portArgumentCaptor = ArgumentCaptor.forClass(Integer.class); - verify(namingService).registerInstance(serviceNameArgumentCaptor.capture(), hostArgumentCaptor.capture(), portArgumentCaptor.capture()); + verify(namingService).registerInstance(serviceNameArgumentCaptor.capture(), hostArgumentCaptor.capture(), portArgumentCaptor + .capture()); assertEquals(SERVICE_NAME, serviceNameArgumentCaptor.getValue()); assertEquals(address.getHost(), hostArgumentCaptor.getValue()); diff --git a/oap-server/server-cluster-plugin/cluster-standalone-plugin/pom.xml b/oap-server/server-cluster-plugin/cluster-standalone-plugin/pom.xml index f68db48d76d5..daa06669bd20 100644 --- a/oap-server/server-cluster-plugin/cluster-standalone-plugin/pom.xml +++ b/oap-server/server-cluster-plugin/cluster-standalone-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + server-cluster-plugin org.apache.skywalking diff --git a/oap-server/server-cluster-plugin/cluster-standalone-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/standalone/ClusterModuleStandaloneProvider.java b/oap-server/server-cluster-plugin/cluster-standalone-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/standalone/ClusterModuleStandaloneProvider.java index a861e3efa5fa..4ca499a66bf4 100644 --- a/oap-server/server-cluster-plugin/cluster-standalone-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/standalone/ClusterModuleStandaloneProvider.java +++ b/oap-server/server-cluster-plugin/cluster-standalone-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/standalone/ClusterModuleStandaloneProvider.java @@ -28,9 +28,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng - */ public class ClusterModuleStandaloneProvider extends ModuleProvider { private static final Logger logger = LoggerFactory.getLogger(ClusterModuleStandaloneProvider.class); @@ -39,28 +36,34 @@ public ClusterModuleStandaloneProvider() { super(); } - @Override public String name() { + @Override + public String name() { return "standalone"; } - @Override public Class module() { + @Override + public Class module() { return ClusterModule.class; } - @Override public ModuleConfig createConfigBeanIfAbsent() { + @Override + public ModuleConfig createConfigBeanIfAbsent() { return null; } - @Override public void prepare() throws ServiceNotProvidedException { + @Override + public void prepare() throws ServiceNotProvidedException { StandaloneManager standaloneManager = new StandaloneManager(); this.registerServiceImplementation(ClusterRegister.class, standaloneManager); this.registerServiceImplementation(ClusterNodesQuery.class, standaloneManager); } - @Override public void start() throws ModuleStartException { + @Override + public void start() throws ModuleStartException { } - @Override public void notifyAfterCompleted() { + @Override + public void notifyAfterCompleted() { } @Override diff --git a/oap-server/server-cluster-plugin/cluster-standalone-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/standalone/StandaloneManager.java b/oap-server/server-cluster-plugin/cluster-standalone-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/standalone/StandaloneManager.java index b70873f8581b..0be426830dfa 100644 --- a/oap-server/server-cluster-plugin/cluster-standalone-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/standalone/StandaloneManager.java +++ b/oap-server/server-cluster-plugin/cluster-standalone-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/standalone/StandaloneManager.java @@ -18,20 +18,22 @@ package org.apache.skywalking.oap.server.cluster.plugin.standalone; -import java.util.*; -import org.apache.skywalking.oap.server.core.cluster.*; +import java.util.ArrayList; +import java.util.List; +import org.apache.skywalking.oap.server.core.cluster.ClusterNodesQuery; +import org.apache.skywalking.oap.server.core.cluster.ClusterRegister; +import org.apache.skywalking.oap.server.core.cluster.RemoteInstance; import org.apache.skywalking.oap.server.telemetry.api.TelemetryRelatedContext; /** * A cluster manager simulator. Work in memory only. Also return the current instance. - * - * @author peng-yongsheng, Wu Sheng */ public class StandaloneManager implements ClusterNodesQuery, ClusterRegister { private volatile RemoteInstance remoteInstance; - @Override public void registerRemote(RemoteInstance remoteInstance) { + @Override + public void registerRemote(RemoteInstance remoteInstance) { this.remoteInstance = remoteInstance; this.remoteInstance.getAddress().setSelf(true); TelemetryRelatedContext.INSTANCE.setId("standalone"); diff --git a/oap-server/server-cluster-plugin/cluster-standalone-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/standalone/StandaloneManagerTest.java b/oap-server/server-cluster-plugin/cluster-standalone-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/standalone/StandaloneManagerTest.java index 77ede74c325b..0612239a6365 100644 --- a/oap-server/server-cluster-plugin/cluster-standalone-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/standalone/StandaloneManagerTest.java +++ b/oap-server/server-cluster-plugin/cluster-standalone-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/standalone/StandaloneManagerTest.java @@ -20,7 +20,8 @@ import org.apache.skywalking.oap.server.core.cluster.RemoteInstance; import org.apache.skywalking.oap.server.core.remote.client.Address; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; public class StandaloneManagerTest { @Test diff --git a/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/pom.xml b/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/pom.xml index 5223c117074b..0680ba22d7e6 100644 --- a/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/pom.xml +++ b/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + org.apache.skywalking server-cluster-plugin diff --git a/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ClusterModuleZookeeperConfig.java b/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ClusterModuleZookeeperConfig.java index eb84fde4e2ef..78a19db923ba 100644 --- a/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ClusterModuleZookeeperConfig.java +++ b/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ClusterModuleZookeeperConfig.java @@ -19,24 +19,34 @@ package org.apache.skywalking.oap.server.cluster.plugin.zookeeper; import com.google.common.base.Strings; -import lombok.*; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.oap.server.library.module.ModuleConfig; -/** - * @author peng-yongsheng - */ class ClusterModuleZookeeperConfig extends ModuleConfig { - @Setter @Getter private String nameSpace; + @Setter + @Getter + private String nameSpace; private String hostPort; private int baseSleepTimeMs; private int maxRetries; - @Setter @Getter private String internalComHost; - @Setter @Getter private int internalComPort = -1; + @Setter + @Getter + private String internalComHost; + @Setter + @Getter + private int internalComPort = -1; - @Setter @Getter private boolean enableACL = false; - @Setter @Getter private String schema; - @Setter @Getter private String expression; + @Setter + @Getter + private boolean enableACL = false; + @Setter + @Getter + private String schema; + @Setter + @Getter + private String expression; public String getHostPort() { return Strings.isNullOrEmpty(hostPort) ? "localhost:2181" : hostPort; diff --git a/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ClusterModuleZookeeperProvider.java b/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ClusterModuleZookeeperProvider.java index abbd7d3e757a..d52813505939 100644 --- a/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ClusterModuleZookeeperProvider.java +++ b/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ClusterModuleZookeeperProvider.java @@ -19,6 +19,8 @@ package org.apache.skywalking.oap.server.cluster.plugin.zookeeper; import com.google.common.collect.Lists; +import java.security.NoSuchAlgorithmException; +import java.util.List; import org.apache.curator.RetryPolicy; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; @@ -42,13 +44,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.security.NoSuchAlgorithmException; -import java.util.List; - /** * Use Zookeeper to manage all instances in SkyWalking cluster. - * - * @author peng-yongsheng, Wu Sheng */ public class ClusterModuleZookeeperProvider extends ModuleProvider { @@ -65,24 +62,28 @@ public ClusterModuleZookeeperProvider() { this.config = new ClusterModuleZookeeperConfig(); } - @Override public String name() { + @Override + public String name() { return "zookeeper"; } - @Override public Class module() { + @Override + public Class module() { return ClusterModule.class; } - @Override public ModuleConfig createConfigBeanIfAbsent() { + @Override + public ModuleConfig createConfigBeanIfAbsent() { return config; } - @Override public void prepare() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void prepare() throws ServiceNotProvidedException, ModuleStartException { RetryPolicy retryPolicy = new ExponentialBackoffRetry(config.getBaseSleepTimeMs(), config.getMaxRetries()); CuratorFrameworkFactory.Builder builder = CuratorFrameworkFactory.builder() - .retryPolicy(retryPolicy) - .connectString(config.getHostPort()); + .retryPolicy(retryPolicy) + .connectString(config.getHostPort()); if (config.isEnableACL()) { String authInfo = config.getExpression(); @@ -117,10 +118,12 @@ public List getAclForPath(String s) { String path = BASE_PATH + (StringUtil.isEmpty(config.getNameSpace()) ? "" : "/" + config.getNameSpace()); - serviceDiscovery = ServiceDiscoveryBuilder.builder(RemoteInstance.class).client(client) - .basePath(path) - .watchInstances(true) - .serializer(new SWInstanceSerializer()).build(); + serviceDiscovery = ServiceDiscoveryBuilder.builder(RemoteInstance.class) + .client(client) + .basePath(path) + .watchInstances(true) + .serializer(new SWInstanceSerializer()) + .build(); ZookeeperCoordinator coordinator; try { @@ -137,10 +140,12 @@ public List getAclForPath(String s) { this.registerServiceImplementation(ClusterNodesQuery.class, coordinator); } - @Override public void start() { + @Override + public void start() { } - @Override public void notifyAfterCompleted() { + @Override + public void notifyAfterCompleted() { } @Override diff --git a/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/NodeNameBuilder.java b/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/NodeNameBuilder.java index af9db7c48d8f..f2c50e2fcdaf 100644 --- a/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/NodeNameBuilder.java +++ b/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/NodeNameBuilder.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.cluster.plugin.zookeeper; -/** - * @author peng-yongsheng - */ public class NodeNameBuilder { public static String build(String moduleName, String providerName) { diff --git a/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/SWInstanceSerializer.java b/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/SWInstanceSerializer.java index 3b86f9de3c8e..243fceab1d08 100644 --- a/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/SWInstanceSerializer.java +++ b/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/SWInstanceSerializer.java @@ -24,18 +24,17 @@ import org.apache.curator.x.discovery.details.InstanceSerializer; import org.apache.skywalking.oap.server.core.cluster.RemoteInstance; -/** - * @author peng-yongsheng - */ public class SWInstanceSerializer implements InstanceSerializer { private final Gson gson = new Gson(); - @Override public byte[] serialize(ServiceInstance instance) throws Exception { + @Override + public byte[] serialize(ServiceInstance instance) throws Exception { return gson.toJson(instance).getBytes(); } - @Override public ServiceInstance deserialize(byte[] bytes) throws Exception { + @Override + public ServiceInstance deserialize(byte[] bytes) throws Exception { return gson.fromJson(new String(bytes), new TypeToken>() { }.getType()); } diff --git a/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ZookeeperCoordinator.java b/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ZookeeperCoordinator.java index 5ab36cb36249..4b0223a54711 100644 --- a/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ZookeeperCoordinator.java +++ b/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ZookeeperCoordinator.java @@ -19,16 +19,21 @@ package org.apache.skywalking.oap.server.cluster.plugin.zookeeper; import com.google.common.base.Strings; -import java.util.*; -import org.apache.curator.x.discovery.*; -import org.apache.skywalking.oap.server.core.cluster.*; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; +import org.apache.curator.x.discovery.ServiceCache; +import org.apache.curator.x.discovery.ServiceDiscovery; +import org.apache.curator.x.discovery.ServiceInstance; +import org.apache.skywalking.oap.server.core.cluster.ClusterNodesQuery; +import org.apache.skywalking.oap.server.core.cluster.ClusterRegister; +import org.apache.skywalking.oap.server.core.cluster.RemoteInstance; +import org.apache.skywalking.oap.server.core.cluster.ServiceRegisterException; import org.apache.skywalking.oap.server.core.remote.client.Address; import org.apache.skywalking.oap.server.telemetry.api.TelemetryRelatedContext; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng - */ public class ZookeeperCoordinator implements ClusterRegister, ClusterNodesQuery { private static final Logger logger = LoggerFactory.getLogger(ZookeeperCoordinator.class); @@ -39,26 +44,32 @@ public class ZookeeperCoordinator implements ClusterRegister, ClusterNodesQuery private final ServiceCache serviceCache; private volatile Address selfAddress; - ZookeeperCoordinator(ClusterModuleZookeeperConfig config, ServiceDiscovery serviceDiscovery) throws Exception { + ZookeeperCoordinator(ClusterModuleZookeeperConfig config, + ServiceDiscovery serviceDiscovery) throws Exception { this.config = config; this.serviceDiscovery = serviceDiscovery; this.serviceCache = serviceDiscovery.serviceCacheBuilder().name(REMOTE_NAME_PATH).build(); this.serviceCache.start(); } - @Override public synchronized void registerRemote(RemoteInstance remoteInstance) throws ServiceRegisterException { + @Override + public synchronized void registerRemote(RemoteInstance remoteInstance) throws ServiceRegisterException { try { if (needUsingInternalAddr()) { remoteInstance = new RemoteInstance(new Address(config.getInternalComHost(), config.getInternalComPort(), true)); } - ServiceInstance thisInstance = ServiceInstance.builder() - .name(REMOTE_NAME_PATH) - .id(UUID.randomUUID().toString()) - .address(remoteInstance.getAddress().getHost()) - .port(remoteInstance.getAddress().getPort()) - .payload(remoteInstance) - .build(); + ServiceInstance thisInstance = ServiceInstance.builder().name(REMOTE_NAME_PATH) + .id(UUID.randomUUID() + .toString()) + .address(remoteInstance + .getAddress() + .getHost()) + .port(remoteInstance + .getAddress() + .getPort()) + .payload(remoteInstance) + .build(); serviceDiscovery.registerService(thisInstance); @@ -69,7 +80,8 @@ public class ZookeeperCoordinator implements ClusterRegister, ClusterNodesQuery } } - @Override public List queryRemoteNodes() { + @Override + public List queryRemoteNodes() { List remoteInstanceDetails = new ArrayList<>(20); List> serviceInstances = serviceCache.getInstances(); serviceInstances.forEach(serviceInstance -> { diff --git a/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ClusterModuleZookeeperProviderTest.java b/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ClusterModuleZookeeperProviderTest.java index 8a6ac730d99f..c797f339f131 100644 --- a/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ClusterModuleZookeeperProviderTest.java +++ b/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ClusterModuleZookeeperProviderTest.java @@ -25,9 +25,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -/** - * @author peng-yongsheng zhangwei - */ public class ClusterModuleZookeeperProviderTest { private ClusterModuleZookeeperProvider provider = new ClusterModuleZookeeperProvider(); diff --git a/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ITClusterModuleZookeeperProviderFunctionalTest.java b/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ITClusterModuleZookeeperProviderFunctionalTest.java index a3df25ea5c11..24e022167a0e 100644 --- a/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ITClusterModuleZookeeperProviderFunctionalTest.java +++ b/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ITClusterModuleZookeeperProviderFunctionalTest.java @@ -18,6 +18,8 @@ package org.apache.skywalking.oap.server.cluster.plugin.zookeeper; +import java.util.Collections; +import java.util.List; import org.apache.curator.x.discovery.ServiceDiscovery; import org.apache.skywalking.apm.util.StringUtil; import org.apache.skywalking.oap.server.core.cluster.ClusterNodesQuery; @@ -29,16 +31,10 @@ import org.junit.Test; import org.powermock.reflect.Whitebox; -import java.util.Collections; -import java.util.List; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -/** - * @author zhangwei - */ public class ITClusterModuleZookeeperProviderFunctionalTest { private String zkAddress; @@ -68,8 +64,7 @@ public void registerRemote() throws Exception { @Test public void registerRemoteOfInternal() throws Exception { final String namespace = "register_remote_internal"; - ModuleProvider provider = - createProvider(namespace, "127.0.1.2", 1000); + ModuleProvider provider = createProvider(namespace, "127.0.1.2", 1000); Address selfAddress = new Address("127.0.0.2", 1000, true); RemoteInstance instance = new RemoteInstance(selfAddress); @@ -164,7 +159,8 @@ private ClusterModuleZookeeperProvider createProvider(String namespace) throws E return createProvider(namespace, null, 0); } - private ClusterModuleZookeeperProvider createProvider(String namespace, String internalComHost, int internalComPort) throws Exception { + private ClusterModuleZookeeperProvider createProvider(String namespace, String internalComHost, + int internalComPort) throws Exception { ClusterModuleZookeeperProvider provider = new ClusterModuleZookeeperProvider(); ClusterModuleZookeeperConfig moduleConfig = (ClusterModuleZookeeperConfig) provider.createConfigBeanIfAbsent(); @@ -203,7 +199,8 @@ private List queryRemoteNodes(ModuleProvider provider, int goals return queryRemoteNodes(provider, goals, 20); } - private List queryRemoteNodes(ModuleProvider provider, int goals, int cyclic) throws InterruptedException { + private List queryRemoteNodes(ModuleProvider provider, int goals, + int cyclic) throws InterruptedException { do { List instances = getClusterNodesQuery(provider).queryRemoteNodes(); if (instances.size() == goals) { @@ -211,7 +208,8 @@ private List queryRemoteNodes(ModuleProvider provider, int goals } else { Thread.sleep(1000); } - } while (--cyclic > 0); + } + while (--cyclic > 0); return Collections.EMPTY_LIST; } diff --git a/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/NodeNameBuilderTest.java b/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/NodeNameBuilderTest.java index 6d7d18502d7a..ab15f1e73dd2 100644 --- a/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/NodeNameBuilderTest.java +++ b/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/NodeNameBuilderTest.java @@ -15,15 +15,13 @@ * limitations under the License. * */ + package org.apache.skywalking.oap.server.cluster.plugin.zookeeper; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; -/** - * Created by dengming, 2019.05.02 - */ public class NodeNameBuilderTest { @Test diff --git a/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ZookeeperCoordinatorTest.java b/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ZookeeperCoordinatorTest.java index d10330e35a21..74681f0ebd92 100644 --- a/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ZookeeperCoordinatorTest.java +++ b/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ZookeeperCoordinatorTest.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.oap.server.cluster.plugin.zookeeper; import com.google.common.base.Strings; @@ -28,12 +29,14 @@ import org.junit.Test; import org.mockito.ArgumentCaptor; -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; -/** - * Created by dengming, 2019.05.02 - */ public class ZookeeperCoordinatorTest { private ClusterModuleZookeeperConfig config = new ClusterModuleZookeeperConfig(); diff --git a/oap-server/server-cluster-plugin/pom.xml b/oap-server/server-cluster-plugin/pom.xml index 041380badd33..f6c231abf4c9 100644 --- a/oap-server/server-cluster-plugin/pom.xml +++ b/oap-server/server-cluster-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + oap-server org.apache.skywalking diff --git a/oap-server/server-configuration/configuration-api/pom.xml b/oap-server/server-configuration/configuration-api/pom.xml index 4924dc5d6383..4de3af9f1fd0 100644 --- a/oap-server/server-configuration/configuration-api/pom.xml +++ b/oap-server/server-configuration/configuration-api/pom.xml @@ -17,7 +17,8 @@ ~ --> - + server-configuration org.apache.skywalking diff --git a/oap-server/server-configuration/configuration-api/src/main/java/org/apache/skywalking/oap/server/configuration/api/AbstractConfigurationProvider.java b/oap-server/server-configuration/configuration-api/src/main/java/org/apache/skywalking/oap/server/configuration/api/AbstractConfigurationProvider.java index 19459af69773..4efa1581947f 100644 --- a/oap-server/server-configuration/configuration-api/src/main/java/org/apache/skywalking/oap/server/configuration/api/AbstractConfigurationProvider.java +++ b/oap-server/server-configuration/configuration-api/src/main/java/org/apache/skywalking/oap/server/configuration/api/AbstractConfigurationProvider.java @@ -18,37 +18,43 @@ package org.apache.skywalking.oap.server.configuration.api; -import org.apache.skywalking.oap.server.library.module.*; +import org.apache.skywalking.oap.server.library.module.ModuleDefine; +import org.apache.skywalking.oap.server.library.module.ModuleProvider; +import org.apache.skywalking.oap.server.library.module.ModuleStartException; +import org.apache.skywalking.oap.server.library.module.ServiceNotProvidedException; /** * The recommendation default base implementor of Configuration module. The real implementor could extend this provider * to make a new one, easily. - * - * @author wusheng */ public abstract class AbstractConfigurationProvider extends ModuleProvider { private ConfigWatcherRegister configWatcherRegister; - @Override public Class module() { + @Override + public Class module() { return ConfigurationModule.class; } - @Override public void prepare() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void prepare() throws ServiceNotProvidedException, ModuleStartException { configWatcherRegister = initConfigReader(); this.registerServiceImplementation(DynamicConfigurationService.class, configWatcherRegister); } protected abstract ConfigWatcherRegister initConfigReader() throws ModuleStartException; - @Override public void start() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void start() throws ServiceNotProvidedException, ModuleStartException { } - @Override public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleStartException { configWatcherRegister.start(); } - @Override public String[] requiredModules() { + @Override + public String[] requiredModules() { return new String[0]; } diff --git a/oap-server/server-configuration/configuration-api/src/main/java/org/apache/skywalking/oap/server/configuration/api/ConfigChangeWatcher.java b/oap-server/server-configuration/configuration-api/src/main/java/org/apache/skywalking/oap/server/configuration/api/ConfigChangeWatcher.java index 1623332f48d6..5925a2d99c96 100644 --- a/oap-server/server-configuration/configuration-api/src/main/java/org/apache/skywalking/oap/server/configuration/api/ConfigChangeWatcher.java +++ b/oap-server/server-configuration/configuration-api/src/main/java/org/apache/skywalking/oap/server/configuration/api/ConfigChangeWatcher.java @@ -18,13 +18,13 @@ package org.apache.skywalking.oap.server.configuration.api; -import lombok.*; -import org.apache.skywalking.oap.server.library.module.*; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.Setter; +import org.apache.skywalking.oap.server.library.module.ModuleProvider; /** * ConfigChangeWatcher represents a watcher implementor, it will be called when the target value changed. - * - * @author wusheng */ @Getter public abstract class ConfigChangeWatcher { @@ -50,12 +50,9 @@ public ConfigChangeWatcher(String module, ModuleProvider provider, String itemNa */ public abstract String value(); - @Override public String toString() { - return "ConfigChangeWatcher{" + - "module=" + module + - ", provider=" + provider + - ", itemName='" + itemName + '\'' + - '}'; + @Override + public String toString() { + return "ConfigChangeWatcher{" + "module=" + module + ", provider=" + provider + ", itemName='" + itemName + '\'' + '}'; } @Setter(AccessLevel.PACKAGE) @@ -64,8 +61,7 @@ public static class ConfigChangeEvent { private String newValue; private EventType eventType; - public ConfigChangeEvent(String newValue, - EventType eventType) { + public ConfigChangeEvent(String newValue, EventType eventType) { this.newValue = newValue; this.eventType = eventType; } diff --git a/oap-server/server-configuration/configuration-api/src/main/java/org/apache/skywalking/oap/server/configuration/api/ConfigTable.java b/oap-server/server-configuration/configuration-api/src/main/java/org/apache/skywalking/oap/server/configuration/api/ConfigTable.java index c8988cbb82a2..02d7364e833d 100644 --- a/oap-server/server-configuration/configuration-api/src/main/java/org/apache/skywalking/oap/server/configuration/api/ConfigTable.java +++ b/oap-server/server-configuration/configuration-api/src/main/java/org/apache/skywalking/oap/server/configuration/api/ConfigTable.java @@ -18,13 +18,14 @@ package org.apache.skywalking.oap.server.configuration.api; -import java.util.*; -import lombok.*; +import java.util.ArrayList; +import java.util.List; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; /** * ConfigTable contains all config. - * - * @author wusheng */ @ToString public class ConfigTable { diff --git a/oap-server/server-configuration/configuration-api/src/main/java/org/apache/skywalking/oap/server/configuration/api/ConfigWatcherRegister.java b/oap-server/server-configuration/configuration-api/src/main/java/org/apache/skywalking/oap/server/configuration/api/ConfigWatcherRegister.java index 8028f1a32fd3..84609702dbfb 100644 --- a/oap-server/server-configuration/configuration-api/src/main/java/org/apache/skywalking/oap/server/configuration/api/ConfigWatcherRegister.java +++ b/oap-server/server-configuration/configuration-api/src/main/java/org/apache/skywalking/oap/server/configuration/api/ConfigWatcherRegister.java @@ -18,16 +18,18 @@ package org.apache.skywalking.oap.server.configuration.api; -import java.util.*; -import java.util.concurrent.*; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import lombok.Getter; import org.apache.skywalking.apm.util.RunnableWithExceptionProtection; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * The default implementor of Config Watcher register. - * - * @author wusheng */ public abstract class ConfigWatcherRegister implements DynamicConfigurationService { private static final Logger logger = LoggerFactory.getLogger(ConfigWatcherRegister.class); @@ -45,7 +47,8 @@ public ConfigWatcherRegister(long syncPeriod) { this.syncPeriod = syncPeriod; } - @Override synchronized public void registerConfigChangeWatcher(ConfigChangeWatcher watcher) { + @Override + synchronized public void registerConfigChangeWatcher(ConfigChangeWatcher watcher) { if (isStarted) { throw new IllegalStateException("Config Register has been started. Can't register new watcher."); } @@ -63,9 +66,8 @@ public void start() { configSync(); logger.info("Current configurations after the bootstrap sync." + LINE_SEPARATOR + register.toString()); - Executors.newSingleThreadScheduledExecutor().scheduleAtFixedRate( - new RunnableWithExceptionProtection(this::configSync, - t -> logger.error("Sync config center error.", t)), syncPeriod, syncPeriod, TimeUnit.SECONDS); + Executors.newSingleThreadScheduledExecutor() + .scheduleAtFixedRate(new RunnableWithExceptionProtection(this::configSync, t -> logger.error("Sync config center error.", t)), syncPeriod, syncPeriod, TimeUnit.SECONDS); } void configSync() { @@ -120,17 +122,22 @@ public Set keys() { return register.keySet(); } - @Override public String toString() { + @Override + public String toString() { StringBuilder registerTableDescription = new StringBuilder(); registerTableDescription.append("Following dynamic config items are available.").append(LINE_SEPARATOR); registerTableDescription.append("---------------------------------------------").append(LINE_SEPARATOR); register.forEach((key, holder) -> { ConfigChangeWatcher watcher = holder.getWatcher(); - registerTableDescription.append("key:").append(key) - .append(" module:").append(watcher.getModule()) - .append(" provider:").append(watcher.getProvider().name()) - .append(" value(current):").append(watcher.value()) - .append(LINE_SEPARATOR); + registerTableDescription.append("key:") + .append(key) + .append(" module:") + .append(watcher.getModule()) + .append(" provider:") + .append(watcher.getProvider().name()) + .append(" value(current):") + .append(watcher.value()) + .append(LINE_SEPARATOR); }); return registerTableDescription.toString(); } diff --git a/oap-server/server-configuration/configuration-api/src/main/java/org/apache/skywalking/oap/server/configuration/api/ConfigurationModule.java b/oap-server/server-configuration/configuration-api/src/main/java/org/apache/skywalking/oap/server/configuration/api/ConfigurationModule.java index f0f55a4269f5..30399b2e06f0 100644 --- a/oap-server/server-configuration/configuration-api/src/main/java/org/apache/skywalking/oap/server/configuration/api/ConfigurationModule.java +++ b/oap-server/server-configuration/configuration-api/src/main/java/org/apache/skywalking/oap/server/configuration/api/ConfigurationModule.java @@ -23,11 +23,9 @@ /** * Configuration Module sync the settings from remote service, the remote service could be implemented by this module * provider. - * + *

* Any configuration item in the whole OAP backend could register a watcher to configuration module, the item change * watcher will be called, if the value changed. - * - * @author wusheng */ public class ConfigurationModule extends ModuleDefine { public static final String NAME = "configuration"; @@ -36,7 +34,8 @@ public ConfigurationModule() { super(NAME); } - @Override public Class[] services() { + @Override + public Class[] services() { return new Class[] {DynamicConfigurationService.class}; } } diff --git a/oap-server/server-configuration/configuration-api/src/main/java/org/apache/skywalking/oap/server/configuration/api/DynamicConfigurationService.java b/oap-server/server-configuration/configuration-api/src/main/java/org/apache/skywalking/oap/server/configuration/api/DynamicConfigurationService.java index a70c2704809c..dcee351f48a1 100644 --- a/oap-server/server-configuration/configuration-api/src/main/java/org/apache/skywalking/oap/server/configuration/api/DynamicConfigurationService.java +++ b/oap-server/server-configuration/configuration-api/src/main/java/org/apache/skywalking/oap/server/configuration/api/DynamicConfigurationService.java @@ -18,12 +18,10 @@ package org.apache.skywalking.oap.server.configuration.api; -import org.apache.skywalking.oap.server.library.module.*; +import org.apache.skywalking.oap.server.library.module.Service; /** * DynamicConfigurationService provides API to register config change watcher. - * - * @author wusheng */ public interface DynamicConfigurationService extends Service { /** diff --git a/oap-server/server-configuration/configuration-api/src/main/java/org/apache/skywalking/oap/server/configuration/api/NoneConfigurationProvider.java b/oap-server/server-configuration/configuration-api/src/main/java/org/apache/skywalking/oap/server/configuration/api/NoneConfigurationProvider.java index 633edcba1d5c..ce22eb821a5f 100644 --- a/oap-server/server-configuration/configuration-api/src/main/java/org/apache/skywalking/oap/server/configuration/api/NoneConfigurationProvider.java +++ b/oap-server/server-configuration/configuration-api/src/main/java/org/apache/skywalking/oap/server/configuration/api/NoneConfigurationProvider.java @@ -18,43 +18,53 @@ package org.apache.skywalking.oap.server.configuration.api; -import org.apache.skywalking.oap.server.library.module.*; +import org.apache.skywalking.oap.server.library.module.ModuleConfig; +import org.apache.skywalking.oap.server.library.module.ModuleDefine; +import org.apache.skywalking.oap.server.library.module.ModuleProvider; +import org.apache.skywalking.oap.server.library.module.ModuleStartException; +import org.apache.skywalking.oap.server.library.module.ServiceNotProvidedException; /** * A nutshell configuration implementor. - * - * @author wusheng */ public class NoneConfigurationProvider extends ModuleProvider { - @Override public String name() { + @Override + public String name() { return "none"; } - @Override public Class module() { + @Override + public Class module() { return ConfigurationModule.class; } - @Override public ModuleConfig createConfigBeanIfAbsent() { + @Override + public ModuleConfig createConfigBeanIfAbsent() { return null; } - @Override public void prepare() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void prepare() throws ServiceNotProvidedException, ModuleStartException { this.registerServiceImplementation(DynamicConfigurationService.class, new DynamicConfigurationService() { - @Override public void registerConfigChangeWatcher(ConfigChangeWatcher watcher) { + @Override + public void registerConfigChangeWatcher(ConfigChangeWatcher watcher) { } }); } - @Override public void start() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void start() throws ServiceNotProvidedException, ModuleStartException { } - @Override public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleStartException { } - @Override public String[] requiredModules() { + @Override + public String[] requiredModules() { return new String[0]; } } diff --git a/oap-server/server-configuration/configuration-api/src/test/java/org/apache/skywalking/oap/server/configuration/api/ConfigWatcherRegisterTest.java b/oap-server/server-configuration/configuration-api/src/test/java/org/apache/skywalking/oap/server/configuration/api/ConfigWatcherRegisterTest.java index 037d23d123b1..702015145e53 100644 --- a/oap-server/server-configuration/configuration-api/src/test/java/org/apache/skywalking/oap/server/configuration/api/ConfigWatcherRegisterTest.java +++ b/oap-server/server-configuration/configuration-api/src/test/java/org/apache/skywalking/oap/server/configuration/api/ConfigWatcherRegisterTest.java @@ -18,15 +18,18 @@ package org.apache.skywalking.oap.server.configuration.api; -import org.apache.skywalking.oap.server.library.module.*; -import org.junit.*; -import org.powermock.reflect.Whitebox; - import java.util.Set; +import org.apache.skywalking.oap.server.library.module.ModuleConfig; +import org.apache.skywalking.oap.server.library.module.ModuleDefine; +import org.apache.skywalking.oap.server.library.module.ModuleProvider; +import org.apache.skywalking.oap.server.library.module.ModuleStartException; +import org.apache.skywalking.oap.server.library.module.ServiceNotProvidedException; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.powermock.reflect.Whitebox; -/** - * @author wusheng - */ public class ConfigWatcherRegisterTest { private ConfigWatcherRegister register; @@ -45,11 +48,13 @@ public void testInit() { final String[] newValue = new String[1]; register.registerConfigChangeWatcher(new ConfigChangeWatcher("MockModule", new MockProvider(), "prop2") { - @Override public void notify(ConfigChangeEvent value) { + @Override + public void notify(ConfigChangeEvent value) { newValue[0] = value.getNewValue(); } - @Override public String value() { + @Override + public String value() { return null; } }); @@ -62,10 +67,12 @@ public void testInit() { @Test public void testRegisterTableLog() { register.registerConfigChangeWatcher(new ConfigChangeWatcher("MockModule", new MockProvider(), "prop2") { - @Override public void notify(ConfigChangeEvent value) { + @Override + public void notify(ConfigChangeEvent value) { } - @Override public String value() { + @Override + public String value() { return null; } }); @@ -73,16 +80,15 @@ public void testRegisterTableLog() { register.configSync(); ConfigWatcherRegister.Register registerTable = Whitebox.getInternalState(this.register, "register"); - String expected = "Following dynamic config items are available." + ConfigWatcherRegister.LINE_SEPARATOR + - "---------------------------------------------" + ConfigWatcherRegister.LINE_SEPARATOR + - "key:MockModule.provider.prop2 module:MockModule provider:provider value(current):null" + ConfigWatcherRegister.LINE_SEPARATOR; + String expected = "Following dynamic config items are available." + ConfigWatcherRegister.LINE_SEPARATOR + "---------------------------------------------" + ConfigWatcherRegister.LINE_SEPARATOR + "key:MockModule.provider.prop2 module:MockModule provider:provider value(current):null" + ConfigWatcherRegister.LINE_SEPARATOR; Assert.assertEquals(expected, registerTable.toString()); } public static class MockConfigWatcherRegister extends ConfigWatcherRegister { - @Override public ConfigTable readConfig(Set keys) { + @Override + public ConfigTable readConfig(Set keys) { ConfigTable.ConfigItem item1 = new ConfigTable.ConfigItem("module.provider.prop1", "abc"); ConfigTable.ConfigItem item2 = new ConfigTable.ConfigItem("MockModule.provider.prop2", "abc2"); @@ -99,38 +105,46 @@ public MockModule() { super("MockModule"); } - @Override public Class[] services() { + @Override + public Class[] services() { return new Class[0]; } } public static class MockProvider extends ModuleProvider { - @Override public String name() { + @Override + public String name() { return "provider"; } - @Override public Class module() { + @Override + public Class module() { return MockModule.class; } - @Override public ModuleConfig createConfigBeanIfAbsent() { + @Override + public ModuleConfig createConfigBeanIfAbsent() { return null; } - @Override public void prepare() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void prepare() throws ServiceNotProvidedException, ModuleStartException { } - @Override public void start() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void start() throws ServiceNotProvidedException, ModuleStartException { } - @Override public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleStartException { } - @Override public String[] requiredModules() { + @Override + public String[] requiredModules() { return new String[0]; } } diff --git a/oap-server/server-configuration/configuration-apollo/pom.xml b/oap-server/server-configuration/configuration-apollo/pom.xml index ac94f0c3aff4..e607049f8837 100644 --- a/oap-server/server-configuration/configuration-apollo/pom.xml +++ b/oap-server/server-configuration/configuration-apollo/pom.xml @@ -17,7 +17,8 @@ ~ --> - + server-configuration org.apache.skywalking diff --git a/oap-server/server-configuration/configuration-apollo/src/main/java/org/apache/skywalking/oap/server/configuration/apollo/ApolloConfigWatcherRegister.java b/oap-server/server-configuration/configuration-apollo/src/main/java/org/apache/skywalking/oap/server/configuration/apollo/ApolloConfigWatcherRegister.java index 76f313f4e06d..6600a6969299 100644 --- a/oap-server/server-configuration/configuration-apollo/src/main/java/org/apache/skywalking/oap/server/configuration/apollo/ApolloConfigWatcherRegister.java +++ b/oap-server/server-configuration/configuration-apollo/src/main/java/org/apache/skywalking/oap/server/configuration/apollo/ApolloConfigWatcherRegister.java @@ -21,16 +21,12 @@ import com.ctrip.framework.apollo.Config; import com.ctrip.framework.apollo.ConfigService; import com.google.common.base.Strings; +import java.util.Set; import org.apache.skywalking.oap.server.configuration.api.ConfigTable; import org.apache.skywalking.oap.server.configuration.api.ConfigWatcherRegister; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Set; - -/** - * @author kezhenxu94 - */ public class ApolloConfigWatcherRegister extends ConfigWatcherRegister { private static final Logger LOGGER = LoggerFactory.getLogger(ApolloConfigWatcherRegister.class); diff --git a/oap-server/server-configuration/configuration-apollo/src/main/java/org/apache/skywalking/oap/server/configuration/apollo/ApolloConfigurationCenterSettings.java b/oap-server/server-configuration/configuration-apollo/src/main/java/org/apache/skywalking/oap/server/configuration/apollo/ApolloConfigurationCenterSettings.java index f96d693b5bd1..2ba13a0bcec1 100644 --- a/oap-server/server-configuration/configuration-apollo/src/main/java/org/apache/skywalking/oap/server/configuration/apollo/ApolloConfigurationCenterSettings.java +++ b/oap-server/server-configuration/configuration-apollo/src/main/java/org/apache/skywalking/oap/server/configuration/apollo/ApolloConfigurationCenterSettings.java @@ -20,9 +20,6 @@ import org.apache.skywalking.oap.server.library.module.ModuleConfig; -/** - * @author kezhenxu94 - */ public class ApolloConfigurationCenterSettings extends ModuleConfig { private String apolloCluster = "default"; private String apolloMeta; @@ -89,9 +86,7 @@ public void setPeriod(int period) { } public String toString() { - return "ApolloConfigurationCenterSettings(" + - "apolloCluster=" + this.getApolloCluster() + - ", clusterName=" + this.getClusterName() + - ", period=" + this.getPeriod() + ")"; + return "ApolloConfigurationCenterSettings(" + "apolloCluster=" + this.getApolloCluster() + ", clusterName=" + this + .getClusterName() + ", period=" + this.getPeriod() + ")"; } } diff --git a/oap-server/server-configuration/configuration-apollo/src/main/java/org/apache/skywalking/oap/server/configuration/apollo/ApolloConfigurationProvider.java b/oap-server/server-configuration/configuration-apollo/src/main/java/org/apache/skywalking/oap/server/configuration/apollo/ApolloConfigurationProvider.java index 20d997c7bfcf..a1fb930d4152 100644 --- a/oap-server/server-configuration/configuration-apollo/src/main/java/org/apache/skywalking/oap/server/configuration/apollo/ApolloConfigurationProvider.java +++ b/oap-server/server-configuration/configuration-apollo/src/main/java/org/apache/skywalking/oap/server/configuration/apollo/ApolloConfigurationProvider.java @@ -26,8 +26,6 @@ /** * Get configuration from Apollo configuration center. - * - * @author kezhenxu94 */ public class ApolloConfigurationProvider extends AbstractConfigurationProvider { private final ApolloConfigurationCenterSettings settings; diff --git a/oap-server/server-configuration/configuration-apollo/src/test/java/org/apache/skywalking/oap/server/configuration/apollo/ApolloConfigurationTestModule.java b/oap-server/server-configuration/configuration-apollo/src/test/java/org/apache/skywalking/oap/server/configuration/apollo/ApolloConfigurationTestModule.java index 9c14deac6bd6..f640f9918dc5 100644 --- a/oap-server/server-configuration/configuration-apollo/src/test/java/org/apache/skywalking/oap/server/configuration/apollo/ApolloConfigurationTestModule.java +++ b/oap-server/server-configuration/configuration-apollo/src/test/java/org/apache/skywalking/oap/server/configuration/apollo/ApolloConfigurationTestModule.java @@ -20,9 +20,6 @@ import org.apache.skywalking.oap.server.library.module.ModuleDefine; -/** - * @author kezhenxu94 - */ public class ApolloConfigurationTestModule extends ModuleDefine { public static final String NAME = "test-module"; diff --git a/oap-server/server-configuration/configuration-apollo/src/test/java/org/apache/skywalking/oap/server/configuration/apollo/ApolloConfigurationTestProvider.java b/oap-server/server-configuration/configuration-apollo/src/test/java/org/apache/skywalking/oap/server/configuration/apollo/ApolloConfigurationTestProvider.java index 0420a5ab0be9..656fa2d0ee10 100644 --- a/oap-server/server-configuration/configuration-apollo/src/test/java/org/apache/skywalking/oap/server/configuration/apollo/ApolloConfigurationTestProvider.java +++ b/oap-server/server-configuration/configuration-apollo/src/test/java/org/apache/skywalking/oap/server/configuration/apollo/ApolloConfigurationTestProvider.java @@ -21,13 +21,14 @@ import org.apache.skywalking.oap.server.configuration.api.ConfigChangeWatcher; import org.apache.skywalking.oap.server.configuration.api.ConfigurationModule; import org.apache.skywalking.oap.server.configuration.api.DynamicConfigurationService; -import org.apache.skywalking.oap.server.library.module.*; +import org.apache.skywalking.oap.server.library.module.ModuleConfig; +import org.apache.skywalking.oap.server.library.module.ModuleDefine; +import org.apache.skywalking.oap.server.library.module.ModuleProvider; +import org.apache.skywalking.oap.server.library.module.ModuleStartException; +import org.apache.skywalking.oap.server.library.module.ServiceNotProvidedException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * @author kezhenxu94 - */ public class ApolloConfigurationTestProvider extends ModuleProvider { private static final Logger LOGGER = LoggerFactory.getLogger(ApolloConfigurationTestProvider.class); @@ -74,9 +75,9 @@ public String value() { @Override public void start() throws ServiceNotProvidedException, ModuleStartException { getManager().find(ConfigurationModule.NAME) - .provider() - .getService(DynamicConfigurationService.class) - .registerConfigChangeWatcher(watcher); + .provider() + .getService(DynamicConfigurationService.class) + .registerConfigChangeWatcher(watcher); } @Override diff --git a/oap-server/server-configuration/configuration-apollo/src/test/java/org/apache/skywalking/oap/server/configuration/apollo/ITApolloConfigurationTest.java b/oap-server/server-configuration/configuration-apollo/src/test/java/org/apache/skywalking/oap/server/configuration/apollo/ITApolloConfigurationTest.java index 051f022b1899..8ed81cd909ed 100644 --- a/oap-server/server-configuration/configuration-apollo/src/test/java/org/apache/skywalking/oap/server/configuration/apollo/ITApolloConfigurationTest.java +++ b/oap-server/server-configuration/configuration-apollo/src/test/java/org/apache/skywalking/oap/server/configuration/apollo/ITApolloConfigurationTest.java @@ -18,6 +18,11 @@ package org.apache.skywalking.oap.server.configuration.apollo; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.Reader; +import java.util.Map; +import java.util.Properties; import org.apache.http.client.ResponseHandler; import org.apache.http.client.methods.HttpDelete; import org.apache.http.client.methods.HttpPost; @@ -38,20 +43,11 @@ import org.slf4j.LoggerFactory; import org.yaml.snakeyaml.Yaml; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.Reader; -import java.util.Map; -import java.util.Properties; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; -/** - * @author kezhenxu94 - */ public class ITApolloConfigurationTest { private static final Logger LOGGER = LoggerFactory.getLogger(ITApolloConfigurationTest.class); @@ -77,10 +73,7 @@ public void setUp() throws Exception { final ModuleManager moduleManager = new ModuleManager(); moduleManager.init(applicationConfiguration); - provider = - (ApolloConfigurationTestProvider) moduleManager - .find(ApolloConfigurationTestModule.NAME) - .provider(); + provider = (ApolloConfigurationTestProvider) moduleManager.find(ApolloConfigurationTestModule.NAME).provider(); assertNotNull(provider); } @@ -92,43 +85,16 @@ public void shouldReadUpdated() { try { assertNull(provider.watcher.value()); - final HttpPost createConfigPost = - new HttpPost( - baseUrl + - "/openapi/v1/envs/DEV" + - "/apps/SampleApp" + - "/clusters/default" + - "/namespaces/application" + - "/items"); + final HttpPost createConfigPost = new HttpPost(baseUrl + "/openapi/v1/envs/DEV" + "/apps/SampleApp" + "/clusters/default" + "/namespaces/application" + "/items"); createConfigPost.setHeader("Authorization", token); createConfigPost.setHeader("Content-Type", "application/json;charset=UTF-8"); - final StringEntity entity = new StringEntity("{\n" + - " \"key\":\"test-module.default.testKey\",\n" + - " \"value\":\"3000\",\n" + - " \"comment\":\"test key\",\n" + - " \"dataChangeCreatedBy\":\"apollo\"\n" + - "}"); + final StringEntity entity = new StringEntity("{\n" + " \"key\":\"test-module.default.testKey\",\n" + " \"value\":\"3000\",\n" + " \"comment\":\"test key\",\n" + " \"dataChangeCreatedBy\":\"apollo\"\n" + "}"); createConfigPost.setEntity(entity); final String createResponse = (String) httpClient.execute(createConfigPost, responseHandler); LOGGER.info("createResponse: {}", createResponse); - final HttpPost releaseConfigRequest = - new HttpPost( - baseUrl + - "/openapi/v1/envs/DEV" + - "/apps/SampleApp" + - "/clusters/default" + - "/namespaces/application/releases" - ); - releaseConfigRequest.setEntity( - new StringEntity( - "{\n" + - " \"releaseTitle\":\"2019-06-07\",\n" + - " \"releaseComment\":\"test\",\n" + - " \"releasedBy\":\"apollo\"\n" + - "}" - ) - ); + final HttpPost releaseConfigRequest = new HttpPost(baseUrl + "/openapi/v1/envs/DEV" + "/apps/SampleApp" + "/clusters/default" + "/namespaces/application/releases"); + releaseConfigRequest.setEntity(new StringEntity("{\n" + " \"releaseTitle\":\"2019-06-07\",\n" + " \"releaseComment\":\"test\",\n" + " \"releasedBy\":\"apollo\"\n" + "}")); releaseConfigRequest.setHeader("Authorization", token); releaseConfigRequest.setHeader("Content-Type", "application/json;charset=UTF-8"); final String releaseCreateResponse = (String) httpClient.execute(releaseConfigRequest, responseHandler); @@ -139,16 +105,7 @@ public void shouldReadUpdated() { assertEquals("3000", provider.watcher.value()); - final HttpDelete deleteConfigRequest = - new HttpDelete( - baseUrl + - "/openapi/v1" + - "/envs/DEV" + - "/apps/SampleApp" + - "/clusters/default" + - "/namespaces/application" + - "/items/test-module.default.testKey" + - "?operator=apollo"); + final HttpDelete deleteConfigRequest = new HttpDelete(baseUrl + "/openapi/v1" + "/envs/DEV" + "/apps/SampleApp" + "/clusters/default" + "/namespaces/application" + "/items/test-module.default.testKey" + "?operator=apollo"); deleteConfigRequest.setHeader("Authorization", token); deleteConfigRequest.setHeader("Content-Type", "application/json;charset=UTF-8"); httpClient.execute(deleteConfigRequest); @@ -178,8 +135,7 @@ private void loadConfig(ApplicationConfiguration configuration) throws FileNotFo if (propertiesConfig != null) { propertiesConfig.forEach((key, value) -> { properties.put(key, value); - final Object replaceValue = yaml.load(PropertyPlaceholderHelper.INSTANCE - .replacePlaceholders(value + "", properties)); + final Object replaceValue = yaml.load(PropertyPlaceholderHelper.INSTANCE.replacePlaceholders(value + "", properties)); if (replaceValue != null) { properties.replace(key, replaceValue); } @@ -195,37 +151,13 @@ private void loadConfig(ApplicationConfiguration configuration) throws FileNotFo @After public void cleanUp() throws IOException { try { - final HttpDelete deleteConfigRequest = - new HttpDelete( - baseUrl + - "/openapi/v1" + - "/envs/DEV" + - "/apps/SampleApp" + - "/clusters/default" + - "/namespaces/application" + - "/items/test-module.default.testKey" + - "?operator=apollo"); + final HttpDelete deleteConfigRequest = new HttpDelete(baseUrl + "/openapi/v1" + "/envs/DEV" + "/apps/SampleApp" + "/clusters/default" + "/namespaces/application" + "/items/test-module.default.testKey" + "?operator=apollo"); deleteConfigRequest.setHeader("Authorization", token); deleteConfigRequest.setHeader("Content-Type", "application/json;charset=UTF-8"); httpClient.execute(deleteConfigRequest); - final HttpPost releaseConfigRequest = - new HttpPost( - baseUrl + - "/openapi/v1/envs/DEV" + - "/apps/SampleApp" + - "/clusters/default" + - "/namespaces/application/releases" - ); - releaseConfigRequest.setEntity( - new StringEntity( - "{\n" + - " \"releaseTitle\":\"2019-06-07\",\n" + - " \"releaseComment\":\"test\",\n" + - " \"releasedBy\":\"apollo\"\n" + - "}" - ) - ); + final HttpPost releaseConfigRequest = new HttpPost(baseUrl + "/openapi/v1/envs/DEV" + "/apps/SampleApp" + "/clusters/default" + "/namespaces/application/releases"); + releaseConfigRequest.setEntity(new StringEntity("{\n" + " \"releaseTitle\":\"2019-06-07\",\n" + " \"releaseComment\":\"test\",\n" + " \"releasedBy\":\"apollo\"\n" + "}")); releaseConfigRequest.setHeader("Authorization", token); releaseConfigRequest.setHeader("Content-Type", "application/json;charset=UTF-8"); httpClient.execute(releaseConfigRequest, responseHandler); diff --git a/oap-server/server-configuration/configuration-consul/pom.xml b/oap-server/server-configuration/configuration-consul/pom.xml index 1ecb76bc119e..505523e267cf 100644 --- a/oap-server/server-configuration/configuration-consul/pom.xml +++ b/oap-server/server-configuration/configuration-consul/pom.xml @@ -17,7 +17,8 @@ ~ --> - + server-configuration org.apache.skywalking diff --git a/oap-server/server-configuration/configuration-consul/src/main/java/org/apache/skywalking/oap/server/configuration/consul/ConsulConfigurationCenterSettings.java b/oap-server/server-configuration/configuration-consul/src/main/java/org/apache/skywalking/oap/server/configuration/consul/ConsulConfigurationCenterSettings.java index 0bd9af54b298..dd2f67c065ea 100644 --- a/oap-server/server-configuration/configuration-consul/src/main/java/org/apache/skywalking/oap/server/configuration/consul/ConsulConfigurationCenterSettings.java +++ b/oap-server/server-configuration/configuration-consul/src/main/java/org/apache/skywalking/oap/server/configuration/consul/ConsulConfigurationCenterSettings.java @@ -22,9 +22,6 @@ import lombok.Setter; import org.apache.skywalking.oap.server.library.module.ModuleConfig; -/** - * @author kezhenxu94 - */ public class ConsulConfigurationCenterSettings extends ModuleConfig { @Getter @Setter diff --git a/oap-server/server-configuration/configuration-consul/src/main/java/org/apache/skywalking/oap/server/configuration/consul/ConsulConfigurationProvider.java b/oap-server/server-configuration/configuration-consul/src/main/java/org/apache/skywalking/oap/server/configuration/consul/ConsulConfigurationProvider.java index 9cb652548eda..e16aa5abcf71 100644 --- a/oap-server/server-configuration/configuration-consul/src/main/java/org/apache/skywalking/oap/server/configuration/consul/ConsulConfigurationProvider.java +++ b/oap-server/server-configuration/configuration-consul/src/main/java/org/apache/skywalking/oap/server/configuration/consul/ConsulConfigurationProvider.java @@ -28,8 +28,6 @@ /** * Get configuration from Consul. - * - * @author kezhenxu94 */ public class ConsulConfigurationProvider extends AbstractConfigurationProvider { private static final Logger LOGGER = LoggerFactory.getLogger(ConsulConfigurationProvider.class); diff --git a/oap-server/server-configuration/configuration-consul/src/main/java/org/apache/skywalking/oap/server/configuration/consul/ConsulConfigurationWatcherRegister.java b/oap-server/server-configuration/configuration-consul/src/main/java/org/apache/skywalking/oap/server/configuration/consul/ConsulConfigurationWatcherRegister.java index 03711c108b8f..5df153178132 100644 --- a/oap-server/server-configuration/configuration-consul/src/main/java/org/apache/skywalking/oap/server/configuration/consul/ConsulConfigurationWatcherRegister.java +++ b/oap-server/server-configuration/configuration-consul/src/main/java/org/apache/skywalking/oap/server/configuration/consul/ConsulConfigurationWatcherRegister.java @@ -18,6 +18,12 @@ package org.apache.skywalking.oap.server.configuration.consul; +import com.google.common.base.Splitter; +import com.google.common.net.HostAndPort; +import com.orbitz.consul.Consul; +import com.orbitz.consul.KeyValueClient; +import com.orbitz.consul.cache.KVCache; +import com.orbitz.consul.model.kv.Value; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -25,22 +31,12 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; - -import com.google.common.base.Splitter; -import com.google.common.net.HostAndPort; -import com.orbitz.consul.Consul; -import com.orbitz.consul.KeyValueClient; -import com.orbitz.consul.cache.KVCache; -import com.orbitz.consul.model.kv.Value; import org.apache.commons.lang3.StringUtils; import org.apache.skywalking.oap.server.configuration.api.ConfigTable; import org.apache.skywalking.oap.server.configuration.api.ConfigWatcherRegister; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * @author kezhenxu94 - */ @SuppressWarnings("UnstableApiUsage") public class ConsulConfigurationWatcherRegister extends ConfigWatcherRegister { private static final Logger LOGGER = LoggerFactory.getLogger(ConsulConfigurationWatcherRegister.class); @@ -58,10 +54,11 @@ public ConsulConfigurationWatcherRegister(ConsulConfigurationCenterSettings sett this.cachesByKey = new ConcurrentHashMap<>(); List hostAndPorts = Splitter.on(",") - .splitToList(settings.getHostAndPorts()) - .parallelStream() - .map(hostAndPort -> HostAndPort.fromString(hostAndPort).withDefaultPort(DEFAULT_PORT)) - .collect(Collectors.toList()); + .splitToList(settings.getHostAndPorts()) + .parallelStream() + .map(hostAndPort -> HostAndPort.fromString(hostAndPort) + .withDefaultPort(DEFAULT_PORT)) + .collect(Collectors.toList()); Consul.Builder builder = Consul.builder().withConnectTimeoutMillis(3000); diff --git a/oap-server/server-configuration/configuration-consul/src/test/java/org/apache/skywalking/oap/server/configuration/consul/ConsulConfigurationProviderTest.java b/oap-server/server-configuration/configuration-consul/src/test/java/org/apache/skywalking/oap/server/configuration/consul/ConsulConfigurationProviderTest.java index 3cea48680d8e..87ad962d23fc 100644 --- a/oap-server/server-configuration/configuration-consul/src/test/java/org/apache/skywalking/oap/server/configuration/consul/ConsulConfigurationProviderTest.java +++ b/oap-server/server-configuration/configuration-consul/src/test/java/org/apache/skywalking/oap/server/configuration/consul/ConsulConfigurationProviderTest.java @@ -21,9 +21,6 @@ import org.apache.skywalking.oap.server.library.module.ModuleStartException; import org.junit.Test; -/** - * @author kezhenxu94 - */ public class ConsulConfigurationProviderTest { @Test(expected = ModuleStartException.class) diff --git a/oap-server/server-configuration/configuration-consul/src/test/java/org/apache/skywalking/oap/server/configuration/consul/ConsulConfigurationTestModule.java b/oap-server/server-configuration/configuration-consul/src/test/java/org/apache/skywalking/oap/server/configuration/consul/ConsulConfigurationTestModule.java index bc42aa97ba8a..3ad8ae49a9b9 100644 --- a/oap-server/server-configuration/configuration-consul/src/test/java/org/apache/skywalking/oap/server/configuration/consul/ConsulConfigurationTestModule.java +++ b/oap-server/server-configuration/configuration-consul/src/test/java/org/apache/skywalking/oap/server/configuration/consul/ConsulConfigurationTestModule.java @@ -20,9 +20,6 @@ import org.apache.skywalking.oap.server.library.module.ModuleDefine; -/** - * @author kezhenxu94 - */ public class ConsulConfigurationTestModule extends ModuleDefine { public static final String NAME = "test-module"; diff --git a/oap-server/server-configuration/configuration-consul/src/test/java/org/apache/skywalking/oap/server/configuration/consul/ConsulConfigurationTestProvider.java b/oap-server/server-configuration/configuration-consul/src/test/java/org/apache/skywalking/oap/server/configuration/consul/ConsulConfigurationTestProvider.java index e03b32ebabbb..23c548feb697 100644 --- a/oap-server/server-configuration/configuration-consul/src/test/java/org/apache/skywalking/oap/server/configuration/consul/ConsulConfigurationTestProvider.java +++ b/oap-server/server-configuration/configuration-consul/src/test/java/org/apache/skywalking/oap/server/configuration/consul/ConsulConfigurationTestProvider.java @@ -29,9 +29,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * @author kezhenxu94 - */ public class ConsulConfigurationTestProvider extends ModuleProvider { private static final Logger LOGGER = LoggerFactory.getLogger(ConsulConfigurationTestProvider.class); @@ -78,9 +75,9 @@ public String value() { @Override public void start() throws ServiceNotProvidedException, ModuleStartException { getManager().find(ConfigurationModule.NAME) - .provider() - .getService(DynamicConfigurationService.class) - .registerConfigChangeWatcher(watcher); + .provider() + .getService(DynamicConfigurationService.class) + .registerConfigChangeWatcher(watcher); } @Override @@ -90,7 +87,7 @@ public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleSta @Override public String[] requiredModules() { - return new String[]{ + return new String[] { ConfigurationModule.NAME }; } diff --git a/oap-server/server-configuration/configuration-consul/src/test/java/org/apache/skywalking/oap/server/configuration/consul/ConsulConfigurationWatcherRegisterTest.java b/oap-server/server-configuration/configuration-consul/src/test/java/org/apache/skywalking/oap/server/configuration/consul/ConsulConfigurationWatcherRegisterTest.java index a41a2005d6f5..1cfec1ef067a 100644 --- a/oap-server/server-configuration/configuration-consul/src/test/java/org/apache/skywalking/oap/server/configuration/consul/ConsulConfigurationWatcherRegisterTest.java +++ b/oap-server/server-configuration/configuration-consul/src/test/java/org/apache/skywalking/oap/server/configuration/consul/ConsulConfigurationWatcherRegisterTest.java @@ -18,10 +18,6 @@ package org.apache.skywalking.oap.server.configuration.consul; -import java.util.Optional; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; - import com.google.common.collect.ImmutableMap; import com.google.common.collect.Sets; import com.google.common.io.BaseEncoding; @@ -29,6 +25,9 @@ import com.orbitz.consul.cache.ConsulCache; import com.orbitz.consul.cache.KVCache; import com.orbitz.consul.model.kv.ImmutableValue; +import java.util.Optional; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -47,12 +46,12 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -/** - * @author kezhenxu94 - */ @RunWith(PowerMockRunner.class) @PrepareForTest(KVCache.class) -@SuppressWarnings({"unchecked", "OptionalGetWithoutIsPresent"}) +@SuppressWarnings({ + "unchecked", + "OptionalGetWithoutIsPresent" +}) public class ConsulConfigurationWatcherRegisterTest { @Mock private ConsulConfigurationWatcherRegister register; @@ -88,32 +87,24 @@ public void shouldUpdateCachesWhenNotified() { verify(cache1).addListener(listener1.capture()); verify(cache2).addListener(listener2.capture()); - listener1.getValue().notify( - ImmutableMap.of( - "key1", - ImmutableValue - .builder() - .createIndex(0) - .modifyIndex(0) - .lockIndex(0) - .key("key1") - .flags(0) - .value(BaseEncoding.base64().encode("val1".getBytes())) - .build()) - ); - listener2.getValue().notify( - ImmutableMap.of( - "key2", - ImmutableValue - .builder() - .createIndex(0) - .modifyIndex(0) - .lockIndex(0) - .key("key2") - .flags(0) - .value(BaseEncoding.base64().encode("val2".getBytes())) - .build()) - ); + listener1.getValue() + .notify(ImmutableMap.of("key1", ImmutableValue.builder() + .createIndex(0) + .modifyIndex(0) + .lockIndex(0) + .key("key1") + .flags(0) + .value(BaseEncoding.base64().encode("val1".getBytes())) + .build())); + listener2.getValue() + .notify(ImmutableMap.of("key2", ImmutableValue.builder() + .createIndex(0) + .modifyIndex(0) + .lockIndex(0) + .key("key2") + .flags(0) + .value(BaseEncoding.base64().encode("val2".getBytes())) + .build())); assertEquals(2, configItemKeyedByName.size()); assertEquals("val1", configItemKeyedByName.get("key1").get()); diff --git a/oap-server/server-configuration/configuration-consul/src/test/java/org/apache/skywalking/oap/server/configuration/consul/ITConsulConfigurationTest.java b/oap-server/server-configuration/configuration-consul/src/test/java/org/apache/skywalking/oap/server/configuration/consul/ITConsulConfigurationTest.java index 9dbe53fb41eb..425c4a160236 100644 --- a/oap-server/server-configuration/configuration-consul/src/test/java/org/apache/skywalking/oap/server/configuration/consul/ITConsulConfigurationTest.java +++ b/oap-server/server-configuration/configuration-consul/src/test/java/org/apache/skywalking/oap/server/configuration/consul/ITConsulConfigurationTest.java @@ -18,14 +18,13 @@ package org.apache.skywalking.oap.server.configuration.consul; +import com.google.common.net.HostAndPort; +import com.orbitz.consul.Consul; +import com.orbitz.consul.KeyValueClient; import java.io.FileNotFoundException; import java.io.Reader; import java.util.Map; import java.util.Properties; - -import com.google.common.net.HostAndPort; -import com.orbitz.consul.Consul; -import com.orbitz.consul.KeyValueClient; import org.apache.skywalking.apm.util.PropertyPlaceholderHelper; import org.apache.skywalking.oap.server.library.module.ApplicationConfiguration; import org.apache.skywalking.oap.server.library.module.ModuleManager; @@ -40,9 +39,6 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -/** - * @author kezhenxu94 - */ public class ITConsulConfigurationTest { private final Yaml yaml = new Yaml(); @@ -56,10 +52,7 @@ public void setUp() throws Exception { final ModuleManager moduleManager = new ModuleManager(); moduleManager.init(applicationConfiguration); - provider = - (ConsulConfigurationTestProvider) moduleManager - .find(ConsulConfigurationTestModule.NAME) - .provider(); + provider = (ConsulConfigurationTestProvider) moduleManager.find(ConsulConfigurationTestModule.NAME).provider(); assertNotNull(provider); } @@ -69,7 +62,10 @@ public void shouldReadUpdated() { assertNull(provider.watcher.value()); String hostAndPort = System.getProperty("consul.address", "127.0.0.1:8500"); - Consul consul = Consul.builder().withHostAndPort(HostAndPort.fromString(hostAndPort)).withConnectTimeoutMillis(5000).build(); + Consul consul = Consul.builder() + .withHostAndPort(HostAndPort.fromString(hostAndPort)) + .withConnectTimeoutMillis(5000) + .build(); KeyValueClient client = consul.keyValueClient(); assertTrue(client.putValue("test-module.default.testKey", "1000")); @@ -100,9 +96,7 @@ private void loadConfig(ApplicationConfiguration configuration) throws FileNotFo if (propertiesConfig != null) { propertiesConfig.forEach((key, value) -> { properties.put(key, value); - final Object replaceValue = yaml.load( - PropertyPlaceholderHelper.INSTANCE.replacePlaceholders(value + "", properties) - ); + final Object replaceValue = yaml.load(PropertyPlaceholderHelper.INSTANCE.replacePlaceholders(value + "", properties)); if (replaceValue != null) { properties.replace(key, replaceValue); } diff --git a/oap-server/server-configuration/configuration-etcd/pom.xml b/oap-server/server-configuration/configuration-etcd/pom.xml index 1631d60ea9d8..eb225c9260c4 100644 --- a/oap-server/server-configuration/configuration-etcd/pom.xml +++ b/oap-server/server-configuration/configuration-etcd/pom.xml @@ -16,7 +16,8 @@ ~ limitations under the License. ~ --> - + server-configuration org.apache.skywalking diff --git a/oap-server/server-configuration/configuration-etcd/src/main/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdConfigException.java b/oap-server/server-configuration/configuration-etcd/src/main/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdConfigException.java index e2ef9c895aa0..4eaaf3b8aae7 100644 --- a/oap-server/server-configuration/configuration-etcd/src/main/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdConfigException.java +++ b/oap-server/server-configuration/configuration-etcd/src/main/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdConfigException.java @@ -20,12 +20,9 @@ /** * exception type throw by Etcd Configuration. - * - * @author Alan Lau */ public class EtcdConfigException extends RuntimeException { - public EtcdConfigException(String message, Throwable cause) { super(message, cause); } diff --git a/oap-server/server-configuration/configuration-etcd/src/main/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdConfigWatcherRegister.java b/oap-server/server-configuration/configuration-etcd/src/main/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdConfigWatcherRegister.java index 17899ea1f65e..1d701581faf7 100644 --- a/oap-server/server-configuration/configuration-etcd/src/main/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdConfigWatcherRegister.java +++ b/oap-server/server-configuration/configuration-etcd/src/main/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdConfigWatcherRegister.java @@ -35,9 +35,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * @author Alan Lau - */ public class EtcdConfigWatcherRegister extends ConfigWatcherRegister { private final static Logger logger = LoggerFactory.getLogger(EtcdConfigWatcherRegister.class); @@ -67,7 +64,8 @@ public EtcdConfigWatcherRegister(EtcdServerSettings settings) { responsePromiseByKey = new ConcurrentHashMap<>(); } - @Override public ConfigTable readConfig(Set keys) { + @Override + public ConfigTable readConfig(Set keys) { removeUninterestedKeys(keys); registerKeyListeners(keys); final ConfigTable table = new ConfigTable(); @@ -135,7 +133,7 @@ private void onDataValueChanged(ResponsePromise promise, Strin configItemKeyedByName.put(key, Optional.ofNullable(value)); } catch (Exception e) { if (e instanceof EtcdException) { - if (EtcdErrorCode.KeyNotFound == ((EtcdException)e).errorCode) { + if (EtcdErrorCode.KeyNotFound == ((EtcdException) e).errorCode) { configItemKeyedByName.put(key, Optional.empty()); return; } @@ -146,10 +144,6 @@ private void onDataValueChanged(ResponsePromise promise, Strin /** * get real key in etcd cluster which is removed "/${group}" from the key retrive from etcd. - * - * @param key - * @param group - * @return */ private String getRealKey(String key, String group) { int index = key.indexOf(group); diff --git a/oap-server/server-configuration/configuration-etcd/src/main/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdConfigurationProvider.java b/oap-server/server-configuration/configuration-etcd/src/main/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdConfigurationProvider.java index f63314c3267e..a9fd4c642132 100644 --- a/oap-server/server-configuration/configuration-etcd/src/main/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdConfigurationProvider.java +++ b/oap-server/server-configuration/configuration-etcd/src/main/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdConfigurationProvider.java @@ -28,8 +28,6 @@ /** * Get Configuration from etcd. - * - * @author Alan Lau */ public class EtcdConfigurationProvider extends AbstractConfigurationProvider { @@ -41,7 +39,8 @@ public EtcdConfigurationProvider() { settings = new EtcdServerSettings(); } - @Override protected ConfigWatcherRegister initConfigReader() throws ModuleStartException { + @Override + protected ConfigWatcherRegister initConfigReader() throws ModuleStartException { logger.info("settings: {}", settings); if (Strings.isNullOrEmpty(settings.getServerAddr())) { throw new ModuleStartException("Etcd serverAddr cannot be null or empty."); @@ -57,11 +56,13 @@ public EtcdConfigurationProvider() { } } - @Override public String name() { + @Override + public String name() { return "etcd"; } - @Override public ModuleConfig createConfigBeanIfAbsent() { + @Override + public ModuleConfig createConfigBeanIfAbsent() { return settings; } } diff --git a/oap-server/server-configuration/configuration-etcd/src/main/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdServerSettings.java b/oap-server/server-configuration/configuration-etcd/src/main/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdServerSettings.java index 689382444186..17fb82a5bf11 100644 --- a/oap-server/server-configuration/configuration-etcd/src/main/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdServerSettings.java +++ b/oap-server/server-configuration/configuration-etcd/src/main/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdServerSettings.java @@ -25,8 +25,6 @@ /** * entity wrapps the etcd cluster configuration. - * - * @author Alan Lau */ @ToString @Getter diff --git a/oap-server/server-configuration/configuration-etcd/src/main/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdUtils.java b/oap-server/server-configuration/configuration-etcd/src/main/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdUtils.java index 71834d7aa4b9..54b43ca6b309 100644 --- a/oap-server/server-configuration/configuration-etcd/src/main/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdUtils.java +++ b/oap-server/server-configuration/configuration-etcd/src/main/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdUtils.java @@ -29,8 +29,6 @@ /** * a util for etcd serverAddr parse. - * - * @author Alan Lau */ public class EtcdUtils { diff --git a/oap-server/server-configuration/configuration-etcd/src/test/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdConfigWatcherRegisterTest.java b/oap-server/server-configuration/configuration-etcd/src/test/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdConfigWatcherRegisterTest.java index 2d4fcf6f982a..09ead678fe2d 100644 --- a/oap-server/server-configuration/configuration-etcd/src/test/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdConfigWatcherRegisterTest.java +++ b/oap-server/server-configuration/configuration-etcd/src/test/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdConfigWatcherRegisterTest.java @@ -47,11 +47,13 @@ import static org.powermock.api.mockito.PowerMockito.when; import static org.powermock.api.mockito.PowerMockito.whenNew; -/** - * @author Alan Lau - */ @RunWith(PowerMockRunner.class) -@PrepareForTest({EtcdKeysResponse.class, EtcdUtils.class, EtcdClient.class, URI.class}) +@PrepareForTest({ + EtcdKeysResponse.class, + EtcdUtils.class, + EtcdClient.class, + URI.class +}) @PowerMockIgnore({"javax.management.*"}) public class EtcdConfigWatcherRegisterTest { diff --git a/oap-server/server-configuration/configuration-etcd/src/test/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdConfigurationTestModule.java b/oap-server/server-configuration/configuration-etcd/src/test/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdConfigurationTestModule.java index c03fae40cdf7..50adfbbc4fc2 100644 --- a/oap-server/server-configuration/configuration-etcd/src/test/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdConfigurationTestModule.java +++ b/oap-server/server-configuration/configuration-etcd/src/test/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdConfigurationTestModule.java @@ -20,9 +20,6 @@ import org.apache.skywalking.oap.server.library.module.ModuleDefine; -/** - * @author Alan Lau - */ public class EtcdConfigurationTestModule extends ModuleDefine { public static final String NAME = "test-module"; @@ -31,7 +28,8 @@ public EtcdConfigurationTestModule() { super(NAME); } - @Override public Class[] services() { + @Override + public Class[] services() { return new Class[0]; } } diff --git a/oap-server/server-configuration/configuration-etcd/src/test/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdConfigurationTestProvider.java b/oap-server/server-configuration/configuration-etcd/src/test/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdConfigurationTestProvider.java index 93d54969c781..c87f84f1ecc1 100644 --- a/oap-server/server-configuration/configuration-etcd/src/test/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdConfigurationTestProvider.java +++ b/oap-server/server-configuration/configuration-etcd/src/test/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdConfigurationTestProvider.java @@ -29,29 +29,30 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * @author Alan Lau - */ public class EtcdConfigurationTestProvider extends ModuleProvider { private final static Logger LOGGER = LoggerFactory.getLogger(EtcdConfigurationTestProvider.class); ConfigChangeWatcher watcher; - @Override public String name() { + @Override + public String name() { return "default"; } - @Override public Class module() { + @Override + public Class module() { return EtcdConfigurationTestModule.class; } - @Override public ModuleConfig createConfigBeanIfAbsent() { + @Override + public ModuleConfig createConfigBeanIfAbsent() { return new ModuleConfig() { }; } - @Override public void prepare() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void prepare() throws ServiceNotProvidedException, ModuleStartException { watcher = new ConfigChangeWatcher(EtcdConfigurationTestModule.NAME, this, "testKey") { private volatile String testValue; @@ -72,18 +73,21 @@ public String value() { }; } - @Override public void start() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void start() throws ServiceNotProvidedException, ModuleStartException { getManager().find(ConfigurationModule.NAME) - .provider() - .getService(DynamicConfigurationService.class) - .registerConfigChangeWatcher(watcher); + .provider() + .getService(DynamicConfigurationService.class) + .registerConfigChangeWatcher(watcher); } - @Override public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleStartException { } - @Override public String[] requiredModules() { + @Override + public String[] requiredModules() { return new String[0]; } } diff --git a/oap-server/server-configuration/configuration-etcd/src/test/java/org/apache/skywalking/oap/server/configuration/etcd/ITEtcdConfigurationTest.java b/oap-server/server-configuration/configuration-etcd/src/test/java/org/apache/skywalking/oap/server/configuration/etcd/ITEtcdConfigurationTest.java index c157652bc5f0..2f7342d7144e 100644 --- a/oap-server/server-configuration/configuration-etcd/src/test/java/org/apache/skywalking/oap/server/configuration/etcd/ITEtcdConfigurationTest.java +++ b/oap-server/server-configuration/configuration-etcd/src/test/java/org/apache/skywalking/oap/server/configuration/etcd/ITEtcdConfigurationTest.java @@ -43,9 +43,6 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -/** - * @author Alan Lau - */ public class ITEtcdConfigurationTest { private static final Logger logger = LoggerFactory.getLogger(ITEtcdConfigurationTest.class); @@ -75,10 +72,7 @@ public void setUp() throws Exception { List uris = EtcdUtils.parseProp(properties); client = new EtcdClient(uris.toArray(new URI[] {})); - provider = - (EtcdConfigurationTestProvider)moduleManager - .find(EtcdConfigurationTestModule.NAME) - .provider(); + provider = (EtcdConfigurationTestProvider) moduleManager.find(EtcdConfigurationTestModule.NAME).provider(); assertNotNull(provider); } @@ -116,8 +110,7 @@ private void loadConfig(ApplicationConfiguration configuration) throws FileNotFo if (propertiesConfig != null) { propertiesConfig.forEach((key, value) -> { properties.put(key, value); - final Object replaceValue = yaml.load(PropertyPlaceholderHelper.INSTANCE - .replacePlaceholders(value + "", properties)); + final Object replaceValue = yaml.load(PropertyPlaceholderHelper.INSTANCE.replacePlaceholders(value + "", properties)); if (replaceValue != null) { properties.replace(key, replaceValue); } diff --git a/oap-server/server-configuration/configuration-etcd/src/test/java/org/apache/skywalking/oap/server/configuration/etcd/TestEtcdUtils.java b/oap-server/server-configuration/configuration-etcd/src/test/java/org/apache/skywalking/oap/server/configuration/etcd/TestEtcdUtils.java index 0977fabd9bfa..feea4cd814e9 100644 --- a/oap-server/server-configuration/configuration-etcd/src/test/java/org/apache/skywalking/oap/server/configuration/etcd/TestEtcdUtils.java +++ b/oap-server/server-configuration/configuration-etcd/src/test/java/org/apache/skywalking/oap/server/configuration/etcd/TestEtcdUtils.java @@ -25,9 +25,6 @@ import org.junit.Before; import org.junit.Test; -/** - * @author Alan Lau - */ public class TestEtcdUtils { private EtcdServerSettings settings; diff --git a/oap-server/server-configuration/configuration-nacos/pom.xml b/oap-server/server-configuration/configuration-nacos/pom.xml index 6214d6e741ab..0baad0313aa5 100644 --- a/oap-server/server-configuration/configuration-nacos/pom.xml +++ b/oap-server/server-configuration/configuration-nacos/pom.xml @@ -17,7 +17,8 @@ ~ --> - + server-configuration org.apache.skywalking diff --git a/oap-server/server-configuration/configuration-nacos/src/main/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigWatcherRegister.java b/oap-server/server-configuration/configuration-nacos/src/main/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigWatcherRegister.java index 8c0f01040806..3a3f2cb0180f 100644 --- a/oap-server/server-configuration/configuration-nacos/src/main/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigWatcherRegister.java +++ b/oap-server/server-configuration/configuration-nacos/src/main/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigWatcherRegister.java @@ -23,18 +23,18 @@ import com.alibaba.nacos.api.config.ConfigService; import com.alibaba.nacos.api.config.listener.Listener; import com.alibaba.nacos.api.exception.NacosException; +import java.util.HashSet; +import java.util.Map; +import java.util.Optional; +import java.util.Properties; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.Executor; import org.apache.skywalking.oap.server.configuration.api.ConfigTable; import org.apache.skywalking.oap.server.configuration.api.ConfigWatcherRegister; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.Executor; - -/** - * @author kezhenxu94 - */ public class NacosConfigWatcherRegister extends ConfigWatcherRegister { private static final Logger LOGGER = LoggerFactory.getLogger(NacosConfigWatcherRegister.class); diff --git a/oap-server/server-configuration/configuration-nacos/src/main/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigurationProvider.java b/oap-server/server-configuration/configuration-nacos/src/main/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigurationProvider.java index bcc353b2fc37..ce04db245209 100644 --- a/oap-server/server-configuration/configuration-nacos/src/main/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigurationProvider.java +++ b/oap-server/server-configuration/configuration-nacos/src/main/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigurationProvider.java @@ -29,8 +29,6 @@ /** * Get configuration from Nacos. - * - * @author kezhenxu94 */ public class NacosConfigurationProvider extends AbstractConfigurationProvider { private static final Logger LOGGER = LoggerFactory.getLogger(NacosConfigurationProvider.class); diff --git a/oap-server/server-configuration/configuration-nacos/src/main/java/org/apache/skywalking/oap/server/configuration/nacos/NacosServerSettings.java b/oap-server/server-configuration/configuration-nacos/src/main/java/org/apache/skywalking/oap/server/configuration/nacos/NacosServerSettings.java index e909a6e5d44d..cbe4af12181e 100644 --- a/oap-server/server-configuration/configuration-nacos/src/main/java/org/apache/skywalking/oap/server/configuration/nacos/NacosServerSettings.java +++ b/oap-server/server-configuration/configuration-nacos/src/main/java/org/apache/skywalking/oap/server/configuration/nacos/NacosServerSettings.java @@ -23,9 +23,6 @@ import lombok.ToString; import org.apache.skywalking.oap.server.library.module.ModuleConfig; -/** - * @author kezhenxu94 - */ @Getter @Setter @ToString diff --git a/oap-server/server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/ITNacosConfigurationTest.java b/oap-server/server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/ITNacosConfigurationTest.java index 1e9d1a0812b4..d71d0eeeac63 100644 --- a/oap-server/server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/ITNacosConfigurationTest.java +++ b/oap-server/server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/ITNacosConfigurationTest.java @@ -21,6 +21,10 @@ import com.alibaba.nacos.api.NacosFactory; import com.alibaba.nacos.api.config.ConfigService; import com.alibaba.nacos.api.exception.NacosException; +import java.io.FileNotFoundException; +import java.io.Reader; +import java.util.Map; +import java.util.Properties; import org.apache.skywalking.apm.util.PropertyPlaceholderHelper; import org.apache.skywalking.oap.server.library.module.ApplicationConfiguration; import org.apache.skywalking.oap.server.library.module.ModuleManager; @@ -32,19 +36,11 @@ import org.slf4j.LoggerFactory; import org.yaml.snakeyaml.Yaml; -import java.io.FileNotFoundException; -import java.io.Reader; -import java.util.Map; -import java.util.Properties; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -/** - * @author kezhenxu94 - */ public class ITNacosConfigurationTest { private static final Logger LOGGER = LoggerFactory.getLogger(ITNacosConfigurationTest.class); @@ -60,10 +56,7 @@ public void setUp() throws Exception { final ModuleManager moduleManager = new ModuleManager(); moduleManager.init(applicationConfiguration); - provider = - (NacosConfigurationTestProvider) moduleManager - .find(NacosConfigurationTestModule.NAME) - .provider(); + provider = (NacosConfigurationTestProvider) moduleManager.find(NacosConfigurationTestModule.NAME).provider(); assertNotNull(provider); } @@ -108,8 +101,7 @@ private void loadConfig(ApplicationConfiguration configuration) throws FileNotFo if (propertiesConfig != null) { propertiesConfig.forEach((key, value) -> { properties.put(key, value); - final Object replaceValue = yaml.load(PropertyPlaceholderHelper.INSTANCE - .replacePlaceholders(value + "", properties)); + final Object replaceValue = yaml.load(PropertyPlaceholderHelper.INSTANCE.replacePlaceholders(value + "", properties)); if (replaceValue != null) { properties.replace(key, replaceValue); } diff --git a/oap-server/server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigWatcherRegisterTest.java b/oap-server/server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigWatcherRegisterTest.java index b6c49bec3de7..f4ae9687c7e5 100644 --- a/oap-server/server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigWatcherRegisterTest.java +++ b/oap-server/server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigWatcherRegisterTest.java @@ -21,19 +21,17 @@ import com.alibaba.nacos.api.config.ConfigService; import com.alibaba.nacos.api.exception.NacosException; import com.google.common.collect.Sets; +import java.util.HashMap; +import java.util.Map; import org.apache.skywalking.oap.server.configuration.api.ConfigTable; import org.junit.Test; import org.powermock.reflect.Whitebox; -import java.util.HashMap; -import java.util.Map; - import static org.junit.Assert.assertEquals; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; -/** - * @author kezhenxu94 - */ public class NacosConfigWatcherRegisterTest { @Test public void shouldReadConfigs() throws NacosException { diff --git a/oap-server/server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigurationTestModule.java b/oap-server/server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigurationTestModule.java index 3990c93cf772..a638f96a8ca7 100644 --- a/oap-server/server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigurationTestModule.java +++ b/oap-server/server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigurationTestModule.java @@ -20,9 +20,6 @@ import org.apache.skywalking.oap.server.library.module.ModuleDefine; -/** - * @author kezhenxu94 - */ public class NacosConfigurationTestModule extends ModuleDefine { public static final String NAME = "test-module"; diff --git a/oap-server/server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigurationTestProvider.java b/oap-server/server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigurationTestProvider.java index 4cfb294c9823..8b62147f1435 100644 --- a/oap-server/server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigurationTestProvider.java +++ b/oap-server/server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigurationTestProvider.java @@ -21,13 +21,14 @@ import org.apache.skywalking.oap.server.configuration.api.ConfigChangeWatcher; import org.apache.skywalking.oap.server.configuration.api.ConfigurationModule; import org.apache.skywalking.oap.server.configuration.api.DynamicConfigurationService; -import org.apache.skywalking.oap.server.library.module.*; +import org.apache.skywalking.oap.server.library.module.ModuleConfig; +import org.apache.skywalking.oap.server.library.module.ModuleDefine; +import org.apache.skywalking.oap.server.library.module.ModuleProvider; +import org.apache.skywalking.oap.server.library.module.ModuleStartException; +import org.apache.skywalking.oap.server.library.module.ServiceNotProvidedException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * @author kezhenxu94 - */ public class NacosConfigurationTestProvider extends ModuleProvider { private static final Logger LOGGER = LoggerFactory.getLogger(NacosConfigurationTestProvider.class); @@ -74,9 +75,9 @@ public String value() { @Override public void start() throws ServiceNotProvidedException, ModuleStartException { getManager().find(ConfigurationModule.NAME) - .provider() - .getService(DynamicConfigurationService.class) - .registerConfigChangeWatcher(watcher); + .provider() + .getService(DynamicConfigurationService.class) + .registerConfigChangeWatcher(watcher); } @Override diff --git a/oap-server/server-configuration/configuration-zookeeper/pom.xml b/oap-server/server-configuration/configuration-zookeeper/pom.xml index f7cec43c07c5..8b4f000d41ae 100644 --- a/oap-server/server-configuration/configuration-zookeeper/pom.xml +++ b/oap-server/server-configuration/configuration-zookeeper/pom.xml @@ -17,7 +17,8 @@ ~ --> - + server-configuration org.apache.skywalking diff --git a/oap-server/server-configuration/configuration-zookeeper/src/main/java/org/apache/skywalking/oap/server/configuration/zookeeper/ZookeeperConfigWatcherRegister.java b/oap-server/server-configuration/configuration-zookeeper/src/main/java/org/apache/skywalking/oap/server/configuration/zookeeper/ZookeeperConfigWatcherRegister.java index 08cf2791a48d..b0ca0791951b 100644 --- a/oap-server/server-configuration/configuration-zookeeper/src/main/java/org/apache/skywalking/oap/server/configuration/zookeeper/ZookeeperConfigWatcherRegister.java +++ b/oap-server/server-configuration/configuration-zookeeper/src/main/java/org/apache/skywalking/oap/server/configuration/zookeeper/ZookeeperConfigWatcherRegister.java @@ -18,6 +18,7 @@ package org.apache.skywalking.oap.server.configuration.zookeeper; +import java.util.Set; import org.apache.curator.RetryPolicy; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; @@ -27,11 +28,6 @@ import org.apache.skywalking.oap.server.configuration.api.ConfigTable; import org.apache.skywalking.oap.server.configuration.api.ConfigWatcherRegister; -import java.util.Set; - -/** - * @author zhaoyuguang - */ public class ZookeeperConfigWatcherRegister extends ConfigWatcherRegister { private final PathChildrenCache childrenCache; private final String prefix; diff --git a/oap-server/server-configuration/configuration-zookeeper/src/main/java/org/apache/skywalking/oap/server/configuration/zookeeper/ZookeeperConfigurationProvider.java b/oap-server/server-configuration/configuration-zookeeper/src/main/java/org/apache/skywalking/oap/server/configuration/zookeeper/ZookeeperConfigurationProvider.java index ba87d7bb1700..618297f79404 100644 --- a/oap-server/server-configuration/configuration-zookeeper/src/main/java/org/apache/skywalking/oap/server/configuration/zookeeper/ZookeeperConfigurationProvider.java +++ b/oap-server/server-configuration/configuration-zookeeper/src/main/java/org/apache/skywalking/oap/server/configuration/zookeeper/ZookeeperConfigurationProvider.java @@ -26,8 +26,6 @@ /** * Get configuration from Zookeeper. - * - * @author zhaoyuguang */ public class ZookeeperConfigurationProvider extends AbstractConfigurationProvider { private ZookeeperServerSettings settings; diff --git a/oap-server/server-configuration/configuration-zookeeper/src/main/java/org/apache/skywalking/oap/server/configuration/zookeeper/ZookeeperServerSettings.java b/oap-server/server-configuration/configuration-zookeeper/src/main/java/org/apache/skywalking/oap/server/configuration/zookeeper/ZookeeperServerSettings.java index 9247a645000f..d54bb36438a4 100644 --- a/oap-server/server-configuration/configuration-zookeeper/src/main/java/org/apache/skywalking/oap/server/configuration/zookeeper/ZookeeperServerSettings.java +++ b/oap-server/server-configuration/configuration-zookeeper/src/main/java/org/apache/skywalking/oap/server/configuration/zookeeper/ZookeeperServerSettings.java @@ -22,9 +22,6 @@ import lombok.Setter; import org.apache.skywalking.oap.server.library.module.ModuleConfig; -/** - * @author zhaoyuguang - */ @Getter @Setter public class ZookeeperServerSettings extends ModuleConfig { @@ -36,10 +33,7 @@ public class ZookeeperServerSettings extends ModuleConfig { @Override public String toString() { - return "ZookeeperServerSettings(nameSpace=" + this.getNameSpace() - + ", hostPort=" + this.getHostPort() - + ", baseSleepTimeMs=" + this.getBaseSleepTimeMs() - + ", maxRetries=" + this.getMaxRetries() - + ", period=" + this.getPeriod() + ")"; + return "ZookeeperServerSettings(nameSpace=" + this.getNameSpace() + ", hostPort=" + this.getHostPort() + ", baseSleepTimeMs=" + this + .getBaseSleepTimeMs() + ", maxRetries=" + this.getMaxRetries() + ", period=" + this.getPeriod() + ")"; } } diff --git a/oap-server/server-configuration/configuration-zookeeper/src/test/java/org/apache/skywalking/oap/server/configuration/zookeeper/it/ITZookeeperConfigurationTest.java b/oap-server/server-configuration/configuration-zookeeper/src/test/java/org/apache/skywalking/oap/server/configuration/zookeeper/it/ITZookeeperConfigurationTest.java index f05a4830decb..76be999fc6e0 100644 --- a/oap-server/server-configuration/configuration-zookeeper/src/test/java/org/apache/skywalking/oap/server/configuration/zookeeper/it/ITZookeeperConfigurationTest.java +++ b/oap-server/server-configuration/configuration-zookeeper/src/test/java/org/apache/skywalking/oap/server/configuration/zookeeper/it/ITZookeeperConfigurationTest.java @@ -18,6 +18,10 @@ package org.apache.skywalking.oap.server.configuration.zookeeper.it; +import java.io.FileNotFoundException; +import java.io.Reader; +import java.util.Map; +import java.util.Properties; import org.apache.curator.RetryPolicy; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; @@ -33,16 +37,10 @@ import org.slf4j.LoggerFactory; import org.yaml.snakeyaml.Yaml; -import java.io.FileNotFoundException; -import java.io.Reader; -import java.util.Map; -import java.util.Properties; - -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; -/** - * @author zhaoyuguang - */ public class ITZookeeperConfigurationTest { private static final Logger LOGGER = LoggerFactory.getLogger(ITZookeeperConfigurationTest.class); @@ -58,10 +56,8 @@ public void setUp() throws Exception { final ModuleManager moduleManager = new ModuleManager(); moduleManager.init(applicationConfiguration); - provider = - (MockZookeeperConfigurationProvider) moduleManager - .find(MockZookeeperConfigurationModule.NAME) - .provider(); + provider = (MockZookeeperConfigurationProvider) moduleManager.find(MockZookeeperConfigurationModule.NAME) + .provider(); assertNotNull(provider); } @@ -110,8 +106,7 @@ private void loadConfig(ApplicationConfiguration configuration) throws FileNotFo if (propertiesConfig != null) { propertiesConfig.forEach((key, value) -> { properties.put(key, value); - final Object replaceValue = yaml.load(PropertyPlaceholderHelper.INSTANCE - .replacePlaceholders(value + "", properties)); + final Object replaceValue = yaml.load(PropertyPlaceholderHelper.INSTANCE.replacePlaceholders(value + "", properties)); if (replaceValue != null) { properties.replace(key, replaceValue); } diff --git a/oap-server/server-configuration/configuration-zookeeper/src/test/java/org/apache/skywalking/oap/server/configuration/zookeeper/it/MockZookeeperConfigurationModule.java b/oap-server/server-configuration/configuration-zookeeper/src/test/java/org/apache/skywalking/oap/server/configuration/zookeeper/it/MockZookeeperConfigurationModule.java index 8f9dcc764d29..6247e4fbcfac 100644 --- a/oap-server/server-configuration/configuration-zookeeper/src/test/java/org/apache/skywalking/oap/server/configuration/zookeeper/it/MockZookeeperConfigurationModule.java +++ b/oap-server/server-configuration/configuration-zookeeper/src/test/java/org/apache/skywalking/oap/server/configuration/zookeeper/it/MockZookeeperConfigurationModule.java @@ -20,9 +20,6 @@ import org.apache.skywalking.oap.server.library.module.ModuleDefine; -/** - * @author zhaoyuguang - */ public class MockZookeeperConfigurationModule extends ModuleDefine { public static final String NAME = "test-module"; diff --git a/oap-server/server-configuration/configuration-zookeeper/src/test/java/org/apache/skywalking/oap/server/configuration/zookeeper/it/MockZookeeperConfigurationProvider.java b/oap-server/server-configuration/configuration-zookeeper/src/test/java/org/apache/skywalking/oap/server/configuration/zookeeper/it/MockZookeeperConfigurationProvider.java index 5260d825e5b9..99427f68f93d 100644 --- a/oap-server/server-configuration/configuration-zookeeper/src/test/java/org/apache/skywalking/oap/server/configuration/zookeeper/it/MockZookeeperConfigurationProvider.java +++ b/oap-server/server-configuration/configuration-zookeeper/src/test/java/org/apache/skywalking/oap/server/configuration/zookeeper/it/MockZookeeperConfigurationProvider.java @@ -21,13 +21,13 @@ import org.apache.skywalking.oap.server.configuration.api.ConfigChangeWatcher; import org.apache.skywalking.oap.server.configuration.api.ConfigurationModule; import org.apache.skywalking.oap.server.configuration.api.DynamicConfigurationService; -import org.apache.skywalking.oap.server.library.module.*; +import org.apache.skywalking.oap.server.library.module.ModuleConfig; +import org.apache.skywalking.oap.server.library.module.ModuleDefine; +import org.apache.skywalking.oap.server.library.module.ModuleProvider; +import org.apache.skywalking.oap.server.library.module.ServiceNotProvidedException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * @author zhaoyuguang - */ public class MockZookeeperConfigurationProvider extends ModuleProvider { private static final Logger LOGGER = LoggerFactory.getLogger(MockZookeeperConfigurationProvider.class); @@ -74,9 +74,9 @@ public String value() { @Override public void start() throws ServiceNotProvidedException { getManager().find(ConfigurationModule.NAME) - .provider() - .getService(DynamicConfigurationService.class) - .registerConfigChangeWatcher(watcher); + .provider() + .getService(DynamicConfigurationService.class) + .registerConfigChangeWatcher(watcher); } @Override diff --git a/oap-server/server-configuration/configuration-zookeeper/src/test/java/org/apache/skywalking/oap/server/configuration/zookeeper/ut/MockZookeeperConfigWatcherRegister.java b/oap-server/server-configuration/configuration-zookeeper/src/test/java/org/apache/skywalking/oap/server/configuration/zookeeper/ut/MockZookeeperConfigWatcherRegister.java index c7fcfb05ffa8..4b424af10c70 100644 --- a/oap-server/server-configuration/configuration-zookeeper/src/test/java/org/apache/skywalking/oap/server/configuration/zookeeper/ut/MockZookeeperConfigWatcherRegister.java +++ b/oap-server/server-configuration/configuration-zookeeper/src/test/java/org/apache/skywalking/oap/server/configuration/zookeeper/ut/MockZookeeperConfigWatcherRegister.java @@ -18,18 +18,13 @@ package org.apache.skywalking.oap.server.configuration.zookeeper.ut; +import java.util.Set; import org.apache.curator.framework.recipes.cache.ChildData; import org.apache.curator.framework.recipes.cache.PathChildrenCache; import org.apache.skywalking.oap.server.configuration.api.ConfigTable; import org.apache.skywalking.oap.server.configuration.api.ConfigWatcherRegister; import org.apache.skywalking.oap.server.configuration.zookeeper.ZookeeperServerSettings; -import java.util.Set; - -/** - * @author zhaoyuguang - */ - public class MockZookeeperConfigWatcherRegister extends ConfigWatcherRegister { private PathChildrenCache childrenCache; private final String prefix; diff --git a/oap-server/server-configuration/configuration-zookeeper/src/test/java/org/apache/skywalking/oap/server/configuration/zookeeper/ut/ZookeeperConfigWatcherRegisterTestCase.java b/oap-server/server-configuration/configuration-zookeeper/src/test/java/org/apache/skywalking/oap/server/configuration/zookeeper/ut/ZookeeperConfigWatcherRegisterTestCase.java index fff9179b4c7a..1d8cf2b40f83 100644 --- a/oap-server/server-configuration/configuration-zookeeper/src/test/java/org/apache/skywalking/oap/server/configuration/zookeeper/ut/ZookeeperConfigWatcherRegisterTestCase.java +++ b/oap-server/server-configuration/configuration-zookeeper/src/test/java/org/apache/skywalking/oap/server/configuration/zookeeper/ut/ZookeeperConfigWatcherRegisterTestCase.java @@ -27,11 +27,10 @@ import org.powermock.reflect.Whitebox; import static org.junit.Assert.assertEquals; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; -/** - * @author zhaoyuguang - */ public class ZookeeperConfigWatcherRegisterTestCase { @Test public void TestCase() throws Exception { @@ -44,7 +43,8 @@ public void TestCase() throws Exception { final MockZookeeperConfigWatcherRegister mockRegister = spy(new MockZookeeperConfigWatcherRegister(mockSettings)); final PathChildrenCache mockPathChildrenCache = mock(PathChildrenCache.class); - when(mockPathChildrenCache.getCurrentData(nameSpace + "/" + key)).thenReturn(new ChildData(nameSpace + "/" + key, null, value.getBytes())); + when(mockPathChildrenCache.getCurrentData(nameSpace + "/" + key)).thenReturn(new ChildData(nameSpace + "/" + key, null, value + .getBytes())); Whitebox.setInternalState(mockRegister, "childrenCache", mockPathChildrenCache); diff --git a/oap-server/server-configuration/grpc-configuration-sync/pom.xml b/oap-server/server-configuration/grpc-configuration-sync/pom.xml index f50951073f08..d5ff54acef7b 100644 --- a/oap-server/server-configuration/grpc-configuration-sync/pom.xml +++ b/oap-server/server-configuration/grpc-configuration-sync/pom.xml @@ -90,10 +90,12 @@ protobuf-java directly, you will be transitively depending on the protobuf-java version that grpc depends on. --> - com.google.protobuf:protoc:${com.google.protobuf.protoc.version}:exe:${os.detected.classifier} + + com.google.protobuf:protoc:${com.google.protobuf.protoc.version}:exe:${os.detected.classifier} grpc-java - io.grpc:protoc-gen-grpc-java:${protoc-gen-grpc-java.plugin.version}:exe:${os.detected.classifier} + + io.grpc:protoc-gen-grpc-java:${protoc-gen-grpc-java.plugin.version}:exe:${os.detected.classifier} diff --git a/oap-server/server-configuration/grpc-configuration-sync/src/main/java/org/apache/skywalking/oap/server/configuration/grpc/GRPCConfigWatcherRegister.java b/oap-server/server-configuration/grpc-configuration-sync/src/main/java/org/apache/skywalking/oap/server/configuration/grpc/GRPCConfigWatcherRegister.java index e3b9f0a55e0a..dd92b2429dbb 100644 --- a/oap-server/server-configuration/grpc-configuration-sync/src/main/java/org/apache/skywalking/oap/server/configuration/grpc/GRPCConfigWatcherRegister.java +++ b/oap-server/server-configuration/grpc-configuration-sync/src/main/java/org/apache/skywalking/oap/server/configuration/grpc/GRPCConfigWatcherRegister.java @@ -19,15 +19,15 @@ package org.apache.skywalking.oap.server.configuration.grpc; import io.grpc.netty.NettyChannelBuilder; -import org.apache.skywalking.oap.server.configuration.api.*; -import org.apache.skywalking.oap.server.configuration.service.*; -import org.slf4j.*; - import java.util.Set; +import org.apache.skywalking.oap.server.configuration.api.ConfigTable; +import org.apache.skywalking.oap.server.configuration.api.ConfigWatcherRegister; +import org.apache.skywalking.oap.server.configuration.service.ConfigurationRequest; +import org.apache.skywalking.oap.server.configuration.service.ConfigurationResponse; +import org.apache.skywalking.oap.server.configuration.service.ConfigurationServiceGrpc; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author wusheng - */ public class GRPCConfigWatcherRegister extends ConfigWatcherRegister { private static final Logger logger = LoggerFactory.getLogger(GRPCConfigWatcherRegister.class); @@ -37,13 +37,18 @@ public class GRPCConfigWatcherRegister extends ConfigWatcherRegister { public GRPCConfigWatcherRegister(RemoteEndpointSettings settings) { super(settings.getPeriod()); this.settings = settings; - stub = ConfigurationServiceGrpc.newBlockingStub(NettyChannelBuilder.forAddress(settings.getHost(), settings.getPort()).usePlaintext().build()); + stub = ConfigurationServiceGrpc.newBlockingStub(NettyChannelBuilder.forAddress(settings.getHost(), settings.getPort()) + .usePlaintext() + .build()); } - @Override public ConfigTable readConfig(Set keys) { + @Override + public ConfigTable readConfig(Set keys) { ConfigTable table = new ConfigTable(); try { - ConfigurationResponse response = stub.call(ConfigurationRequest.newBuilder().setClusterName(settings.getClusterName()).build()); + ConfigurationResponse response = stub.call(ConfigurationRequest.newBuilder() + .setClusterName(settings.getClusterName()) + .build()); response.getConfigTableList().forEach(config -> { final String name = config.getName(); if (keys.contains(name)) { diff --git a/oap-server/server-configuration/grpc-configuration-sync/src/main/java/org/apache/skywalking/oap/server/configuration/grpc/GRPCConfigurationProvider.java b/oap-server/server-configuration/grpc-configuration-sync/src/main/java/org/apache/skywalking/oap/server/configuration/grpc/GRPCConfigurationProvider.java index 0dc4ccf70021..1a3d213b6dda 100644 --- a/oap-server/server-configuration/grpc-configuration-sync/src/main/java/org/apache/skywalking/oap/server/configuration/grpc/GRPCConfigurationProvider.java +++ b/oap-server/server-configuration/grpc-configuration-sync/src/main/java/org/apache/skywalking/oap/server/configuration/grpc/GRPCConfigurationProvider.java @@ -19,15 +19,15 @@ package org.apache.skywalking.oap.server.configuration.grpc; import com.google.common.base.Strings; -import org.apache.skywalking.oap.server.configuration.api.*; -import org.apache.skywalking.oap.server.library.module.*; +import org.apache.skywalking.oap.server.configuration.api.AbstractConfigurationProvider; +import org.apache.skywalking.oap.server.configuration.api.ConfigWatcherRegister; +import org.apache.skywalking.oap.server.library.module.ModuleConfig; +import org.apache.skywalking.oap.server.library.module.ModuleStartException; /** * Get configuration from remote through gRPC protocol. - * + *

* Read configuration-service.proto for more details. - * - * @author wusheng */ public class GRPCConfigurationProvider extends AbstractConfigurationProvider { private RemoteEndpointSettings settings; @@ -36,15 +36,18 @@ public GRPCConfigurationProvider() { settings = new RemoteEndpointSettings(); } - @Override public String name() { + @Override + public String name() { return "grpc"; } - @Override public ModuleConfig createConfigBeanIfAbsent() { + @Override + public ModuleConfig createConfigBeanIfAbsent() { return settings; } - @Override protected ConfigWatcherRegister initConfigReader() throws ModuleStartException { + @Override + protected ConfigWatcherRegister initConfigReader() throws ModuleStartException { if (Strings.isNullOrEmpty(settings.getHost())) { throw new ModuleStartException("No host setting."); } diff --git a/oap-server/server-configuration/grpc-configuration-sync/src/main/java/org/apache/skywalking/oap/server/configuration/grpc/RemoteEndpointSettings.java b/oap-server/server-configuration/grpc-configuration-sync/src/main/java/org/apache/skywalking/oap/server/configuration/grpc/RemoteEndpointSettings.java index 8d041fb24544..f692d90633ef 100644 --- a/oap-server/server-configuration/grpc-configuration-sync/src/main/java/org/apache/skywalking/oap/server/configuration/grpc/RemoteEndpointSettings.java +++ b/oap-server/server-configuration/grpc-configuration-sync/src/main/java/org/apache/skywalking/oap/server/configuration/grpc/RemoteEndpointSettings.java @@ -18,12 +18,10 @@ package org.apache.skywalking.oap.server.configuration.grpc; -import lombok.*; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.oap.server.library.module.ModuleConfig; -/** - * @author wusheng - */ @Setter @Getter public class RemoteEndpointSettings extends ModuleConfig { @@ -33,11 +31,8 @@ public class RemoteEndpointSettings extends ModuleConfig { // Sync configuration per 60 seconds. private int period = 60; - @Override public String toString() { - return "RemoteEndpointSettings{" + - "host='" + host + '\'' + - ", port=" + port + - ", clusterName='" + clusterName + '\'' + - '}'; + @Override + public String toString() { + return "RemoteEndpointSettings{" + "host='" + host + '\'' + ", port=" + port + ", clusterName='" + clusterName + '\'' + '}'; } } diff --git a/oap-server/server-configuration/pom.xml b/oap-server/server-configuration/pom.xml index 1d767b18a132..6fa2620eea31 100644 --- a/oap-server/server-configuration/pom.xml +++ b/oap-server/server-configuration/pom.xml @@ -17,7 +17,8 @@ ~ --> - + oap-server org.apache.skywalking diff --git a/oap-server/server-core/pom.xml b/oap-server/server-core/pom.xml index f79d7f1e969a..8c256a2c89cc 100644 --- a/oap-server/server-core/pom.xml +++ b/oap-server/server-core/pom.xml @@ -17,7 +17,8 @@ ~ --> - + oap-server org.apache.skywalking @@ -121,10 +122,12 @@ protobuf-java directly, you will be transitively depending on the protobuf-java version that grpc depends on. --> - com.google.protobuf:protoc:${com.google.protobuf.protoc.version}:exe:${os.detected.classifier} + + com.google.protobuf:protoc:${com.google.protobuf.protoc.version}:exe:${os.detected.classifier} grpc-java - io.grpc:protoc-gen-grpc-java:${protoc-gen-grpc-java.plugin.version}:exe:${os.detected.classifier} + + io.grpc:protoc-gen-grpc-java:${protoc-gen-grpc-java.plugin.version}:exe:${os.detected.classifier} diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/Const.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/Const.java index f7e7bf3c3867..213f482d5932 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/Const.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/Const.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.core; -/** - * @author peng-yongsheng - */ public class Const { public static final int NONE = 0; public static final String ID_SPLIT = "_"; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModule.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModule.java index cf09e7759e83..ce71372f9c94 100755 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModule.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModule.java @@ -20,14 +20,25 @@ import java.util.ArrayList; import java.util.List; - -import org.apache.skywalking.oap.server.core.cache.*; +import org.apache.skywalking.oap.server.core.cache.EndpointInventoryCache; +import org.apache.skywalking.oap.server.core.cache.NetworkAddressInventoryCache; +import org.apache.skywalking.oap.server.core.cache.ProfileTaskCache; +import org.apache.skywalking.oap.server.core.cache.ServiceInstanceInventoryCache; +import org.apache.skywalking.oap.server.core.cache.ServiceInventoryCache; import org.apache.skywalking.oap.server.core.command.CommandService; import org.apache.skywalking.oap.server.core.config.ConfigService; import org.apache.skywalking.oap.server.core.config.DownsamplingConfigService; import org.apache.skywalking.oap.server.core.config.IComponentLibraryCatalogService; import org.apache.skywalking.oap.server.core.profile.ProfileTaskMutationService; -import org.apache.skywalking.oap.server.core.query.*; +import org.apache.skywalking.oap.server.core.query.AggregationQueryService; +import org.apache.skywalking.oap.server.core.query.AlarmQueryService; +import org.apache.skywalking.oap.server.core.query.LogQueryService; +import org.apache.skywalking.oap.server.core.query.MetadataQueryService; +import org.apache.skywalking.oap.server.core.query.MetricQueryService; +import org.apache.skywalking.oap.server.core.query.ProfileTaskQueryService; +import org.apache.skywalking.oap.server.core.query.TopNRecordsQueryService; +import org.apache.skywalking.oap.server.core.query.TopologyQueryService; +import org.apache.skywalking.oap.server.core.query.TraceQueryService; import org.apache.skywalking.oap.server.core.register.service.IEndpointInventoryRegister; import org.apache.skywalking.oap.server.core.register.service.INetworkAddressInventoryRegister; import org.apache.skywalking.oap.server.core.register.service.IServiceInstanceInventoryRegister; @@ -44,9 +55,6 @@ import org.apache.skywalking.oap.server.core.worker.IWorkerInstanceSetter; import org.apache.skywalking.oap.server.library.module.ModuleDefine; -/** - * @author peng-yongsheng - */ public class CoreModule extends ModuleDefine { public static final String NAME = "core"; @@ -55,7 +63,8 @@ public CoreModule() { super(NAME); } - @Override public Class[] services() { + @Override + public Class[] services() { List classes = new ArrayList<>(); classes.add(ConfigService.class); classes.add(DownsamplingConfigService.class); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleConfig.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleConfig.java index a41a7bbeac37..00acefb56704 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleConfig.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleConfig.java @@ -18,46 +18,67 @@ package org.apache.skywalking.oap.server.core; -import java.util.*; -import lombok.*; +import java.util.ArrayList; +import java.util.List; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.oap.server.library.module.ModuleConfig; -/** - * @author peng-yongsheng - */ @Getter public class CoreModuleConfig extends ModuleConfig { - @Setter private String role = "Mixed"; - @Setter private String nameSpace; - @Setter private String restHost; - @Setter private int restPort; - @Setter private int jettySelectors = 1; - @Setter private String restContextPath; - @Setter private String gRPCHost; - @Setter private int gRPCPort; - @Setter private int maxConcurrentCallsPerConnection; - @Setter private int maxMessageSize; - @Setter private boolean enableDatabaseSession; - @Setter private int topNReportPeriod; + @Setter + private String role = "Mixed"; + @Setter + private String nameSpace; + @Setter + private String restHost; + @Setter + private int restPort; + @Setter + private int jettySelectors = 1; + @Setter + private String restContextPath; + @Setter + private String gRPCHost; + @Setter + private int gRPCPort; + @Setter + private int maxConcurrentCallsPerConnection; + @Setter + private int maxMessageSize; + @Setter + private boolean enableDatabaseSession; + @Setter + private int topNReportPeriod; private final List downsampling; /** - * The period of doing data persistence. - * Unit is second. + * The period of doing data persistence. Unit is second. */ - @Setter private long persistentPeriod = 3; - @Setter private boolean enableDataKeeperExecutor = true; - @Setter private int dataKeeperExecutePeriod = 5; - @Setter private int recordDataTTL; - @Setter private int minuteMetricsDataTTL; - @Setter private int hourMetricsDataTTL; - @Setter private int dayMetricsDataTTL; - @Setter private int monthMetricsDataTTL; - @Setter private int gRPCThreadPoolSize; - @Setter private int gRPCThreadPoolQueueSize; + @Setter + private long persistentPeriod = 3; + @Setter + private boolean enableDataKeeperExecutor = true; + @Setter + private int dataKeeperExecutePeriod = 5; + @Setter + private int recordDataTTL; + @Setter + private int minuteMetricsDataTTL; + @Setter + private int hourMetricsDataTTL; + @Setter + private int dayMetricsDataTTL; + @Setter + private int monthMetricsDataTTL; + @Setter + private int gRPCThreadPoolSize; + @Setter + private int gRPCThreadPoolQueueSize; /** * Timeout for cluster internal communication, in seconds. */ - @Setter private int remoteTimeout = 20; + @Setter + private int remoteTimeout = 20; /** * Following are cache settings for inventory(s) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleProvider.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleProvider.java index c01cc403cde2..9069cb0355c2 100755 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleProvider.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleProvider.java @@ -21,37 +21,78 @@ import java.io.IOException; import org.apache.skywalking.oap.server.configuration.api.ConfigurationModule; import org.apache.skywalking.oap.server.configuration.api.DynamicConfigurationService; -import org.apache.skywalking.oap.server.core.analysis.*; +import org.apache.skywalking.oap.server.core.analysis.ApdexThresholdConfig; +import org.apache.skywalking.oap.server.core.analysis.DisableRegister; +import org.apache.skywalking.oap.server.core.analysis.StreamAnnotationListener; import org.apache.skywalking.oap.server.core.analysis.metrics.ApdexMetrics; import org.apache.skywalking.oap.server.core.analysis.worker.MetricsStreamProcessor; import org.apache.skywalking.oap.server.core.analysis.worker.TopNStreamProcessor; import org.apache.skywalking.oap.server.core.annotation.AnnotationScan; -import org.apache.skywalking.oap.server.core.cache.*; -import org.apache.skywalking.oap.server.core.cluster.*; +import org.apache.skywalking.oap.server.core.cache.CacheUpdateTimer; +import org.apache.skywalking.oap.server.core.cache.EndpointInventoryCache; +import org.apache.skywalking.oap.server.core.cache.NetworkAddressInventoryCache; +import org.apache.skywalking.oap.server.core.cache.ProfileTaskCache; +import org.apache.skywalking.oap.server.core.cache.ServiceInstanceInventoryCache; +import org.apache.skywalking.oap.server.core.cache.ServiceInventoryCache; +import org.apache.skywalking.oap.server.core.cluster.ClusterModule; +import org.apache.skywalking.oap.server.core.cluster.ClusterRegister; +import org.apache.skywalking.oap.server.core.cluster.RemoteInstance; import org.apache.skywalking.oap.server.core.command.CommandService; -import org.apache.skywalking.oap.server.core.config.*; +import org.apache.skywalking.oap.server.core.config.ComponentLibraryCatalogService; +import org.apache.skywalking.oap.server.core.config.ConfigService; +import org.apache.skywalking.oap.server.core.config.DownsamplingConfigService; +import org.apache.skywalking.oap.server.core.config.IComponentLibraryCatalogService; +import org.apache.skywalking.oap.server.core.oal.rt.OALEngine; +import org.apache.skywalking.oap.server.core.oal.rt.OALEngineLoader; import org.apache.skywalking.oap.server.core.profile.ProfileTaskMutationService; -import org.apache.skywalking.oap.server.core.oal.rt.*; -import org.apache.skywalking.oap.server.core.query.*; -import org.apache.skywalking.oap.server.core.register.service.*; -import org.apache.skywalking.oap.server.core.remote.*; -import org.apache.skywalking.oap.server.core.remote.client.*; +import org.apache.skywalking.oap.server.core.query.AggregationQueryService; +import org.apache.skywalking.oap.server.core.query.AlarmQueryService; +import org.apache.skywalking.oap.server.core.query.LogQueryService; +import org.apache.skywalking.oap.server.core.query.MetadataQueryService; +import org.apache.skywalking.oap.server.core.query.MetricQueryService; +import org.apache.skywalking.oap.server.core.query.ProfileTaskQueryService; +import org.apache.skywalking.oap.server.core.query.TopNRecordsQueryService; +import org.apache.skywalking.oap.server.core.query.TopologyQueryService; +import org.apache.skywalking.oap.server.core.query.TraceQueryService; +import org.apache.skywalking.oap.server.core.register.service.EndpointInventoryRegister; +import org.apache.skywalking.oap.server.core.register.service.IEndpointInventoryRegister; +import org.apache.skywalking.oap.server.core.register.service.INetworkAddressInventoryRegister; +import org.apache.skywalking.oap.server.core.register.service.IServiceInstanceInventoryRegister; +import org.apache.skywalking.oap.server.core.register.service.IServiceInventoryRegister; +import org.apache.skywalking.oap.server.core.register.service.NetworkAddressInventoryRegister; +import org.apache.skywalking.oap.server.core.register.service.ServiceInstanceInventoryRegister; +import org.apache.skywalking.oap.server.core.register.service.ServiceInventoryRegister; +import org.apache.skywalking.oap.server.core.remote.RemoteSenderService; +import org.apache.skywalking.oap.server.core.remote.RemoteServiceHandler; +import org.apache.skywalking.oap.server.core.remote.client.Address; +import org.apache.skywalking.oap.server.core.remote.client.RemoteClientManager; import org.apache.skywalking.oap.server.core.remote.health.HealthCheckServiceHandler; -import org.apache.skywalking.oap.server.core.server.*; -import org.apache.skywalking.oap.server.core.source.*; +import org.apache.skywalking.oap.server.core.server.GRPCHandlerRegister; +import org.apache.skywalking.oap.server.core.server.GRPCHandlerRegisterImpl; +import org.apache.skywalking.oap.server.core.server.JettyHandlerRegister; +import org.apache.skywalking.oap.server.core.server.JettyHandlerRegisterImpl; +import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine; +import org.apache.skywalking.oap.server.core.source.SourceReceiver; +import org.apache.skywalking.oap.server.core.source.SourceReceiverImpl; import org.apache.skywalking.oap.server.core.storage.PersistenceTimer; -import org.apache.skywalking.oap.server.core.storage.model.*; +import org.apache.skywalking.oap.server.core.storage.model.IModelGetter; +import org.apache.skywalking.oap.server.core.storage.model.IModelOverride; +import org.apache.skywalking.oap.server.core.storage.model.IModelSetter; +import org.apache.skywalking.oap.server.core.storage.model.StorageModels; import org.apache.skywalking.oap.server.core.storage.ttl.DataTTLKeeperTimer; -import org.apache.skywalking.oap.server.core.worker.*; -import org.apache.skywalking.oap.server.library.module.*; +import org.apache.skywalking.oap.server.core.worker.IWorkerInstanceGetter; +import org.apache.skywalking.oap.server.core.worker.IWorkerInstanceSetter; +import org.apache.skywalking.oap.server.core.worker.WorkerInstancesService; +import org.apache.skywalking.oap.server.library.module.ModuleConfig; +import org.apache.skywalking.oap.server.library.module.ModuleDefine; +import org.apache.skywalking.oap.server.library.module.ModuleProvider; +import org.apache.skywalking.oap.server.library.module.ModuleStartException; +import org.apache.skywalking.oap.server.library.module.ServiceNotProvidedException; import org.apache.skywalking.oap.server.library.server.ServerException; import org.apache.skywalking.oap.server.library.server.grpc.GRPCServer; import org.apache.skywalking.oap.server.library.server.jetty.JettyServer; import org.apache.skywalking.oap.server.telemetry.TelemetryModule; -/** - * @author peng-yongsheng - */ public class CoreModuleProvider extends ModuleProvider { private final CoreModuleConfig moduleConfig; @@ -72,19 +113,23 @@ public CoreModuleProvider() { this.receiver = new SourceReceiverImpl(); } - @Override public String name() { + @Override + public String name() { return "default"; } - @Override public Class module() { + @Override + public Class module() { return CoreModule.class; } - @Override public ModuleConfig createConfigBeanIfAbsent() { + @Override + public ModuleConfig createConfigBeanIfAbsent() { return moduleConfig; } - @Override public void prepare() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void prepare() throws ServiceNotProvidedException, ModuleStartException { StreamAnnotationListener streamAnnotationListener = new StreamAnnotationListener(getManager()); AnnotationScan scopeScan = new AnnotationScan(); @@ -124,7 +169,8 @@ public CoreModuleProvider() { } grpcServer.initialize(); - jettyServer = new JettyServer(moduleConfig.getRestHost(), moduleConfig.getRestPort(), moduleConfig.getRestContextPath(), moduleConfig.getJettySelectors()); + jettyServer = new JettyServer(moduleConfig.getRestHost(), moduleConfig.getRestPort(), moduleConfig.getRestContextPath(), moduleConfig + .getJettySelectors()); jettyServer.initialize(); this.registerServiceImplementation(ConfigService.class, new ConfigService(moduleConfig)); @@ -185,7 +231,8 @@ public CoreModuleProvider() { ApdexMetrics.setDICT(apdexThresholdConfig); } - @Override public void start() throws ModuleStartException { + @Override + public void start() throws ModuleStartException { grpcServer.addHandler(new RemoteServiceHandler(getManager())); grpcServer.addHandler(new HealthCheckServiceHandler()); @@ -200,16 +247,26 @@ public CoreModuleProvider() { throw new ModuleStartException(e.getMessage(), e); } - if (CoreModuleConfig.Role.Mixed.name().equalsIgnoreCase(moduleConfig.getRole()) || CoreModuleConfig.Role.Aggregator.name().equalsIgnoreCase(moduleConfig.getRole())) { + if (CoreModuleConfig.Role.Mixed.name() + .equalsIgnoreCase(moduleConfig.getRole()) || CoreModuleConfig.Role.Aggregator.name() + .equalsIgnoreCase(moduleConfig + .getRole())) { RemoteInstance gRPCServerInstance = new RemoteInstance(new Address(moduleConfig.getGRPCHost(), moduleConfig.getGRPCPort(), true)); - this.getManager().find(ClusterModule.NAME).provider().getService(ClusterRegister.class).registerRemote(gRPCServerInstance); + this.getManager() + .find(ClusterModule.NAME) + .provider() + .getService(ClusterRegister.class) + .registerRemote(gRPCServerInstance); } - DynamicConfigurationService dynamicConfigurationService = getManager().find(ConfigurationModule.NAME).provider().getService(DynamicConfigurationService.class); + DynamicConfigurationService dynamicConfigurationService = getManager().find(ConfigurationModule.NAME) + .provider() + .getService(DynamicConfigurationService.class); dynamicConfigurationService.registerConfigChangeWatcher(apdexThresholdConfig); } - @Override public void notifyAfterCompleted() throws ModuleStartException { + @Override + public void notifyAfterCompleted() throws ModuleStartException { try { grpcServer.start(); jettyServer.start(); @@ -228,6 +285,9 @@ public CoreModuleProvider() { @Override public String[] requiredModules() { - return new String[] {TelemetryModule.NAME, ConfigurationModule.NAME}; + return new String[] { + TelemetryModule.NAME, + ConfigurationModule.NAME + }; } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/DataTTLConfig.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/DataTTLConfig.java index 34c8ef57cde8..e6f6cb184b36 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/DataTTLConfig.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/DataTTLConfig.java @@ -18,11 +18,9 @@ package org.apache.skywalking.oap.server.core; -import lombok.*; +import lombok.Getter; +import lombok.Setter; -/** - * @author peng-yongsheng - */ @Setter @Getter public class DataTTLConfig { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/RunningMode.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/RunningMode.java index 8a282dce2802..df599fecef17 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/RunningMode.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/RunningMode.java @@ -22,8 +22,6 @@ /** * The running mode of the OAP server. - * - * @author wusheng */ public class RunningMode { private static String MODE = ""; @@ -40,6 +38,7 @@ public static void setMode(String mode) { /** * Init mode, do all initialization things, and process should exit. + * * @return true if in this status */ public static boolean isInitMode() { @@ -48,6 +47,7 @@ public static boolean isInitMode() { /** * No-init mode, the oap just starts up, but wouldn't do storage init. + * * @return true if in this status. */ public static boolean isNoInitMode() { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/UnexpectedException.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/UnexpectedException.java index f5dc51b88508..007a2c9d798e 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/UnexpectedException.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/UnexpectedException.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.core; -/** - * @author wu-sheng - */ public class UnexpectedException extends RuntimeException { public UnexpectedException(String message) { super(message); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/WorkPath.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/WorkPath.java index d92d2eedd5cc..443bad517729 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/WorkPath.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/WorkPath.java @@ -27,8 +27,6 @@ /** * Locate the base work path of OAP backend. - * - * @author wusheng */ public class WorkPath { private static final Logger logger = LoggerFactory.getLogger(WorkPath.class); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmCallback.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmCallback.java index 784d8f2dd55c..5cd896114008 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmCallback.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmCallback.java @@ -21,10 +21,7 @@ import java.util.List; /** - * Alarm call back will be called by alarm implementor, - * after it decided alarm should be sent. - * - * @author wusheng + * Alarm call back will be called by alarm implementor, after it decided alarm should be sent. */ public interface AlarmCallback { void doAlarm(List alarmMessage); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmEntrance.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmEntrance.java index e71ce7a37342..22d8abd2c2a3 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmEntrance.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmEntrance.java @@ -21,9 +21,6 @@ import org.apache.skywalking.oap.server.core.analysis.metrics.Metrics; import org.apache.skywalking.oap.server.library.module.ModuleDefineHolder; -/** - * @author wusheng - */ public class AlarmEntrance { private ModuleDefineHolder moduleDefineHolder; private MetricsNotify metricsNotify; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmMessage.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmMessage.java index 95ecd177942f..0ee654f2a7b0 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmMessage.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmMessage.java @@ -18,12 +18,12 @@ package org.apache.skywalking.oap.server.core.alarm; -import lombok.*; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.Setter; /** * Alarm message represents the details of each alarm. - * - * @author wusheng, peng-yongsheng */ @Setter(AccessLevel.PUBLIC) @Getter(AccessLevel.PUBLIC) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmModule.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmModule.java index 793e58822839..1a2f23aff98e 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmModule.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmModule.java @@ -18,14 +18,12 @@ package org.apache.skywalking.oap.server.core.alarm; -import org.apache.skywalking.oap.server.library.module.*; +import org.apache.skywalking.oap.server.library.module.ModuleDefine; /** * Alarm module define the main bridge entrance of the alarm implementor. - * + *

* SkyWalking supports alarm implementation pluggable. - * - * @author wusheng */ public class AlarmModule extends ModuleDefine { public static final String NAME = "alarm"; @@ -34,7 +32,8 @@ public AlarmModule() { super(NAME); } - @Override public Class[] services() { + @Override + public Class[] services() { return new Class[] {MetricsNotify.class}; } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmRecord.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmRecord.java index 82cbd6afeca6..18093940c48d 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmRecord.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmRecord.java @@ -18,21 +18,21 @@ package org.apache.skywalking.oap.server.core.alarm; -import java.util.*; -import lombok.*; +import java.util.HashMap; +import java.util.Map; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.oap.server.core.Const; import org.apache.skywalking.oap.server.core.analysis.Stream; import org.apache.skywalking.oap.server.core.analysis.record.Record; import org.apache.skywalking.oap.server.core.analysis.worker.RecordStreamProcessor; -import org.apache.skywalking.oap.server.core.source.*; +import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine; +import org.apache.skywalking.oap.server.core.source.ScopeDeclaration; import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.Column; import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.ALARM; -/** - * @author peng-yongsheng - */ @Getter @Setter @ScopeDeclaration(id = ALARM, name = "Alarm") @@ -47,20 +47,28 @@ public class AlarmRecord extends Record { public static final String START_TIME = "start_time"; public static final String ALARM_MESSAGE = "alarm_message"; - @Override public String id() { + @Override + public String id() { return getTimeBucket() + Const.ID_SPLIT + scope + Const.ID_SPLIT + id0 + Const.ID_SPLIT + id1; } - @Column(columnName = SCOPE) private int scope; - @Column(columnName = NAME) private String name; - @Column(columnName = ID0) private int id0; - @Column(columnName = ID1) private int id1; - @Column(columnName = START_TIME) private long startTime; - @Column(columnName = ALARM_MESSAGE, matchQuery = true) private String alarmMessage; + @Column(columnName = SCOPE) + private int scope; + @Column(columnName = NAME) + private String name; + @Column(columnName = ID0) + private int id0; + @Column(columnName = ID1) + private int id1; + @Column(columnName = START_TIME) + private long startTime; + @Column(columnName = ALARM_MESSAGE, matchQuery = true) + private String alarmMessage; public static class Builder implements StorageBuilder { - @Override public Map data2Map(AlarmRecord storageData) { + @Override + public Map data2Map(AlarmRecord storageData) { Map map = new HashMap<>(); map.put(SCOPE, storageData.getScope()); map.put(NAME, storageData.getName()); @@ -72,15 +80,16 @@ public static class Builder implements StorageBuilder { return map; } - @Override public AlarmRecord map2Data(Map dbMap) { + @Override + public AlarmRecord map2Data(Map dbMap) { AlarmRecord record = new AlarmRecord(); - record.setScope(((Number)dbMap.get(SCOPE)).intValue()); - record.setName((String)dbMap.get(NAME)); - record.setId0(((Number)dbMap.get(ID0)).intValue()); - record.setId1(((Number)dbMap.get(ID1)).intValue()); - record.setAlarmMessage((String)dbMap.get(ALARM_MESSAGE)); - record.setStartTime(((Number)dbMap.get(START_TIME)).longValue()); - record.setTimeBucket(((Number)dbMap.get(TIME_BUCKET)).longValue()); + record.setScope(((Number) dbMap.get(SCOPE)).intValue()); + record.setName((String) dbMap.get(NAME)); + record.setId0(((Number) dbMap.get(ID0)).intValue()); + record.setId1(((Number) dbMap.get(ID1)).intValue()); + record.setAlarmMessage((String) dbMap.get(ALARM_MESSAGE)); + record.setStartTime(((Number) dbMap.get(START_TIME)).longValue()); + record.setTimeBucket(((Number) dbMap.get(TIME_BUCKET)).longValue()); return record; } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmStandardPersistence.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmStandardPersistence.java index 6237bfd2af66..6216bc1aac23 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmStandardPersistence.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmStandardPersistence.java @@ -19,20 +19,20 @@ package org.apache.skywalking.oap.server.core.alarm; import java.util.List; -import org.apache.skywalking.oap.server.core.analysis.worker.RecordStreamProcessor; import org.apache.skywalking.oap.server.core.analysis.TimeBucket; -import org.slf4j.*; +import org.apache.skywalking.oap.server.core.analysis.worker.RecordStreamProcessor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Save the alarm info into storage for UI query. - * - * @author wusheng, peng-yongsheng */ public class AlarmStandardPersistence implements AlarmCallback { private static final Logger logger = LoggerFactory.getLogger(AlarmStandardPersistence.class); - @Override public void doAlarm(List alarmMessage) { + @Override + public void doAlarm(List alarmMessage) { alarmMessage.forEach(message -> { if (logger.isDebugEnabled()) { logger.debug("Alarm message: {}", message.getAlarmMessage()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/EndpointMetaInAlarm.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/EndpointMetaInAlarm.java index ad0f23a3b214..1b0d769b8b5d 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/EndpointMetaInAlarm.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/EndpointMetaInAlarm.java @@ -33,19 +33,23 @@ public class EndpointMetaInAlarm extends MetaInAlarm { private String[] tags; private String[] properties; - @Override public String getScope() { + @Override + public String getScope() { return DefaultScopeDefine.ENDPOINT_CATALOG_NAME; } - @Override public int getScopeId() { + @Override + public int getScopeId() { return DefaultScopeDefine.ENDPOINT; } - @Override public int getId0() { + @Override + public int getId0() { return id; } - @Override public int getId1() { + @Override + public int getId1() { return 0; } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/MetaInAlarm.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/MetaInAlarm.java index f6e888c1617c..c94dcae7fcbe 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/MetaInAlarm.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/MetaInAlarm.java @@ -40,21 +40,21 @@ public abstract class MetaInAlarm { /** * Only exist in multiple IDs case, Such as ServiceRelation, id1 represents the dest service id - * - * @return */ public abstract int getId1(); - @Override public boolean equals(Object o) { + @Override + public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - MetaInAlarm that = (MetaInAlarm)o; + MetaInAlarm that = (MetaInAlarm) o; return getId0() == that.getId0() && getId1() == that.getId1(); } - @Override public int hashCode() { + @Override + public int hashCode() { return Objects.hash(getId0(), getId1()); } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/MetricsNotify.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/MetricsNotify.java index 86a0cbe0e41e..5d488282899a 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/MetricsNotify.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/MetricsNotify.java @@ -22,14 +22,12 @@ import org.apache.skywalking.oap.server.library.module.Service; /** - * Metrics notify service should be provided by Alarm Module provider, which can receive the metrics value, driven - * by storage core. - * + * Metrics notify service should be provided by Alarm Module provider, which can receive the metrics value, driven by + * storage core. + *

* The alarm module provider could choose whether or how to do the alarm. Meanwhile, the storage core will provide the * standard persistence service for generated alarm, if the alarm engine wants the alarm to show in UI, please call * those to save. - * - * @author wusheng */ public interface MetricsNotify extends Service { void notify(Metrics metrics); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/ServiceInstanceMetaInAlarm.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/ServiceInstanceMetaInAlarm.java index 2a79ced39776..76518fb15cf5 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/ServiceInstanceMetaInAlarm.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/ServiceInstanceMetaInAlarm.java @@ -18,7 +18,9 @@ package org.apache.skywalking.oap.server.core.alarm; -import lombok.*; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine; @Getter(AccessLevel.PUBLIC) @@ -31,19 +33,23 @@ public class ServiceInstanceMetaInAlarm extends MetaInAlarm { private String[] tags; private String[] properties; - @Override public String getScope() { + @Override + public String getScope() { return DefaultScopeDefine.SERVICE_INSTANCE_CATALOG_NAME; } - @Override public int getScopeId() { + @Override + public int getScopeId() { return DefaultScopeDefine.SERVICE_INSTANCE; } - @Override public int getId0() { + @Override + public int getId0() { return id; } - @Override public int getId1() { + @Override + public int getId1() { return 0; } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/ServiceMetaInAlarm.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/ServiceMetaInAlarm.java index 1bab784e5bf9..d03022535eac 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/ServiceMetaInAlarm.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/ServiceMetaInAlarm.java @@ -18,7 +18,9 @@ package org.apache.skywalking.oap.server.core.alarm; -import lombok.*; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine; @Getter(AccessLevel.PUBLIC) @@ -31,19 +33,23 @@ public class ServiceMetaInAlarm extends MetaInAlarm { private String[] tags; private String[] properties; - @Override public String getScope() { + @Override + public String getScope() { return DefaultScopeDefine.SERVICE_CATALOG_NAME; } - @Override public int getScopeId() { + @Override + public int getScopeId() { return DefaultScopeDefine.SERVICE; } - @Override public int getId0() { + @Override + public int getId0() { return id; } - @Override public int getId1() { + @Override + public int getId1() { return 0; } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/ApdexThresholdConfig.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/ApdexThresholdConfig.java index 5e902667878d..7c9c0cc05ab4 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/ApdexThresholdConfig.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/ApdexThresholdConfig.java @@ -32,10 +32,7 @@ import org.yaml.snakeyaml.Yaml; /** - * Apdex threshold configuration dictionary adapter. - * Looking up a service apdex threshold from dynamic config service. - * - * @author hongtaogao + * Apdex threshold configuration dictionary adapter. Looking up a service apdex threshold from dynamic config service. */ @Slf4j public class ApdexThresholdConfig extends ConfigChangeWatcher implements ConfigurationDictionary { @@ -57,7 +54,8 @@ public ApdexThresholdConfig(final CoreModuleProvider provider) { } } - @Override public Number lookup(String name) { + @Override + public Number lookup(String name) { int t = dictionary.getOrDefault(name, -1); if (t < 0) { t = dictionary.getOrDefault("default", -1); @@ -72,7 +70,8 @@ public ApdexThresholdConfig(final CoreModuleProvider provider) { return t; } - @Override public void notify(ConfigChangeEvent value) { + @Override + public void notify(ConfigChangeEvent value) { if (EventType.DELETE.equals(value.getEventType())) { activeSetting(""); } else { @@ -80,7 +79,8 @@ public ApdexThresholdConfig(final CoreModuleProvider provider) { } } - @Override public String value() { + @Override + public String value() { return rawConfig; } @@ -94,7 +94,7 @@ private synchronized void activeSetting(String config) { @SuppressWarnings("unchecked") private void updateConfig(final Reader contentRender) { - dictionary = (Map)new Yaml().load(contentRender); + dictionary = (Map) new Yaml().load(contentRender); if (dictionary == null) { dictionary = Collections.emptyMap(); } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/ConfigurationDictionary.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/ConfigurationDictionary.java index f0b72e0b3fc1..ae6a9af741df 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/ConfigurationDictionary.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/ConfigurationDictionary.java @@ -20,8 +20,6 @@ /** * Dictionary for lookup config item. - * - * @author gaohongtao */ public interface ConfigurationDictionary { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/Disable.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/Disable.java index 43637983afa9..2be06bbc76e6 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/Disable.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/Disable.java @@ -18,11 +18,12 @@ package org.apache.skywalking.oap.server.core.analysis; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Repeatable; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; -/** - * @author wusheng - */ @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) @Repeatable(MultipleDisable.class) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/DisableRegister.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/DisableRegister.java index b87dd79fdb12..e560f63920f4 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/DisableRegister.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/DisableRegister.java @@ -19,13 +19,12 @@ package org.apache.skywalking.oap.server.core.analysis; import java.lang.annotation.Annotation; -import java.util.*; +import java.util.HashSet; +import java.util.Set; import org.apache.skywalking.oap.server.core.annotation.AnnotationListener; /** * Disable definition scanner and register. - * - * @author wusheng */ public class DisableRegister implements AnnotationListener { public static DisableRegister INSTANCE = new DisableRegister(); @@ -34,12 +33,14 @@ public class DisableRegister implements AnnotationListener { private DisableRegister() { } - @Override public Class annotation() { + @Override + public Class annotation() { return MultipleDisable.class; } - @Override public void notify(Class aClass) { - MultipleDisable annotation = (MultipleDisable)aClass.getAnnotation(MultipleDisable.class); + @Override + public void notify(Class aClass) { + MultipleDisable annotation = (MultipleDisable) aClass.getAnnotation(MultipleDisable.class); Disable[] valueList = annotation.value(); if (valueList != null) { for (Disable disable : valueList) { @@ -57,12 +58,14 @@ public boolean include(String name) { } public static class SingleDisableScanListener implements AnnotationListener { - @Override public Class annotation() { + @Override + public Class annotation() { return Disable.class; } - @Override public void notify(Class aClass) { - String name = ((Disable)aClass.getAnnotation(Disable.class)).value(); + @Override + public void notify(Class aClass) { + String name = ((Disable) aClass.getAnnotation(Disable.class)).value(); DisableRegister.INSTANCE.disableEntitySet.add(name); } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/DispatcherDetectorListener.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/DispatcherDetectorListener.java index 0c29033e1219..a8a3a885a8c5 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/DispatcherDetectorListener.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/DispatcherDetectorListener.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.core.analysis; -/** - * @author wusheng - */ public interface DispatcherDetectorListener { void addIfAsSourceDispatcher(Class aClass) throws IllegalAccessException, InstantiationException; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/DispatcherManager.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/DispatcherManager.java index 48356de4f616..59a51772853f 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/DispatcherManager.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/DispatcherManager.java @@ -32,9 +32,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng, wusheng - */ public class DispatcherManager implements DispatcherDetectorListener { private static final Logger logger = LoggerFactory.getLogger(DispatcherManager.class); @@ -66,13 +63,9 @@ public void forward(Source source) { /** * Scan all classes under `org.apache.skywalking` package, - * + *

* If it implement {@link org.apache.skywalking.oap.server.core.analysis.SourceDispatcher}, then, it will be added * into this DispatcherManager based on the Source definition. - * - * @throws IOException - * @throws IllegalAccessException - * @throws InstantiationException */ public void scan() throws IOException, IllegalAccessException, InstantiationException { ClassPath classpath = ClassPath.from(this.getClass().getClassLoader()); @@ -89,7 +82,7 @@ public void addIfAsSourceDispatcher(Class aClass) throws IllegalAccessException, if (!aClass.isInterface() && SourceDispatcher.class.isAssignableFrom(aClass)) { Type[] genericInterfaces = aClass.getGenericInterfaces(); for (Type genericInterface : genericInterfaces) { - ParameterizedType anInterface = (ParameterizedType)genericInterface; + ParameterizedType anInterface = (ParameterizedType) genericInterface; if (anInterface.getRawType().getTypeName().equals(SourceDispatcher.class.getName())) { Type[] arguments = anInterface.getActualTypeArguments(); @@ -98,14 +91,14 @@ public void addIfAsSourceDispatcher(Class aClass) throws IllegalAccessException, } Type argument = arguments[0]; - Object source = ((Class)argument).newInstance(); + Object source = ((Class) argument).newInstance(); if (!Source.class.isAssignableFrom(source.getClass())) { throw new UnexpectedException("unexpected type argument of class " + aClass.getName() + ", should be `org.apache.skywalking.oap.server.core.source.Source`. "); } - Source dispatcherSource = (Source)source; - SourceDispatcher dispatcher = (SourceDispatcher)aClass.newInstance(); + Source dispatcherSource = (Source) source; + SourceDispatcher dispatcher = (SourceDispatcher) aClass.newInstance(); int scopeId = dispatcherSource.scope(); @@ -117,7 +110,8 @@ public void addIfAsSourceDispatcher(Class aClass) throws IllegalAccessException, dispatchers.add(dispatcher); - logger.info("Dispatcher {} is added into DefaultScopeDefine {}.", dispatcher.getClass().getName(), scopeId); + logger.info("Dispatcher {} is added into DefaultScopeDefine {}.", dispatcher.getClass() + .getName(), scopeId); } } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/Downsampling.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/Downsampling.java index f1f711f97b74..bb156c8fd1da 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/Downsampling.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/Downsampling.java @@ -17,9 +17,6 @@ package org.apache.skywalking.oap.server.core.analysis; -/** - * @author peng-yongsheng - */ public enum Downsampling { None(0, ""), Second(1, "second"), Minute(2, "minute"), Hour(3, "hour"), Day(4, "day"), Month(5, "month"); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/MultipleDisable.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/MultipleDisable.java index 53c829f00395..3c1e2155b0e5 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/MultipleDisable.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/MultipleDisable.java @@ -18,7 +18,10 @@ package org.apache.skywalking.oap.server.core.analysis; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/SourceDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/SourceDispatcher.java index 2a5f48b93642..6e85f8049719 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/SourceDispatcher.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/SourceDispatcher.java @@ -20,9 +20,6 @@ import org.apache.skywalking.oap.server.core.source.Source; -/** - * @author peng-yongsheng - */ public interface SourceDispatcher { void dispatch(SOURCE source); } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/Stream.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/Stream.java index b12f7fe0d1dd..74709f7f4d68 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/Stream.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/Stream.java @@ -18,12 +18,12 @@ package org.apache.skywalking.oap.server.core.analysis; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import org.apache.skywalking.oap.server.core.storage.StorageBuilder; -/** - * @author peng-yongsheng - */ @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) public @interface Stream { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/StreamAnnotationListener.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/StreamAnnotationListener.java index 6f61739dc80a..154a4393b6a3 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/StreamAnnotationListener.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/StreamAnnotationListener.java @@ -20,14 +20,14 @@ import java.lang.annotation.Annotation; import org.apache.skywalking.oap.server.core.UnexpectedException; -import org.apache.skywalking.oap.server.core.analysis.worker.*; +import org.apache.skywalking.oap.server.core.analysis.worker.MetricsStreamProcessor; +import org.apache.skywalking.oap.server.core.analysis.worker.NoneStreamingProcessor; +import org.apache.skywalking.oap.server.core.analysis.worker.RecordStreamProcessor; +import org.apache.skywalking.oap.server.core.analysis.worker.TopNStreamProcessor; import org.apache.skywalking.oap.server.core.annotation.AnnotationListener; import org.apache.skywalking.oap.server.core.register.worker.InventoryStreamProcessor; import org.apache.skywalking.oap.server.library.module.ModuleDefineHolder; -/** - * @author peng-yongsheng - */ public class StreamAnnotationListener implements AnnotationListener { private final ModuleDefineHolder moduleDefineHolder; @@ -36,14 +36,16 @@ public StreamAnnotationListener(ModuleDefineHolder moduleDefineHolder) { this.moduleDefineHolder = moduleDefineHolder; } - @Override public Class annotation() { + @Override + public Class annotation() { return Stream.class; } @SuppressWarnings("unchecked") - @Override public void notify(Class aClass) { + @Override + public void notify(Class aClass) { if (aClass.isAnnotationPresent(Stream.class)) { - Stream stream = (Stream)aClass.getAnnotation(Stream.class); + Stream stream = (Stream) aClass.getAnnotation(Stream.class); if (stream.processor().equals(InventoryStreamProcessor.class)) { InventoryStreamProcessor.getInstance().create(moduleDefineHolder, stream, aClass); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/StreamProcessor.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/StreamProcessor.java index e90b15917fe3..11828e4a6ac6 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/StreamProcessor.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/StreamProcessor.java @@ -20,9 +20,6 @@ import org.apache.skywalking.oap.server.library.module.ModuleDefineHolder; -/** - * @author peng-yongsheng - */ public interface StreamProcessor { void in(STREAM stream); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/TimeBucket.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/TimeBucket.java index 3df3470fb8a7..c5a43939b285 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/TimeBucket.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/TimeBucket.java @@ -20,9 +20,6 @@ import java.util.Calendar; import org.apache.skywalking.oap.server.core.UnexpectedException; -/** - * @author peng-yongsheng - */ public class TimeBucket { /** diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/config/NoneStream.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/config/NoneStream.java index 2967c44081b4..31efa7a39251 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/config/NoneStream.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/config/NoneStream.java @@ -22,8 +22,6 @@ /** * None stream data base on record, support time bucket field to TTL. - * - * @author MrPro */ public abstract class NoneStream extends Record { } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/DataCache.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/DataCache.java index f26011e0c7d2..868d16a00ceb 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/DataCache.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/DataCache.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.core.analysis.data; -/** - * @author peng-yongsheng - */ public interface DataCache { void writing(); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/LimitedSizeDataCache.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/LimitedSizeDataCache.java index 33cfe1d6843d..c7393c40666c 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/LimitedSizeDataCache.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/LimitedSizeDataCache.java @@ -18,7 +18,7 @@ package org.apache.skywalking.oap.server.core.analysis.data; -import org.apache.skywalking.oap.server.core.storage.*; +import org.apache.skywalking.oap.server.core.storage.ComparableStorageData; public class LimitedSizeDataCache extends Window implements DataCache { @@ -31,7 +31,8 @@ public LimitedSizeDataCache(int limitSize) { init(); } - @Override public SWCollection collectionInstance() { + @Override + public SWCollection collectionInstance() { return new LimitedSizeDataCollection<>(limitSize); } @@ -39,11 +40,13 @@ public void add(STORAGE_DATA data) { limitedSizeDataCollection.put(data); } - @Override public void writing() { + @Override + public void writing() { limitedSizeDataCollection = getCurrentAndWriting(); } - @Override public void finishWriting() { + @Override + public void finishWriting() { limitedSizeDataCollection.finishWriting(); limitedSizeDataCollection = null; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/LimitedSizeDataCollection.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/LimitedSizeDataCollection.java index 69d9e8eb277f..ab5347d2f098 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/LimitedSizeDataCollection.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/LimitedSizeDataCollection.java @@ -18,7 +18,11 @@ package org.apache.skywalking.oap.server.core.analysis.data; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; import org.apache.skywalking.oap.server.core.storage.ComparableStorageData; public class LimitedSizeDataCollection implements SWCollection { @@ -35,47 +39,58 @@ public class LimitedSizeDataCollection storageDataList = this.data.get(value); if (storageDataList == null) { storageDataList = new LinkedList<>(); @@ -107,7 +122,8 @@ public class LimitedSizeDataCollection collection() { + @Override + public Collection collection() { List collection = new ArrayList<>(); data.values().forEach(e -> e.forEach(collection::add)); return collection; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/MergeDataCache.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/MergeDataCache.java index 5419607b0822..a7c4b6be4e06 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/MergeDataCache.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/MergeDataCache.java @@ -20,14 +20,12 @@ import org.apache.skywalking.oap.server.core.analysis.metrics.Metrics; -/** - * @author peng-yongsheng - */ public class MergeDataCache extends Window implements DataCache { private SWCollection lockedMergeDataCollection; - @Override public SWCollection collectionInstance() { + @Override + public SWCollection collectionInstance() { return new MergeDataCollection<>(); } @@ -43,11 +41,13 @@ public void put(METRICS data) { lockedMergeDataCollection.put(data); } - @Override public void writing() { + @Override + public void writing() { lockedMergeDataCollection = getCurrentAndWriting(); } - @Override public void finishWriting() { + @Override + public void finishWriting() { lockedMergeDataCollection.finishWriting(); lockedMergeDataCollection = null; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/MergeDataCollection.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/MergeDataCollection.java index 3f44678327fb..f310cb42e2bc 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/MergeDataCollection.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/MergeDataCollection.java @@ -18,12 +18,11 @@ package org.apache.skywalking.oap.server.core.analysis.data; -import java.util.*; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; import org.apache.skywalking.oap.server.core.remote.data.StreamData; -/** - * @author peng-yongsheng - */ public class MergeDataCollection implements SWCollection { private Map collection; @@ -36,51 +35,63 @@ public class MergeDataCollection implements SWCo this.reading = false; } - @Override public void finishWriting() { + @Override + public void finishWriting() { writing = false; } - @Override public void writing() { + @Override + public void writing() { writing = true; } - @Override public boolean isWriting() { + @Override + public boolean isWriting() { return writing; } - @Override public void finishReading() { + @Override + public void finishReading() { reading = false; } - @Override public void reading() { + @Override + public void reading() { reading = true; } - @Override public boolean isReading() { + @Override + public boolean isReading() { return reading; } - @Override public boolean containsKey(STREAM_DATA key) { + @Override + public boolean containsKey(STREAM_DATA key) { return collection.containsKey(key); } - @Override public void put(STREAM_DATA value) { + @Override + public void put(STREAM_DATA value) { collection.put(value, value); } - @Override public STREAM_DATA get(STREAM_DATA key) { + @Override + public STREAM_DATA get(STREAM_DATA key) { return collection.get(key); } - @Override public int size() { + @Override + public int size() { return collection.size(); } - @Override public void clear() { + @Override + public void clear() { collection.clear(); } - @Override public Collection collection() { + @Override + public Collection collection() { return collection.values(); } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/NonMergeDataCache.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/NonMergeDataCache.java index 238b127c4c77..69d8d8a4ab96 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/NonMergeDataCache.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/NonMergeDataCache.java @@ -20,14 +20,12 @@ import org.apache.skywalking.oap.server.core.storage.StorageData; -/** - * @author peng-yongsheng - */ public class NonMergeDataCache extends Window implements DataCache { private SWCollection lockedMergeDataCollection; - @Override public SWCollection collectionInstance() { + @Override + public SWCollection collectionInstance() { return new NonMergeDataCollection<>(); } @@ -35,11 +33,13 @@ public void add(STORAGE_DATA data) { lockedMergeDataCollection.put(data); } - @Override public void writing() { + @Override + public void writing() { lockedMergeDataCollection = getCurrentAndWriting(); } - @Override public void finishWriting() { + @Override + public void finishWriting() { lockedMergeDataCollection.finishWriting(); lockedMergeDataCollection = null; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/NonMergeDataCollection.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/NonMergeDataCollection.java index b8f2f5acf0e5..6a5646538493 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/NonMergeDataCollection.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/NonMergeDataCollection.java @@ -18,12 +18,11 @@ package org.apache.skywalking.oap.server.core.analysis.data; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; import org.apache.skywalking.oap.server.core.storage.StorageData; -/** - * @author peng-yongsheng - */ public class NonMergeDataCollection implements SWCollection { private final List data; @@ -36,51 +35,63 @@ public class NonMergeDataCollection implements this.reading = false; } - @Override public void finishWriting() { + @Override + public void finishWriting() { writing = false; } - @Override public void writing() { + @Override + public void writing() { writing = true; } - @Override public boolean isWriting() { + @Override + public boolean isWriting() { return writing; } - @Override public void finishReading() { + @Override + public void finishReading() { reading = false; } - @Override public void reading() { + @Override + public void reading() { reading = true; } - @Override public boolean isReading() { + @Override + public boolean isReading() { return reading; } - @Override public int size() { + @Override + public int size() { return data.size(); } - @Override public void clear() { + @Override + public void clear() { data.clear(); } - @Override public boolean containsKey(STORAGE_DATA key) { + @Override + public boolean containsKey(STORAGE_DATA key) { throw new UnsupportedOperationException("Non merge data collection doesn't support containsKey operation."); } - @Override public STORAGE_DATA get(STORAGE_DATA key) { + @Override + public STORAGE_DATA get(STORAGE_DATA key) { throw new UnsupportedOperationException("Non merge data collection doesn't support get operation."); } - @Override public void put(STORAGE_DATA value) { + @Override + public void put(STORAGE_DATA value) { data.add(value); } - @Override public Collection collection() { + @Override + public Collection collection() { return data; } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/QueueData.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/QueueData.java index 494d3487430f..9880b6c76305 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/QueueData.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/QueueData.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.core.analysis.data; -/** - * @author peng-yongsheng - */ public interface QueueData { void resetEndOfBatch(); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/SWCollection.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/SWCollection.java index 032563d86323..16bbe0749e76 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/SWCollection.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/SWCollection.java @@ -20,9 +20,6 @@ import java.util.Collection; -/** - * @author peng-yongsheng - */ public interface SWCollection { void reading(); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/Window.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/Window.java index ff2ca6d40267..4236a1ffa612 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/Window.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/Window.java @@ -20,9 +20,6 @@ import java.util.concurrent.atomic.AtomicInteger; -/** - * @author peng-yongsheng - */ public abstract class Window { private AtomicInteger windowSwitch = new AtomicInteger(0); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/RelationDefineUtil.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/RelationDefineUtil.java index 32ef0910d6a0..9aa698e9ddc8 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/RelationDefineUtil.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/RelationDefineUtil.java @@ -23,13 +23,10 @@ public class RelationDefineUtil { public static String buildEntityId(RelationDefine define) { - return String.valueOf(define.source) - + Const.ID_SPLIT + String.valueOf(define.dest) - + Const.ID_SPLIT + String.valueOf(define.componentId); + return String.valueOf(define.source) + Const.ID_SPLIT + String.valueOf(define.dest) + Const.ID_SPLIT + String.valueOf(define.componentId); } /** - * @param entityId * @return 1. sourceId 2. destId 3. componentId */ public static RelationDefine splitEntityId(String entityId) { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/database/DatabaseStatementDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/database/DatabaseStatementDispatcher.java index 6702874fa836..1f810b2774cf 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/database/DatabaseStatementDispatcher.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/database/DatabaseStatementDispatcher.java @@ -22,12 +22,10 @@ import org.apache.skywalking.oap.server.core.analysis.worker.TopNStreamProcessor; import org.apache.skywalking.oap.server.core.source.DatabaseSlowStatement; -/** - * @author wusheng - */ public class DatabaseStatementDispatcher implements SourceDispatcher { - @Override public void dispatch(DatabaseSlowStatement source) { + @Override + public void dispatch(DatabaseSlowStatement source) { TopNDatabaseStatement statement = new TopNDatabaseStatement(); statement.setId(source.getId()); statement.setServiceId(source.getDatabaseServiceId()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/database/TopNDatabaseStatement.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/database/TopNDatabaseStatement.java index 8a385d0d3413..4da786f66d13 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/database/TopNDatabaseStatement.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/database/TopNDatabaseStatement.java @@ -18,7 +18,9 @@ package org.apache.skywalking.oap.server.core.analysis.manual.database; -import java.util.*; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; import lombok.Setter; import org.apache.skywalking.oap.server.core.analysis.Stream; import org.apache.skywalking.oap.server.core.analysis.topn.TopN; @@ -28,46 +30,50 @@ /** * Database TopN statement, including Database SQL statement, mongoDB and Redis commands. - * - * @author wusheng */ @Stream(name = TopNDatabaseStatement.INDEX_NAME, scopeId = DefaultScopeDefine.DATABASE_SLOW_STATEMENT, builder = TopNDatabaseStatement.Builder.class, processor = TopNStreamProcessor.class) public class TopNDatabaseStatement extends TopN { public static final String INDEX_NAME = "top_n_database_statement"; - @Setter private String id; + @Setter + private String id; - @Override public String id() { + @Override + public String id() { return id; } - @Override public boolean equals(Object o) { + @Override + public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - TopNDatabaseStatement statement = (TopNDatabaseStatement)o; + TopNDatabaseStatement statement = (TopNDatabaseStatement) o; return getServiceId() == statement.getServiceId(); } - @Override public int hashCode() { + @Override + public int hashCode() { return Objects.hash(getServiceId()); } public static class Builder implements StorageBuilder { - @Override public TopNDatabaseStatement map2Data(Map dbMap) { + @Override + public TopNDatabaseStatement map2Data(Map dbMap) { TopNDatabaseStatement statement = new TopNDatabaseStatement(); - statement.setStatement((String)dbMap.get(STATEMENT)); - statement.setTraceId((String)dbMap.get(TRACE_ID)); - statement.setLatency(((Number)dbMap.get(LATENCY)).longValue()); - statement.setServiceId(((Number)dbMap.get(SERVICE_ID)).intValue()); - statement.setTimeBucket(((Number)dbMap.get(TIME_BUCKET)).longValue()); + statement.setStatement((String) dbMap.get(STATEMENT)); + statement.setTraceId((String) dbMap.get(TRACE_ID)); + statement.setLatency(((Number) dbMap.get(LATENCY)).longValue()); + statement.setServiceId(((Number) dbMap.get(SERVICE_ID)).intValue()); + statement.setTimeBucket(((Number) dbMap.get(TIME_BUCKET)).longValue()); return statement; } - @Override public Map data2Map(TopNDatabaseStatement storageData) { + @Override + public Map data2Map(TopNDatabaseStatement storageData) { Map map = new HashMap<>(); map.put(STATEMENT, storageData.getStatement()); map.put(TRACE_ID, storageData.getTraceId()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/endpointrelation/EndpointCallRelationDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/endpointrelation/EndpointCallRelationDispatcher.java index 6eca4757645d..f72e94896f1d 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/endpointrelation/EndpointCallRelationDispatcher.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/endpointrelation/EndpointCallRelationDispatcher.java @@ -22,9 +22,6 @@ import org.apache.skywalking.oap.server.core.analysis.worker.MetricsStreamProcessor; import org.apache.skywalking.oap.server.core.source.EndpointRelation; -/** - * @author wusheng, peng-yongsheng - */ public class EndpointCallRelationDispatcher implements SourceDispatcher { @Override diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/endpointrelation/EndpointRelationServerSideMetrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/endpointrelation/EndpointRelationServerSideMetrics.java index 08a346c35b94..57667f3e592e 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/endpointrelation/EndpointRelationServerSideMetrics.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/endpointrelation/EndpointRelationServerSideMetrics.java @@ -18,8 +18,11 @@ package org.apache.skywalking.oap.server.core.analysis.manual.endpointrelation; -import java.util.*; -import lombok.*; +import java.util.HashMap; +import java.util.Map; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.oap.server.core.Const; import org.apache.skywalking.oap.server.core.analysis.Stream; import org.apache.skywalking.oap.server.core.analysis.metrics.Metrics; @@ -27,7 +30,8 @@ import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine; import org.apache.skywalking.oap.server.core.storage.StorageBuilder; -import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.annotation.Column; +import org.apache.skywalking.oap.server.core.storage.annotation.IDColumn; @Stream(name = EndpointRelationServerSideMetrics.INDEX_NAME, scopeId = DefaultScopeDefine.ENDPOINT_RELATION, builder = EndpointRelationServerSideMetrics.Builder.class, processor = MetricsStreamProcessor.class) public class EndpointRelationServerSideMetrics extends Metrics { @@ -37,12 +41,29 @@ public class EndpointRelationServerSideMetrics extends Metrics { public static final String DEST_ENDPOINT_ID = "dest_endpoint_id"; public static final String COMPONENT_ID = "component_id"; - @Setter @Getter @Column(columnName = SOURCE_ENDPOINT_ID) @IDColumn private int sourceEndpointId; - @Setter @Getter @Column(columnName = DEST_ENDPOINT_ID) @IDColumn private int destEndpointId; - @Setter @Getter @Column(columnName = COMPONENT_ID) @IDColumn private int componentId; - @Setter(AccessLevel.PRIVATE) @Getter @Column(columnName = ENTITY_ID) @IDColumn private String entityId; - - @Override public String id() { + @Setter + @Getter + @Column(columnName = SOURCE_ENDPOINT_ID) + @IDColumn + private int sourceEndpointId; + @Setter + @Getter + @Column(columnName = DEST_ENDPOINT_ID) + @IDColumn + private int destEndpointId; + @Setter + @Getter + @Column(columnName = COMPONENT_ID) + @IDColumn + private int componentId; + @Setter(AccessLevel.PRIVATE) + @Getter + @Column(columnName = ENTITY_ID) + @IDColumn + private String entityId; + + @Override + public String id() { String splitJointId = String.valueOf(getTimeBucket()); splitJointId += Const.ID_SPLIT + sourceEndpointId; splitJointId += Const.ID_SPLIT + destEndpointId; @@ -57,15 +78,18 @@ public void buildEntityId() { entityId = splitJointId; } - @Override public void combine(Metrics metrics) { + @Override + public void combine(Metrics metrics) { } - @Override public void calculate() { + @Override + public void calculate() { } - @Override public Metrics toHour() { + @Override + public Metrics toHour() { EndpointRelationServerSideMetrics metrics = new EndpointRelationServerSideMetrics(); metrics.setTimeBucket(toTimeBucketInHour()); metrics.setSourceEndpointId(getSourceEndpointId()); @@ -75,7 +99,8 @@ public void buildEntityId() { return metrics; } - @Override public Metrics toDay() { + @Override + public Metrics toDay() { EndpointRelationServerSideMetrics metrics = new EndpointRelationServerSideMetrics(); metrics.setTimeBucket(toTimeBucketInDay()); metrics.setSourceEndpointId(getSourceEndpointId()); @@ -85,7 +110,8 @@ public void buildEntityId() { return metrics; } - @Override public Metrics toMonth() { + @Override + public Metrics toMonth() { EndpointRelationServerSideMetrics metrics = new EndpointRelationServerSideMetrics(); metrics.setTimeBucket(toTimeBucketInMonth()); metrics.setSourceEndpointId(getSourceEndpointId()); @@ -95,7 +121,8 @@ public void buildEntityId() { return metrics; } - @Override public int remoteHashCode() { + @Override + public int remoteHashCode() { int result = 17; result = 31 * result + sourceEndpointId; result = 31 * result + destEndpointId; @@ -103,7 +130,8 @@ public void buildEntityId() { return result; } - @Override public void deserialize(RemoteData remoteData) { + @Override + public void deserialize(RemoteData remoteData) { setSourceEndpointId(remoteData.getDataIntegers(0)); setDestEndpointId(remoteData.getDataIntegers(1)); setComponentId(remoteData.getDataIntegers(2)); @@ -113,7 +141,8 @@ public void buildEntityId() { setEntityId(remoteData.getDataStrings(0)); } - @Override public RemoteData.Builder serialize() { + @Override + public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); remoteBuilder.addDataIntegers(getSourceEndpointId()); @@ -126,16 +155,18 @@ public void buildEntityId() { return remoteBuilder; } - @Override public int hashCode() { + @Override + public int hashCode() { int result = 17; result = 31 * result + sourceEndpointId; result = 31 * result + destEndpointId; result = 31 * result + componentId; - result = 31 * result + (int)getTimeBucket(); + result = 31 * result + (int) getTimeBucket(); return result; } - @Override public boolean equals(Object obj) { + @Override + public boolean equals(Object obj) { if (this == obj) return true; if (obj == null) @@ -143,7 +174,7 @@ public void buildEntityId() { if (getClass() != obj.getClass()) return false; - EndpointRelationServerSideMetrics metrics = (EndpointRelationServerSideMetrics)obj; + EndpointRelationServerSideMetrics metrics = (EndpointRelationServerSideMetrics) obj; if (sourceEndpointId != metrics.sourceEndpointId) return false; if (destEndpointId != metrics.destEndpointId) @@ -159,17 +190,19 @@ public void buildEntityId() { public static class Builder implements StorageBuilder { - @Override public EndpointRelationServerSideMetrics map2Data(Map dbMap) { + @Override + public EndpointRelationServerSideMetrics map2Data(Map dbMap) { EndpointRelationServerSideMetrics metrics = new EndpointRelationServerSideMetrics(); - metrics.setSourceEndpointId(((Number)dbMap.get(SOURCE_ENDPOINT_ID)).intValue()); - metrics.setDestEndpointId(((Number)dbMap.get(DEST_ENDPOINT_ID)).intValue()); - metrics.setComponentId(((Number)dbMap.get(COMPONENT_ID)).intValue()); - metrics.setTimeBucket(((Number)dbMap.get(TIME_BUCKET)).longValue()); - metrics.setEntityId((String)dbMap.get(ENTITY_ID)); + metrics.setSourceEndpointId(((Number) dbMap.get(SOURCE_ENDPOINT_ID)).intValue()); + metrics.setDestEndpointId(((Number) dbMap.get(DEST_ENDPOINT_ID)).intValue()); + metrics.setComponentId(((Number) dbMap.get(COMPONENT_ID)).intValue()); + metrics.setTimeBucket(((Number) dbMap.get(TIME_BUCKET)).longValue()); + metrics.setEntityId((String) dbMap.get(ENTITY_ID)); return metrics; } - @Override public Map data2Map(EndpointRelationServerSideMetrics storageData) { + @Override + public Map data2Map(EndpointRelationServerSideMetrics storageData) { Map map = new HashMap<>(); map.put(SOURCE_ENDPOINT_ID, storageData.getSourceEndpointId()); map.put(DEST_ENDPOINT_ID, storageData.getDestEndpointId()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/log/AbstractLogRecord.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/log/AbstractLogRecord.java index 799aeef77192..a11b53e255b1 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/log/AbstractLogRecord.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/log/AbstractLogRecord.java @@ -18,18 +18,16 @@ package org.apache.skywalking.oap.server.core.analysis.manual.log; -import java.util.*; -import lombok.*; +import java.util.HashMap; +import java.util.Map; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.oap.server.core.UnexpectedException; import org.apache.skywalking.oap.server.core.analysis.record.Record; import org.apache.skywalking.oap.server.core.query.entity.ContentType; import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.Column; -/** - * @author wusheng - */ - public abstract class AbstractLogRecord extends Record { public static final String SERVICE_ID = "service_id"; @@ -42,35 +40,64 @@ public abstract class AbstractLogRecord extends Record { public static final String CONTENT = "content"; public static final String TIMESTAMP = "timestamp"; - @Setter @Getter @Column(columnName = SERVICE_ID) private int serviceId; - @Setter @Getter @Column(columnName = SERVICE_INSTANCE_ID) private int serviceInstanceId; - @Setter @Getter @Column(columnName = ENDPOINT_ID) private int endpointId; - @Setter @Getter @Column(columnName = TRACE_ID) private String traceId; - @Setter @Getter @Column(columnName = IS_ERROR) private int isError; - @Setter @Getter @Column(columnName = STATUS_CODE) private String statusCode; - @Setter @Getter @Column(columnName = CONTENT_TYPE) private int contentType = ContentType.NONE.value(); - @Setter @Getter @Column(columnName = CONTENT) private String content; - @Setter @Getter @Column(columnName = TIMESTAMP) private long timestamp; + @Setter + @Getter + @Column(columnName = SERVICE_ID) + private int serviceId; + @Setter + @Getter + @Column(columnName = SERVICE_INSTANCE_ID) + private int serviceInstanceId; + @Setter + @Getter + @Column(columnName = ENDPOINT_ID) + private int endpointId; + @Setter + @Getter + @Column(columnName = TRACE_ID) + private String traceId; + @Setter + @Getter + @Column(columnName = IS_ERROR) + private int isError; + @Setter + @Getter + @Column(columnName = STATUS_CODE) + private String statusCode; + @Setter + @Getter + @Column(columnName = CONTENT_TYPE) + private int contentType = ContentType.NONE.value(); + @Setter + @Getter + @Column(columnName = CONTENT) + private String content; + @Setter + @Getter + @Column(columnName = TIMESTAMP) + private long timestamp; - @Override public String id() { + @Override + public String id() { throw new UnexpectedException("AbstractLogRecord doesn't provide id()"); } public static abstract class Builder implements StorageBuilder { protected void map2Data(T record, Map dbMap) { - record.setServiceId(((Number)dbMap.get(SERVICE_ID)).intValue()); - record.setServiceInstanceId(((Number)dbMap.get(SERVICE_INSTANCE_ID)).intValue()); - record.setEndpointId(((Number)dbMap.get(ENDPOINT_ID)).intValue()); - record.setIsError(((Number)dbMap.get(IS_ERROR)).intValue()); - record.setTraceId((String)dbMap.get(TRACE_ID)); - record.setStatusCode((String)dbMap.get(STATUS_CODE)); - record.setContentType(((Number)dbMap.get(CONTENT_TYPE)).intValue()); - record.setContent((String)dbMap.get(CONTENT)); - record.setTimestamp(((Number)dbMap.get(TIMESTAMP)).longValue()); - record.setTimeBucket(((Number)dbMap.get(TIME_BUCKET)).longValue()); + record.setServiceId(((Number) dbMap.get(SERVICE_ID)).intValue()); + record.setServiceInstanceId(((Number) dbMap.get(SERVICE_INSTANCE_ID)).intValue()); + record.setEndpointId(((Number) dbMap.get(ENDPOINT_ID)).intValue()); + record.setIsError(((Number) dbMap.get(IS_ERROR)).intValue()); + record.setTraceId((String) dbMap.get(TRACE_ID)); + record.setStatusCode((String) dbMap.get(STATUS_CODE)); + record.setContentType(((Number) dbMap.get(CONTENT_TYPE)).intValue()); + record.setContent((String) dbMap.get(CONTENT)); + record.setTimestamp(((Number) dbMap.get(TIMESTAMP)).longValue()); + record.setTimeBucket(((Number) dbMap.get(TIME_BUCKET)).longValue()); } - @Override public Map data2Map(AbstractLogRecord record) { + @Override + public Map data2Map(AbstractLogRecord record) { Map map = new HashMap<>(); map.put(SERVICE_ID, record.getServiceId()); map.put(SERVICE_INSTANCE_ID, record.getServiceInstanceId()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/log/HTTPAccessLogDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/log/HTTPAccessLogDispatcher.java index 792c4cb2caa6..f92eced2d4cb 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/log/HTTPAccessLogDispatcher.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/log/HTTPAccessLogDispatcher.java @@ -22,12 +22,10 @@ import org.apache.skywalking.oap.server.core.analysis.worker.RecordStreamProcessor; import org.apache.skywalking.oap.server.core.source.HTTPAccessLog; -/** - * @author wusheng - */ public class HTTPAccessLogDispatcher implements SourceDispatcher { - @Override public void dispatch(HTTPAccessLog source) { + @Override + public void dispatch(HTTPAccessLog source) { HTTPAccessLogRecord record = new HTTPAccessLogRecord(); record.setTimestamp(source.getTimestamp()); record.setTimeBucket(source.getTimeBucket()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/log/HTTPAccessLogRecord.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/log/HTTPAccessLogRecord.java index 9242810886f3..1ded7b26cf4d 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/log/HTTPAccessLogRecord.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/log/HTTPAccessLogRecord.java @@ -31,7 +31,8 @@ public class HTTPAccessLogRecord extends AbstractLogRecord { public static final String INDEX_NAME = "http_access_log"; public static class Builder extends AbstractLogRecord.Builder { - @Override public HTTPAccessLogRecord map2Data(Map dbMap) { + @Override + public HTTPAccessLogRecord map2Data(Map dbMap) { HTTPAccessLogRecord record = new HTTPAccessLogRecord(); super.map2Data(record, dbMap); return record; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/instance/ServiceInstanceCallRelationDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/instance/ServiceInstanceCallRelationDispatcher.java index 894625dd4f4c..c412efa4bb1a 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/instance/ServiceInstanceCallRelationDispatcher.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/instance/ServiceInstanceCallRelationDispatcher.java @@ -22,9 +22,6 @@ import org.apache.skywalking.oap.server.core.analysis.worker.MetricsStreamProcessor; import org.apache.skywalking.oap.server.core.source.ServiceInstanceRelation; -/** - * @author zhangwei - */ public class ServiceInstanceCallRelationDispatcher implements SourceDispatcher { @Override diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/instance/ServiceInstanceRelationClientSideMetrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/instance/ServiceInstanceRelationClientSideMetrics.java index bfeb9929bbaf..6ec75a0edc13 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/instance/ServiceInstanceRelationClientSideMetrics.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/instance/ServiceInstanceRelationClientSideMetrics.java @@ -18,6 +18,8 @@ package org.apache.skywalking.oap.server.core.analysis.manual.relation.instance; +import java.util.HashMap; +import java.util.Map; import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; @@ -32,12 +34,6 @@ import org.apache.skywalking.oap.server.core.storage.annotation.Column; import org.apache.skywalking.oap.server.core.storage.annotation.IDColumn; -import java.util.HashMap; -import java.util.Map; - -/** - * @author zhangwei - */ @Stream(name = ServiceInstanceRelationClientSideMetrics.INDEX_NAME, scopeId = DefaultScopeDefine.SERVICE_INSTANCE_RELATION, builder = ServiceInstanceRelationClientSideMetrics.Builder.class, processor = MetricsStreamProcessor.class) public class ServiceInstanceRelationClientSideMetrics extends Metrics { @@ -48,19 +44,39 @@ public class ServiceInstanceRelationClientSideMetrics extends Metrics { public static final String DEST_SERVICE_INSTANCE_ID = "dest_service_instance_id"; public static final String COMPONENT_ID = "component_id"; - @Setter @Getter @Column(columnName = SOURCE_SERVICE_ID) private int sourceServiceId; - @Setter @Getter @Column(columnName = SOURCE_SERVICE_INSTANCE_ID) @IDColumn private int sourceServiceInstanceId; - @Setter @Getter @Column(columnName = DEST_SERVICE_ID) private int destServiceId; - @Setter @Getter @Column(columnName = DEST_SERVICE_INSTANCE_ID) @IDColumn private int destServiceInstanceId; - @Setter @Getter @Column(columnName = COMPONENT_ID) @IDColumn private int componentId; - @Setter(AccessLevel.PRIVATE) @Getter @Column(columnName = ENTITY_ID) @IDColumn private String entityId; + @Setter + @Getter + @Column(columnName = SOURCE_SERVICE_ID) + private int sourceServiceId; + @Setter + @Getter + @Column(columnName = SOURCE_SERVICE_INSTANCE_ID) + @IDColumn + private int sourceServiceInstanceId; + @Setter + @Getter + @Column(columnName = DEST_SERVICE_ID) + private int destServiceId; + @Setter + @Getter + @Column(columnName = DEST_SERVICE_INSTANCE_ID) + @IDColumn + private int destServiceInstanceId; + @Setter + @Getter + @Column(columnName = COMPONENT_ID) + @IDColumn + private int componentId; + @Setter(AccessLevel.PRIVATE) + @Getter + @Column(columnName = ENTITY_ID) + @IDColumn + private String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); - splitJointId += Const.ID_SPLIT + RelationDefineUtil.buildEntityId( - new RelationDefineUtil.RelationDefine(sourceServiceInstanceId, destServiceInstanceId, componentId) - ); + splitJointId += Const.ID_SPLIT + RelationDefineUtil.buildEntityId(new RelationDefineUtil.RelationDefine(sourceServiceInstanceId, destServiceInstanceId, componentId)); return splitJointId; } @@ -159,13 +175,17 @@ public RemoteData.Builder serialize() { @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; ServiceInstanceRelationClientSideMetrics that = (ServiceInstanceRelationClientSideMetrics) o; - if (sourceServiceInstanceId != that.sourceServiceInstanceId) return false; - if (destServiceInstanceId != that.destServiceInstanceId) return false; + if (sourceServiceInstanceId != that.sourceServiceInstanceId) + return false; + if (destServiceInstanceId != that.destServiceInstanceId) + return false; return componentId == that.componentId; } @@ -179,14 +199,13 @@ public int hashCode() { public static class Builder implements StorageBuilder { - @Override public ServiceInstanceRelationClientSideMetrics map2Data(Map dbMap) { ServiceInstanceRelationClientSideMetrics metrics = new ServiceInstanceRelationClientSideMetrics(); metrics.setEntityId((String) dbMap.get(ENTITY_ID)); - metrics.setSourceServiceId(((Number)dbMap.get(SOURCE_SERVICE_ID)).intValue()); + metrics.setSourceServiceId(((Number) dbMap.get(SOURCE_SERVICE_ID)).intValue()); metrics.setSourceServiceInstanceId(((Number) dbMap.get(SOURCE_SERVICE_INSTANCE_ID)).intValue()); - metrics.setDestServiceId(((Number)dbMap.get(DEST_SERVICE_ID)).intValue()); + metrics.setDestServiceId(((Number) dbMap.get(DEST_SERVICE_ID)).intValue()); metrics.setDestServiceInstanceId(((Number) dbMap.get(DEST_SERVICE_INSTANCE_ID)).intValue()); metrics.setComponentId(((Number) dbMap.get(COMPONENT_ID)).intValue()); metrics.setTimeBucket(((Number) dbMap.get(TIME_BUCKET)).longValue()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/instance/ServiceInstanceRelationServerSideMetrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/instance/ServiceInstanceRelationServerSideMetrics.java index decf0947e760..38a5eecfae56 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/instance/ServiceInstanceRelationServerSideMetrics.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/instance/ServiceInstanceRelationServerSideMetrics.java @@ -18,6 +18,8 @@ package org.apache.skywalking.oap.server.core.analysis.manual.relation.instance; +import java.util.HashMap; +import java.util.Map; import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; @@ -32,12 +34,6 @@ import org.apache.skywalking.oap.server.core.storage.annotation.Column; import org.apache.skywalking.oap.server.core.storage.annotation.IDColumn; -import java.util.HashMap; -import java.util.Map; - -/** - * @author zhangwei - */ @Stream(name = ServiceInstanceRelationServerSideMetrics.INDEX_NAME, scopeId = DefaultScopeDefine.SERVICE_INSTANCE_RELATION, builder = ServiceInstanceRelationServerSideMetrics.Builder.class, processor = MetricsStreamProcessor.class) public class ServiceInstanceRelationServerSideMetrics extends Metrics { @@ -48,19 +44,39 @@ public class ServiceInstanceRelationServerSideMetrics extends Metrics { public static final String DEST_SERVICE_INSTANCE_ID = "dest_service_instance_id"; public static final String COMPONENT_ID = "component_id"; - @Setter @Getter @Column(columnName = SOURCE_SERVICE_ID) private int sourceServiceId; - @Setter @Getter @Column(columnName = SOURCE_SERVICE_INSTANCE_ID) @IDColumn private int sourceServiceInstanceId; - @Setter @Getter @Column(columnName = DEST_SERVICE_ID) private int destServiceId; - @Setter @Getter @Column(columnName = DEST_SERVICE_INSTANCE_ID) @IDColumn private int destServiceInstanceId; - @Setter @Getter @Column(columnName = COMPONENT_ID) @IDColumn private int componentId; - @Setter(AccessLevel.PRIVATE) @Getter @Column(columnName = ENTITY_ID) @IDColumn private String entityId; + @Setter + @Getter + @Column(columnName = SOURCE_SERVICE_ID) + private int sourceServiceId; + @Setter + @Getter + @Column(columnName = SOURCE_SERVICE_INSTANCE_ID) + @IDColumn + private int sourceServiceInstanceId; + @Setter + @Getter + @Column(columnName = DEST_SERVICE_ID) + private int destServiceId; + @Setter + @Getter + @Column(columnName = DEST_SERVICE_INSTANCE_ID) + @IDColumn + private int destServiceInstanceId; + @Setter + @Getter + @Column(columnName = COMPONENT_ID) + @IDColumn + private int componentId; + @Setter(AccessLevel.PRIVATE) + @Getter + @Column(columnName = ENTITY_ID) + @IDColumn + private String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); - splitJointId += Const.ID_SPLIT + RelationDefineUtil.buildEntityId( - new RelationDefineUtil.RelationDefine(sourceServiceInstanceId, destServiceInstanceId, componentId) - ); + splitJointId += Const.ID_SPLIT + RelationDefineUtil.buildEntityId(new RelationDefineUtil.RelationDefine(sourceServiceInstanceId, destServiceInstanceId, componentId)); return splitJointId; } @@ -159,13 +175,17 @@ public RemoteData.Builder serialize() { @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; ServiceInstanceRelationServerSideMetrics that = (ServiceInstanceRelationServerSideMetrics) o; - if (sourceServiceInstanceId != that.sourceServiceInstanceId) return false; - if (destServiceInstanceId != that.destServiceInstanceId) return false; + if (sourceServiceInstanceId != that.sourceServiceInstanceId) + return false; + if (destServiceInstanceId != that.destServiceInstanceId) + return false; return componentId == that.componentId; } @@ -183,9 +203,9 @@ public static class Builder implements StorageBuilder dbMap) { ServiceInstanceRelationServerSideMetrics metrics = new ServiceInstanceRelationServerSideMetrics(); metrics.setEntityId((String) dbMap.get(ENTITY_ID)); - metrics.setSourceServiceId(((Number)dbMap.get(SOURCE_SERVICE_ID)).intValue()); + metrics.setSourceServiceId(((Number) dbMap.get(SOURCE_SERVICE_ID)).intValue()); metrics.setSourceServiceInstanceId(((Number) dbMap.get(SOURCE_SERVICE_INSTANCE_ID)).intValue()); - metrics.setDestServiceId(((Number)dbMap.get(DEST_SERVICE_ID)).intValue()); + metrics.setDestServiceId(((Number) dbMap.get(DEST_SERVICE_ID)).intValue()); metrics.setDestServiceInstanceId(((Number) dbMap.get(DEST_SERVICE_INSTANCE_ID)).intValue()); metrics.setComponentId(((Number) dbMap.get(COMPONENT_ID)).intValue()); metrics.setTimeBucket(((Number) dbMap.get(TIME_BUCKET)).longValue()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/service/ServiceCallRelationDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/service/ServiceCallRelationDispatcher.java index f2ab87780b12..188c7dfbf75c 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/service/ServiceCallRelationDispatcher.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/service/ServiceCallRelationDispatcher.java @@ -22,9 +22,6 @@ import org.apache.skywalking.oap.server.core.analysis.worker.MetricsStreamProcessor; import org.apache.skywalking.oap.server.core.source.ServiceRelation; -/** - * @author wusheng - */ public class ServiceCallRelationDispatcher implements SourceDispatcher { @Override diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/service/ServiceRelationClientSideMetrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/service/ServiceRelationClientSideMetrics.java index 4481baad2c4d..29c9516c224e 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/service/ServiceRelationClientSideMetrics.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/service/ServiceRelationClientSideMetrics.java @@ -18,8 +18,11 @@ package org.apache.skywalking.oap.server.core.analysis.manual.relation.service; -import java.util.*; -import lombok.*; +import java.util.HashMap; +import java.util.Map; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.oap.server.core.Const; import org.apache.skywalking.oap.server.core.analysis.Stream; import org.apache.skywalking.oap.server.core.analysis.manual.RelationDefineUtil; @@ -28,7 +31,8 @@ import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine; import org.apache.skywalking.oap.server.core.storage.StorageBuilder; -import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.annotation.Column; +import org.apache.skywalking.oap.server.core.storage.annotation.IDColumn; @Stream(name = ServiceRelationClientSideMetrics.INDEX_NAME, scopeId = DefaultScopeDefine.SERVICE_RELATION, builder = ServiceRelationClientSideMetrics.Builder.class, processor = MetricsStreamProcessor.class) public class ServiceRelationClientSideMetrics extends Metrics { @@ -38,15 +42,31 @@ public class ServiceRelationClientSideMetrics extends Metrics { public static final String DEST_SERVICE_ID = "dest_service_id"; public static final String COMPONENT_ID = "component_id"; - @Setter @Getter @Column(columnName = SOURCE_SERVICE_ID) @IDColumn private int sourceServiceId; - @Setter @Getter @Column(columnName = DEST_SERVICE_ID) @IDColumn private int destServiceId; - @Setter @Getter @Column(columnName = COMPONENT_ID) @IDColumn private int componentId; - @Setter(AccessLevel.PRIVATE) @Getter @Column(columnName = ENTITY_ID) @IDColumn private String entityId; - - @Override public String id() { + @Setter + @Getter + @Column(columnName = SOURCE_SERVICE_ID) + @IDColumn + private int sourceServiceId; + @Setter + @Getter + @Column(columnName = DEST_SERVICE_ID) + @IDColumn + private int destServiceId; + @Setter + @Getter + @Column(columnName = COMPONENT_ID) + @IDColumn + private int componentId; + @Setter(AccessLevel.PRIVATE) + @Getter + @Column(columnName = ENTITY_ID) + @IDColumn + private String entityId; + + @Override + public String id() { String splitJointId = String.valueOf(getTimeBucket()); - splitJointId += Const.ID_SPLIT + RelationDefineUtil.buildEntityId( - new RelationDefineUtil.RelationDefine(sourceServiceId, destServiceId, componentId)); + splitJointId += Const.ID_SPLIT + RelationDefineUtil.buildEntityId(new RelationDefineUtil.RelationDefine(sourceServiceId, destServiceId, componentId)); return splitJointId; } @@ -57,15 +77,18 @@ public void buildEntityId() { entityId = splitJointId; } - @Override public void combine(Metrics metrics) { + @Override + public void combine(Metrics metrics) { } - @Override public void calculate() { + @Override + public void calculate() { } - @Override public Metrics toHour() { + @Override + public Metrics toHour() { ServiceRelationClientSideMetrics metrics = new ServiceRelationClientSideMetrics(); metrics.setEntityId(getEntityId()); metrics.setTimeBucket(toTimeBucketInHour()); @@ -75,7 +98,8 @@ public void buildEntityId() { return metrics; } - @Override public Metrics toDay() { + @Override + public Metrics toDay() { ServiceRelationClientSideMetrics metrics = new ServiceRelationClientSideMetrics(); metrics.setEntityId(getEntityId()); metrics.setTimeBucket(toTimeBucketInDay()); @@ -85,7 +109,8 @@ public void buildEntityId() { return metrics; } - @Override public Metrics toMonth() { + @Override + public Metrics toMonth() { ServiceRelationClientSideMetrics metrics = new ServiceRelationClientSideMetrics(); metrics.setEntityId(getEntityId()); metrics.setTimeBucket(toTimeBucketInMonth()); @@ -95,7 +120,8 @@ public void buildEntityId() { return metrics; } - @Override public int remoteHashCode() { + @Override + public int remoteHashCode() { int result = 17; result = 31 * result + sourceServiceId; result = 31 * result + destServiceId; @@ -103,7 +129,8 @@ public void buildEntityId() { return result; } - @Override public void deserialize(RemoteData remoteData) { + @Override + public void deserialize(RemoteData remoteData) { setSourceServiceId(remoteData.getDataIntegers(0)); setDestServiceId(remoteData.getDataIntegers(1)); setComponentId(remoteData.getDataIntegers(2)); @@ -113,7 +140,8 @@ public void buildEntityId() { setEntityId(remoteData.getDataStrings(0)); } - @Override public RemoteData.Builder serialize() { + @Override + public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); remoteBuilder.addDataIntegers(getSourceServiceId()); @@ -126,16 +154,18 @@ public void buildEntityId() { return remoteBuilder; } - @Override public int hashCode() { + @Override + public int hashCode() { int result = 17; result = 31 * result + sourceServiceId; result = 31 * result + destServiceId; result = 31 * result + componentId; - result = 31 * result + (int)getTimeBucket(); + result = 31 * result + (int) getTimeBucket(); return result; } - @Override public boolean equals(Object obj) { + @Override + public boolean equals(Object obj) { if (this == obj) return true; if (obj == null) @@ -143,7 +173,7 @@ public void buildEntityId() { if (getClass() != obj.getClass()) return false; - ServiceRelationClientSideMetrics metrics = (ServiceRelationClientSideMetrics)obj; + ServiceRelationClientSideMetrics metrics = (ServiceRelationClientSideMetrics) obj; if (sourceServiceId != metrics.sourceServiceId) return false; if (destServiceId != metrics.destServiceId) @@ -159,17 +189,19 @@ public void buildEntityId() { public static class Builder implements StorageBuilder { - @Override public ServiceRelationClientSideMetrics map2Data(Map dbMap) { + @Override + public ServiceRelationClientSideMetrics map2Data(Map dbMap) { ServiceRelationClientSideMetrics metrics = new ServiceRelationClientSideMetrics(); - metrics.setSourceServiceId(((Number)dbMap.get(SOURCE_SERVICE_ID)).intValue()); - metrics.setDestServiceId(((Number)dbMap.get(DEST_SERVICE_ID)).intValue()); - metrics.setComponentId(((Number)dbMap.get(COMPONENT_ID)).intValue()); - metrics.setTimeBucket(((Number)dbMap.get(TIME_BUCKET)).longValue()); - metrics.setEntityId((String)dbMap.get(ENTITY_ID)); + metrics.setSourceServiceId(((Number) dbMap.get(SOURCE_SERVICE_ID)).intValue()); + metrics.setDestServiceId(((Number) dbMap.get(DEST_SERVICE_ID)).intValue()); + metrics.setComponentId(((Number) dbMap.get(COMPONENT_ID)).intValue()); + metrics.setTimeBucket(((Number) dbMap.get(TIME_BUCKET)).longValue()); + metrics.setEntityId((String) dbMap.get(ENTITY_ID)); return metrics; } - @Override public Map data2Map(ServiceRelationClientSideMetrics storageData) { + @Override + public Map data2Map(ServiceRelationClientSideMetrics storageData) { Map map = new HashMap<>(); map.put(TIME_BUCKET, storageData.getTimeBucket()); map.put(SOURCE_SERVICE_ID, storageData.getSourceServiceId()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/service/ServiceRelationServerSideMetrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/service/ServiceRelationServerSideMetrics.java index 658a248d864c..f3a6b5152747 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/service/ServiceRelationServerSideMetrics.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/service/ServiceRelationServerSideMetrics.java @@ -18,8 +18,11 @@ package org.apache.skywalking.oap.server.core.analysis.manual.relation.service; -import java.util.*; -import lombok.*; +import java.util.HashMap; +import java.util.Map; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.oap.server.core.Const; import org.apache.skywalking.oap.server.core.analysis.Stream; import org.apache.skywalking.oap.server.core.analysis.manual.RelationDefineUtil; @@ -28,7 +31,8 @@ import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine; import org.apache.skywalking.oap.server.core.storage.StorageBuilder; -import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.annotation.Column; +import org.apache.skywalking.oap.server.core.storage.annotation.IDColumn; @Stream(name = ServiceRelationServerSideMetrics.INDEX_NAME, scopeId = DefaultScopeDefine.SERVICE_RELATION, builder = ServiceRelationServerSideMetrics.Builder.class, processor = MetricsStreamProcessor.class) public class ServiceRelationServerSideMetrics extends Metrics { @@ -38,15 +42,31 @@ public class ServiceRelationServerSideMetrics extends Metrics { public static final String DEST_SERVICE_ID = "dest_service_id"; public static final String COMPONENT_ID = "component_id"; - @Setter @Getter @Column(columnName = SOURCE_SERVICE_ID) @IDColumn private int sourceServiceId; - @Setter @Getter @Column(columnName = DEST_SERVICE_ID) @IDColumn private int destServiceId; - @Setter @Getter @Column(columnName = COMPONENT_ID) @IDColumn private int componentId; - @Setter(AccessLevel.PRIVATE) @Getter @Column(columnName = ENTITY_ID) @IDColumn private String entityId; - - @Override public String id() { + @Setter + @Getter + @Column(columnName = SOURCE_SERVICE_ID) + @IDColumn + private int sourceServiceId; + @Setter + @Getter + @Column(columnName = DEST_SERVICE_ID) + @IDColumn + private int destServiceId; + @Setter + @Getter + @Column(columnName = COMPONENT_ID) + @IDColumn + private int componentId; + @Setter(AccessLevel.PRIVATE) + @Getter + @Column(columnName = ENTITY_ID) + @IDColumn + private String entityId; + + @Override + public String id() { String splitJointId = String.valueOf(getTimeBucket()); - splitJointId += Const.ID_SPLIT + RelationDefineUtil.buildEntityId( - new RelationDefineUtil.RelationDefine(sourceServiceId, destServiceId, componentId)); + splitJointId += Const.ID_SPLIT + RelationDefineUtil.buildEntityId(new RelationDefineUtil.RelationDefine(sourceServiceId, destServiceId, componentId)); return splitJointId; } @@ -57,15 +77,18 @@ public void buildEntityId() { entityId = splitJointId; } - @Override public void combine(Metrics metrics) { + @Override + public void combine(Metrics metrics) { } - @Override public void calculate() { + @Override + public void calculate() { } - @Override public Metrics toHour() { + @Override + public Metrics toHour() { ServiceRelationServerSideMetrics metrics = new ServiceRelationServerSideMetrics(); metrics.setTimeBucket(toTimeBucketInHour()); metrics.setSourceServiceId(getSourceServiceId()); @@ -75,7 +98,8 @@ public void buildEntityId() { return metrics; } - @Override public Metrics toDay() { + @Override + public Metrics toDay() { ServiceRelationServerSideMetrics metrics = new ServiceRelationServerSideMetrics(); metrics.setTimeBucket(toTimeBucketInDay()); metrics.setSourceServiceId(getSourceServiceId()); @@ -85,7 +109,8 @@ public void buildEntityId() { return metrics; } - @Override public Metrics toMonth() { + @Override + public Metrics toMonth() { ServiceRelationServerSideMetrics metrics = new ServiceRelationServerSideMetrics(); metrics.setTimeBucket(toTimeBucketInMonth()); metrics.setSourceServiceId(getSourceServiceId()); @@ -95,7 +120,8 @@ public void buildEntityId() { return metrics; } - @Override public int remoteHashCode() { + @Override + public int remoteHashCode() { int result = 17; result = 31 * result + sourceServiceId; result = 31 * result + destServiceId; @@ -103,7 +129,8 @@ public void buildEntityId() { return result; } - @Override public void deserialize(RemoteData remoteData) { + @Override + public void deserialize(RemoteData remoteData) { setEntityId(remoteData.getDataStrings(0)); setSourceServiceId(remoteData.getDataIntegers(0)); @@ -113,7 +140,8 @@ public void buildEntityId() { setTimeBucket(remoteData.getDataLongs(0)); } - @Override public RemoteData.Builder serialize() { + @Override + public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); remoteBuilder.addDataIntegers(getSourceServiceId()); @@ -126,16 +154,18 @@ public void buildEntityId() { return remoteBuilder; } - @Override public int hashCode() { + @Override + public int hashCode() { int result = 17; result = 31 * result + sourceServiceId; result = 31 * result + destServiceId; result = 31 * result + componentId; - result = 31 * result + (int)getTimeBucket(); + result = 31 * result + (int) getTimeBucket(); return result; } - @Override public boolean equals(Object obj) { + @Override + public boolean equals(Object obj) { if (this == obj) return true; if (obj == null) @@ -143,7 +173,7 @@ public void buildEntityId() { if (getClass() != obj.getClass()) return false; - ServiceRelationServerSideMetrics metrics = (ServiceRelationServerSideMetrics)obj; + ServiceRelationServerSideMetrics metrics = (ServiceRelationServerSideMetrics) obj; if (sourceServiceId != metrics.sourceServiceId) return false; if (destServiceId != metrics.destServiceId) @@ -159,17 +189,19 @@ public void buildEntityId() { public static class Builder implements StorageBuilder { - @Override public ServiceRelationServerSideMetrics map2Data(Map dbMap) { + @Override + public ServiceRelationServerSideMetrics map2Data(Map dbMap) { ServiceRelationServerSideMetrics metrics = new ServiceRelationServerSideMetrics(); - metrics.setEntityId((String)dbMap.get(ENTITY_ID)); - metrics.setSourceServiceId(((Number)dbMap.get(SOURCE_SERVICE_ID)).intValue()); - metrics.setDestServiceId(((Number)dbMap.get(DEST_SERVICE_ID)).intValue()); - metrics.setComponentId(((Number)dbMap.get(COMPONENT_ID)).intValue()); - metrics.setTimeBucket(((Number)dbMap.get(TIME_BUCKET)).longValue()); + metrics.setEntityId((String) dbMap.get(ENTITY_ID)); + metrics.setSourceServiceId(((Number) dbMap.get(SOURCE_SERVICE_ID)).intValue()); + metrics.setDestServiceId(((Number) dbMap.get(DEST_SERVICE_ID)).intValue()); + metrics.setComponentId(((Number) dbMap.get(COMPONENT_ID)).intValue()); + metrics.setTimeBucket(((Number) dbMap.get(TIME_BUCKET)).longValue()); return metrics; } - @Override public Map data2Map(ServiceRelationServerSideMetrics storageData) { + @Override + public Map data2Map(ServiceRelationServerSideMetrics storageData) { Map map = new HashMap<>(); map.put(ENTITY_ID, storageData.getEntityId()); map.put(SOURCE_SERVICE_ID, storageData.getSourceServiceId()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/segment/SegmentDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/segment/SegmentDispatcher.java index e8c77a18f4ba..69f8fab9e4e2 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/segment/SegmentDispatcher.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/segment/SegmentDispatcher.java @@ -22,12 +22,10 @@ import org.apache.skywalking.oap.server.core.analysis.worker.RecordStreamProcessor; import org.apache.skywalking.oap.server.core.source.Segment; -/** - * @author peng-yongsheng - */ public class SegmentDispatcher implements SourceDispatcher { - @Override public void dispatch(Segment source) { + @Override + public void dispatch(Segment source) { SegmentRecord segment = new SegmentRecord(); segment.setSegmentId(source.getSegmentId()); segment.setTraceId(source.getTraceId()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/segment/SegmentRecord.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/segment/SegmentRecord.java index 2b0b090dd51d..b5f94ccf0ce9 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/segment/SegmentRecord.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/segment/SegmentRecord.java @@ -18,8 +18,11 @@ package org.apache.skywalking.oap.server.core.analysis.manual.segment; -import java.util.*; -import lombok.*; +import java.util.Base64; +import java.util.HashMap; +import java.util.Map; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.apm.util.StringUtil; import org.apache.skywalking.oap.server.core.Const; import org.apache.skywalking.oap.server.core.analysis.Stream; @@ -30,9 +33,6 @@ import org.apache.skywalking.oap.server.core.storage.annotation.Column; import org.apache.skywalking.oap.server.library.util.CollectionUtils; -/** - * @author peng-yongsheng - */ @Stream(name = SegmentRecord.INDEX_NAME, scopeId = DefaultScopeDefine.SEGMENT, builder = SegmentRecord.Builder.class, processor = RecordStreamProcessor.class) public class SegmentRecord extends Record { @@ -50,26 +50,64 @@ public class SegmentRecord extends Record { public static final String DATA_BINARY = "data_binary"; public static final String VERSION = "version"; - @Setter @Getter @Column(columnName = SEGMENT_ID) private String segmentId; - @Setter @Getter @Column(columnName = TRACE_ID) private String traceId; - @Setter @Getter @Column(columnName = SERVICE_ID) private int serviceId; - @Setter @Getter @Column(columnName = SERVICE_INSTANCE_ID) private int serviceInstanceId; - @Setter @Getter @Column(columnName = ENDPOINT_NAME, matchQuery = true) private String endpointName; - @Setter @Getter @Column(columnName = ENDPOINT_ID) private int endpointId; - @Setter @Getter @Column(columnName = START_TIME) private long startTime; - @Setter @Getter @Column(columnName = END_TIME) private long endTime; - @Setter @Getter @Column(columnName = LATENCY) private int latency; - @Setter @Getter @Column(columnName = IS_ERROR) private int isError; - @Setter @Getter @Column(columnName = DATA_BINARY) private byte[] dataBinary; - @Setter @Getter @Column(columnName = VERSION) private int version; + @Setter + @Getter + @Column(columnName = SEGMENT_ID) + private String segmentId; + @Setter + @Getter + @Column(columnName = TRACE_ID) + private String traceId; + @Setter + @Getter + @Column(columnName = SERVICE_ID) + private int serviceId; + @Setter + @Getter + @Column(columnName = SERVICE_INSTANCE_ID) + private int serviceInstanceId; + @Setter + @Getter + @Column(columnName = ENDPOINT_NAME, matchQuery = true) + private String endpointName; + @Setter + @Getter + @Column(columnName = ENDPOINT_ID) + private int endpointId; + @Setter + @Getter + @Column(columnName = START_TIME) + private long startTime; + @Setter + @Getter + @Column(columnName = END_TIME) + private long endTime; + @Setter + @Getter + @Column(columnName = LATENCY) + private int latency; + @Setter + @Getter + @Column(columnName = IS_ERROR) + private int isError; + @Setter + @Getter + @Column(columnName = DATA_BINARY) + private byte[] dataBinary; + @Setter + @Getter + @Column(columnName = VERSION) + private int version; - @Override public String id() { + @Override + public String id() { return segmentId; } public static class Builder implements StorageBuilder { - @Override public Map data2Map(SegmentRecord storageData) { + @Override + public Map data2Map(SegmentRecord storageData) { Map map = new HashMap<>(); map.put(SEGMENT_ID, storageData.getSegmentId()); map.put(TRACE_ID, storageData.getTraceId()); @@ -91,25 +129,26 @@ public static class Builder implements StorageBuilder { return map; } - @Override public SegmentRecord map2Data(Map dbMap) { + @Override + public SegmentRecord map2Data(Map dbMap) { SegmentRecord record = new SegmentRecord(); - record.setSegmentId((String)dbMap.get(SEGMENT_ID)); - record.setTraceId((String)dbMap.get(TRACE_ID)); - record.setServiceId(((Number)dbMap.get(SERVICE_ID)).intValue()); - record.setServiceInstanceId(((Number)dbMap.get(SERVICE_INSTANCE_ID)).intValue()); - record.setEndpointName((String)dbMap.get(ENDPOINT_NAME)); - record.setEndpointId(((Number)dbMap.get(ENDPOINT_ID)).intValue()); - record.setStartTime(((Number)dbMap.get(START_TIME)).longValue()); - record.setEndTime(((Number)dbMap.get(END_TIME)).longValue()); - record.setLatency(((Number)dbMap.get(LATENCY)).intValue()); - record.setIsError(((Number)dbMap.get(IS_ERROR)).intValue()); - record.setTimeBucket(((Number)dbMap.get(TIME_BUCKET)).longValue()); - if (StringUtil.isEmpty((String)dbMap.get(DATA_BINARY))) { + record.setSegmentId((String) dbMap.get(SEGMENT_ID)); + record.setTraceId((String) dbMap.get(TRACE_ID)); + record.setServiceId(((Number) dbMap.get(SERVICE_ID)).intValue()); + record.setServiceInstanceId(((Number) dbMap.get(SERVICE_INSTANCE_ID)).intValue()); + record.setEndpointName((String) dbMap.get(ENDPOINT_NAME)); + record.setEndpointId(((Number) dbMap.get(ENDPOINT_ID)).intValue()); + record.setStartTime(((Number) dbMap.get(START_TIME)).longValue()); + record.setEndTime(((Number) dbMap.get(END_TIME)).longValue()); + record.setLatency(((Number) dbMap.get(LATENCY)).intValue()); + record.setIsError(((Number) dbMap.get(IS_ERROR)).intValue()); + record.setTimeBucket(((Number) dbMap.get(TIME_BUCKET)).longValue()); + if (StringUtil.isEmpty((String) dbMap.get(DATA_BINARY))) { record.setDataBinary(new byte[] {}); } else { - record.setDataBinary(Base64.getDecoder().decode((String)dbMap.get(DATA_BINARY))); + record.setDataBinary(Base64.getDecoder().decode((String) dbMap.get(DATA_BINARY))); } - record.setVersion(((Number)dbMap.get(VERSION)).intValue()); + record.setVersion(((Number) dbMap.get(VERSION)).intValue()); return record; } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/ApdexMetrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/ApdexMetrics.java index 9ad11173aadd..25dcae2d03d4 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/ApdexMetrics.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/ApdexMetrics.java @@ -31,13 +31,9 @@ /** * Apdex dissatisfaction levels of Tolerating (apdex_t) and Frustrated (apdex_f) indicate how slow site performance * contributes to poor customer experiences in your app. For example: - * - * 10000: All responses are satisfactory. - * Tolerating responses half satisfy a user. For example, if all responses are Tolerating, then the Apdex value will - * be 5000. - * 0: None of the responses are satisfactory. - * - * @author gaohongtao + *

+ * 10000: All responses are satisfactory. Tolerating responses half satisfy a user. For example, if all responses are + * Tolerating, then the Apdex value will be 5000. 0: None of the responses are satisfactory. */ @MetricsFunction(functionName = "apdex") public abstract class ApdexMetrics extends Metrics implements IntValueHolder { @@ -50,10 +46,22 @@ public abstract class ApdexMetrics extends Metrics implements IntValueHolder { protected static final String T_NUM = "t_num"; protected static final String VALUE = "value"; - @Getter @Setter @Column(columnName = TOTAL_NUM) private int totalNum; - @Getter @Setter @Column(columnName = S_NUM) private int sNum; - @Getter @Setter @Column(columnName = T_NUM) private int tNum; - @Getter @Setter @Column(columnName = VALUE, isValue = true, function = Function.Avg) private int value; + @Getter + @Setter + @Column(columnName = TOTAL_NUM) + private int totalNum; + @Getter + @Setter + @Column(columnName = S_NUM) + private int sNum; + @Getter + @Setter + @Column(columnName = T_NUM) + private int tNum; + @Getter + @Setter + @Column(columnName = VALUE, isValue = true, function = Function.Avg) + private int value; @Entrance public final void combine(@SourceFrom int value, @Arg String name, @Arg boolean status) { @@ -70,17 +78,20 @@ public final void combine(@SourceFrom int value, @Arg String name, @Arg boolean } } - @Override public final void combine(Metrics metrics) { - tNum += ((ApdexMetrics)metrics).tNum; - sNum += ((ApdexMetrics)metrics).sNum; - totalNum += ((ApdexMetrics)metrics).totalNum; + @Override + public final void combine(Metrics metrics) { + tNum += ((ApdexMetrics) metrics).tNum; + sNum += ((ApdexMetrics) metrics).sNum; + totalNum += ((ApdexMetrics) metrics).totalNum; } - @Override public void calculate() { + @Override + public void calculate() { value = (sNum * 10000 + tNum * 10000 / 2) / totalNum; } - @Override public int getValue() { + @Override + public int getValue() { return value; } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/CPMMetrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/CPMMetrics.java index a7ed5a9a6dca..5c3f29f11580 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/CPMMetrics.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/CPMMetrics.java @@ -18,34 +18,42 @@ package org.apache.skywalking.oap.server.core.analysis.metrics; -import lombok.*; -import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.*; +import lombok.Getter; +import lombok.Setter; +import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.ConstOne; +import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.Entrance; +import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.MetricsFunction; import org.apache.skywalking.oap.server.core.query.sql.Function; import org.apache.skywalking.oap.server.core.storage.annotation.Column; -/** - * @author wusheng - */ @MetricsFunction(functionName = "cpm") public abstract class CPMMetrics extends Metrics implements LongValueHolder { protected static final String VALUE = "value"; protected static final String TOTAL = "total"; - @Getter @Setter @Column(columnName = VALUE, isValue = true, function = Function.Avg) private long value; - @Getter @Setter @Column(columnName = TOTAL) private long total; + @Getter + @Setter + @Column(columnName = VALUE, isValue = true, function = Function.Avg) + private long value; + @Getter + @Setter + @Column(columnName = TOTAL) + private long total; @Entrance public final void combine(@ConstOne long count) { this.total += count; } - @Override public final void combine(Metrics metrics) { - CPMMetrics cpmMetrics = (CPMMetrics)metrics; + @Override + public final void combine(Metrics metrics) { + CPMMetrics cpmMetrics = (CPMMetrics) metrics; combine(cpmMetrics.total); } - @Override public void calculate() { + @Override + public void calculate() { this.value = total / getDurationInMinute(); } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/CountMetrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/CountMetrics.java index 7aab20cc403e..2313fd06d043 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/CountMetrics.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/CountMetrics.java @@ -18,31 +18,36 @@ package org.apache.skywalking.oap.server.core.analysis.metrics; -import lombok.*; -import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.*; +import lombok.Getter; +import lombok.Setter; +import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.ConstOne; +import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.Entrance; +import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.MetricsFunction; import org.apache.skywalking.oap.server.core.query.sql.Function; import org.apache.skywalking.oap.server.core.storage.annotation.Column; -/** - * @author peng-yongsheng - */ @MetricsFunction(functionName = "count") public abstract class CountMetrics extends Metrics implements LongValueHolder { protected static final String VALUE = "value"; - @Getter @Setter @Column(columnName = VALUE, isValue = true, function = Function.Sum) private long value; + @Getter + @Setter + @Column(columnName = VALUE, isValue = true, function = Function.Sum) + private long value; @Entrance public final void combine(@ConstOne long count) { this.value += count; } - @Override public final void combine(Metrics metrics) { - CountMetrics countMetrics = (CountMetrics)metrics; + @Override + public final void combine(Metrics metrics) { + CountMetrics countMetrics = (CountMetrics) metrics; combine(countMetrics.value); } - @Override public void calculate() { + @Override + public void calculate() { } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/DoubleAvgMetrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/DoubleAvgMetrics.java index 850c580936d6..07af20b585a0 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/DoubleAvgMetrics.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/DoubleAvgMetrics.java @@ -18,14 +18,15 @@ package org.apache.skywalking.oap.server.core.analysis.metrics; -import lombok.*; -import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.*; +import lombok.Getter; +import lombok.Setter; +import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.ConstOne; +import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.Entrance; +import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.MetricsFunction; +import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.SourceFrom; import org.apache.skywalking.oap.server.core.query.sql.Function; import org.apache.skywalking.oap.server.core.storage.annotation.Column; -/** - * @author peng-yongsheng - */ @MetricsFunction(functionName = "doubleAvg") public abstract class DoubleAvgMetrics extends Metrics implements DoubleValueHolder { @@ -33,9 +34,18 @@ public abstract class DoubleAvgMetrics extends Metrics implements DoubleValueHol protected static final String COUNT = "count"; protected static final String VALUE = "value"; - @Getter @Setter @Column(columnName = SUMMATION) private double summation; - @Getter @Setter @Column(columnName = COUNT) private long count; - @Getter @Setter @Column(columnName = VALUE, isValue = true, function = Function.Avg) private double value; + @Getter + @Setter + @Column(columnName = SUMMATION) + private double summation; + @Getter + @Setter + @Column(columnName = COUNT) + private long count; + @Getter + @Setter + @Column(columnName = VALUE, isValue = true, function = Function.Avg) + private double value; @Entrance public final void combine(@SourceFrom double summation, @ConstOne long count) { @@ -43,12 +53,14 @@ public final void combine(@SourceFrom double summation, @ConstOne long count) { this.count += count; } - @Override public final void combine(Metrics metrics) { - DoubleAvgMetrics doubleAvgMetrics = (DoubleAvgMetrics)metrics; + @Override + public final void combine(Metrics metrics) { + DoubleAvgMetrics doubleAvgMetrics = (DoubleAvgMetrics) metrics; combine(doubleAvgMetrics.summation, doubleAvgMetrics.count); } - @Override public final void calculate() { + @Override + public final void calculate() { this.value = this.summation / this.count; } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/DoubleValueHolder.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/DoubleValueHolder.java index f42406eab3a8..13cf3773584e 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/DoubleValueHolder.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/DoubleValueHolder.java @@ -20,8 +20,6 @@ /** * DoubleValueHolder always holds a value of double. - * - * @author wusheng */ public interface DoubleValueHolder { double getValue(); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/GroupMetrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/GroupMetrics.java index 72052d2b2591..c1b818de1b04 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/GroupMetrics.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/GroupMetrics.java @@ -17,9 +17,6 @@ package org.apache.skywalking.oap.server.core.analysis.metrics; -/** - * @author peng-yongsheng - */ public abstract class GroupMetrics extends Metrics { protected void combine(IntKeyLongValueHashMap source, IntKeyLongValueHashMap target) { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/IntKeyLongValue.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/IntKeyLongValue.java index bcfde3929e44..a0907cd88a21 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/IntKeyLongValue.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/IntKeyLongValue.java @@ -19,15 +19,14 @@ package org.apache.skywalking.oap.server.core.analysis.metrics; import java.util.Objects; -import lombok.*; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.oap.server.core.Const; import org.apache.skywalking.oap.server.core.remote.grpc.proto.IntKeyLongValuePair; import org.apache.skywalking.oap.server.core.storage.type.StorageDataType; /** * IntKeyLongValue is a common bean, with key in Int and value in Long - * - * @author wusheng, peng-yongsheng */ @Setter @Getter @@ -52,16 +51,18 @@ public int compareTo(IntKeyLongValue o) { return key - o.key; } - @Override public boolean equals(Object o) { + @Override + public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - IntKeyLongValue value = (IntKeyLongValue)o; + IntKeyLongValue value = (IntKeyLongValue) o; return key == value.key; } - @Override public int hashCode() { + @Override + public int hashCode() { return Objects.hash(key); } @@ -74,18 +75,21 @@ public void deserialize(IntKeyLongValuePair pair) { this.value = pair.getValue(); } - @Override public String toStorageData() { + @Override + public String toStorageData() { return key + Const.KEY_VALUE_SPLIT + value; } - @Override public void toObject(String data) { + @Override + public void toObject(String data) { String[] keyValue = data.split(Const.KEY_VALUE_SPLIT); this.key = Integer.valueOf(keyValue[0]); this.value = Long.valueOf(keyValue[1]); } - @Override public void copyFrom(Object source) { - IntKeyLongValue value = (IntKeyLongValue)source; + @Override + public void copyFrom(Object source) { + IntKeyLongValue value = (IntKeyLongValue) source; this.key = value.key; this.value = value.value; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/IntKeyLongValueHashMap.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/IntKeyLongValueHashMap.java index ba6d72e4ec2b..d2d149e29173 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/IntKeyLongValueHashMap.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/IntKeyLongValueHashMap.java @@ -17,13 +17,13 @@ package org.apache.skywalking.oap.server.core.analysis.metrics; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import org.apache.skywalking.oap.server.core.Const; import org.apache.skywalking.oap.server.core.storage.type.StorageDataType; -/** - * @author peng-yongsheng - */ public class IntKeyLongValueHashMap extends HashMap implements StorageDataType { public IntKeyLongValueHashMap() { @@ -39,7 +39,8 @@ public IntKeyLongValueHashMap(String data) { toObject(data); } - @Override public String toStorageData() { + @Override + public String toStorageData() { StringBuilder data = new StringBuilder(); List> list = new ArrayList<>(this.entrySet()); @@ -54,7 +55,8 @@ public IntKeyLongValueHashMap(String data) { return data.toString(); } - @Override public void toObject(String data) { + @Override + public void toObject(String data) { String[] keyValues = data.split(Const.ARRAY_PARSER_SPLIT); for (String keyValue : keyValues) { IntKeyLongValue value = new IntKeyLongValue(); @@ -63,8 +65,9 @@ public IntKeyLongValueHashMap(String data) { } } - @Override public void copyFrom(Object source) { - IntKeyLongValueHashMap intKeyLongValueHashMap = (IntKeyLongValueHashMap)source; + @Override + public void copyFrom(Object source) { + IntKeyLongValueHashMap intKeyLongValueHashMap = (IntKeyLongValueHashMap) source; intKeyLongValueHashMap.values().forEach(value -> { IntKeyLongValue newValue = new IntKeyLongValue(); newValue.copyFrom(value); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/IntValueHolder.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/IntValueHolder.java index 52c40770e17f..61af7930cd07 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/IntValueHolder.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/IntValueHolder.java @@ -20,8 +20,6 @@ /** * IntValueHolder always holds a value of int. - * - * @author wusheng */ public interface IntValueHolder { int getValue(); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/LongAvgMetrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/LongAvgMetrics.java index a0d5c3a61e95..4773a75613fc 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/LongAvgMetrics.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/LongAvgMetrics.java @@ -18,14 +18,15 @@ package org.apache.skywalking.oap.server.core.analysis.metrics; -import lombok.*; -import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.*; +import lombok.Getter; +import lombok.Setter; +import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.ConstOne; +import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.Entrance; +import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.MetricsFunction; +import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.SourceFrom; import org.apache.skywalking.oap.server.core.query.sql.Function; import org.apache.skywalking.oap.server.core.storage.annotation.Column; -/** - * @author peng-yongsheng - */ @MetricsFunction(functionName = "longAvg") public abstract class LongAvgMetrics extends Metrics implements LongValueHolder { @@ -33,9 +34,18 @@ public abstract class LongAvgMetrics extends Metrics implements LongValueHolder protected static final String COUNT = "count"; protected static final String VALUE = "value"; - @Getter @Setter @Column(columnName = SUMMATION) private long summation; - @Getter @Setter @Column(columnName = COUNT) private long count; - @Getter @Setter @Column(columnName = VALUE, isValue = true, function = Function.Avg) private long value; + @Getter + @Setter + @Column(columnName = SUMMATION) + private long summation; + @Getter + @Setter + @Column(columnName = COUNT) + private long count; + @Getter + @Setter + @Column(columnName = VALUE, isValue = true, function = Function.Avg) + private long value; @Entrance public final void combine(@SourceFrom long summation, @ConstOne long count) { @@ -43,12 +53,14 @@ public final void combine(@SourceFrom long summation, @ConstOne long count) { this.count += count; } - @Override public final void combine(Metrics metrics) { - LongAvgMetrics longAvgMetrics = (LongAvgMetrics)metrics; + @Override + public final void combine(Metrics metrics) { + LongAvgMetrics longAvgMetrics = (LongAvgMetrics) metrics; combine(longAvgMetrics.summation, longAvgMetrics.count); } - @Override public final void calculate() { + @Override + public final void calculate() { this.value = this.summation / this.count; } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/LongValueHolder.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/LongValueHolder.java index 904325d13927..f526b8ec4f04 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/LongValueHolder.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/LongValueHolder.java @@ -20,8 +20,6 @@ /** * LongValueHolder always holds a value of long. - * - * @author wusheng */ public interface LongValueHolder { long getValue(); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MaxDoubleMetrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MaxDoubleMetrics.java index c953710e002c..db8029e94c71 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MaxDoubleMetrics.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MaxDoubleMetrics.java @@ -18,19 +18,22 @@ package org.apache.skywalking.oap.server.core.analysis.metrics; -import lombok.*; -import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.*; +import lombok.Getter; +import lombok.Setter; +import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.Entrance; +import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.MetricsFunction; +import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.SourceFrom; import org.apache.skywalking.oap.server.core.storage.annotation.Column; -/** - * @author wusheng - */ @MetricsFunction(functionName = "maxDouble") public abstract class MaxDoubleMetrics extends Metrics implements DoubleValueHolder { protected static final String VALUE = "value"; - @Getter @Setter @Column(columnName = VALUE, isValue = true) private double value; + @Getter + @Setter + @Column(columnName = VALUE, isValue = true) + private double value; @Entrance public final void combine(@SourceFrom double count) { @@ -39,11 +42,13 @@ public final void combine(@SourceFrom double count) { } } - @Override public final void combine(Metrics metrics) { - MaxDoubleMetrics maxDoubleMetrics = (MaxDoubleMetrics)metrics; + @Override + public final void combine(Metrics metrics) { + MaxDoubleMetrics maxDoubleMetrics = (MaxDoubleMetrics) metrics; combine(maxDoubleMetrics.value); } - @Override public void calculate() { + @Override + public void calculate() { } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MaxLongMetrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MaxLongMetrics.java index f336aaaf3302..ff0a8fac53de 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MaxLongMetrics.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MaxLongMetrics.java @@ -18,19 +18,25 @@ package org.apache.skywalking.oap.server.core.analysis.metrics; -import lombok.*; -import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.*; +import lombok.Getter; +import lombok.Setter; +import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.Entrance; +import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.MetricsFunction; +import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.SourceFrom; import org.apache.skywalking.oap.server.core.storage.annotation.Column; /** - * @author liuhaoyang + * **/ @MetricsFunction(functionName = "max") public abstract class MaxLongMetrics extends Metrics implements LongValueHolder { protected static final String VALUE = "value"; - @Getter @Setter @Column(columnName = VALUE, isValue = true) private long value; + @Getter + @Setter + @Column(columnName = VALUE, isValue = true) + private long value; @Entrance public final void combine(@SourceFrom long count) { @@ -39,11 +45,13 @@ public final void combine(@SourceFrom long count) { } } - @Override public final void combine(Metrics metrics) { - MaxLongMetrics maxLongMetrics = (MaxLongMetrics)metrics; + @Override + public final void combine(Metrics metrics) { + MaxLongMetrics maxLongMetrics = (MaxLongMetrics) metrics; combine(maxLongMetrics.value); } - @Override public void calculate() { + @Override + public void calculate() { } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/Metrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/Metrics.java index 4254a1cff05d..065a98c05b37 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/Metrics.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/Metrics.java @@ -18,22 +18,26 @@ package org.apache.skywalking.oap.server.core.analysis.metrics; -import lombok.*; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.oap.server.core.remote.data.StreamData; import org.apache.skywalking.oap.server.core.storage.StorageData; import org.apache.skywalking.oap.server.core.storage.annotation.Column; -import org.joda.time.format.*; +import org.joda.time.format.DateTimeFormat; +import org.joda.time.format.DateTimeFormatter; -/** - * @author peng-yongsheng - */ public abstract class Metrics extends StreamData implements StorageData { public static final String TIME_BUCKET = "time_bucket"; public static final String ENTITY_ID = "entity_id"; - @Getter @Setter @Column(columnName = TIME_BUCKET) private long timeBucket; - @Getter @Setter private long survivalTime = 0L; + @Getter + @Setter + @Column(columnName = TIME_BUCKET) + private long timeBucket; + @Getter + @Setter + private long survivalTime = 0L; public abstract String id(); @@ -79,8 +83,6 @@ public long toTimeBucketInMonth() { /** * Always get the duration for this time bucket in minute. - * - * @return minutes. */ protected long getDurationInMinute() { if (isMinuteBucket()) { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MetricsMetaInfo.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MetricsMetaInfo.java index 59a547bccd26..6540204baab8 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MetricsMetaInfo.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MetricsMetaInfo.java @@ -18,16 +18,20 @@ package org.apache.skywalking.oap.server.core.analysis.metrics; -import lombok.*; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.oap.server.core.Const; -/** - * @author wusheng - */ public class MetricsMetaInfo { - @Setter @Getter private String metricsName; - @Setter @Getter private int scope; - @Setter @Getter private String id; + @Setter + @Getter + private String metricsName; + @Setter + @Getter + private int scope; + @Setter + @Getter + private String id; public MetricsMetaInfo(String metricsName, int scope) { this.metricsName = metricsName; @@ -41,11 +45,8 @@ public MetricsMetaInfo(String metricsName, int scope, String id) { this.id = id; } - @Override public String toString() { - return "MetricsMetaInfo{" + - "metricsName='" + metricsName + '\'' + - ", scope=" + scope + - ", id='" + id + '\'' + - '}'; + @Override + public String toString() { + return "MetricsMetaInfo{" + "metricsName='" + metricsName + '\'' + ", scope=" + scope + ", id='" + id + '\'' + '}'; } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MinDoubleMetrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MinDoubleMetrics.java index 349a75d766eb..d1fa0e391ad8 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MinDoubleMetrics.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MinDoubleMetrics.java @@ -25,16 +25,15 @@ import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.SourceFrom; import org.apache.skywalking.oap.server.core.storage.annotation.Column; -/** - * @author jian.tan - */ - @MetricsFunction(functionName = "minDouble") public abstract class MinDoubleMetrics extends Metrics implements DoubleValueHolder { protected static final String VALUE = "value"; - @Getter @Setter @Column(columnName = VALUE, isValue = true) private double value = Double.MAX_VALUE; + @Getter + @Setter + @Column(columnName = VALUE, isValue = true) + private double value = Double.MAX_VALUE; @Entrance public final void combine(@SourceFrom double count) { @@ -43,11 +42,13 @@ public final void combine(@SourceFrom double count) { } } - @Override public final void combine(Metrics metrics) { - MinDoubleMetrics minDoubleMetrics = (MinDoubleMetrics)metrics; + @Override + public final void combine(Metrics metrics) { + MinDoubleMetrics minDoubleMetrics = (MinDoubleMetrics) metrics; combine(minDoubleMetrics.value); } - @Override public void calculate() { + @Override + public void calculate() { } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MinLongMetrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MinLongMetrics.java index 8d370d9e0483..2f95895f500b 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MinLongMetrics.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MinLongMetrics.java @@ -25,16 +25,15 @@ import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.SourceFrom; import org.apache.skywalking.oap.server.core.storage.annotation.Column; -/** - * @author jian.tan - */ - @MetricsFunction(functionName = "min") public abstract class MinLongMetrics extends Metrics implements LongValueHolder { protected static final String VALUE = "value"; - @Getter @Setter @Column(columnName = VALUE, isValue = true) private long value = Long.MAX_VALUE; + @Getter + @Setter + @Column(columnName = VALUE, isValue = true) + private long value = Long.MAX_VALUE; @Entrance public final void combine(@SourceFrom long count) { @@ -43,11 +42,13 @@ public final void combine(@SourceFrom long count) { } } - @Override public final void combine(Metrics metrics) { - MinLongMetrics minLongMetrics = (MinLongMetrics)metrics; + @Override + public final void combine(Metrics metrics) { + MinLongMetrics minLongMetrics = (MinLongMetrics) metrics; combine(minLongMetrics.value); } - @Override public void calculate() { + @Override + public void calculate() { } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MultiIntValuesHolder.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MultiIntValuesHolder.java index f8fefd53d5b1..46b095f455ae 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MultiIntValuesHolder.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/MultiIntValuesHolder.java @@ -20,8 +20,6 @@ /** * MultiIntValuesHolder always holds a set of int(s). - * - * @author wusheng */ public interface MultiIntValuesHolder { int[] getValues(); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/P50Metrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/P50Metrics.java index 238eac1e19a7..bc20a15dd6f4 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/P50Metrics.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/P50Metrics.java @@ -22,8 +22,6 @@ /** * P50 - * - * @author wusheng */ @MetricsFunction(functionName = "p50") public abstract class P50Metrics extends PxxMetrics { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/P75Metrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/P75Metrics.java index 208eb8670b87..c6b68a28f8dd 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/P75Metrics.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/P75Metrics.java @@ -22,8 +22,6 @@ /** * P75 - * - * @author wusheng */ @MetricsFunction(functionName = "p75") public abstract class P75Metrics extends PxxMetrics { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/P90Metrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/P90Metrics.java index 9e5464e5b2d1..058fc24c29bb 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/P90Metrics.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/P90Metrics.java @@ -22,8 +22,6 @@ /** * P90 - * - * @author wusheng */ @MetricsFunction(functionName = "p90") public abstract class P90Metrics extends PxxMetrics { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/P95Metrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/P95Metrics.java index 8e5384285e56..e4c4ffecdb7c 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/P95Metrics.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/P95Metrics.java @@ -22,8 +22,6 @@ /** * P95 - * - * @author wusheng */ @MetricsFunction(functionName = "p95") public abstract class P95Metrics extends PxxMetrics { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/P99Metrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/P99Metrics.java index 376d5bf97daa..a97d88e1dac1 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/P99Metrics.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/P99Metrics.java @@ -22,8 +22,6 @@ /** * P99 - * - * @author wusheng */ @MetricsFunction(functionName = "p99") public abstract class P99Metrics extends PxxMetrics { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/PercentMetrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/PercentMetrics.java index e88539ce85ab..e4b0d08bc392 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/PercentMetrics.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/PercentMetrics.java @@ -26,18 +26,24 @@ import org.apache.skywalking.oap.server.core.query.sql.Function; import org.apache.skywalking.oap.server.core.storage.annotation.Column; -/** - * @author wusheng - */ @MetricsFunction(functionName = "percent") public abstract class PercentMetrics extends Metrics implements IntValueHolder { protected static final String TOTAL = "total"; protected static final String MATCH = "match"; protected static final String PERCENTAGE = "percentage"; - @Getter @Setter @Column(columnName = TOTAL) private long total; - @Getter @Setter @Column(columnName = PERCENTAGE, isValue = true, function = Function.Avg) private int percentage; - @Getter @Setter @Column(columnName = MATCH) private long match; + @Getter + @Setter + @Column(columnName = TOTAL) + private long total; + @Getter + @Setter + @Column(columnName = PERCENTAGE, isValue = true, function = Function.Avg) + private int percentage; + @Getter + @Setter + @Column(columnName = MATCH) + private long match; @Entrance public final void combine(@Expression boolean isMatch) { @@ -47,16 +53,19 @@ public final void combine(@Expression boolean isMatch) { total++; } - @Override public final void combine(Metrics metrics) { - total += ((PercentMetrics)metrics).total; - match += ((PercentMetrics)metrics).match; + @Override + public final void combine(Metrics metrics) { + total += ((PercentMetrics) metrics).total; + match += ((PercentMetrics) metrics).match; } - @Override public void calculate() { - percentage = (int)(match * 10000 / total); + @Override + public void calculate() { + percentage = (int) (match * 10000 / total); } - @Override public int getValue() { + @Override + public int getValue() { return percentage; } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/PercentileMetrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/PercentileMetrics.java index a622250619bb..2c0e2b294290 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/PercentileMetrics.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/PercentileMetrics.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.oap.server.core.analysis.metrics; import java.util.Comparator; @@ -31,8 +30,6 @@ /** * Percentile is a better implementation than {@link PxxMetrics}. It is introduced since 7.0.0, it could calculate the * multiple P50/75/90/95/99 values once for all. - * - * @author wusheng */ @MetricsFunction(functionName = "percentile") public abstract class PercentileMetrics extends GroupMetrics implements MultiIntValuesHolder { @@ -40,11 +37,26 @@ public abstract class PercentileMetrics extends GroupMetrics implements MultiInt protected static final String VALUE = "value"; protected static final String PRECISION = "precision"; - private static final int[] RANKS = {50, 75, 90, 95, 99}; - - @Getter @Setter @Column(columnName = VALUE, isValue = true) private IntKeyLongValueHashMap percentileValues; - @Getter @Setter @Column(columnName = PRECISION) private int precision; - @Getter @Setter @Column(columnName = DATASET) private IntKeyLongValueHashMap dataset; + private static final int[] RANKS = { + 50, + 75, + 90, + 95, + 99 + }; + + @Getter + @Setter + @Column(columnName = VALUE, isValue = true) + private IntKeyLongValueHashMap percentileValues; + @Getter + @Setter + @Column(columnName = PRECISION) + private int precision; + @Getter + @Setter + @Column(columnName = DATASET) + private IntKeyLongValueHashMap dataset; private boolean isCalculated; @@ -72,7 +84,7 @@ public final void combine(@SourceFrom int value, @Arg int precision) { public void combine(Metrics metrics) { this.isCalculated = false; - PercentileMetrics percentileMetrics = (PercentileMetrics)metrics; + PercentileMetrics percentileMetrics = (PercentileMetrics) metrics; combine(percentileMetrics.getDataset(), this.dataset); } @@ -80,7 +92,7 @@ public void combine(Metrics metrics) { public final void calculate() { if (!isCalculated) { - int total = dataset.values().stream().mapToInt(element -> (int)element.getValue()).sum(); + int total = dataset.values().stream().mapToInt(element -> (int) element.getValue()).sum(); int index = 0; int[] roofs = new int[RANKS.length]; @@ -112,7 +124,7 @@ public final void calculate() { public int[] getValues() { int[] values = new int[percentileValues.size()]; for (int i = 0; i < values.length; i++) { - values[i] = (int)percentileValues.get(i).getValue(); + values[i] = (int) percentileValues.get(i).getValue(); } return values; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/PxxMetrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/PxxMetrics.java index a9026801cb16..658b75724e75 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/PxxMetrics.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/PxxMetrics.java @@ -19,19 +19,20 @@ package org.apache.skywalking.oap.server.core.analysis.metrics; import java.util.Comparator; -import lombok.*; -import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.*; +import lombok.Getter; +import lombok.Setter; +import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.Arg; +import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.Entrance; +import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.SourceFrom; import org.apache.skywalking.oap.server.core.query.sql.Function; import org.apache.skywalking.oap.server.core.storage.annotation.Column; /** * PxxMetrics is a parent metrics for p99/p95/p90/p75/p50 metrics. P(xx) metrics is also for P(xx) percentile. - * + *

* A percentile (or a centile) is a measure used in statistics indicating the value below which a given percentage of * observations in a group of observations fall. For example, the 20th percentile is the value (or score) below which * 20% of the observations may be found. - * - * @author wusheng, peng-yongsheng */ public abstract class PxxMetrics extends GroupMetrics implements IntValueHolder { @@ -39,9 +40,18 @@ public abstract class PxxMetrics extends GroupMetrics implements IntValueHolder protected static final String VALUE = "value"; protected static final String PRECISION = "precision"; - @Getter @Setter @Column(columnName = VALUE, isValue = true, function = Function.Avg) private int value; - @Getter @Setter @Column(columnName = PRECISION) private int precision; - @Getter @Setter @Column(columnName = DETAIL_GROUP) private IntKeyLongValueHashMap detailGroup; + @Getter + @Setter + @Column(columnName = VALUE, isValue = true, function = Function.Avg) + private int value; + @Getter + @Setter + @Column(columnName = PRECISION) + private int precision; + @Getter + @Setter + @Column(columnName = DETAIL_GROUP) + private IntKeyLongValueHashMap detailGroup; private final int percentileRank; private boolean isCalculated; @@ -70,7 +80,7 @@ public final void combine(@SourceFrom int value, @Arg int precision) { public void combine(Metrics metrics) { this.isCalculated = false; - PxxMetrics pxxMetrics = (PxxMetrics)metrics; + PxxMetrics pxxMetrics = (PxxMetrics) metrics; combine(pxxMetrics.getDetailGroup(), this.detailGroup); } @@ -78,12 +88,13 @@ public void combine(Metrics metrics) { public final void calculate() { if (!isCalculated) { - int total = detailGroup.values().stream().mapToInt(element -> (int)element.getValue()).sum(); + int total = detailGroup.values().stream().mapToInt(element -> (int) element.getValue()).sum(); int roof = Math.round(total * percentileRank * 1.0f / 100); int count = 0; IntKeyLongValue[] sortedData = detailGroup.values().stream().sorted(new Comparator() { - @Override public int compare(IntKeyLongValue o1, IntKeyLongValue o2) { + @Override + public int compare(IntKeyLongValue o1, IntKeyLongValue o2) { return o1.getKey() - o2.getKey(); } }).toArray(IntKeyLongValue[]::new); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/SumMetrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/SumMetrics.java index 8a83844e58fc..91044b5d6e7d 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/SumMetrics.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/SumMetrics.java @@ -18,31 +18,36 @@ package org.apache.skywalking.oap.server.core.analysis.metrics; -import lombok.*; -import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.*; +import lombok.Getter; +import lombok.Setter; +import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.Entrance; +import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.MetricsFunction; +import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.SourceFrom; import org.apache.skywalking.oap.server.core.query.sql.Function; import org.apache.skywalking.oap.server.core.storage.annotation.Column; -/** - * @author wusheng - */ @MetricsFunction(functionName = "sum") public abstract class SumMetrics extends Metrics implements LongValueHolder { protected static final String VALUE = "value"; - @Getter @Setter @Column(columnName = VALUE, isValue = true, function = Function.Sum) private long value; + @Getter + @Setter + @Column(columnName = VALUE, isValue = true, function = Function.Sum) + private long value; @Entrance public final void combine(@SourceFrom long count) { this.value += count; } - @Override public final void combine(Metrics metrics) { - SumMetrics sumMetrics = (SumMetrics)metrics; + @Override + public final void combine(Metrics metrics) { + SumMetrics sumMetrics = (SumMetrics) metrics; combine(sumMetrics.value); } - @Override public void calculate() { + @Override + public void calculate() { } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/ThermodynamicMetrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/ThermodynamicMetrics.java index a23c7a7dcd63..cc238dbc59bd 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/ThermodynamicMetrics.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/ThermodynamicMetrics.java @@ -18,19 +18,21 @@ package org.apache.skywalking.oap.server.core.analysis.metrics; -import lombok.*; -import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.*; +import lombok.Getter; +import lombok.Setter; +import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.Arg; +import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.Entrance; +import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.MetricsFunction; +import org.apache.skywalking.oap.server.core.analysis.metrics.annotation.SourceFrom; import org.apache.skywalking.oap.server.core.storage.annotation.Column; /** * Thermodynamic metrics represents the calculator for heat map. - * + *

* It groups the given collection of values by the given step and number of steps. - * + *

* A heat map (or heatmap) is a graphical representation of data where the individual values contained in a matrix are * represented as colors. - * - * @author wusheng, peng-yongsheng */ @MetricsFunction(functionName = "thermodynamic") public abstract class ThermodynamicMetrics extends GroupMetrics { @@ -39,18 +41,26 @@ public abstract class ThermodynamicMetrics extends GroupMetrics { public static final String STEP = "step"; public static final String NUM_OF_STEPS = "num_of_steps"; - @Getter @Setter @Column(columnName = STEP) private int step = 0; - @Getter @Setter @Column(columnName = NUM_OF_STEPS) private int numOfSteps = 0; - @Getter @Setter @Column(columnName = DETAIL_GROUP, isValue = true) private IntKeyLongValueHashMap detailGroup = new IntKeyLongValueHashMap(30); + @Getter + @Setter + @Column(columnName = STEP) + private int step = 0; + @Getter + @Setter + @Column(columnName = NUM_OF_STEPS) + private int numOfSteps = 0; + @Getter + @Setter + @Column(columnName = DETAIL_GROUP, isValue = true) + private IntKeyLongValueHashMap detailGroup = new IntKeyLongValueHashMap(30); /** * Data will be grouped in - * + *

* [0, step), [step, step * 2), ..., [step * (maxNumOfSteps - 1), step * maxNumOfSteps), [step * maxNumOfSteps, * MAX) * - * @param value - * @param step the size of each step. A positive integer. + * @param step the size of each step. A positive integer. * @param maxNumOfSteps Steps are used to group incoming value. */ @Entrance @@ -78,7 +88,7 @@ public final void combine(@SourceFrom int value, @Arg int step, @Arg int maxNumO @Override public void combine(Metrics metrics) { - ThermodynamicMetrics thermodynamicMetrics = (ThermodynamicMetrics)metrics; + ThermodynamicMetrics thermodynamicMetrics = (ThermodynamicMetrics) metrics; combine(thermodynamicMetrics.getDetailGroup(), this.detailGroup); } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/WithMetadata.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/WithMetadata.java index 1ada004d89fd..1672f8e62336 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/WithMetadata.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/WithMetadata.java @@ -20,8 +20,6 @@ /** * Metrics, which implement this interface, could provide {@link MetricsMetaInfo}. - * - * @author wusheng */ public interface WithMetadata { MetricsMetaInfo getMeta(); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/annotation/Arg.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/annotation/Arg.java index 9a4a271dc5bf..b974060744a3 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/annotation/Arg.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/annotation/Arg.java @@ -23,9 +23,6 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -/** - * @author wusheng - */ @Target(ElementType.PARAMETER) @Retention(RetentionPolicy.RUNTIME) public @interface Arg { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/annotation/ConstOne.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/annotation/ConstOne.java index 693c9573b06b..570a65ac3ace 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/annotation/ConstOne.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/annotation/ConstOne.java @@ -18,11 +18,11 @@ package org.apache.skywalking.oap.server.core.analysis.metrics.annotation; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; -/** - * @author peng-yongsheng - */ @Target(ElementType.PARAMETER) @Retention(RetentionPolicy.RUNTIME) public @interface ConstOne { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/annotation/Entrance.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/annotation/Entrance.java index 5ebf15706bb7..584dd9af30ba 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/annotation/Entrance.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/annotation/Entrance.java @@ -18,11 +18,11 @@ package org.apache.skywalking.oap.server.core.analysis.metrics.annotation; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; -/** - * @author peng-yongsheng - */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) public @interface Entrance { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/annotation/Expression.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/annotation/Expression.java index 8909990b6f95..d653f476b85a 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/annotation/Expression.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/annotation/Expression.java @@ -23,9 +23,6 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -/** - * @author wusheng - */ @Target(ElementType.PARAMETER) @Retention(RetentionPolicy.RUNTIME) public @interface Expression { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/annotation/MetricsFunction.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/annotation/MetricsFunction.java index 6adaf5869a00..6d4631c34f06 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/annotation/MetricsFunction.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/annotation/MetricsFunction.java @@ -18,12 +18,13 @@ package org.apache.skywalking.oap.server.core.analysis.metrics.annotation; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * MetricsFunction annotation represent this a function in OAL script. - * - * @author wusheng */ @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/annotation/SourceFrom.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/annotation/SourceFrom.java index 1d2ca66adc73..89edd08f97e1 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/annotation/SourceFrom.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/annotation/SourceFrom.java @@ -18,11 +18,11 @@ package org.apache.skywalking.oap.server.core.analysis.metrics.annotation; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; -/** - * @author peng-yongsheng - */ @Target(ElementType.PARAMETER) @Retention(RetentionPolicy.RUNTIME) public @interface SourceFrom { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/EqualMatch.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/EqualMatch.java index 96e4849b6177..952d4c548de4 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/EqualMatch.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/EqualMatch.java @@ -20,9 +20,6 @@ import java.util.Objects; -/** - * @author wusheng - */ public class EqualMatch { public boolean match(int left, int right) { return left == right; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/GreaterEqualMatch.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/GreaterEqualMatch.java index 7c8f455613da..58395919d000 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/GreaterEqualMatch.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/GreaterEqualMatch.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.core.analysis.metrics.expression; -/** - * @author peng-yongsheng - */ public class GreaterEqualMatch { public boolean match(int left, int right) { return left >= right; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/GreaterMatch.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/GreaterMatch.java index 7a82dc0fea87..1b8b479d75d8 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/GreaterMatch.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/GreaterMatch.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.core.analysis.metrics.expression; -/** - * @author peng-yongsheng - */ public class GreaterMatch { public boolean match(int left, int right) { return left > right; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/LessEqualMatch.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/LessEqualMatch.java index 4590dab5d83d..95276c832261 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/LessEqualMatch.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/LessEqualMatch.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.core.analysis.metrics.expression; -/** - * @author peng-yongsheng - */ public class LessEqualMatch { public boolean match(int left, int right) { return left <= right; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/LessMatch.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/LessMatch.java index 924d2fbb3891..bfee3069e91b 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/LessMatch.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/LessMatch.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.core.analysis.metrics.expression; -/** - * @author peng-yongsheng - */ public class LessMatch { public boolean match(int left, int right) { return left < right; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/record/Record.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/record/Record.java index 0973a63d8db1..b75e2aca7723 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/record/Record.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/record/Record.java @@ -18,16 +18,17 @@ package org.apache.skywalking.oap.server.core.analysis.record; -import lombok.*; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.oap.server.core.storage.StorageData; import org.apache.skywalking.oap.server.core.storage.annotation.Column; -/** - * @author peng-yongsheng - */ public abstract class Record implements StorageData { public static final String TIME_BUCKET = "time_bucket"; - @Getter @Setter @Column(columnName = TIME_BUCKET) private long timeBucket; + @Getter + @Setter + @Column(columnName = TIME_BUCKET) + private long timeBucket; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/topn/TopN.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/topn/TopN.java index eede0197c582..bfc56e718c7b 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/topn/TopN.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/topn/TopN.java @@ -18,15 +18,14 @@ package org.apache.skywalking.oap.server.core.analysis.topn; -import lombok.*; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.oap.server.core.analysis.record.Record; import org.apache.skywalking.oap.server.core.storage.ComparableStorageData; import org.apache.skywalking.oap.server.core.storage.annotation.Column; /** * TopN data. - * - * @author wusheng */ public abstract class TopN extends Record implements ComparableStorageData { public static final String STATEMENT = "statement"; @@ -34,13 +33,26 @@ public abstract class TopN extends Record implements ComparableStorageData { public static final String TRACE_ID = "trace_id"; public static final String SERVICE_ID = "service_id"; - @Getter @Setter @Column(columnName = STATEMENT, content = true) private String statement; - @Getter @Setter @Column(columnName = LATENCY) private long latency; - @Getter @Setter @Column(columnName = TRACE_ID) private String traceId; - @Getter @Setter @Column(columnName = SERVICE_ID) private int serviceId; + @Getter + @Setter + @Column(columnName = STATEMENT, content = true) + private String statement; + @Getter + @Setter + @Column(columnName = LATENCY) + private long latency; + @Getter + @Setter + @Column(columnName = TRACE_ID) + private String traceId; + @Getter + @Setter + @Column(columnName = SERVICE_ID) + private int serviceId; - @Override public int compareTo(Object o) { - TopN target = (TopN)o; - return (int)(latency - target.latency); + @Override + public int compareTo(Object o) { + TopN target = (TopN) o; + return (int) (latency - target.latency); } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/AlarmNotifyWorker.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/AlarmNotifyWorker.java index be827756ce89..35ccc6429060 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/AlarmNotifyWorker.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/AlarmNotifyWorker.java @@ -19,14 +19,13 @@ package org.apache.skywalking.oap.server.core.analysis.worker; import org.apache.skywalking.oap.server.core.alarm.AlarmEntrance; -import org.apache.skywalking.oap.server.core.analysis.metrics.*; +import org.apache.skywalking.oap.server.core.analysis.metrics.Metrics; +import org.apache.skywalking.oap.server.core.analysis.metrics.WithMetadata; import org.apache.skywalking.oap.server.core.worker.AbstractWorker; import org.apache.skywalking.oap.server.library.module.ModuleDefineHolder; /** * Alarm notify worker, do a simple route to alarm core after the aggregation persistence. - * - * @author wusheng */ public class AlarmNotifyWorker extends AbstractWorker { private AlarmEntrance entrance; @@ -36,7 +35,8 @@ public AlarmNotifyWorker(ModuleDefineHolder moduleDefineHolder) { this.entrance = new AlarmEntrance(moduleDefineHolder); } - @Override public void in(Metrics metrics) { + @Override + public void in(Metrics metrics) { if (metrics instanceof WithMetadata) { entrance.forward(metrics); } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/ExportWorker.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/ExportWorker.java index 09fa143f92ae..822a44edfea0 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/ExportWorker.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/ExportWorker.java @@ -18,13 +18,12 @@ package org.apache.skywalking.oap.server.core.analysis.worker; -import org.apache.skywalking.oap.server.core.exporter.*; +import org.apache.skywalking.oap.server.core.exporter.ExportEvent; +import org.apache.skywalking.oap.server.core.exporter.ExporterModule; +import org.apache.skywalking.oap.server.core.exporter.MetricValuesExportService; import org.apache.skywalking.oap.server.core.worker.AbstractWorker; import org.apache.skywalking.oap.server.library.module.ModuleDefineHolder; -/** - * @author wusheng - */ public class ExportWorker extends AbstractWorker { private MetricValuesExportService exportService; @@ -32,10 +31,13 @@ public ExportWorker(ModuleDefineHolder moduleDefineHolder) { super(moduleDefineHolder); } - @Override public void in(ExportEvent event) { + @Override + public void in(ExportEvent event) { if (exportService != null || getModuleDefineHolder().has(ExporterModule.NAME)) { if (exportService == null) { - exportService = getModuleDefineHolder().find(ExporterModule.NAME).provider().getService(MetricValuesExportService.class); + exportService = getModuleDefineHolder().find(ExporterModule.NAME) + .provider() + .getService(MetricValuesExportService.class); } exportService.export(event); } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsAggregateWorker.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsAggregateWorker.java index ff3d0d0a8bdc..7daebc82dbdc 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsAggregateWorker.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsAggregateWorker.java @@ -18,21 +18,24 @@ package org.apache.skywalking.oap.server.core.analysis.worker; -import java.util.*; +import java.util.Iterator; +import java.util.List; import org.apache.skywalking.apm.commons.datacarrier.DataCarrier; -import org.apache.skywalking.apm.commons.datacarrier.consumer.*; +import org.apache.skywalking.apm.commons.datacarrier.consumer.BulkConsumePool; +import org.apache.skywalking.apm.commons.datacarrier.consumer.ConsumerPoolFactory; +import org.apache.skywalking.apm.commons.datacarrier.consumer.IConsumer; import org.apache.skywalking.oap.server.core.UnexpectedException; import org.apache.skywalking.oap.server.core.analysis.data.MergeDataCache; import org.apache.skywalking.oap.server.core.analysis.metrics.Metrics; import org.apache.skywalking.oap.server.core.worker.AbstractWorker; import org.apache.skywalking.oap.server.library.module.ModuleDefineHolder; import org.apache.skywalking.oap.server.telemetry.TelemetryModule; -import org.apache.skywalking.oap.server.telemetry.api.*; -import org.slf4j.*; +import org.apache.skywalking.oap.server.telemetry.api.CounterMetrics; +import org.apache.skywalking.oap.server.telemetry.api.MetricsCreator; +import org.apache.skywalking.oap.server.telemetry.api.MetricsTag; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng - */ public class MetricsAggregateWorker extends AbstractWorker { private static final Logger logger = LoggerFactory.getLogger(MetricsAggregateWorker.class); @@ -42,7 +45,8 @@ public class MetricsAggregateWorker extends AbstractWorker { private final MergeDataCache mergeDataCache; private CounterMetrics aggregationCounter; - MetricsAggregateWorker(ModuleDefineHolder moduleDefineHolder, AbstractWorker nextWorker, String modelName) { + MetricsAggregateWorker(ModuleDefineHolder moduleDefineHolder, AbstractWorker nextWorker, + String modelName) { super(moduleDefineHolder); this.nextWorker = nextWorker; this.mergeDataCache = new MergeDataCache<>(); @@ -57,12 +61,14 @@ public class MetricsAggregateWorker extends AbstractWorker { } this.dataCarrier.consume(ConsumerPoolFactory.INSTANCE.get(name), new AggregatorConsumer(this)); - MetricsCreator metricsCreator = moduleDefineHolder.find(TelemetryModule.NAME).provider().getService(MetricsCreator.class); - aggregationCounter = metricsCreator.createCounter("metrics_aggregation", "The number of rows in aggregation", - new MetricsTag.Keys("metricName", "level", "dimensionality"), new MetricsTag.Values(modelName, "1", "min")); + MetricsCreator metricsCreator = moduleDefineHolder.find(TelemetryModule.NAME) + .provider() + .getService(MetricsCreator.class); + aggregationCounter = metricsCreator.createCounter("metrics_aggregation", "The number of rows in aggregation", new MetricsTag.Keys("metricName", "level", "dimensionality"), new MetricsTag.Values(modelName, "1", "min")); } - @Override public final void in(Metrics metrics) { + @Override + public final void in(Metrics metrics) { metrics.resetEndOfBatch(); dataCarrier.produce(metrics); } @@ -115,11 +121,13 @@ private AggregatorConsumer(MetricsAggregateWorker aggregator) { this.aggregator = aggregator; } - @Override public void init() { + @Override + public void init() { } - @Override public void consume(List data) { + @Override + public void consume(List data) { Iterator inputIterator = data.iterator(); int i = 0; @@ -133,11 +141,13 @@ private AggregatorConsumer(MetricsAggregateWorker aggregator) { } } - @Override public void onError(List data, Throwable t) { + @Override + public void onError(List data, Throwable t) { logger.error(t.getMessage(), t); } - @Override public void onExit() { + @Override + public void onExit() { } } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsPersistentWorker.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsPersistentWorker.java index bbe5f7fec22f..259695e39813 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsPersistentWorker.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsPersistentWorker.java @@ -19,9 +19,17 @@ package org.apache.skywalking.oap.server.core.analysis.worker; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Objects; import org.apache.skywalking.apm.commons.datacarrier.DataCarrier; -import org.apache.skywalking.apm.commons.datacarrier.consumer.*; +import org.apache.skywalking.apm.commons.datacarrier.consumer.BulkConsumePool; +import org.apache.skywalking.apm.commons.datacarrier.consumer.ConsumerPoolFactory; +import org.apache.skywalking.apm.commons.datacarrier.consumer.IConsumer; import org.apache.skywalking.oap.server.core.UnexpectedException; import org.apache.skywalking.oap.server.core.analysis.data.MergeDataCache; import org.apache.skywalking.oap.server.core.analysis.metrics.Metrics; @@ -31,11 +39,9 @@ import org.apache.skywalking.oap.server.core.worker.AbstractWorker; import org.apache.skywalking.oap.server.library.client.request.PrepareRequest; import org.apache.skywalking.oap.server.library.module.ModuleDefineHolder; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng - */ public class MetricsPersistentWorker extends PersistenceWorker> { private static final Logger logger = LoggerFactory.getLogger(MetricsPersistentWorker.class); @@ -50,8 +56,9 @@ public class MetricsPersistentWorker extends PersistenceWorker nextAlarmWorker, - AbstractWorker nextExportWorker, MetricsTransWorker transWorker, boolean enableDatabaseSession) { + MetricsPersistentWorker(ModuleDefineHolder moduleDefineHolder, Model model, IMetricsDAO metricsDAO, + AbstractWorker nextAlarmWorker, AbstractWorker nextExportWorker, + MetricsTransWorker transWorker, boolean enableDatabaseSession) { super(moduleDefineHolder); this.model = model; this.databaseSession = new HashMap<>(100); @@ -78,19 +85,23 @@ public class MetricsPersistentWorker extends PersistenceWorker getCache() { + @Override + public MergeDataCache getCache() { return mergeDataCache; } - @Override public void prepareBatch(Collection lastCollection, List prepareRequests) { + @Override + public void prepareBatch(Collection lastCollection, List prepareRequests) { long start = System.currentTimeMillis(); int i = 0; @@ -155,7 +166,8 @@ private void nextWorker(Metrics metric) { } } - @Override public void cacheData(Metrics input) { + @Override + public void cacheData(Metrics input) { mergeDataCache.writing(); if (mergeDataCache.containsKey(input)) { Metrics metrics = mergeDataCache.get(input); @@ -189,7 +201,8 @@ private void syncStorageToCache(Metrics[] metrics) throws IOException { } } - @Override public void endOfRound(long tookTime) { + @Override + public void endOfRound(long tookTime) { if (enableDatabaseSession) { Iterator iterator = databaseSession.values().iterator(); while (iterator.hasNext()) { @@ -210,19 +223,23 @@ private PersistentConsumer(MetricsPersistentWorker persistent) { this.persistent = persistent; } - @Override public void init() { + @Override + public void init() { } - @Override public void consume(List data) { + @Override + public void consume(List data) { data.forEach(persistent::onWork); } - @Override public void onError(List data, Throwable t) { + @Override + public void onError(List data, Throwable t) { logger.error(t.getMessage(), t); } - @Override public void onExit() { + @Override + public void onExit() { } } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsRemoteWorker.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsRemoteWorker.java index 392d9b2245d3..782338b83b01 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsRemoteWorker.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsRemoteWorker.java @@ -24,11 +24,9 @@ import org.apache.skywalking.oap.server.core.remote.selector.Selector; import org.apache.skywalking.oap.server.core.worker.AbstractWorker; import org.apache.skywalking.oap.server.library.module.ModuleDefineHolder; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng - */ public class MetricsRemoteWorker extends AbstractWorker { private static final Logger logger = LoggerFactory.getLogger(MetricsRemoteWorker.class); @@ -42,7 +40,8 @@ public class MetricsRemoteWorker extends AbstractWorker { this.remoteReceiverWorkerName = remoteReceiverWorkerName; } - @Override public final void in(Metrics metrics) { + @Override + public final void in(Metrics metrics) { try { remoteSender.send(remoteReceiverWorkerName, metrics, Selector.HashCode); } catch (Throwable e) { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsStreamProcessor.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsStreamProcessor.java index 5da8a3e57a7f..2075b24a3eea 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsStreamProcessor.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsStreamProcessor.java @@ -18,28 +18,39 @@ package org.apache.skywalking.oap.server.core.analysis.worker; -import java.util.*; -import lombok.*; -import org.apache.skywalking.oap.server.core.*; -import org.apache.skywalking.oap.server.core.analysis.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import lombok.Getter; +import lombok.Setter; +import org.apache.skywalking.oap.server.core.CoreModule; +import org.apache.skywalking.oap.server.core.UnexpectedException; +import org.apache.skywalking.oap.server.core.analysis.DisableRegister; +import org.apache.skywalking.oap.server.core.analysis.Downsampling; +import org.apache.skywalking.oap.server.core.analysis.Stream; +import org.apache.skywalking.oap.server.core.analysis.StreamProcessor; import org.apache.skywalking.oap.server.core.analysis.metrics.Metrics; import org.apache.skywalking.oap.server.core.config.DownsamplingConfigService; -import org.apache.skywalking.oap.server.core.storage.*; +import org.apache.skywalking.oap.server.core.storage.IMetricsDAO; +import org.apache.skywalking.oap.server.core.storage.StorageDAO; +import org.apache.skywalking.oap.server.core.storage.StorageModule; import org.apache.skywalking.oap.server.core.storage.annotation.Storage; -import org.apache.skywalking.oap.server.core.storage.model.*; +import org.apache.skywalking.oap.server.core.storage.model.IModelSetter; +import org.apache.skywalking.oap.server.core.storage.model.Model; import org.apache.skywalking.oap.server.core.worker.IWorkerInstanceSetter; import org.apache.skywalking.oap.server.library.module.ModuleDefineHolder; -/** - * @author peng-yongsheng - */ public class MetricsStreamProcessor implements StreamProcessor { private final static MetricsStreamProcessor PROCESSOR = new MetricsStreamProcessor(); private Map, MetricsAggregateWorker> entryWorkers = new HashMap<>(); - @Getter private List persistentWorkers = new ArrayList<>(); - @Setter @Getter private boolean enableDatabaseSession; + @Getter + private List persistentWorkers = new ArrayList<>(); + @Setter + @Getter + private boolean enableDatabaseSession; public static MetricsStreamProcessor getInstance() { return PROCESSOR; @@ -67,7 +78,9 @@ public void create(ModuleDefineHolder moduleDefineHolder, Stream stream, Class { private static final Logger logger = LoggerFactory.getLogger(MetricsTransWorker.class); @@ -42,24 +42,23 @@ public class MetricsTransWorker extends AbstractWorker { private final CounterMetrics aggregationMonthCounter; public MetricsTransWorker(ModuleDefineHolder moduleDefineHolder, String modelName, - MetricsPersistentWorker hourPersistenceWorker, - MetricsPersistentWorker dayPersistenceWorker, + MetricsPersistentWorker hourPersistenceWorker, MetricsPersistentWorker dayPersistenceWorker, MetricsPersistentWorker monthPersistenceWorker) { super(moduleDefineHolder); this.hourPersistenceWorker = hourPersistenceWorker; this.dayPersistenceWorker = dayPersistenceWorker; this.monthPersistenceWorker = monthPersistenceWorker; - MetricsCreator metricsCreator = moduleDefineHolder.find(TelemetryModule.NAME).provider().getService(MetricsCreator.class); - aggregationHourCounter = metricsCreator.createCounter("metrics_aggregation", "The number of rows in aggregation", - new MetricsTag.Keys("metricName", "level", "dimensionality"), new MetricsTag.Values(modelName, "2", "hour")); - aggregationDayCounter = metricsCreator.createCounter("metrics_aggregation", "The number of rows in aggregation", - new MetricsTag.Keys("metricName", "level", "dimensionality"), new MetricsTag.Values(modelName, "2", "day")); - aggregationMonthCounter = metricsCreator.createCounter("metrics_aggregation", "The number of rows in aggregation", - new MetricsTag.Keys("metricName", "level", "dimensionality"), new MetricsTag.Values(modelName, "2", "month")); + MetricsCreator metricsCreator = moduleDefineHolder.find(TelemetryModule.NAME) + .provider() + .getService(MetricsCreator.class); + aggregationHourCounter = metricsCreator.createCounter("metrics_aggregation", "The number of rows in aggregation", new MetricsTag.Keys("metricName", "level", "dimensionality"), new MetricsTag.Values(modelName, "2", "hour")); + aggregationDayCounter = metricsCreator.createCounter("metrics_aggregation", "The number of rows in aggregation", new MetricsTag.Keys("metricName", "level", "dimensionality"), new MetricsTag.Values(modelName, "2", "day")); + aggregationMonthCounter = metricsCreator.createCounter("metrics_aggregation", "The number of rows in aggregation", new MetricsTag.Keys("metricName", "level", "dimensionality"), new MetricsTag.Values(modelName, "2", "month")); } - @Override public void in(Metrics metrics) { + @Override + public void in(Metrics metrics) { if (Objects.nonNull(hourPersistenceWorker)) { aggregationMonthCounter.inc(); hourPersistenceWorker.in(metrics.toHour()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/NoneStreamPersistentWorker.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/NoneStreamPersistentWorker.java index ea3a67145252..59c729c0cd15 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/NoneStreamPersistentWorker.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/NoneStreamPersistentWorker.java @@ -18,6 +18,7 @@ package org.apache.skywalking.oap.server.core.analysis.worker; +import java.io.IOException; import org.apache.skywalking.oap.server.core.analysis.config.NoneStream; import org.apache.skywalking.oap.server.core.storage.INoneStreamDAO; import org.apache.skywalking.oap.server.core.storage.model.Model; @@ -26,12 +27,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; - /** * None persistent use {@link INoneStreamDAO#insert(Model, NoneStream)} on get new data - * - * @author MrPro */ public class NoneStreamPersistentWorker extends AbstractWorker { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/NoneStreamingProcessor.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/NoneStreamingProcessor.java index 164b158618e2..c52650efbb9e 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/NoneStreamingProcessor.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/NoneStreamingProcessor.java @@ -18,6 +18,8 @@ package org.apache.skywalking.oap.server.core.analysis.worker; +import java.util.HashMap; +import java.util.Map; import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.UnexpectedException; import org.apache.skywalking.oap.server.core.analysis.DisableRegister; @@ -33,13 +35,9 @@ import org.apache.skywalking.oap.server.core.storage.model.Model; import org.apache.skywalking.oap.server.library.module.ModuleDefineHolder; -import java.util.HashMap; -import java.util.Map; - /** - * none streaming is designed for user operation configuration in UI interface. It uses storage (synchronization) similar to Inventory and supports TTL deletion mode similar to the record. - * - * @author MrPro + * none streaming is designed for user operation configuration in UI interface. It uses storage (synchronization) + * similar to Inventory and supports TTL deletion mode similar to the record. */ public class NoneStreamingProcessor implements StreamProcessor { @@ -70,7 +68,8 @@ public void create(ModuleDefineHolder moduleDefineHolder, Stream stream, Class> extends AbstractWorker { private static final Logger logger = LoggerFactory.getLogger(PersistenceWorker.class); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/RecordPersistentWorker.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/RecordPersistentWorker.java index f77de2beb09e..7cfeef8f628d 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/RecordPersistentWorker.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/RecordPersistentWorker.java @@ -20,16 +20,16 @@ import java.io.IOException; import org.apache.skywalking.oap.server.core.analysis.record.Record; -import org.apache.skywalking.oap.server.core.storage.*; +import org.apache.skywalking.oap.server.core.storage.IBatchDAO; +import org.apache.skywalking.oap.server.core.storage.IRecordDAO; +import org.apache.skywalking.oap.server.core.storage.StorageModule; import org.apache.skywalking.oap.server.core.storage.model.Model; import org.apache.skywalking.oap.server.core.worker.AbstractWorker; import org.apache.skywalking.oap.server.library.client.request.InsertRequest; import org.apache.skywalking.oap.server.library.module.ModuleDefineHolder; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng - */ public class RecordPersistentWorker extends AbstractWorker { private static final Logger logger = LoggerFactory.getLogger(RecordPersistentWorker.class); @@ -45,7 +45,8 @@ public class RecordPersistentWorker extends AbstractWorker { this.batchDAO = moduleDefineHolder.find(StorageModule.NAME).provider().getService(IBatchDAO.class); } - @Override public void in(Record record) { + @Override + public void in(Record record) { try { InsertRequest insertRequest = recordDAO.prepareBatchInsert(model, record); batchDAO.asynchronous(insertRequest); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/RecordStreamProcessor.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/RecordStreamProcessor.java index 3397f7519d7c..11ab17da6fa0 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/RecordStreamProcessor.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/RecordStreamProcessor.java @@ -18,18 +18,23 @@ package org.apache.skywalking.oap.server.core.analysis.worker; -import java.util.*; -import org.apache.skywalking.oap.server.core.*; -import org.apache.skywalking.oap.server.core.analysis.*; +import java.util.HashMap; +import java.util.Map; +import org.apache.skywalking.oap.server.core.CoreModule; +import org.apache.skywalking.oap.server.core.UnexpectedException; +import org.apache.skywalking.oap.server.core.analysis.DisableRegister; +import org.apache.skywalking.oap.server.core.analysis.Downsampling; +import org.apache.skywalking.oap.server.core.analysis.Stream; +import org.apache.skywalking.oap.server.core.analysis.StreamProcessor; import org.apache.skywalking.oap.server.core.analysis.record.Record; -import org.apache.skywalking.oap.server.core.storage.*; +import org.apache.skywalking.oap.server.core.storage.IRecordDAO; +import org.apache.skywalking.oap.server.core.storage.StorageDAO; +import org.apache.skywalking.oap.server.core.storage.StorageModule; import org.apache.skywalking.oap.server.core.storage.annotation.Storage; -import org.apache.skywalking.oap.server.core.storage.model.*; +import org.apache.skywalking.oap.server.core.storage.model.IModelSetter; +import org.apache.skywalking.oap.server.core.storage.model.Model; import org.apache.skywalking.oap.server.library.module.ModuleDefineHolder; -/** - * @author peng-yongsheng - */ public class RecordStreamProcessor implements StreamProcessor { private final static RecordStreamProcessor PROCESSOR = new RecordStreamProcessor(); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/TopNStreamProcessor.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/TopNStreamProcessor.java index 7265d73a31a6..751cd41a8f42 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/TopNStreamProcessor.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/TopNStreamProcessor.java @@ -18,32 +18,45 @@ package org.apache.skywalking.oap.server.core.analysis.worker; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import lombok.Getter; import lombok.Setter; -import org.apache.skywalking.oap.server.core.*; -import org.apache.skywalking.oap.server.core.analysis.*; +import org.apache.skywalking.oap.server.core.CoreModule; +import org.apache.skywalking.oap.server.core.UnexpectedException; +import org.apache.skywalking.oap.server.core.analysis.DisableRegister; +import org.apache.skywalking.oap.server.core.analysis.Downsampling; +import org.apache.skywalking.oap.server.core.analysis.Stream; +import org.apache.skywalking.oap.server.core.analysis.StreamProcessor; import org.apache.skywalking.oap.server.core.analysis.record.Record; import org.apache.skywalking.oap.server.core.analysis.topn.TopN; -import org.apache.skywalking.oap.server.core.storage.*; +import org.apache.skywalking.oap.server.core.storage.IRecordDAO; +import org.apache.skywalking.oap.server.core.storage.StorageDAO; +import org.apache.skywalking.oap.server.core.storage.StorageModule; import org.apache.skywalking.oap.server.core.storage.annotation.Storage; -import org.apache.skywalking.oap.server.core.storage.model.*; +import org.apache.skywalking.oap.server.core.storage.model.IModelSetter; +import org.apache.skywalking.oap.server.core.storage.model.Model; import org.apache.skywalking.oap.server.library.module.ModuleDefineHolder; /** * TopN is a special process, which hold a certain size of windows, and cache all top N records, save to the persistence * in low frequency. - * - * @author wusheng */ public class TopNStreamProcessor implements StreamProcessor { private static final TopNStreamProcessor PROCESSOR = new TopNStreamProcessor(); - @Getter private List persistentWorkers = new ArrayList<>(); + @Getter + private List persistentWorkers = new ArrayList<>(); private Map, TopNWorker> workers = new HashMap<>(); - @Setter @Getter private int topNWorkerReportCycle = 10; - @Setter @Getter private int topSize = 50; + @Setter + @Getter + private int topNWorkerReportCycle = 10; + @Setter + @Getter + private int topSize = 50; public static TopNStreamProcessor getInstance() { return PROCESSOR; @@ -60,7 +73,8 @@ public void create(ModuleDefineHolder moduleDefineHolder, Stream stream, Class> { @@ -45,8 +45,8 @@ public class TopNWorker extends PersistenceWorker(topNSize); this.recordDAO = recordDAO; @@ -58,7 +58,8 @@ public class TopNWorker extends PersistenceWorker getCache() { + @Override + public LimitedSizeDataCache getCache() { return limitedSizeDataCache; } /** * The top N worker persistent cycle is much less than the others, override `flushAndSwitch` to extend the execute * time windows. - * + *

* Switch and persistent attempt happens based on reportCycle. */ - @Override public boolean flushAndSwitch() { + @Override + public boolean flushAndSwitch() { long now = System.currentTimeMillis(); if (now - lastReportTimestamp <= reportCycle) { return false; @@ -86,7 +89,8 @@ public class TopNWorker extends PersistenceWorker lastCollection, List prepareRequests) { + @Override + public void prepareBatch(Collection lastCollection, List prepareRequests) { lastCollection.forEach(record -> { try { prepareRequests.add(recordDAO.prepareBatchInsert(model, record)); @@ -99,20 +103,24 @@ public class TopNWorker extends PersistenceWorker { - @Override public void init() { + @Override + public void init() { } - @Override public void consume(List data) { + @Override + public void consume(List data) { /* * TopN is not following the batch size trigger mode. * No need to implement this method, the memory size is limited always. @@ -120,11 +128,13 @@ private class TopNConsumer implements IConsumer { data.forEach(TopNWorker.this::onWork); } - @Override public void onError(List data, Throwable t) { + @Override + public void onError(List data, Throwable t) { logger.error(t.getMessage(), t); } - @Override public void onExit() { + @Override + public void onExit() { } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/annotation/AnnotationListener.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/annotation/AnnotationListener.java index a64db3160971..31cb4cd4233b 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/annotation/AnnotationListener.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/annotation/AnnotationListener.java @@ -20,9 +20,6 @@ import java.lang.annotation.Annotation; -/** - * @author peng-yongsheng - */ public interface AnnotationListener { Class annotation(); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/annotation/AnnotationScan.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/annotation/AnnotationScan.java index da68bc5dd2be..5a1f22487843 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/annotation/AnnotationScan.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/annotation/AnnotationScan.java @@ -22,12 +22,12 @@ import com.google.common.reflect.ClassPath; import java.io.IOException; import java.lang.annotation.Annotation; -import java.util.*; +import java.util.Comparator; +import java.util.LinkedList; +import java.util.List; /** * Scan the annotation, and notify the listener(s) - * - * @author peng-yongsheng, wusheng */ public class AnnotationScan { @@ -39,6 +39,7 @@ public AnnotationScan() { /** * Register the callback listener + * * @param listener to be called after class found w/ annotation */ public void registerListener(AnnotationListener listener) { @@ -47,8 +48,6 @@ public void registerListener(AnnotationListener listener) { /** * Begin to scan classes. - * - * @throws IOException */ public void scan() throws IOException { ClassPath classpath = ClassPath.from(this.getClass().getClassLoader()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cache/CacheUpdateTimer.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cache/CacheUpdateTimer.java index e55984e2fba9..778370962a54 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cache/CacheUpdateTimer.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cache/CacheUpdateTimer.java @@ -19,23 +19,26 @@ package org.apache.skywalking.oap.server.core.cache; import java.io.IOException; -import java.util.*; -import java.util.concurrent.*; +import java.util.List; +import java.util.Objects; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; - import org.apache.skywalking.apm.util.RunnableWithExceptionProtection; import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.query.entity.ProfileTask; -import org.apache.skywalking.oap.server.core.register.*; +import org.apache.skywalking.oap.server.core.register.NetworkAddressInventory; +import org.apache.skywalking.oap.server.core.register.ServiceInstanceInventory; +import org.apache.skywalking.oap.server.core.register.ServiceInventory; import org.apache.skywalking.oap.server.core.storage.StorageModule; -import org.apache.skywalking.oap.server.core.storage.cache.*; +import org.apache.skywalking.oap.server.core.storage.cache.INetworkAddressInventoryCacheDAO; +import org.apache.skywalking.oap.server.core.storage.cache.IServiceInstanceInventoryCacheDAO; +import org.apache.skywalking.oap.server.core.storage.cache.IServiceInventoryCacheDAO; import org.apache.skywalking.oap.server.core.storage.profile.IProfileTaskQueryDAO; import org.apache.skywalking.oap.server.library.module.ModuleDefineHolder; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng - */ public enum CacheUpdateTimer { INSTANCE; @@ -49,9 +52,9 @@ public void start(ModuleDefineHolder moduleDefineHolder) { final long timeInterval = 10; if (!isStarted) { - Executors.newSingleThreadScheduledExecutor().scheduleAtFixedRate( - new RunnableWithExceptionProtection(() -> update(moduleDefineHolder), - t -> logger.error("Cache update failure.", t)), 1, timeInterval, TimeUnit.SECONDS); + Executors.newSingleThreadScheduledExecutor() + .scheduleAtFixedRate(new RunnableWithExceptionProtection(() -> update(moduleDefineHolder), t -> logger + .error("Cache update failure.", t)), 1, timeInterval, TimeUnit.SECONDS); this.isStarted = true; } @@ -65,8 +68,12 @@ private void update(ModuleDefineHolder moduleDefineHolder) { } private void updateServiceInventory(ModuleDefineHolder moduleDefineHolder) { - IServiceInventoryCacheDAO serviceInventoryCacheDAO = moduleDefineHolder.find(StorageModule.NAME).provider().getService(IServiceInventoryCacheDAO.class); - ServiceInventoryCache serviceInventoryCache = moduleDefineHolder.find(CoreModule.NAME).provider().getService(ServiceInventoryCache.class); + IServiceInventoryCacheDAO serviceInventoryCacheDAO = moduleDefineHolder.find(StorageModule.NAME) + .provider() + .getService(IServiceInventoryCacheDAO.class); + ServiceInventoryCache serviceInventoryCache = moduleDefineHolder.find(CoreModule.NAME) + .provider() + .getService(ServiceInventoryCache.class); List serviceInventories = serviceInventoryCacheDAO.loadLastUpdate(System.currentTimeMillis() - 60000); serviceInventories.forEach(serviceInventory -> { @@ -85,8 +92,12 @@ private void updateServiceInventory(ModuleDefineHolder moduleDefineHolder) { } private void updateServiceInstanceInventory(ModuleDefineHolder moduleDefineHolder) { - IServiceInstanceInventoryCacheDAO instanceInventoryCacheDAO = moduleDefineHolder.find(StorageModule.NAME).provider().getService(IServiceInstanceInventoryCacheDAO.class); - ServiceInstanceInventoryCache instanceInventoryCache = moduleDefineHolder.find(CoreModule.NAME).provider().getService(ServiceInstanceInventoryCache.class); + IServiceInstanceInventoryCacheDAO instanceInventoryCacheDAO = moduleDefineHolder.find(StorageModule.NAME) + .provider() + .getService(IServiceInstanceInventoryCacheDAO.class); + ServiceInstanceInventoryCache instanceInventoryCache = moduleDefineHolder.find(CoreModule.NAME) + .provider() + .getService(ServiceInstanceInventoryCache.class); List instanceInventories = instanceInventoryCacheDAO.loadLastUpdate(System.currentTimeMillis() - 60000); instanceInventories.forEach(instanceInventory -> { @@ -105,8 +116,12 @@ private void updateServiceInstanceInventory(ModuleDefineHolder moduleDefineHolde } private void updateNetAddressInventory(ModuleDefineHolder moduleDefineHolder) { - INetworkAddressInventoryCacheDAO addressInventoryCacheDAO = moduleDefineHolder.find(StorageModule.NAME).provider().getService(INetworkAddressInventoryCacheDAO.class); - NetworkAddressInventoryCache addressInventoryCache = moduleDefineHolder.find(CoreModule.NAME).provider().getService(NetworkAddressInventoryCache.class); + INetworkAddressInventoryCacheDAO addressInventoryCacheDAO = moduleDefineHolder.find(StorageModule.NAME) + .provider() + .getService(INetworkAddressInventoryCacheDAO.class); + NetworkAddressInventoryCache addressInventoryCache = moduleDefineHolder.find(CoreModule.NAME) + .provider() + .getService(NetworkAddressInventoryCache.class); List addressInventories = addressInventoryCacheDAO.loadLastUpdate(System.currentTimeMillis() - 60000); addressInventories.forEach(addressInventory -> { @@ -124,13 +139,17 @@ private void updateNetAddressInventory(ModuleDefineHolder moduleDefineHolder) { /** * update all profile task list for each service - * @param moduleDefineHolder */ private void updateProfileTask(ModuleDefineHolder moduleDefineHolder) { - IProfileTaskQueryDAO profileTaskQueryDAO = moduleDefineHolder.find(StorageModule.NAME).provider().getService(IProfileTaskQueryDAO.class); - ProfileTaskCache profileTaskCache = moduleDefineHolder.find(CoreModule.NAME).provider().getService(ProfileTaskCache.class); + IProfileTaskQueryDAO profileTaskQueryDAO = moduleDefineHolder.find(StorageModule.NAME) + .provider() + .getService(IProfileTaskQueryDAO.class); + ProfileTaskCache profileTaskCache = moduleDefineHolder.find(CoreModule.NAME) + .provider() + .getService(ProfileTaskCache.class); try { - final List taskList = profileTaskQueryDAO.getTaskList(null, null, profileTaskCache.getCacheStartTimeBucket(), profileTaskCache.getCacheEndTimeBucket(), null); + final List taskList = profileTaskQueryDAO.getTaskList(null, null, profileTaskCache.getCacheStartTimeBucket(), profileTaskCache + .getCacheEndTimeBucket(), null); taskList.stream().collect(Collectors.groupingBy(t -> t.getServiceId())).entrySet().stream().forEach(e -> { final Integer serviceId = e.getKey(); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cache/EndpointInventoryCache.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cache/EndpointInventoryCache.java index 096a5d13732d..4181a5151f8b 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cache/EndpointInventoryCache.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cache/EndpointInventoryCache.java @@ -18,21 +18,22 @@ package org.apache.skywalking.oap.server.core.cache; -import com.google.common.cache.*; +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; import java.util.Objects; import org.apache.skywalking.oap.server.core.Const; import org.apache.skywalking.oap.server.core.CoreModuleConfig; import org.apache.skywalking.oap.server.core.register.EndpointInventory; import org.apache.skywalking.oap.server.core.storage.StorageModule; import org.apache.skywalking.oap.server.core.storage.cache.IEndpointInventoryCacheDAO; -import org.apache.skywalking.oap.server.library.module.*; -import org.slf4j.*; +import org.apache.skywalking.oap.server.library.module.ModuleManager; +import org.apache.skywalking.oap.server.library.module.Service; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import static java.util.Objects.*; +import static java.util.Objects.isNull; +import static java.util.Objects.nonNull; -/** - * @author peng-yongsheng - */ public class EndpointInventoryCache implements Service { private static final Logger logger = LoggerFactory.getLogger(EndpointInventoryCache.class); @@ -53,10 +54,16 @@ public EndpointInventoryCache(ModuleManager moduleManager, CoreModuleConfig modu this.userEndpoint.setServiceId(Const.USER_SERVICE_ID); long initialSize = moduleConfig.getMaxSizeOfEndpointInventory() / 10L; - int initialCapacitySize = (int)(initialSize > Integer.MAX_VALUE ? Integer.MAX_VALUE : initialSize); - - endpointNameCache = CacheBuilder.newBuilder().initialCapacity(initialCapacitySize).maximumSize(moduleConfig.getMaxSizeOfEndpointInventory()).build(); - endpointIdCache = CacheBuilder.newBuilder().initialCapacity(initialCapacitySize).maximumSize(moduleConfig.getMaxSizeOfEndpointInventory()).build(); + int initialCapacitySize = (int) (initialSize > Integer.MAX_VALUE ? Integer.MAX_VALUE : initialSize); + + endpointNameCache = CacheBuilder.newBuilder() + .initialCapacity(initialCapacitySize) + .maximumSize(moduleConfig.getMaxSizeOfEndpointInventory()) + .build(); + endpointIdCache = CacheBuilder.newBuilder() + .initialCapacity(initialCapacitySize) + .maximumSize(moduleConfig.getMaxSizeOfEndpointInventory()) + .build(); } private IEndpointInventoryCacheDAO getCacheDAO() { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cache/NetworkAddressInventoryCache.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cache/NetworkAddressInventoryCache.java index 6a254c892b18..889c3ee9355f 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cache/NetworkAddressInventoryCache.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cache/NetworkAddressInventoryCache.java @@ -18,21 +18,22 @@ package org.apache.skywalking.oap.server.core.cache; -import com.google.common.cache.*; +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; import java.util.Objects; import org.apache.skywalking.oap.server.core.Const; import org.apache.skywalking.oap.server.core.CoreModuleConfig; import org.apache.skywalking.oap.server.core.register.NetworkAddressInventory; import org.apache.skywalking.oap.server.core.storage.StorageModule; import org.apache.skywalking.oap.server.core.storage.cache.INetworkAddressInventoryCacheDAO; -import org.apache.skywalking.oap.server.library.module.*; -import org.slf4j.*; +import org.apache.skywalking.oap.server.library.module.ModuleManager; +import org.apache.skywalking.oap.server.library.module.Service; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import static java.util.Objects.*; +import static java.util.Objects.isNull; +import static java.util.Objects.nonNull; -/** - * @author peng-yongsheng - */ public class NetworkAddressInventoryCache implements Service { private static final Logger logger = LoggerFactory.getLogger(NetworkAddressInventoryCache.class); @@ -47,15 +48,23 @@ public NetworkAddressInventoryCache(ModuleManager moduleManager, CoreModuleConfi this.moduleManager = moduleManager; long initialSize = moduleConfig.getMaxSizeOfNetworkInventory() / 10L; - int initialCapacitySize = (int)(initialSize > Integer.MAX_VALUE ? Integer.MAX_VALUE : initialSize); - - networkAddressCache = CacheBuilder.newBuilder().initialCapacity(initialCapacitySize).maximumSize(moduleConfig.getMaxSizeOfNetworkInventory()).build(); - addressIdCache = CacheBuilder.newBuilder().initialCapacity(initialCapacitySize).maximumSize(moduleConfig.getMaxSizeOfNetworkInventory()).build(); + int initialCapacitySize = (int) (initialSize > Integer.MAX_VALUE ? Integer.MAX_VALUE : initialSize); + + networkAddressCache = CacheBuilder.newBuilder() + .initialCapacity(initialCapacitySize) + .maximumSize(moduleConfig.getMaxSizeOfNetworkInventory()) + .build(); + addressIdCache = CacheBuilder.newBuilder() + .initialCapacity(initialCapacitySize) + .maximumSize(moduleConfig.getMaxSizeOfNetworkInventory()) + .build(); } private INetworkAddressInventoryCacheDAO getCacheDAO() { if (isNull(cacheDAO)) { - this.cacheDAO = moduleManager.find(StorageModule.NAME).provider().getService(INetworkAddressInventoryCacheDAO.class); + this.cacheDAO = moduleManager.find(StorageModule.NAME) + .provider() + .getService(INetworkAddressInventoryCacheDAO.class); } return this.cacheDAO; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cache/ProfileTaskCache.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cache/ProfileTaskCache.java index 22f6172cb683..2ad62dbddf9f 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cache/ProfileTaskCache.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cache/ProfileTaskCache.java @@ -20,6 +20,12 @@ import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; +import java.io.IOException; +import java.time.Duration; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.concurrent.TimeUnit; import org.apache.skywalking.oap.server.core.CoreModuleConfig; import org.apache.skywalking.oap.server.core.analysis.TimeBucket; import org.apache.skywalking.oap.server.core.query.entity.ProfileTask; @@ -30,17 +36,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.time.Duration; -import java.util.Collections; -import java.util.List; -import java.util.Objects; -import java.util.concurrent.TimeUnit; - /** * cache need to execute profile task - * - * @author MrPro */ public class ProfileTaskCache implements Service { @@ -56,26 +53,32 @@ public ProfileTaskCache(ModuleManager moduleManager, CoreModuleConfig moduleConf this.moduleManager = moduleManager; long initialSize = moduleConfig.getMaxSizeOfProfileTask() / 10L; - int initialCapacitySize = (int)(initialSize > Integer.MAX_VALUE ? Integer.MAX_VALUE : initialSize); - - profileTaskDownstreamCache = CacheBuilder.newBuilder().initialCapacity(initialCapacitySize).maximumSize(moduleConfig.getMaxSizeOfProfileTask()) - // remove old profile task data - .expireAfterWrite(Duration.ofMinutes(1)).build(); - - profileTaskIdCache = CacheBuilder.newBuilder().initialCapacity(initialCapacitySize).maximumSize(moduleConfig.getMaxSizeOfProfileTask()).build(); + int initialCapacitySize = (int) (initialSize > Integer.MAX_VALUE ? Integer.MAX_VALUE : initialSize); + + profileTaskDownstreamCache = CacheBuilder.newBuilder() + .initialCapacity(initialCapacitySize) + .maximumSize(moduleConfig.getMaxSizeOfProfileTask()) + // remove old profile task data + .expireAfterWrite(Duration.ofMinutes(1)) + .build(); + + profileTaskIdCache = CacheBuilder.newBuilder() + .initialCapacity(initialCapacitySize) + .maximumSize(moduleConfig.getMaxSizeOfProfileTask()) + .build(); } private IProfileTaskQueryDAO getProfileTaskQueryDAO() { if (Objects.isNull(profileTaskQueryDAO)) { - profileTaskQueryDAO = moduleManager.find(StorageModule.NAME).provider().getService(IProfileTaskQueryDAO.class); + profileTaskQueryDAO = moduleManager.find(StorageModule.NAME) + .provider() + .getService(IProfileTaskQueryDAO.class); } return profileTaskQueryDAO; } /** * query executable profile task - * @param serviceId - * @return */ public List getProfileTaskList(int serviceId) { // read profile task list from cache only, use cache update timer mechanism @@ -85,8 +88,6 @@ public List getProfileTaskList(int serviceId) { /** * query profile task by id - * @param id - * @return */ public ProfileTask getProfileTaskById(String id) { ProfileTask profile = profileTaskIdCache.getIfPresent(id); @@ -107,8 +108,6 @@ public ProfileTask getProfileTaskById(String id) { /** * save service task list - * @param serviceId - * @param taskList */ public void saveTaskList(int serviceId, List taskList) { if (taskList == null) { @@ -120,7 +119,6 @@ public void saveTaskList(int serviceId, List taskList) { /** * use for every db query - * @return */ public long getCacheStartTimeBucket() { return TimeBucket.getRecordTimeBucket(System.currentTimeMillis()); @@ -128,7 +126,6 @@ public long getCacheStartTimeBucket() { /** * use for every db query, +10 start time and +15 end time(because use task end time to search) - * @return */ public long getCacheEndTimeBucket() { return TimeBucket.getRecordTimeBucket(System.currentTimeMillis() + TimeUnit.MINUTES.toMillis(25)); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cache/ServiceInstanceInventoryCache.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cache/ServiceInstanceInventoryCache.java index e37e947eb6d1..8a3401d04f77 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cache/ServiceInstanceInventoryCache.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cache/ServiceInstanceInventoryCache.java @@ -18,22 +18,22 @@ package org.apache.skywalking.oap.server.core.cache; -import com.google.common.cache.*; +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; import java.util.Objects; import org.apache.skywalking.oap.server.core.Const; import org.apache.skywalking.oap.server.core.CoreModuleConfig; import org.apache.skywalking.oap.server.core.register.ServiceInstanceInventory; import org.apache.skywalking.oap.server.core.storage.StorageModule; import org.apache.skywalking.oap.server.core.storage.cache.IServiceInstanceInventoryCacheDAO; -import org.apache.skywalking.oap.server.library.module.*; +import org.apache.skywalking.oap.server.library.module.ModuleManager; +import org.apache.skywalking.oap.server.library.module.Service; import org.apache.skywalking.oap.server.library.util.BooleanUtils; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static java.util.Objects.isNull; -/** - * @author peng-yongsheng - */ public class ServiceInstanceInventoryCache implements Service { private static final Logger logger = LoggerFactory.getLogger(ServiceInstanceInventoryCache.class); @@ -55,16 +55,27 @@ public ServiceInstanceInventoryCache(ModuleManager moduleManager, CoreModuleConf this.userServiceInstance.setIsAddress(BooleanUtils.FALSE); long initialSize = moduleConfig.getMaxSizeOfServiceInstanceInventory() / 10L; - int initialCapacitySize = (int)(initialSize > Integer.MAX_VALUE ? Integer.MAX_VALUE : initialSize); - - serviceInstanceIdCache = CacheBuilder.newBuilder().initialCapacity(initialCapacitySize).maximumSize(moduleConfig.getMaxSizeOfServiceInstanceInventory()).build(); - serviceInstanceNameCache = CacheBuilder.newBuilder().initialCapacity(initialCapacitySize).maximumSize(moduleConfig.getMaxSizeOfServiceInstanceInventory()).build(); - addressIdCache = CacheBuilder.newBuilder().initialCapacity(initialCapacitySize).maximumSize(moduleConfig.getMaxSizeOfServiceInstanceInventory()).build(); + int initialCapacitySize = (int) (initialSize > Integer.MAX_VALUE ? Integer.MAX_VALUE : initialSize); + + serviceInstanceIdCache = CacheBuilder.newBuilder() + .initialCapacity(initialCapacitySize) + .maximumSize(moduleConfig.getMaxSizeOfServiceInstanceInventory()) + .build(); + serviceInstanceNameCache = CacheBuilder.newBuilder() + .initialCapacity(initialCapacitySize) + .maximumSize(moduleConfig.getMaxSizeOfServiceInstanceInventory()) + .build(); + addressIdCache = CacheBuilder.newBuilder() + .initialCapacity(initialCapacitySize) + .maximumSize(moduleConfig.getMaxSizeOfServiceInstanceInventory()) + .build(); } private IServiceInstanceInventoryCacheDAO getCacheDAO() { if (isNull(cacheDAO)) { - this.cacheDAO = moduleManager.find(StorageModule.NAME).provider().getService(IServiceInstanceInventoryCacheDAO.class); + this.cacheDAO = moduleManager.find(StorageModule.NAME) + .provider() + .getService(IServiceInstanceInventoryCacheDAO.class); } return this.cacheDAO; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cache/ServiceInventoryCache.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cache/ServiceInventoryCache.java index 9bbebb8180b6..5ad4b9fe18cf 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cache/ServiceInventoryCache.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cache/ServiceInventoryCache.java @@ -18,22 +18,23 @@ package org.apache.skywalking.oap.server.core.cache; -import com.google.common.cache.*; +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; import java.util.Objects; import org.apache.skywalking.oap.server.core.Const; import org.apache.skywalking.oap.server.core.CoreModuleConfig; import org.apache.skywalking.oap.server.core.register.ServiceInventory; import org.apache.skywalking.oap.server.core.storage.StorageModule; import org.apache.skywalking.oap.server.core.storage.cache.IServiceInventoryCacheDAO; -import org.apache.skywalking.oap.server.library.module.*; +import org.apache.skywalking.oap.server.library.module.ModuleManager; +import org.apache.skywalking.oap.server.library.module.Service; import org.apache.skywalking.oap.server.library.util.BooleanUtils; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import static java.util.Objects.*; +import static java.util.Objects.isNull; +import static java.util.Objects.nonNull; -/** - * @author peng-yongsheng - */ public class ServiceInventoryCache implements Service { private static final Logger logger = LoggerFactory.getLogger(ServiceInventoryCache.class); @@ -55,16 +56,27 @@ public ServiceInventoryCache(ModuleManager moduleManager, CoreModuleConfig modul this.userService.setIsAddress(BooleanUtils.FALSE); long initialSize = moduleConfig.getMaxSizeOfServiceInventory() / 10L; - int initialCapacitySize = (int)(initialSize > Integer.MAX_VALUE ? Integer.MAX_VALUE : initialSize); - - serviceNameCache = CacheBuilder.newBuilder().initialCapacity(initialCapacitySize).maximumSize(moduleConfig.getMaxSizeOfServiceInventory()).build(); - addressIdCache = CacheBuilder.newBuilder().initialCapacity(initialCapacitySize).maximumSize(moduleConfig.getMaxSizeOfServiceInventory()).build(); - serviceIdCache = CacheBuilder.newBuilder().initialCapacity(initialCapacitySize).maximumSize(moduleConfig.getMaxSizeOfServiceInventory()).build(); + int initialCapacitySize = (int) (initialSize > Integer.MAX_VALUE ? Integer.MAX_VALUE : initialSize); + + serviceNameCache = CacheBuilder.newBuilder() + .initialCapacity(initialCapacitySize) + .maximumSize(moduleConfig.getMaxSizeOfServiceInventory()) + .build(); + addressIdCache = CacheBuilder.newBuilder() + .initialCapacity(initialCapacitySize) + .maximumSize(moduleConfig.getMaxSizeOfServiceInventory()) + .build(); + serviceIdCache = CacheBuilder.newBuilder() + .initialCapacity(initialCapacitySize) + .maximumSize(moduleConfig.getMaxSizeOfServiceInventory()) + .build(); } private IServiceInventoryCacheDAO getCacheDAO() { if (isNull(cacheDAO)) { - this.cacheDAO = moduleManager.find(StorageModule.NAME).provider().getService(IServiceInventoryCacheDAO.class); + this.cacheDAO = moduleManager.find(StorageModule.NAME) + .provider() + .getService(IServiceInventoryCacheDAO.class); } return this.cacheDAO; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cluster/ClusterModule.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cluster/ClusterModule.java index c4c826a0e467..9e65fcc5b626 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cluster/ClusterModule.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cluster/ClusterModule.java @@ -18,11 +18,8 @@ package org.apache.skywalking.oap.server.core.cluster; -import org.apache.skywalking.oap.server.library.module.*; +import org.apache.skywalking.oap.server.library.module.ModuleDefine; -/** - * @author peng-yongsheng - */ public class ClusterModule extends ModuleDefine { public static final String NAME = "cluster"; @@ -31,7 +28,11 @@ public ClusterModule() { super(NAME); } - @Override public Class[] services() { - return new Class[] {ClusterRegister.class, ClusterNodesQuery.class}; + @Override + public Class[] services() { + return new Class[] { + ClusterRegister.class, + ClusterNodesQuery.class + }; } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cluster/ClusterNodesQuery.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cluster/ClusterNodesQuery.java index a7c0d82d0a1f..3b94f6c649e8 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cluster/ClusterNodesQuery.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cluster/ClusterNodesQuery.java @@ -18,13 +18,9 @@ package org.apache.skywalking.oap.server.core.cluster; -import org.apache.skywalking.oap.server.library.module.Service; - import java.util.List; +import org.apache.skywalking.oap.server.library.module.Service; -/** - * @author peng-yongsheng - */ public interface ClusterNodesQuery extends Service { List queryRemoteNodes(); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cluster/ClusterRegister.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cluster/ClusterRegister.java index 3e5a8c2d053a..20fa5ca6edf9 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cluster/ClusterRegister.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cluster/ClusterRegister.java @@ -20,9 +20,6 @@ import org.apache.skywalking.oap.server.library.module.Service; -/** - * @author peng-yongsheng - */ public interface ClusterRegister extends Service { void registerRemote(RemoteInstance remoteInstance) throws ServiceRegisterException; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cluster/RemoteInstance.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cluster/RemoteInstance.java index 44a4855fdd37..0fd6915cbf92 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cluster/RemoteInstance.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cluster/RemoteInstance.java @@ -21,9 +21,6 @@ import lombok.Getter; import org.apache.skywalking.oap.server.core.remote.client.Address; -/** - * @author peng-yongsheng - */ @Getter public class RemoteInstance implements Comparable { @@ -33,11 +30,13 @@ public RemoteInstance(Address address) { this.address = address; } - @Override public String toString() { + @Override + public String toString() { return address.toString(); } - @Override public int compareTo(RemoteInstance o) { + @Override + public int compareTo(RemoteInstance o) { return this.address.compareTo(o.getAddress()); } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cluster/ServiceQueryException.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cluster/ServiceQueryException.java index 495b8c3b9882..0906abfe68ca 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cluster/ServiceQueryException.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cluster/ServiceQueryException.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.core.cluster; -/** - * @author caoyixiong - */ public class ServiceQueryException extends RuntimeException { public ServiceQueryException(String message) { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cluster/ServiceRegisterException.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cluster/ServiceRegisterException.java index 9d83d304d258..edb47d35f335 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cluster/ServiceRegisterException.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cluster/ServiceRegisterException.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.core.cluster; -/** - * @author peng-yongsheng - */ public class ServiceRegisterException extends RuntimeException { public ServiceRegisterException(String message) { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/command/CommandService.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/command/CommandService.java index c152d83d4737..9bd86ebd17fa 100755 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/command/CommandService.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/command/CommandService.java @@ -18,17 +18,13 @@ package org.apache.skywalking.oap.server.core.command; +import java.util.UUID; import org.apache.skywalking.apm.network.trace.component.command.ProfileTaskCommand; import org.apache.skywalking.apm.network.trace.component.command.ServiceResetCommand; import org.apache.skywalking.oap.server.core.query.entity.ProfileTask; import org.apache.skywalking.oap.server.library.module.ModuleManager; import org.apache.skywalking.oap.server.library.module.Service; -import java.util.UUID; - -/** - * @author kezhenxu94 - */ public class CommandService implements Service { private final ModuleManager moduleManager; @@ -36,17 +32,20 @@ public CommandService(final ModuleManager moduleManager) { this.moduleManager = moduleManager; } - public ServiceResetCommand newResetCommand(final int serviceInstanceId, final long time, final String serviceInstanceUUID) { + public ServiceResetCommand newResetCommand(final int serviceInstanceId, final long time, + final String serviceInstanceUUID) { final String serialNumber = generateSerialNumber(serviceInstanceId, time, serviceInstanceUUID); return new ServiceResetCommand(serialNumber); } public ProfileTaskCommand newProfileTaskCommand(ProfileTask task) { final String serialNumber = UUID.randomUUID().toString(); - return new ProfileTaskCommand(serialNumber, task.getId(), task.getEndpointName(), task.getDuration(), task.getMinDurationThreshold(), task.getDumpPeriod(), task.getMaxSamplingCount(), task.getStartTime(), task.getCreateTime()); + return new ProfileTaskCommand(serialNumber, task.getId(), task.getEndpointName(), task.getDuration(), task.getMinDurationThreshold(), task + .getDumpPeriod(), task.getMaxSamplingCount(), task.getStartTime(), task.getCreateTime()); } - private String generateSerialNumber(final int serviceInstanceId, final long time, final String serviceInstanceUUID) { + private String generateSerialNumber(final int serviceInstanceId, final long time, + final String serviceInstanceUUID) { return UUID.randomUUID().toString(); // Simply generate a uuid without taking care of the parameters } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/ComponentLibraryCatalogService.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/ComponentLibraryCatalogService.java index a2580f7066c0..88ba448417e6 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/ComponentLibraryCatalogService.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/ComponentLibraryCatalogService.java @@ -18,18 +18,19 @@ package org.apache.skywalking.oap.server.core.config; -import java.io.*; -import java.util.*; +import java.io.FileNotFoundException; +import java.io.Reader; +import java.util.HashMap; +import java.util.Map; import org.apache.skywalking.oap.server.core.Const; import org.apache.skywalking.oap.server.library.util.ResourceUtils; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.yaml.snakeyaml.Yaml; /** - * Load settings from component-libraries.yml - * this file includes all component defines, and the component mappings, which declare the real server type based on client component. - * - * @author wusheng + * Load settings from component-libraries.yml this file includes all component defines, and the component mappings, + * which declare the real server type based on client component. */ public class ComponentLibraryCatalogService implements IComponentLibraryCatalogService { private static final Logger logger = LoggerFactory.getLogger(ComponentLibraryCatalogService.class); @@ -81,15 +82,15 @@ private void init() throws InitialComponentCatalogException { Map map = yaml.loadAs(applicationReader, Map.class); map.forEach((componentName, settingCollection) -> { - Map settings = (Map)settingCollection; + Map settings = (Map) settingCollection; if (COMPONENT_SERVER_MAPPING_SECTION.equals(componentName)) { settings.forEach((name, serverName) -> { - nameMapping.put((String)name, (String)serverName); + nameMapping.put((String) name, (String) serverName); }); } else { - Integer componentId = (Integer)settings.get("id"); - componentName2Id.put((String)componentName, componentId); - componentId2Name.put(componentId, (String)componentName); + Integer componentId = (Integer) settings.get("id"); + componentName2Id.put((String) componentName, componentId); + componentId2Name.put(componentId, (String) componentName); } }); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/ConfigService.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/ConfigService.java index a5f86f7fd55a..17e23ca339f8 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/ConfigService.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/ConfigService.java @@ -19,12 +19,10 @@ package org.apache.skywalking.oap.server.core.config; import lombok.Getter; -import org.apache.skywalking.oap.server.core.*; +import org.apache.skywalking.oap.server.core.CoreModuleConfig; +import org.apache.skywalking.oap.server.core.DataTTLConfig; import org.apache.skywalking.oap.server.library.module.Service; -/** - * @author wusheng - */ @Getter public class ConfigService implements Service { private final String gRPCHost; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/DownsamplingConfigService.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/DownsamplingConfigService.java index d8df6a7ed404..ac0f4973fe0d 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/DownsamplingConfigService.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/DownsamplingConfigService.java @@ -22,9 +22,6 @@ import org.apache.skywalking.oap.server.core.analysis.Downsampling; import org.apache.skywalking.oap.server.library.module.Service; -/** - * @author peng-yongsheng - */ public class DownsamplingConfigService implements Service { private boolean shouldToHour = false; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/IComponentLibraryCatalogService.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/IComponentLibraryCatalogService.java index b848b1519de2..6f4ed3b992dd 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/IComponentLibraryCatalogService.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/IComponentLibraryCatalogService.java @@ -20,9 +20,6 @@ import org.apache.skywalking.oap.server.library.module.Service; -/** - * @author wusheng - */ public interface IComponentLibraryCatalogService extends Service { int getComponentId(String componentName); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/InitialComponentCatalogException.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/InitialComponentCatalogException.java index 3592808788a1..d1e04ec6303c 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/InitialComponentCatalogException.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/InitialComponentCatalogException.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.core.config; -/** - * @author wusheng - */ class InitialComponentCatalogException extends RuntimeException { InitialComponentCatalogException(String message) { super(message); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/exporter/ExportEvent.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/exporter/ExportEvent.java index cce4e0c81077..8a38efce1d6b 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/exporter/ExportEvent.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/exporter/ExportEvent.java @@ -22,10 +22,8 @@ import org.apache.skywalking.oap.server.core.analysis.metrics.Metrics; /** - * The event for exporter {@link MetricValuesExportService} implementation processes. - * {@link #metrics} should not be changed in any case. - * - * @author wusheng + * The event for exporter {@link MetricValuesExportService} implementation processes. {@link #metrics} should not be + * changed in any case. */ @Getter public class ExportEvent { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/exporter/ExporterModule.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/exporter/ExporterModule.java index 8669c30a706a..8a409a33586f 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/exporter/ExporterModule.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/exporter/ExporterModule.java @@ -20,9 +20,6 @@ import org.apache.skywalking.oap.server.library.module.ModuleDefine; -/** - * @author wusheng - */ public class ExporterModule extends ModuleDefine { public static final String NAME = "exporter"; @@ -30,7 +27,8 @@ public ExporterModule() { super(NAME); } - @Override public Class[] services() { + @Override + public Class[] services() { return new Class[] {MetricValuesExportService.class}; } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/exporter/MetricValuesExportService.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/exporter/MetricValuesExportService.java index f6f461e95e75..dd83788fd31c 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/exporter/MetricValuesExportService.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/exporter/MetricValuesExportService.java @@ -22,12 +22,11 @@ /** * Export the metrics value from metrics through this service, if provider exists. - * - * @author wusheng */ public interface MetricValuesExportService extends Service { /** - * This method is sync-mode export, the performance effects the persistence result. Queue mode is highly recommended. + * This method is sync-mode export, the performance effects the persistence result. Queue mode is highly + * recommended. * * @param event value is only accurate when the method invokes. Don't cache it. */ diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/oal/rt/OALCompileException.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/oal/rt/OALCompileException.java index b72321e24a76..9eb05bd5d672 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/oal/rt/OALCompileException.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/oal/rt/OALCompileException.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.core.oal.rt; -/** - * @author wusheng - */ public class OALCompileException extends Exception { public OALCompileException(String message) { super(message); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/oal/rt/OALEngine.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/oal/rt/OALEngine.java index 7eaf814376c4..95d29537a935 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/oal/rt/OALEngine.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/oal/rt/OALEngine.java @@ -24,8 +24,6 @@ /** * OALEngine defines the main entrance of the oal script engine runtime. - * - * @author wusheng */ public interface OALEngine { void setStreamListener(StreamAnnotationListener listener) throws ModuleStartException; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/oal/rt/OALEngineLoader.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/oal/rt/OALEngineLoader.java index a921635410a0..e25dcf497f46 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/oal/rt/OALEngineLoader.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/oal/rt/OALEngineLoader.java @@ -22,8 +22,6 @@ /** * Load the OAL Engine runtime, because runtime module depends on core, so we have to use class::forname to locate it. - * - * @author wusheng */ public class OALEngineLoader { private static volatile OALEngine ENGINE = null; @@ -45,6 +43,6 @@ public static OALEngine get() throws ClassNotFoundException, InstantiationExcept private static void init() throws ClassNotFoundException, IllegalAccessException, InstantiationException { Class engineRTClass = Class.forName("org.apache.skywalking.oal.rt.OALRuntime"); - ENGINE = (OALEngine)engineRTClass.newInstance(); + ENGINE = (OALEngine) engineRTClass.newInstance(); } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileTaskLogRecord.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileTaskLogRecord.java index 4ff10f410ad2..ebbdd2da00e7 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileTaskLogRecord.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileTaskLogRecord.java @@ -15,8 +15,11 @@ * limitations under the License. * */ + package org.apache.skywalking.oap.server.core.profile; +import java.util.HashMap; +import java.util.Map; import lombok.Getter; import lombok.Setter; import org.apache.skywalking.oap.server.core.Const; @@ -27,15 +30,10 @@ import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.Column; -import java.util.HashMap; -import java.util.Map; - import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.PROFILE_TASK_LOG; /** * profile task log database bean, use record - * - * @author MrPro */ @Getter @Setter @@ -49,10 +47,14 @@ public class ProfileTaskLogRecord extends Record { public static final String OPERATION_TYPE = "operation_type"; public static final String OPERATION_TIME = "operation_time"; - @Column(columnName = TASK_ID) private String taskId; - @Column(columnName = INSTANCE_ID) private int instanceId; - @Column(columnName = OPERATION_TYPE) private int operationType; - @Column(columnName = OPERATION_TIME) private long operationTime; + @Column(columnName = TASK_ID) + private String taskId; + @Column(columnName = INSTANCE_ID) + private int instanceId; + @Column(columnName = OPERATION_TYPE) + private int operationType; + @Column(columnName = OPERATION_TIME) + private long operationTime; @Override public String id() { @@ -64,11 +66,11 @@ public static class Builder implements StorageBuilder { @Override public ProfileTaskLogRecord map2Data(Map dbMap) { final ProfileTaskLogRecord log = new ProfileTaskLogRecord(); - log.setTaskId((String)dbMap.get(TASK_ID)); - log.setInstanceId(((Number)dbMap.get(INSTANCE_ID)).intValue()); - log.setOperationType(((Number)dbMap.get(OPERATION_TYPE)).intValue()); - log.setOperationTime(((Number)dbMap.get(OPERATION_TIME)).longValue()); - log.setTimeBucket(((Number)dbMap.get(TIME_BUCKET)).longValue()); + log.setTaskId((String) dbMap.get(TASK_ID)); + log.setInstanceId(((Number) dbMap.get(INSTANCE_ID)).intValue()); + log.setOperationType(((Number) dbMap.get(OPERATION_TYPE)).intValue()); + log.setOperationTime(((Number) dbMap.get(OPERATION_TIME)).longValue()); + log.setTimeBucket(((Number) dbMap.get(TIME_BUCKET)).longValue()); return log; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileTaskMutationService.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileTaskMutationService.java index 2ba4f67203c7..b9f703a2d627 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileTaskMutationService.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileTaskMutationService.java @@ -15,8 +15,12 @@ * limitations under the License. * */ + package org.apache.skywalking.oap.server.core.profile; +import java.io.IOException; +import java.util.List; +import java.util.concurrent.TimeUnit; import org.apache.skywalking.apm.network.constants.ProfileConstants; import org.apache.skywalking.apm.util.StringUtil; import org.apache.skywalking.oap.server.core.analysis.Downsampling; @@ -30,13 +34,6 @@ import org.apache.skywalking.oap.server.library.module.Service; import org.apache.skywalking.oap.server.library.util.CollectionUtils; -import java.io.IOException; -import java.util.List; -import java.util.concurrent.TimeUnit; - -/** - * @author MrPro - */ public class ProfileTaskMutationService implements Service { private final ModuleManager moduleManager; @@ -48,24 +45,28 @@ public ProfileTaskMutationService(ModuleManager moduleManager) { private IProfileTaskQueryDAO getProfileTaskDAO() { if (profileTaskQueryDAO == null) { - this.profileTaskQueryDAO = moduleManager.find(StorageModule.NAME).provider().getService(IProfileTaskQueryDAO.class); + this.profileTaskQueryDAO = moduleManager.find(StorageModule.NAME) + .provider() + .getService(IProfileTaskQueryDAO.class); } return profileTaskQueryDAO; } /** * create new profile task - * @param serviceId monitor service id - * @param endpointName monitor endpoint name - * @param monitorStartTime create fix start time task when it's bigger 0 - * @param monitorDuration monitor task duration(minute) + * + * @param serviceId monitor service id + * @param endpointName monitor endpoint name + * @param monitorStartTime create fix start time task when it's bigger 0 + * @param monitorDuration monitor task duration(minute) * @param minDurationThreshold min duration threshold - * @param dumpPeriod dump period - * @param maxSamplingCount max trace count on sniffer + * @param dumpPeriod dump period + * @param maxSamplingCount max trace count on sniffer * @return task create result */ - public ProfileTaskCreationResult createTask(final int serviceId, final String endpointName, final long monitorStartTime, final int monitorDuration, - final int minDurationThreshold, final int dumpPeriod, final int maxSamplingCount) throws IOException { + public ProfileTaskCreationResult createTask(final int serviceId, final String endpointName, + final long monitorStartTime, final int monitorDuration, final int minDurationThreshold, final int dumpPeriod, + final int maxSamplingCount) throws IOException { // calculate task execute range long taskStartTime = monitorStartTime > 0 ? monitorStartTime : System.currentTimeMillis(); @@ -94,8 +95,9 @@ public ProfileTaskCreationResult createTask(final int serviceId, final String en return ProfileTaskCreationResult.builder().id(task.id()).build(); } - private String checkDataSuccess(final Integer serviceId, final String endpointName, final long monitorStartTime, final long monitorEndTime, final int monitorDuration, - final int minDurationThreshold, final int dumpPeriod, final int maxSamplingCount) throws IOException { + private String checkDataSuccess(final Integer serviceId, final String endpointName, final long monitorStartTime, + final long monitorEndTime, final int monitorDuration, final int minDurationThreshold, final int dumpPeriod, + final int maxSamplingCount) throws IOException { // basic check if (serviceId == null) { return "service cannot be null"; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileTaskNoneStream.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileTaskNoneStream.java index 446f97f3b79c..fb92f23978d5 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileTaskNoneStream.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileTaskNoneStream.java @@ -18,6 +18,8 @@ package org.apache.skywalking.oap.server.core.profile; +import java.util.HashMap; +import java.util.Map; import lombok.Getter; import lombok.Setter; import org.apache.skywalking.oap.server.core.Const; @@ -28,15 +30,10 @@ import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.Column; -import java.util.HashMap; -import java.util.Map; - import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.PROFILE_TASK; /** * profile task database bean, use none stream - * - * @author MrPro */ @Getter @Setter @@ -59,29 +56,37 @@ public String id() { return getCreateTime() + Const.ID_SPLIT + getServiceId(); } - @Column(columnName = SERVICE_ID) private int serviceId; - @Column(columnName = ENDPOINT_NAME) private String endpointName; - @Column(columnName = START_TIME) private long startTime; - @Column(columnName = DURATION) private int duration; - @Column(columnName = MIN_DURATION_THRESHOLD) private int minDurationThreshold; - @Column(columnName = DUMP_PERIOD) private int dumpPeriod; - @Column(columnName = CREATE_TIME) private long createTime; - @Column(columnName = MAX_SAMPLING_COUNT) private int maxSamplingCount; + @Column(columnName = SERVICE_ID) + private int serviceId; + @Column(columnName = ENDPOINT_NAME) + private String endpointName; + @Column(columnName = START_TIME) + private long startTime; + @Column(columnName = DURATION) + private int duration; + @Column(columnName = MIN_DURATION_THRESHOLD) + private int minDurationThreshold; + @Column(columnName = DUMP_PERIOD) + private int dumpPeriod; + @Column(columnName = CREATE_TIME) + private long createTime; + @Column(columnName = MAX_SAMPLING_COUNT) + private int maxSamplingCount; public static class Builder implements StorageBuilder { @Override public ProfileTaskNoneStream map2Data(Map dbMap) { final ProfileTaskNoneStream record = new ProfileTaskNoneStream(); - record.setServiceId(((Number)dbMap.get(SERVICE_ID)).intValue()); - record.setEndpointName((String)dbMap.get(ENDPOINT_NAME)); - record.setStartTime(((Number)dbMap.get(START_TIME)).longValue()); - record.setDuration(((Number)dbMap.get(DURATION)).intValue()); - record.setMinDurationThreshold(((Number)dbMap.get(MIN_DURATION_THRESHOLD)).intValue()); - record.setDumpPeriod(((Number)dbMap.get(DUMP_PERIOD)).intValue()); - record.setCreateTime(((Number)dbMap.get(CREATE_TIME)).longValue()); - record.setTimeBucket(((Number)dbMap.get(TIME_BUCKET)).longValue()); - record.setMaxSamplingCount(((Number)dbMap.get(MAX_SAMPLING_COUNT)).intValue()); + record.setServiceId(((Number) dbMap.get(SERVICE_ID)).intValue()); + record.setEndpointName((String) dbMap.get(ENDPOINT_NAME)); + record.setStartTime(((Number) dbMap.get(START_TIME)).longValue()); + record.setDuration(((Number) dbMap.get(DURATION)).intValue()); + record.setMinDurationThreshold(((Number) dbMap.get(MIN_DURATION_THRESHOLD)).intValue()); + record.setDumpPeriod(((Number) dbMap.get(DUMP_PERIOD)).intValue()); + record.setCreateTime(((Number) dbMap.get(CREATE_TIME)).longValue()); + record.setTimeBucket(((Number) dbMap.get(TIME_BUCKET)).longValue()); + record.setMaxSamplingCount(((Number) dbMap.get(MAX_SAMPLING_COUNT)).intValue()); return record; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileThreadSnapshotRecord.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileThreadSnapshotRecord.java index 981a7707dbb8..42ff8f0d96f6 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileThreadSnapshotRecord.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileThreadSnapshotRecord.java @@ -15,8 +15,12 @@ * limitations under the License. * */ + package org.apache.skywalking.oap.server.core.profile; +import java.util.Base64; +import java.util.HashMap; +import java.util.Map; import lombok.Getter; import lombok.Setter; import org.apache.skywalking.apm.util.StringUtil; @@ -29,16 +33,10 @@ import org.apache.skywalking.oap.server.core.storage.annotation.Column; import org.apache.skywalking.oap.server.library.util.CollectionUtils; -import java.util.Base64; -import java.util.HashMap; -import java.util.Map; - import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.PROFILE_TASK_SEGMENT_SNAPSHOT; /** * Profiling segment snapshot database bean, use record - * - * @author MrPro */ @Getter @Setter @@ -53,11 +51,16 @@ public class ProfileThreadSnapshotRecord extends Record { public static final String SEQUENCE = "sequence"; public static final String STACK_BINARY = "stack_binary"; - @Column(columnName = TASK_ID) private String taskId; - @Column(columnName = SEGMENT_ID) private String segmentId; - @Column(columnName = DUMP_TIME) private long dumpTime; - @Column(columnName = SEQUENCE) private int sequence; - @Column(columnName = STACK_BINARY) private byte[] stackBinary; + @Column(columnName = TASK_ID) + private String taskId; + @Column(columnName = SEGMENT_ID) + private String segmentId; + @Column(columnName = DUMP_TIME) + private long dumpTime; + @Column(columnName = SEQUENCE) + private int sequence; + @Column(columnName = STACK_BINARY) + private byte[] stackBinary; @Override public String id() { @@ -69,15 +72,15 @@ public static class Builder implements StorageBuilder dbMap) { final ProfileThreadSnapshotRecord snapshot = new ProfileThreadSnapshotRecord(); - snapshot.setTaskId((String)dbMap.get(TASK_ID)); - snapshot.setSegmentId((String)dbMap.get(SEGMENT_ID)); - snapshot.setDumpTime(((Number)dbMap.get(DUMP_TIME)).longValue()); - snapshot.setSequence(((Number)dbMap.get(SEQUENCE)).intValue()); - snapshot.setTimeBucket(((Number)dbMap.get(TIME_BUCKET)).intValue()); - if (StringUtil.isEmpty((String)dbMap.get(STACK_BINARY))) { + snapshot.setTaskId((String) dbMap.get(TASK_ID)); + snapshot.setSegmentId((String) dbMap.get(SEGMENT_ID)); + snapshot.setDumpTime(((Number) dbMap.get(DUMP_TIME)).longValue()); + snapshot.setSequence(((Number) dbMap.get(SEQUENCE)).intValue()); + snapshot.setTimeBucket(((Number) dbMap.get(TIME_BUCKET)).intValue()); + if (StringUtil.isEmpty((String) dbMap.get(STACK_BINARY))) { snapshot.setStackBinary(new byte[] {}); } else { - snapshot.setStackBinary(Base64.getDecoder().decode((String)dbMap.get(STACK_BINARY))); + snapshot.setStackBinary(Base64.getDecoder().decode((String) dbMap.get(STACK_BINARY))); } return snapshot; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/analyze/ProfileAnalyzeCollector.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/analyze/ProfileAnalyzeCollector.java index d8875dc66764..8645df3bb92f 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/analyze/ProfileAnalyzeCollector.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/analyze/ProfileAnalyzeCollector.java @@ -18,8 +18,6 @@ package org.apache.skywalking.oap.server.core.profile.analyze; -import org.apache.skywalking.oap.server.core.query.entity.ProfileStackTree; - import java.util.Collections; import java.util.EnumSet; import java.util.Set; @@ -28,6 +26,7 @@ import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Collector; +import org.apache.skywalking.oap.server.core.query.entity.ProfileStackTree; /** * Work for {@link ProfileAnalyzer} to analyze. diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/analyze/ProfileAnalyzer.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/analyze/ProfileAnalyzer.java index c8786266202f..57b738db9218 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/analyze/ProfileAnalyzer.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/analyze/ProfileAnalyzer.java @@ -18,6 +18,14 @@ package org.apache.skywalking.oap.server.core.profile.analyze; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; import org.apache.skywalking.oap.server.core.profile.ProfileThreadSnapshotRecord; import org.apache.skywalking.oap.server.core.query.entity.ProfileAnalyzation; import org.apache.skywalking.oap.server.core.query.entity.ProfileStackTree; @@ -28,10 +36,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.util.*; -import java.util.stream.Collectors; - /** * Analyze {@link ProfileStack} data to {@link ProfileAnalyzation} * @@ -57,10 +61,6 @@ public ProfileAnalyzer(ModuleManager moduleManager, int snapshotAnalyzeBatchSize /** * search snapshots and analyze - * @param segmentId - * @param start - * @param end - * @return */ public ProfileAnalyzation analyze(String segmentId, long start, long end) throws IOException { ProfileAnalyzation analyzation = new ProfileAnalyzation(); @@ -83,7 +83,7 @@ public ProfileAnalyzation analyze(String segmentId, long start, long end) throws LOGGER.warn(e.getMessage(), e); return Collections.emptyList(); } - }).flatMap(t -> t.stream()).map(ProfileStack::deserialize).collect(Collectors.toList()); + }).flatMap(Collection::stream).map(ProfileStack::deserialize).collect(Collectors.toList()); // analyze analyzation.setTrees(analyze(stacks)); @@ -108,7 +108,8 @@ private SequenceSearch getAllSequenceRange(String segmentId, long start, long en int batchMax = Math.min(minSequence + threadSnapshotAnalyzeBatchSize, maxSequence); sequenceSearch.getRanges().add(new SequenceRange(minSequence, batchMax)); minSequence = batchMax + 1; - } while (minSequence < maxSequence); + } + while (minSequence < maxSequence); // increase last range max sequence, need to include last sequence data sequenceSearch.getRanges().getLast().increaseMaxSequence(); @@ -118,8 +119,6 @@ private SequenceSearch getAllSequenceRange(String segmentId, long start, long en /** * Analyze records - * @param stacks - * @return */ protected List analyze(List stacks) { if (CollectionUtils.isEmpty(stacks)) { @@ -128,16 +127,19 @@ protected List analyze(List stacks) { // using parallel stream Map stackTrees = stacks.parallelStream() - // stack list cannot be empty - .filter(s -> CollectionUtils.isNotEmpty(s.getStack())) - .collect(Collectors.groupingBy(s -> s.getStack().get(0), ANALYZE_COLLECTOR)); + // stack list cannot be empty + .filter(s -> CollectionUtils.isNotEmpty(s.getStack())) + .collect(Collectors.groupingBy(s -> s.getStack() + .get(0), ANALYZE_COLLECTOR)); return new ArrayList<>(stackTrees.values()); } private IProfileThreadSnapshotQueryDAO getProfileThreadSnapshotQueryDAO() { if (profileThreadSnapshotQueryDAO == null) { - profileThreadSnapshotQueryDAO = moduleManager.find(StorageModule.NAME).provider().getService(IProfileThreadSnapshotQueryDAO.class); + profileThreadSnapshotQueryDAO = moduleManager.find(StorageModule.NAME) + .provider() + .getService(IProfileThreadSnapshotQueryDAO.class); } return profileThreadSnapshotQueryDAO; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/analyze/ProfileStack.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/analyze/ProfileStack.java index c31b609e7791..de10e5ce6dbd 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/analyze/ProfileStack.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/analyze/ProfileStack.java @@ -20,12 +20,11 @@ import com.google.common.primitives.Ints; import com.google.protobuf.InvalidProtocolBufferException; +import java.util.List; import lombok.Data; import org.apache.skywalking.apm.network.language.profile.ThreadStack; import org.apache.skywalking.oap.server.core.profile.ProfileThreadSnapshotRecord; -import java.util.List; - /** * Deserialize from {@link ProfileThreadSnapshotRecord} */ diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/analyze/ProfileStackNode.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/analyze/ProfileStackNode.java index 289347912eec..5e0313f19daa 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/analyze/ProfileStackNode.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/analyze/ProfileStackNode.java @@ -19,12 +19,15 @@ package org.apache.skywalking.oap.server.core.profile.analyze; import com.google.common.base.Objects; +import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.ListIterator; +import java.util.function.Consumer; import org.apache.skywalking.oap.server.core.query.entity.ProfileStackElement; import org.apache.skywalking.oap.server.core.query.entity.ProfileStackTree; -import java.util.*; -import java.util.function.Consumer; - /** * Work for profiling stacks, intermediate state of the {@link ProfileStackElement} and {@link ProfileStack} */ @@ -37,7 +40,6 @@ public class ProfileStackNode { /** * create new empty, un-init node - * @return */ public static ProfileStackNode newNode() { ProfileStackNode emptyNode = new ProfileStackNode(); @@ -48,7 +50,6 @@ public static ProfileStackNode newNode() { /** * accumulate {@link ProfileStack} to this tree, it will invoke on the tree root node - * @param stack */ public void accumulateFrom(ProfileStack stack) { List stackList = stack.getStack(); @@ -90,8 +91,6 @@ public void accumulateFrom(ProfileStack stack) { /** * combine from other {@link ProfileStackNode} - * @param node - * @return */ public ProfileStackNode combine(ProfileStackNode node) { // combine this node @@ -115,18 +114,16 @@ public ProfileStackNode combine(ProfileStackNode node) { /** * merge all children nodes to appoint node - * @param targetNode - * @param beingMergedNode - * @param continueChildrenMerging */ - private void combineChildrenNodes(ProfileStackNode targetNode, ProfileStackNode beingMergedNode, Consumer> continueChildrenMerging) { + private void combineChildrenNodes(ProfileStackNode targetNode, ProfileStackNode beingMergedNode, + Consumer> continueChildrenMerging) { if (beingMergedNode.children.isEmpty()) { return; } for (ProfileStackNode childrenNode : targetNode.children) { // find node from being merged node children - for (ListIterator it = beingMergedNode.children.listIterator(); it.hasNext();) { + for (ListIterator it = beingMergedNode.children.listIterator(); it.hasNext(); ) { ProfileStackNode node = it.next(); if (node != null && node.matches(childrenNode)) { childrenNode.combineDetectedStacks(node); @@ -147,7 +144,6 @@ private void combineChildrenNodes(ProfileStackNode targetNode, ProfileStackNode /** * build GraphQL result, calculate duration and count data using parallels - * @return */ public ProfileStackTree buildAnalyzeResult() { // all nodes add to single-level list (such as flat), work for parallel calculating @@ -236,8 +232,8 @@ private void calculateDuration(ProfileStackElement element) { } /** - * calculate duration to {@link ProfileStackElement#getDurationChildExcluded()}, expends on {@link #calculateDuration(ProfileStackElement)} - * @param element + * calculate duration to {@link ProfileStackElement#getDurationChildExcluded()}, expends on {@link + * #calculateDuration(ProfileStackElement)} */ private void calculateDurationExcludeChild(ProfileStackElement element) { element.setDurationChildExcluded(element.getDuration() - children.stream().mapToInt(t -> t.duration).sum()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/entity/ProfileTaskCreationResult.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/entity/ProfileTaskCreationResult.java index 46a3e4033c98..5a8842205410 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/entity/ProfileTaskCreationResult.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/entity/ProfileTaskCreationResult.java @@ -18,12 +18,14 @@ package org.apache.skywalking.oap.server.core.profile.entity; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; /** * create profile task result - * - * @author MrPro */ @Setter @Getter diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/AggregationQueryService.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/AggregationQueryService.java index 271926c379ea..6397af0fe1b1 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/AggregationQueryService.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/AggregationQueryService.java @@ -22,18 +22,20 @@ import java.util.List; import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.analysis.Downsampling; -import org.apache.skywalking.oap.server.core.cache.*; -import org.apache.skywalking.oap.server.core.query.entity.*; -import org.apache.skywalking.oap.server.core.register.*; +import org.apache.skywalking.oap.server.core.cache.EndpointInventoryCache; +import org.apache.skywalking.oap.server.core.cache.ServiceInstanceInventoryCache; +import org.apache.skywalking.oap.server.core.cache.ServiceInventoryCache; +import org.apache.skywalking.oap.server.core.query.entity.Order; +import org.apache.skywalking.oap.server.core.query.entity.TopNEntity; +import org.apache.skywalking.oap.server.core.register.EndpointInventory; +import org.apache.skywalking.oap.server.core.register.ServiceInstanceInventory; +import org.apache.skywalking.oap.server.core.register.ServiceInventory; import org.apache.skywalking.oap.server.core.storage.StorageModule; import org.apache.skywalking.oap.server.core.storage.annotation.ValueColumnIds; import org.apache.skywalking.oap.server.core.storage.query.IAggregationQueryDAO; +import org.apache.skywalking.oap.server.library.module.ModuleManager; import org.apache.skywalking.oap.server.library.module.Service; -import org.apache.skywalking.oap.server.library.module.*; -/** - * @author peng-yongsheng - */ public class AggregationQueryService implements Service { private final ModuleManager moduleManager; @@ -45,16 +47,21 @@ public AggregationQueryService(ModuleManager moduleManager) { private IAggregationQueryDAO getAggregationQueryDAO() { if (aggregationQueryDAO == null) { - aggregationQueryDAO = moduleManager.find(StorageModule.NAME).provider().getService(IAggregationQueryDAO.class); + aggregationQueryDAO = moduleManager.find(StorageModule.NAME) + .provider() + .getService(IAggregationQueryDAO.class); } return aggregationQueryDAO; } - public List getServiceTopN(final String indName, final int topN, final Downsampling downsampling, final long startTB, - final long endTB, final Order order) throws IOException { + public List getServiceTopN(final String indName, final int topN, final Downsampling downsampling, + final long startTB, final long endTB, final Order order) throws IOException { List topNEntities = getAggregationQueryDAO().getServiceTopN(indName, ValueColumnIds.INSTANCE.getValueCName(indName), topN, downsampling, startTB, endTB, order); for (TopNEntity entity : topNEntities) { - ServiceInventory inventory = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInventoryCache.class).get(Integer.parseInt(entity.getId())); + ServiceInventory inventory = moduleManager.find(CoreModule.NAME) + .provider() + .getService(ServiceInventoryCache.class) + .get(Integer.parseInt(entity.getId())); if (inventory != null) { entity.setName(inventory.getName()); } @@ -62,11 +69,15 @@ public List getServiceTopN(final String indName, final int topN, fin return topNEntities; } - public List getAllServiceInstanceTopN(final String indName, final int topN, final Downsampling downsampling, - final long startTB, final long endTB, final Order order) throws IOException { - List topNEntities = getAggregationQueryDAO().getAllServiceInstanceTopN(indName, ValueColumnIds.INSTANCE.getValueCName(indName), topN, downsampling, startTB, endTB, order); + public List getAllServiceInstanceTopN(final String indName, final int topN, + final Downsampling downsampling, final long startTB, final long endTB, final Order order) throws IOException { + List topNEntities = getAggregationQueryDAO().getAllServiceInstanceTopN(indName, ValueColumnIds.INSTANCE + .getValueCName(indName), topN, downsampling, startTB, endTB, order); for (TopNEntity entity : topNEntities) { - ServiceInstanceInventory inventory = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInstanceInventoryCache.class).get(Integer.parseInt(entity.getId())); + ServiceInstanceInventory inventory = moduleManager.find(CoreModule.NAME) + .provider() + .getService(ServiceInstanceInventoryCache.class) + .get(Integer.parseInt(entity.getId())); if (inventory != null) { entity.setName(inventory.getName()); } @@ -76,9 +87,13 @@ public List getAllServiceInstanceTopN(final String indName, final in public List getServiceInstanceTopN(final int serviceId, final String indName, final int topN, final Downsampling downsampling, final long startTB, final long endTB, final Order order) throws IOException { - List topNEntities = getAggregationQueryDAO().getServiceInstanceTopN(serviceId, indName, ValueColumnIds.INSTANCE.getValueCName(indName), topN, downsampling, startTB, endTB, order); + List topNEntities = getAggregationQueryDAO().getServiceInstanceTopN(serviceId, indName, ValueColumnIds.INSTANCE + .getValueCName(indName), topN, downsampling, startTB, endTB, order); for (TopNEntity entity : topNEntities) { - ServiceInstanceInventory inventory = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInstanceInventoryCache.class).get(Integer.parseInt(entity.getId())); + ServiceInstanceInventory inventory = moduleManager.find(CoreModule.NAME) + .provider() + .getService(ServiceInstanceInventoryCache.class) + .get(Integer.parseInt(entity.getId())); if (inventory != null) { entity.setName(inventory.getName()); } @@ -90,7 +105,10 @@ public List getAllEndpointTopN(final String indName, final int topN, final long startTB, final long endTB, final Order order) throws IOException { List topNEntities = getAggregationQueryDAO().getAllEndpointTopN(indName, ValueColumnIds.INSTANCE.getValueCName(indName), topN, downsampling, startTB, endTB, order); for (TopNEntity entity : topNEntities) { - EndpointInventory inventory = moduleManager.find(CoreModule.NAME).provider().getService(EndpointInventoryCache.class).get(Integer.parseInt(entity.getId())); + EndpointInventory inventory = moduleManager.find(CoreModule.NAME) + .provider() + .getService(EndpointInventoryCache.class) + .get(Integer.parseInt(entity.getId())); if (inventory != null) { entity.setName(inventory.getName()); } @@ -100,9 +118,13 @@ public List getAllEndpointTopN(final String indName, final int topN, public List getEndpointTopN(final int serviceId, final String indName, final int topN, final Downsampling downsampling, final long startTB, final long endTB, final Order order) throws IOException { - List topNEntities = getAggregationQueryDAO().getEndpointTopN(serviceId, indName, ValueColumnIds.INSTANCE.getValueCName(indName), topN, downsampling, startTB, endTB, order); + List topNEntities = getAggregationQueryDAO().getEndpointTopN(serviceId, indName, ValueColumnIds.INSTANCE + .getValueCName(indName), topN, downsampling, startTB, endTB, order); for (TopNEntity entity : topNEntities) { - EndpointInventory inventory = moduleManager.find(CoreModule.NAME).provider().getService(EndpointInventoryCache.class).get(Integer.parseInt(entity.getId())); + EndpointInventory inventory = moduleManager.find(CoreModule.NAME) + .provider() + .getService(EndpointInventoryCache.class) + .get(Integer.parseInt(entity.getId())); if (inventory != null) { entity.setName(inventory.getName()); } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/AlarmQueryService.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/AlarmQueryService.java index 0bc796487255..e2f65e50c9b3 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/AlarmQueryService.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/AlarmQueryService.java @@ -19,15 +19,13 @@ package org.apache.skywalking.oap.server.core.query; import java.io.IOException; -import org.apache.skywalking.oap.server.core.query.entity.*; +import org.apache.skywalking.oap.server.core.query.entity.Alarms; +import org.apache.skywalking.oap.server.core.query.entity.Pagination; import org.apache.skywalking.oap.server.core.storage.StorageModule; import org.apache.skywalking.oap.server.core.storage.query.IAlarmQueryDAO; +import org.apache.skywalking.oap.server.library.module.ModuleManager; import org.apache.skywalking.oap.server.library.module.Service; -import org.apache.skywalking.oap.server.library.module.*; -/** - * @author peng-yongsheng - */ public class AlarmQueryService implements Service { private final ModuleManager moduleManager; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/DurationPoint.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/DurationPoint.java index e086e56a1bf5..049a9bc2fe94 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/DurationPoint.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/DurationPoint.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.core.query; -/** - * @author peng-yongsheng - */ public class DurationPoint { private long point; private long secondsBetween; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/DurationUtils.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/DurationUtils.java index dd5fc44f6d3f..a78b0003d614 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/DurationUtils.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/DurationUtils.java @@ -28,9 +28,6 @@ import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; -/** - * @author peng-yongsheng - */ public enum DurationUtils { INSTANCE; @@ -156,8 +153,7 @@ public int secondsBetween(Downsampling downsampling, DateTime dateTime) { } } - public List getDurationPoints(Downsampling downsampling, long startTimeBucket, - long endTimeBucket) { + public List getDurationPoints(Downsampling downsampling, long startTimeBucket, long endTimeBucket) { DateTime dateTime = parseToDateTime(downsampling, startTimeBucket); List durations = new LinkedList<>(); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/LogQueryService.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/LogQueryService.java index ffdea88ad7fb..13b8631512ef 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/LogQueryService.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/LogQueryService.java @@ -19,19 +19,21 @@ package org.apache.skywalking.oap.server.core.query; import java.io.IOException; -import org.apache.skywalking.oap.server.core.*; -import org.apache.skywalking.oap.server.core.cache.*; -import org.apache.skywalking.oap.server.core.query.entity.*; +import org.apache.skywalking.oap.server.core.Const; +import org.apache.skywalking.oap.server.core.CoreModule; +import org.apache.skywalking.oap.server.core.cache.EndpointInventoryCache; +import org.apache.skywalking.oap.server.core.cache.ServiceInstanceInventoryCache; +import org.apache.skywalking.oap.server.core.cache.ServiceInventoryCache; +import org.apache.skywalking.oap.server.core.query.entity.LogState; +import org.apache.skywalking.oap.server.core.query.entity.Logs; +import org.apache.skywalking.oap.server.core.query.entity.Pagination; import org.apache.skywalking.oap.server.core.storage.StorageModule; import org.apache.skywalking.oap.server.core.storage.query.ILogQueryDAO; +import org.apache.skywalking.oap.server.library.module.ModuleManager; import org.apache.skywalking.oap.server.library.module.Service; -import org.apache.skywalking.oap.server.library.module.*; -/** - * @author wusheng - */ public class LogQueryService implements Service { - + private final ModuleManager moduleManager; private ILogQueryDAO logQueryDAO; private ServiceInventoryCache serviceInventoryCache; @@ -51,38 +53,44 @@ private ILogQueryDAO getLogQueryDAO() { private ServiceInventoryCache getServiceInventoryCache() { if (serviceInventoryCache == null) { - this.serviceInventoryCache = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInventoryCache.class); + this.serviceInventoryCache = moduleManager.find(CoreModule.NAME) + .provider() + .getService(ServiceInventoryCache.class); } return serviceInventoryCache; } private ServiceInstanceInventoryCache getServiceInstanceInventoryCache() { if (serviceInstanceInventoryCache == null) { - this.serviceInstanceInventoryCache = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInstanceInventoryCache.class); + this.serviceInstanceInventoryCache = moduleManager.find(CoreModule.NAME) + .provider() + .getService(ServiceInstanceInventoryCache.class); } return serviceInstanceInventoryCache; } private EndpointInventoryCache getEndpointInventoryCache() { if (endpointInventoryCache == null) { - this.endpointInventoryCache = moduleManager.find(CoreModule.NAME).provider().getService(EndpointInventoryCache.class); + this.endpointInventoryCache = moduleManager.find(CoreModule.NAME) + .provider() + .getService(EndpointInventoryCache.class); } return endpointInventoryCache; } - public Logs queryLogs(final String metricName, int serviceId, int serviceInstanceId, int endpointId, - String traceId, LogState state, String stateCode, Pagination paging, final long startTB, - final long endTB) throws IOException { + public Logs queryLogs(final String metricName, int serviceId, int serviceInstanceId, int endpointId, String traceId, + LogState state, String stateCode, Pagination paging, final long startTB, final long endTB) throws IOException { PaginationUtils.Page page = PaginationUtils.INSTANCE.exchange(paging); - Logs logs = getLogQueryDAO().queryLogs(metricName, serviceId, serviceInstanceId, endpointId, - traceId, state, stateCode, paging, page.getFrom(), page.getLimit(), startTB, endTB); + Logs logs = getLogQueryDAO().queryLogs(metricName, serviceId, serviceInstanceId, endpointId, traceId, state, stateCode, paging, page + .getFrom(), page.getLimit(), startTB, endTB); logs.getLogs().forEach(log -> { if (log.getServiceId() != Const.NONE) { log.setServiceName(getServiceInventoryCache().get(log.getServiceId()).getName()); } if (log.getServiceInstanceId() != Const.NONE) { - log.setServiceInstanceName(getServiceInstanceInventoryCache().get(log.getServiceInstanceId()).getName()); + log.setServiceInstanceName(getServiceInstanceInventoryCache().get(log.getServiceInstanceId()) + .getName()); } if (log.getEndpointId() != Const.NONE) { log.setEndpointName(getEndpointInventoryCache().get(log.getEndpointId()).getName()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/MetadataQueryService.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/MetadataQueryService.java index 8b6e3672c4fc..bae70a7bc3ea 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/MetadataQueryService.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/MetadataQueryService.java @@ -21,16 +21,20 @@ import java.io.IOException; import java.util.List; import org.apache.skywalking.oap.server.core.CoreModule; -import org.apache.skywalking.oap.server.core.cache.*; -import org.apache.skywalking.oap.server.core.query.entity.*; -import org.apache.skywalking.oap.server.core.register.*; +import org.apache.skywalking.oap.server.core.cache.EndpointInventoryCache; +import org.apache.skywalking.oap.server.core.cache.ServiceInventoryCache; +import org.apache.skywalking.oap.server.core.query.entity.ClusterBrief; +import org.apache.skywalking.oap.server.core.query.entity.Database; +import org.apache.skywalking.oap.server.core.query.entity.Endpoint; +import org.apache.skywalking.oap.server.core.query.entity.EndpointInfo; +import org.apache.skywalking.oap.server.core.query.entity.Service; +import org.apache.skywalking.oap.server.core.query.entity.ServiceInstance; +import org.apache.skywalking.oap.server.core.register.EndpointInventory; +import org.apache.skywalking.oap.server.core.register.NodeType; import org.apache.skywalking.oap.server.core.storage.StorageModule; import org.apache.skywalking.oap.server.core.storage.query.IMetadataQueryDAO; import org.apache.skywalking.oap.server.library.module.ModuleManager; -/** - * @author peng-yongsheng - */ public class MetadataQueryService implements org.apache.skywalking.oap.server.library.module.Service { private final ModuleManager moduleManager; @@ -51,14 +55,18 @@ private IMetadataQueryDAO getMetadataQueryDAO() { private ServiceInventoryCache getServiceInventoryCache() { if (serviceInventoryCache == null) { - serviceInventoryCache = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInventoryCache.class); + serviceInventoryCache = moduleManager.find(CoreModule.NAME) + .provider() + .getService(ServiceInventoryCache.class); } return serviceInventoryCache; } private EndpointInventoryCache getEndpointInventoryCache() { if (endpointInventoryCache == null) { - endpointInventoryCache = moduleManager.find(CoreModule.NAME).provider().getService(EndpointInventoryCache.class); + endpointInventoryCache = moduleManager.find(CoreModule.NAME) + .provider() + .getService(EndpointInventoryCache.class); } return endpointInventoryCache; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/MetricQueryService.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/MetricQueryService.java index d2cb9af1ac1f..edfc8184d769 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/MetricQueryService.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/MetricQueryService.java @@ -39,9 +39,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng - */ public class MetricQueryService implements Service { private static final Logger logger = LoggerFactory.getLogger(MetricQueryService.class); @@ -61,8 +58,7 @@ private IMetricsQueryDAO getMetricQueryDAO() { } public IntValues getValues(final String metricsName, final List ids, final Downsampling downsampling, - final long startTB, - final long endTB) throws IOException { + final long startTB, final long endTB) throws IOException { if (CollectionUtils.isEmpty(ids)) { /* * Don't support query values w/o ID. but UI still did this(as bug), @@ -79,12 +75,12 @@ public IntValues getValues(final String metricsName, final List ids, fin where.getKeyValues().add(intKeyValues); ids.forEach(intKeyValues.getValues()::add); - return getMetricQueryDAO().getValues(metricsName, downsampling, startTB, endTB, where, ValueColumnIds.INSTANCE.getValueCName(metricsName), ValueColumnIds.INSTANCE.getValueFunction(metricsName)); + return getMetricQueryDAO().getValues(metricsName, downsampling, startTB, endTB, where, ValueColumnIds.INSTANCE.getValueCName(metricsName), ValueColumnIds.INSTANCE + .getValueFunction(metricsName)); } public IntValues getLinearIntValues(final String indName, final String id, final Downsampling downsampling, - final long startTB, - final long endTB) throws IOException { + final long startTB, final long endTB) throws IOException { List durationPoints = DurationUtils.INSTANCE.getDurationPoints(downsampling, startTB, endTB); List ids = new ArrayList<>(); if (StringUtil.isEmpty(id)) { @@ -97,9 +93,7 @@ public IntValues getLinearIntValues(final String indName, final String id, final } public List getMultipleLinearIntValues(final String indName, final String id, final int numOfLinear, - final Downsampling downsampling, - final long startTB, - final long endTB) throws IOException { + final Downsampling downsampling, final long startTB, final long endTB) throws IOException { List linearIndex = new ArrayList<>(numOfLinear); for (int i = 0; i < numOfLinear; i++) { linearIndex.add(i); @@ -109,9 +103,7 @@ public List getMultipleLinearIntValues(final String indName, final St } public List getSubsetOfMultipleLinearIntValues(final String indName, final String id, - final List linearIndex, - final Downsampling downsampling, - final long startTB, + final List linearIndex, final Downsampling downsampling, final long startTB, final long endTB) throws IOException { List durationPoints = DurationUtils.INSTANCE.getDurationPoints(downsampling, startTB, endTB); List ids = new ArrayList<>(); @@ -121,7 +113,8 @@ public List getSubsetOfMultipleLinearIntValues(final String indName, durationPoints.forEach(durationPoint -> ids.add(durationPoint.getPoint() + Const.ID_SPLIT + id)); } - IntValues[] multipleLinearIntValues = getMetricQueryDAO().getMultipleLinearIntValues(indName, downsampling, ids, linearIndex, ValueColumnIds.INSTANCE.getValueCName(indName)); + IntValues[] multipleLinearIntValues = getMetricQueryDAO().getMultipleLinearIntValues(indName, downsampling, ids, linearIndex, ValueColumnIds.INSTANCE + .getValueCName(indName)); List response = new ArrayList<>(linearIndex.size()); Collections.addAll(response, multipleLinearIntValues); @@ -129,8 +122,7 @@ public List getSubsetOfMultipleLinearIntValues(final String indName, } public Thermodynamic getThermodynamic(final String indName, final String id, final Downsampling downsampling, - final long startTB, - final long endTB) throws IOException { + final long startTB, final long endTB) throws IOException { List durationPoints = DurationUtils.INSTANCE.getDurationPoints(downsampling, startTB, endTB); List ids = new ArrayList<>(); durationPoints.forEach(durationPoint -> { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/PaginationUtils.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/PaginationUtils.java index 8d7002af035e..fe1c81656841 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/PaginationUtils.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/PaginationUtils.java @@ -20,9 +20,6 @@ import org.apache.skywalking.oap.server.core.query.entity.Pagination; -/** - * @author peng-yongsheng - */ public enum PaginationUtils { INSTANCE; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/ProfileTaskQueryService.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/ProfileTaskQueryService.java index 58aef9d2f15c..72012ccb66fd 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/ProfileTaskQueryService.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/ProfileTaskQueryService.java @@ -15,9 +15,14 @@ * limitations under the License. * */ + package org.apache.skywalking.oap.server.core.query; import com.google.common.base.Objects; +import java.io.IOException; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.CoreModuleConfig; import org.apache.skywalking.oap.server.core.cache.ServiceInstanceInventoryCache; @@ -37,17 +42,10 @@ import org.apache.skywalking.oap.server.library.module.Service; import org.apache.skywalking.oap.server.library.util.CollectionUtils; -import java.io.IOException; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; - import static java.util.Objects.isNull; /** * handle profile task queries - * - * @author MrPro */ public class ProfileTaskQueryService implements Service { private final ModuleManager moduleManager; @@ -66,44 +64,54 @@ public ProfileTaskQueryService(ModuleManager moduleManager, CoreModuleConfig mod private IProfileTaskQueryDAO getProfileTaskDAO() { if (isNull(profileTaskQueryDAO)) { - this.profileTaskQueryDAO = moduleManager.find(StorageModule.NAME).provider().getService(IProfileTaskQueryDAO.class); + this.profileTaskQueryDAO = moduleManager.find(StorageModule.NAME) + .provider() + .getService(IProfileTaskQueryDAO.class); } return profileTaskQueryDAO; } private ServiceInventoryCache getServiceInventoryCache() { if (isNull(serviceInventoryCache)) { - this.serviceInventoryCache = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInventoryCache.class); + this.serviceInventoryCache = moduleManager.find(CoreModule.NAME) + .provider() + .getService(ServiceInventoryCache.class); } return serviceInventoryCache; } private IProfileTaskLogQueryDAO getProfileTaskLogQueryDAO() { if (isNull(profileTaskLogQueryDAO)) { - profileTaskLogQueryDAO = moduleManager.find(StorageModule.NAME).provider().getService(IProfileTaskLogQueryDAO.class); + profileTaskLogQueryDAO = moduleManager.find(StorageModule.NAME) + .provider() + .getService(IProfileTaskLogQueryDAO.class); } return profileTaskLogQueryDAO; } private ServiceInstanceInventoryCache getServiceInstanceInventoryCache() { if (isNull(serviceInstanceInventoryCache)) { - serviceInstanceInventoryCache = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInstanceInventoryCache.class); + serviceInstanceInventoryCache = moduleManager.find(CoreModule.NAME) + .provider() + .getService(ServiceInstanceInventoryCache.class); } return serviceInstanceInventoryCache; } private IProfileThreadSnapshotQueryDAO getProfileThreadSnapshotQueryDAO() { if (isNull(profileThreadSnapshotQueryDAO)) { - profileThreadSnapshotQueryDAO = moduleManager.find(StorageModule.NAME).provider().getService(IProfileThreadSnapshotQueryDAO.class); + profileThreadSnapshotQueryDAO = moduleManager.find(StorageModule.NAME) + .provider() + .getService(IProfileThreadSnapshotQueryDAO.class); } return profileThreadSnapshotQueryDAO; } /** * search profile task list - * @param serviceId monitor service + * + * @param serviceId monitor service * @param endpointName endpoint name to monitored - * @return */ public List getTaskList(Integer serviceId, String endpointName) throws IOException { final List tasks = getProfileTaskDAO().getTaskList(serviceId, endpointName, null, null, null); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/QueryModule.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/QueryModule.java index 5821e4fa9f54..50b818c60dd0 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/QueryModule.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/QueryModule.java @@ -22,8 +22,6 @@ /** * The root module of Query plugin. - * - * @author gaohongtao */ public class QueryModule extends ModuleDefine { @@ -33,7 +31,8 @@ public QueryModule() { super(NAME); } - @Override public Class[] services() { + @Override + public Class[] services() { return new Class[] {}; } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/ServiceInstanceTopologyBuilder.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/ServiceInstanceTopologyBuilder.java index baa28105138b..486f486e1987 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/ServiceInstanceTopologyBuilder.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/ServiceInstanceTopologyBuilder.java @@ -18,29 +18,27 @@ package org.apache.skywalking.oap.server.core.query; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import lombok.extern.slf4j.Slf4j; import org.apache.skywalking.oap.server.core.Const; import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.cache.ServiceInstanceInventoryCache; import org.apache.skywalking.oap.server.core.cache.ServiceInventoryCache; import org.apache.skywalking.oap.server.core.config.IComponentLibraryCatalogService; -import org.apache.skywalking.oap.server.core.query.entity.*; +import org.apache.skywalking.oap.server.core.query.entity.Call; +import org.apache.skywalking.oap.server.core.query.entity.ServiceInstanceNode; +import org.apache.skywalking.oap.server.core.query.entity.ServiceInstanceTopology; import org.apache.skywalking.oap.server.core.register.ServiceInstanceInventory; import org.apache.skywalking.oap.server.core.register.ServiceInventory; import org.apache.skywalking.oap.server.core.source.DetectPoint; import org.apache.skywalking.oap.server.library.module.ModuleManager; import org.apache.skywalking.oap.server.library.util.BooleanUtils; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - import static java.util.Objects.isNull; -/** - * @author zhangwei - */ @Slf4j public class ServiceInstanceTopologyBuilder { @@ -49,12 +47,19 @@ public class ServiceInstanceTopologyBuilder { private final IComponentLibraryCatalogService componentLibraryCatalogService; public ServiceInstanceTopologyBuilder(ModuleManager moduleManager) { - this.serviceInventoryCache = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInventoryCache.class); - this.serviceInstanceInventoryCache = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInstanceInventoryCache.class); - this.componentLibraryCatalogService = moduleManager.find(CoreModule.NAME).provider().getService(IComponentLibraryCatalogService.class); + this.serviceInventoryCache = moduleManager.find(CoreModule.NAME) + .provider() + .getService(ServiceInventoryCache.class); + this.serviceInstanceInventoryCache = moduleManager.find(CoreModule.NAME) + .provider() + .getService(ServiceInstanceInventoryCache.class); + this.componentLibraryCatalogService = moduleManager.find(CoreModule.NAME) + .provider() + .getService(IComponentLibraryCatalogService.class); } - ServiceInstanceTopology build(List serviceInstanceRelationClientCalls, List serviceInstanceRelationServerCalls) { + ServiceInstanceTopology build(List serviceInstanceRelationClientCalls, + List serviceInstanceRelationServerCalls) { filterZeroSourceOrTargetReference(serviceInstanceRelationClientCalls); filterZeroSourceOrTargetReference(serviceInstanceRelationServerCalls); @@ -83,7 +88,8 @@ ServiceInstanceTopology build(List serviceInstanceRelationClien ServiceInventory targetService = serviceInventoryCache.get(targetInstance.getServiceId()); nodes.put(targetInstance.getSequence(), buildNode(targetService, targetInstance)); if (BooleanUtils.valueToBoolean(targetInstance.getIsAddress())) { - nodes.get(targetInstance.getSequence()).setType(componentLibraryCatalogService.getServerNameBasedOnComponent(clientCall.getComponentId())); + nodes.get(targetInstance.getSequence()) + .setType(componentLibraryCatalogService.getServerNameBasedOnComponent(clientCall.getComponentId())); } } @@ -171,7 +177,8 @@ ServiceInstanceTopology build(List serviceInstanceRelationClien } if (nodes.containsKey(targetInstance.getSequence())) { - nodes.get(targetInstance.getSequence()).setType(componentLibraryCatalogService.getComponentName(serverCall.getComponentId())); + nodes.get(targetInstance.getSequence()) + .setType(componentLibraryCatalogService.getComponentName(serverCall.getComponentId())); } } @@ -181,7 +188,8 @@ ServiceInstanceTopology build(List serviceInstanceRelationClien return topology; } - private ServiceInstanceNode buildNode(ServiceInventory serviceInventory, ServiceInstanceInventory instanceInventory) { + private ServiceInstanceNode buildNode(ServiceInventory serviceInventory, + ServiceInstanceInventory instanceInventory) { ServiceInstanceNode instanceNode = new ServiceInstanceNode(); instanceNode.setId(instanceInventory.getSequence()); instanceNode.setName(instanceInventory.getName()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/StepToDownsampling.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/StepToDownsampling.java index 61a193777b9b..fb487e40e7ae 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/StepToDownsampling.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/StepToDownsampling.java @@ -18,12 +18,9 @@ package org.apache.skywalking.oap.server.core.query; import org.apache.skywalking.oap.server.core.UnexpectedException; -import org.apache.skywalking.oap.server.core.query.entity.Step; import org.apache.skywalking.oap.server.core.analysis.Downsampling; +import org.apache.skywalking.oap.server.core.query.entity.Step; -/** - * @author peng-yongsheng - */ public class StepToDownsampling { public static Downsampling transform(Step step) { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TopNRecordsQueryService.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TopNRecordsQueryService.java index 3d07aa5ea1fa..334dbf3f9833 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TopNRecordsQueryService.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TopNRecordsQueryService.java @@ -20,15 +20,13 @@ import java.io.IOException; import java.util.List; -import org.apache.skywalking.oap.server.core.query.entity.*; +import org.apache.skywalking.oap.server.core.query.entity.Order; +import org.apache.skywalking.oap.server.core.query.entity.TopNRecord; import org.apache.skywalking.oap.server.core.storage.StorageModule; -import org.apache.skywalking.oap.server.core.storage.query.*; -import org.apache.skywalking.oap.server.library.module.*; +import org.apache.skywalking.oap.server.core.storage.query.ITopNRecordsQueryDAO; +import org.apache.skywalking.oap.server.library.module.ModuleManager; import org.apache.skywalking.oap.server.library.module.Service; -/** - * @author wusheng - */ public class TopNRecordsQueryService implements Service { private final ModuleManager moduleManager; private ITopNRecordsQueryDAO topNRecordsQueryDAO; @@ -39,7 +37,9 @@ public TopNRecordsQueryService(ModuleManager manager) { private ITopNRecordsQueryDAO getTopNRecordsQueryDAO() { if (topNRecordsQueryDAO == null) { - this.topNRecordsQueryDAO = moduleManager.find(StorageModule.NAME).provider().getService(ITopNRecordsQueryDAO.class); + this.topNRecordsQueryDAO = moduleManager.find(StorageModule.NAME) + .provider() + .getService(ITopNRecordsQueryDAO.class); } return topNRecordsQueryDAO; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TopologyBuilder.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TopologyBuilder.java index b1aff49465a8..5c6f51bcf73f 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TopologyBuilder.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TopologyBuilder.java @@ -18,22 +18,26 @@ package org.apache.skywalking.oap.server.core.query; -import java.util.*; -import org.apache.skywalking.oap.server.core.*; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import org.apache.skywalking.oap.server.core.Const; +import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.cache.ServiceInventoryCache; import org.apache.skywalking.oap.server.core.config.IComponentLibraryCatalogService; -import org.apache.skywalking.oap.server.core.query.entity.*; +import org.apache.skywalking.oap.server.core.query.entity.Call; +import org.apache.skywalking.oap.server.core.query.entity.Node; +import org.apache.skywalking.oap.server.core.query.entity.Topology; import org.apache.skywalking.oap.server.core.register.ServiceInventory; import org.apache.skywalking.oap.server.core.source.DetectPoint; import org.apache.skywalking.oap.server.library.module.ModuleManager; import org.apache.skywalking.oap.server.library.util.BooleanUtils; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static java.util.Objects.isNull; -/** - * @author peng-yongsheng - */ class TopologyBuilder { private static final Logger logger = LoggerFactory.getLogger(TopologyBuilder.class); @@ -42,8 +46,12 @@ class TopologyBuilder { private final IComponentLibraryCatalogService componentLibraryCatalogService; TopologyBuilder(ModuleManager moduleManager) { - this.serviceInventoryCache = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInventoryCache.class); - this.componentLibraryCatalogService = moduleManager.find(CoreModule.NAME).provider().getService(IComponentLibraryCatalogService.class); + this.serviceInventoryCache = moduleManager.find(CoreModule.NAME) + .provider() + .getService(ServiceInventoryCache.class); + this.componentLibraryCatalogService = moduleManager.find(CoreModule.NAME) + .provider() + .getService(IComponentLibraryCatalogService.class); } Topology build(List serviceRelationClientCalls, List serviceRelationServerCalls) { @@ -73,7 +81,8 @@ Topology build(List serviceRelationClientCalls, List serviceRelationClientCalls, List serviceRelationServerCalls = getTopologyQueryDAO().loadServerSideServiceRelations(downsampling, startTB, endTB); List serviceRelationClientCalls = getTopologyQueryDAO().loadClientSideServiceRelations(downsampling, startTB, endTB); @@ -98,7 +99,8 @@ public Topology getGlobalTopology(final Downsampling downsampling, final long st return builder.build(serviceRelationClientCalls, serviceRelationServerCalls); } - public Topology getServiceTopology(final Downsampling downsampling, final long startTB, final long endTB, final int serviceId) throws IOException { + public Topology getServiceTopology(final Downsampling downsampling, final long startTB, final long endTB, + final int serviceId) throws IOException { List serviceIds = new ArrayList<>(); serviceIds.add(serviceId); @@ -127,7 +129,8 @@ public Topology getServiceTopology(final Downsampling downsampling, final long s return topology; } - public ServiceInstanceTopology getServiceInstanceTopology(final int clientServiceId, final int serverServiceId, final Downsampling downsampling, final long startTB, final long endTB) throws IOException { + public ServiceInstanceTopology getServiceInstanceTopology(final int clientServiceId, final int serverServiceId, + final Downsampling downsampling, final long startTB, final long endTB) throws IOException { logger.debug("ClientServiceId: {}, ServerServiceId: {}, Downsampling: {}, startTimeBucket: {}, endTimeBucket: {}", clientServiceId, serverServiceId, downsampling, startTB, endTB); List serviceInstanceRelationClientCalls = getTopologyQueryDAO().loadClientSideServiceInstanceRelations(clientServiceId, serverServiceId, downsampling, startTB, endTB); @@ -137,7 +140,8 @@ public ServiceInstanceTopology getServiceInstanceTopology(final int clientServic return builder.build(serviceInstanceRelationClientCalls, serviceInstanceRelationServerCalls); } - public Topology getEndpointTopology(final Downsampling downsampling, final long startTB, final long endTB, final int endpointId) throws IOException { + public Topology getEndpointTopology(final Downsampling downsampling, final long startTB, final long endTB, + final int endpointId) throws IOException { List serverSideCalls = getTopologyQueryDAO().loadSpecifiedDestOfServerSideEndpointRelations(downsampling, startTB, endTB, endpointId); Topology topology = new Topology(); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TraceQueryService.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TraceQueryService.java index ca11770b1e18..a04347c8cd52 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TraceQueryService.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TraceQueryService.java @@ -54,9 +54,6 @@ import static java.util.Objects.nonNull; -/** - * @author peng-yongsheng - */ public class TraceQueryService implements Service { private final ModuleManager moduleManager; @@ -79,40 +76,48 @@ private ITraceQueryDAO getTraceQueryDAO() { private ServiceInventoryCache getServiceInventoryCache() { if (serviceInventoryCache == null) { - this.serviceInventoryCache = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInventoryCache.class); + this.serviceInventoryCache = moduleManager.find(CoreModule.NAME) + .provider() + .getService(ServiceInventoryCache.class); } return serviceInventoryCache; } private EndpointInventoryCache getEndpointInventoryCache() { if (endpointInventoryCache == null) { - this.endpointInventoryCache = moduleManager.find(CoreModule.NAME).provider().getService(EndpointInventoryCache.class); + this.endpointInventoryCache = moduleManager.find(CoreModule.NAME) + .provider() + .getService(EndpointInventoryCache.class); } return endpointInventoryCache; } private NetworkAddressInventoryCache getNetworkAddressInventoryCache() { if (networkAddressInventoryCache == null) { - this.networkAddressInventoryCache = moduleManager.find(CoreModule.NAME).provider().getService(NetworkAddressInventoryCache.class); + this.networkAddressInventoryCache = moduleManager.find(CoreModule.NAME) + .provider() + .getService(NetworkAddressInventoryCache.class); } return networkAddressInventoryCache; } private IComponentLibraryCatalogService getComponentLibraryCatalogService() { if (componentLibraryCatalogService == null) { - this.componentLibraryCatalogService = moduleManager.find(CoreModule.NAME).provider().getService(IComponentLibraryCatalogService.class); + this.componentLibraryCatalogService = moduleManager.find(CoreModule.NAME) + .provider() + .getService(IComponentLibraryCatalogService.class); } return componentLibraryCatalogService; } public TraceBrief queryBasicTraces(final int serviceId, final int serviceInstanceId, final int endpointId, final String traceId, final String endpointName, final int minTraceDuration, int maxTraceDuration, - final TraceState traceState, final QueryOrder queryOrder, - final Pagination paging, final long startTB, final long endTB) throws IOException { + final TraceState traceState, final QueryOrder queryOrder, final Pagination paging, final long startTB, + final long endTB) throws IOException { PaginationUtils.Page page = PaginationUtils.INSTANCE.exchange(paging); - return getTraceQueryDAO().queryBasicTraces(startTB, endTB, minTraceDuration, maxTraceDuration, endpointName, - serviceId, serviceInstanceId, endpointId, traceId, page.getLimit(), page.getFrom(), traceState, queryOrder); + return getTraceQueryDAO().queryBasicTraces(startTB, endTB, minTraceDuration, maxTraceDuration, endpointName, serviceId, serviceInstanceId, endpointId, traceId, page + .getLimit(), page.getFrom(), traceState, queryOrder); } public Trace queryTrace(final String traceId) throws IOException { @@ -125,7 +130,8 @@ public Trace queryTrace(final String traceId) throws IOException { for (SegmentRecord segment : segmentRecords) { if (nonNull(segment)) { SegmentObject segmentObject = SegmentObject.parseFrom(segment.getDataBinary()); - trace.getSpans().addAll(buildSpanV2List(traceId, segment.getSegmentId(), segment.getServiceId(), segmentObject.getSpansList())); + trace.getSpans() + .addAll(buildSpanV2List(traceId, segment.getSegmentId(), segment.getServiceId(), segmentObject.getSpansList())); } } } @@ -216,7 +222,10 @@ private List buildSpanV2List(String traceId, String segmentId, int service ref.setParentSpanId(reference.getParentSpanId()); final UniqueId uniqueId = reference.getParentTraceSegmentId(); - final String parentSegmentId = uniqueId.getIdPartsList().stream().map(String::valueOf).collect(Collectors.joining(".")); + final String parentSegmentId = uniqueId.getIdPartsList() + .stream() + .map(String::valueOf) + .collect(Collectors.joining(".")); ref.setParentSegmentId(parentSegmentId); span.setSegmentParentSpanId(ref.getParentSegmentId() + Const.SEGMENT_SPAN_SPLIT + ref.getParentSpanId()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/AlarmMessage.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/AlarmMessage.java index b179378a0263..044dba42c7f5 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/AlarmMessage.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/AlarmMessage.java @@ -18,11 +18,9 @@ package org.apache.skywalking.oap.server.core.query.entity; -import lombok.*; +import lombok.Getter; +import lombok.Setter; -/** - * @author peng-yongsheng - */ @Getter @Setter public class AlarmMessage { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/AlarmTrend.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/AlarmTrend.java index 1d4c99eeaa85..8028aeec572a 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/AlarmTrend.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/AlarmTrend.java @@ -18,12 +18,10 @@ package org.apache.skywalking.oap.server.core.query.entity; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import lombok.Getter; -/** - * @author peng-yongsheng - */ @Getter public class AlarmTrend { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Alarms.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Alarms.java index 22c0aef96286..af813f9c7c80 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Alarms.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Alarms.java @@ -18,17 +18,17 @@ package org.apache.skywalking.oap.server.core.query.entity; -import java.util.*; -import lombok.*; +import java.util.ArrayList; +import java.util.List; +import lombok.Getter; +import lombok.Setter; -/** - * @author peng-yongsheng - */ @Getter public class Alarms { private final List msgs; - @Setter private int total; + @Setter + private int total; public Alarms() { this.msgs = new ArrayList<>(); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Attribute.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Attribute.java index fa2ed539c9f9..a53dd7755e0b 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Attribute.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Attribute.java @@ -18,11 +18,9 @@ package org.apache.skywalking.oap.server.core.query.entity; -import lombok.*; +import lombok.Getter; +import lombok.Setter; -/** - * @author peng-yongsheng - */ @Getter @Setter public class Attribute { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/BasicTrace.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/BasicTrace.java index 33bcace421ec..4511c987f8aa 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/BasicTrace.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/BasicTrace.java @@ -18,19 +18,22 @@ package org.apache.skywalking.oap.server.core.query.entity; -import java.util.*; -import lombok.*; +import java.util.ArrayList; +import java.util.List; +import lombok.Getter; +import lombok.Setter; -/** - * @author peng-yongsheng - */ @Getter public class BasicTrace { - @Setter private String segmentId; + @Setter + private String segmentId; private final List endpointNames; - @Setter private int duration; - @Setter private String start; - @Setter private boolean isError; + @Setter + private int duration; + @Setter + private String start; + @Setter + private boolean isError; private final List traceIds; public BasicTrace() { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Call.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Call.java index 0a518584cec1..e54f9a5b371a 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Call.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Call.java @@ -18,14 +18,14 @@ package org.apache.skywalking.oap.server.core.query.entity; -import java.util.*; -import lombok.*; +import java.util.ArrayList; +import java.util.List; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.oap.server.core.Const; import org.apache.skywalking.oap.server.core.source.DetectPoint; -/** - * @author peng-yongsheng - */ @Getter @Setter public class Call { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ClusterBrief.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ClusterBrief.java index 681eb6121c91..ad05b1493006 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ClusterBrief.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ClusterBrief.java @@ -18,11 +18,9 @@ package org.apache.skywalking.oap.server.core.query.entity; -import lombok.*; +import lombok.Getter; +import lombok.Setter; -/** - * @author peng-yongsheng - */ @Getter @Setter public class ClusterBrief { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ContentType.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ContentType.java index 68db82b24455..49c805d44d4b 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ContentType.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ContentType.java @@ -20,9 +20,6 @@ import org.apache.skywalking.oap.server.core.UnexpectedException; -/** - * @author wusheng - */ public enum ContentType { TEXT(1), JSON(2), NONE(0); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Database.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Database.java index 73962212a3bf..7546408725b8 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Database.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Database.java @@ -22,7 +22,7 @@ import lombok.Setter; /** - * @author: liuhaoyang + * **/ @Getter @Setter diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Endpoint.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Endpoint.java index f325d6c4e935..dc8696ccc0aa 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Endpoint.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Endpoint.java @@ -18,11 +18,9 @@ package org.apache.skywalking.oap.server.core.query.entity; -import lombok.*; +import lombok.Getter; +import lombok.Setter; -/** - * @author peng-yongsheng - */ @Getter @Setter public class Endpoint { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/EndpointInfo.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/EndpointInfo.java index f18d5bae2cd2..e9981f5f51aa 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/EndpointInfo.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/EndpointInfo.java @@ -18,11 +18,9 @@ package org.apache.skywalking.oap.server.core.query.entity; -import lombok.*; +import lombok.Getter; +import lombok.Setter; -/** - * @author peng-yongsheng - */ @Getter @Setter public class EndpointInfo { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/IntValues.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/IntValues.java index 3525c60f4521..d2b3da5b0b7f 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/IntValues.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/IntValues.java @@ -20,9 +20,6 @@ import java.util.LinkedList; -/** - * @author peng-yongsheng, wusheng - */ public class IntValues { private LinkedList values = new LinkedList<>(); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/KVInt.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/KVInt.java index 796528523c98..c3150aa0aeb6 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/KVInt.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/KVInt.java @@ -18,11 +18,9 @@ package org.apache.skywalking.oap.server.core.query.entity; -import lombok.*; +import lombok.Getter; +import lombok.Setter; -/** - * @author peng-yongsheng - */ @Setter @Getter public class KVInt { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/KeyValue.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/KeyValue.java index b6cbd953a48b..5dcbc53ede25 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/KeyValue.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/KeyValue.java @@ -18,11 +18,9 @@ package org.apache.skywalking.oap.server.core.query.entity; -import lombok.*; +import lombok.Getter; +import lombok.Setter; -/** - * @author peng-yongsheng - */ @Getter @Setter public class KeyValue { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Language.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Language.java index 75bd1b419bb1..88b28d0aa52b 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Language.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Language.java @@ -18,14 +18,6 @@ package org.apache.skywalking.oap.server.core.query.entity; -/** - * @author peng-yongsheng - */ public enum Language { - UNKNOWN, - JAVA, - DOTNET, - NODEJS, - PYTHON, - RUBY + UNKNOWN, JAVA, DOTNET, NODEJS, PYTHON, RUBY } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/LanguageTrans.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/LanguageTrans.java index 369fb525953b..398c33a382ae 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/LanguageTrans.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/LanguageTrans.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.core.query.entity; -/** - * @author peng-yongsheng - */ public enum LanguageTrans { INSTANCE; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Log.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Log.java index 99cb3035a77d..a0192f6f4434 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Log.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Log.java @@ -18,11 +18,9 @@ package org.apache.skywalking.oap.server.core.query.entity; -import lombok.*; +import lombok.Getter; +import lombok.Setter; -/** - * @author wusheng - */ @Setter @Getter public class Log { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/LogEntity.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/LogEntity.java index 30a01957369d..df56398bbfdd 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/LogEntity.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/LogEntity.java @@ -18,15 +18,15 @@ package org.apache.skywalking.oap.server.core.query.entity; -import java.util.*; -import lombok.*; +import java.util.ArrayList; +import java.util.List; +import lombok.Getter; +import lombok.Setter; -/** - * @author peng-yongsheng - */ @Getter public class LogEntity { - @Setter private long time; + @Setter + private long time; private final List data; public LogEntity() { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/LogState.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/LogState.java index dd262c92c52f..78be0ba8ad70 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/LogState.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/LogState.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.core.query.entity; -/** - * @author wusheng - */ public enum LogState { ALL, SUCCESS, ERROR } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Logs.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Logs.java index 738657641213..5127a9499247 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Logs.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Logs.java @@ -18,12 +18,11 @@ package org.apache.skywalking.oap.server.core.query.entity; -import java.util.*; -import lombok.*; +import java.util.ArrayList; +import java.util.List; +import lombok.Getter; +import lombok.Setter; -/** - * @author wusheng - */ @Setter @Getter public class Logs { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Node.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Node.java index ee1c54884947..4ee3afe68ea3 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Node.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Node.java @@ -18,11 +18,9 @@ package org.apache.skywalking.oap.server.core.query.entity; -import lombok.*; +import lombok.Getter; +import lombok.Setter; -/** - * @author peng-yongsheng - */ @Getter @Setter public class Node { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Order.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Order.java index b81710efb628..52bd64722e5b 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Order.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Order.java @@ -18,10 +18,6 @@ package org.apache.skywalking.oap.server.core.query.entity; -/** - * @author peng-yongsheng - */ public enum Order { - ASC, - DES + ASC, DES } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Pagination.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Pagination.java index 8deec5ac5897..22f004ede6e1 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Pagination.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Pagination.java @@ -18,11 +18,9 @@ package org.apache.skywalking.oap.server.core.query.entity; -import lombok.*; +import lombok.Getter; +import lombok.Setter; -/** - * @author peng-yongsheng - */ @Getter @Setter public class Pagination { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ProfileAnalyzation.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ProfileAnalyzation.java index f18698e18278..2c1c84611f47 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ProfileAnalyzation.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ProfileAnalyzation.java @@ -18,14 +18,10 @@ package org.apache.skywalking.oap.server.core.query.entity; +import java.util.List; import lombok.Getter; import lombok.Setter; -import java.util.List; - -/** - * @author MrPro - */ @Getter @Setter public class ProfileAnalyzation { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ProfileStackTree.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ProfileStackTree.java index c569e1912196..91c11e8eb839 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ProfileStackTree.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ProfileStackTree.java @@ -15,13 +15,13 @@ * limitations under the License. * */ -package org.apache.skywalking.oap.server.core.query.entity; -import lombok.Getter; -import lombok.Setter; +package org.apache.skywalking.oap.server.core.query.entity; import java.util.ArrayList; import java.util.List; +import lombok.Getter; +import lombok.Setter; @Getter @Setter diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ProfileTask.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ProfileTask.java index fd5a1b2a2e91..c84e4f4fab25 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ProfileTask.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ProfileTask.java @@ -18,13 +18,13 @@ package org.apache.skywalking.oap.server.core.query.entity; -import lombok.*; - import java.util.List; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; -/** - * @author MrPro - */ @Setter @Getter @NoArgsConstructor diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ProfileTaskLog.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ProfileTaskLog.java index 018fdb557540..a86ef0971660 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ProfileTaskLog.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ProfileTaskLog.java @@ -15,14 +15,17 @@ * limitations under the License. * */ + package org.apache.skywalking.oap.server.core.query.entity; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; /** * Profile task execute log - * - * @author MrPro */ @Setter @Getter diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ProfileTaskLogOperationType.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ProfileTaskLogOperationType.java index 678492b621eb..322bdf96042e 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ProfileTaskLogOperationType.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ProfileTaskLogOperationType.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.oap.server.core.query.entity; import java.util.HashMap; @@ -22,29 +23,24 @@ /** * Profile task log operation type - * - * @author MrPro */ public enum ProfileTaskLogOperationType { // when sniffer has notified - NOTIFIED(1), - // when sniffer has execution finished to report + NOTIFIED(1), // when sniffer has execution finished to report EXECUTION_FINISHED(2); private int code; private static final Map CACHE = new HashMap(); static { - for (ProfileTaskLogOperationType val :ProfileTaskLogOperationType.values()) { + for (ProfileTaskLogOperationType val : ProfileTaskLogOperationType.values()) { CACHE.put(val.getCode(), val); } } /** * Parse opetation type by code - * @param code - * @return */ public static ProfileTaskLogOperationType parse(int code) { return CACHE.get(code); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/QueryOrder.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/QueryOrder.java index 6b829e872d42..5aa10429eeae 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/QueryOrder.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/QueryOrder.java @@ -18,10 +18,6 @@ package org.apache.skywalking.oap.server.core.query.entity; -/** - * @author peng-yongsheng - */ public enum QueryOrder { - BY_START_TIME, - BY_DURATION + BY_START_TIME, BY_DURATION } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Ref.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Ref.java index c32b36a7f925..d2822e264d08 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Ref.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Ref.java @@ -18,11 +18,9 @@ package org.apache.skywalking.oap.server.core.query.entity; -import lombok.*; +import lombok.Getter; +import lombok.Setter; -/** - * @author peng-yongsheng - */ @Setter @Getter public class Ref { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/RefType.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/RefType.java index 6e9625707bfc..d47798bfda65 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/RefType.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/RefType.java @@ -18,10 +18,6 @@ package org.apache.skywalking.oap.server.core.query.entity; -/** - * @author peng-yongsheng - */ public enum RefType { - CROSS_PROCESS, - CROSS_THREAD + CROSS_PROCESS, CROSS_THREAD } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Scope.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Scope.java index be8b793354bc..e01006c60c06 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Scope.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Scope.java @@ -23,16 +23,8 @@ import org.apache.skywalking.oap.server.core.UnexpectedException; import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine; -/** - * @author wusheng - */ public enum Scope { - Service(DefaultScopeDefine.SERVICE), - ServiceInstance(DefaultScopeDefine.SERVICE_INSTANCE), - Endpoint(DefaultScopeDefine.ENDPOINT), - ServiceRelation(DefaultScopeDefine.SERVICE_RELATION), - ServiceInstanceRelation(DefaultScopeDefine.SERVICE_INSTANCE_RELATION), - EndpointRelation(DefaultScopeDefine.ENDPOINT_RELATION); + Service(DefaultScopeDefine.SERVICE), ServiceInstance(DefaultScopeDefine.SERVICE_INSTANCE), Endpoint(DefaultScopeDefine.ENDPOINT), ServiceRelation(DefaultScopeDefine.SERVICE_RELATION), ServiceInstanceRelation(DefaultScopeDefine.SERVICE_INSTANCE_RELATION), EndpointRelation(DefaultScopeDefine.ENDPOINT_RELATION); @Getter private int scopeId; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Service.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Service.java index 1c6b8e858e48..1745dc97ca46 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Service.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Service.java @@ -21,9 +21,6 @@ import lombok.Getter; import lombok.Setter; -/** - * @author peng-yongsheng - */ @Getter @Setter public class Service { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ServiceInstance.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ServiceInstance.java index 4f62ae877871..a97ee356d1f8 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ServiceInstance.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ServiceInstance.java @@ -23,16 +23,17 @@ import lombok.Getter; import lombok.Setter; -/** - * @author peng-yongsheng - */ @Getter public class ServiceInstance { - @Setter private String id; - @Setter private String name; + @Setter + private String id; + @Setter + private String name; private final List attributes; - @Setter private Language language = Language.UNKNOWN; - @Setter private String instanceUUID; + @Setter + private Language language = Language.UNKNOWN; + @Setter + private String instanceUUID; public ServiceInstance() { this.attributes = new ArrayList<>(); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ServiceInstanceNode.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ServiceInstanceNode.java index 23df1ad199f0..b3f4058b2a5e 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ServiceInstanceNode.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ServiceInstanceNode.java @@ -21,9 +21,6 @@ import lombok.Getter; import lombok.Setter; -/** - * @author zhangwei - */ @Setter @Getter public class ServiceInstanceNode { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ServiceInstanceTopology.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ServiceInstanceTopology.java index 8c2f342004aa..4de98a21308a 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ServiceInstanceTopology.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ServiceInstanceTopology.java @@ -18,14 +18,10 @@ package org.apache.skywalking.oap.server.core.query.entity; -import lombok.Getter; - import java.util.ArrayList; import java.util.List; +import lombok.Getter; -/** - * @author zhangwei - */ @Getter public class ServiceInstanceTopology { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Span.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Span.java index c948c506b938..c21662dcf754 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Span.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Span.java @@ -18,33 +18,48 @@ package org.apache.skywalking.oap.server.core.query.entity; -import java.util.*; -import lombok.*; +import java.util.ArrayList; +import java.util.List; +import lombok.Getter; +import lombok.Setter; -/** - * @author peng-yongsheng - */ @Getter public class Span { - @Setter private String traceId; - @Setter private String segmentId; - @Setter private int spanId; - @Setter private int parentSpanId; + @Setter + private String traceId; + @Setter + private String segmentId; + @Setter + private int spanId; + @Setter + private int parentSpanId; private final List refs; - @Setter private String serviceCode; - @Setter private long startTime; - @Setter private long endTime; - @Setter private String endpointName; - @Setter private String type; - @Setter private String peer; - @Setter private String component; - @Setter private boolean isError; - @Setter private String layer; + @Setter + private String serviceCode; + @Setter + private long startTime; + @Setter + private long endTime; + @Setter + private String endpointName; + @Setter + private String type; + @Setter + private String peer; + @Setter + private String component; + @Setter + private boolean isError; + @Setter + private String layer; private final List tags; private final List logs; - @Setter private boolean isRoot; - @Setter private String segmentSpanId; - @Setter private String segmentParentSpanId; + @Setter + private boolean isRoot; + @Setter + private String segmentSpanId; + @Setter + private String segmentParentSpanId; public Span() { this.refs = new ArrayList<>(); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Step.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Step.java index 7d22268e6252..a83f48baf2e2 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Step.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Step.java @@ -18,13 +18,6 @@ package org.apache.skywalking.oap.server.core.query.entity; -/** - * @author peng-yongsheng - */ public enum Step { - MONTH, - DAY, - HOUR, - MINUTE, - SECOND + MONTH, DAY, HOUR, MINUTE, SECOND } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Thermodynamic.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Thermodynamic.java index 98331c019c6f..759bb85d614b 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Thermodynamic.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Thermodynamic.java @@ -18,16 +18,16 @@ package org.apache.skywalking.oap.server.core.query.entity; -import java.util.*; -import lombok.*; +import java.util.ArrayList; +import java.util.List; +import lombok.Getter; +import lombok.Setter; -/** - * @author peng-yongsheng - */ @Getter public class Thermodynamic { private final List> nodes; - @Setter private int axisYStep; + @Setter + private int axisYStep; public Thermodynamic() { this.nodes = new ArrayList<>(); @@ -35,15 +35,14 @@ public Thermodynamic() { public void fromMatrixData(List> thermodynamicValueMatrix, int numOfSteps) { thermodynamicValueMatrix.forEach(columnOfThermodynamic -> { - if (columnOfThermodynamic.size() == 0) { - if (numOfSteps > 0) { - for (int i = 0; i < numOfSteps; i++) { - columnOfThermodynamic.add(0L); - } + if (columnOfThermodynamic.size() == 0) { + if (numOfSteps > 0) { + for (int i = 0; i < numOfSteps; i++) { + columnOfThermodynamic.add(0L); } } } - ); + }); for (int colNum = 0; colNum < thermodynamicValueMatrix.size(); colNum++) { List column = thermodynamicValueMatrix.get(colNum); @@ -56,8 +55,8 @@ public void fromMatrixData(List> thermodynamicValueMatrix, int numOfS private void setNodeValue(int columnNum, int rowNum, Long value) { List element = new ArrayList<>(3); - element.add((long)columnNum); - element.add((long)rowNum); + element.add((long) columnNum); + element.add((long) rowNum); element.add(value); nodes.add(element); } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/TopNEntity.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/TopNEntity.java index 49f4c1536ecc..1f716ab2e1b6 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/TopNEntity.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/TopNEntity.java @@ -18,11 +18,9 @@ package org.apache.skywalking.oap.server.core.query.entity; -import lombok.*; +import lombok.Getter; +import lombok.Setter; -/** - * @author peng-yongsheng - */ @Getter @Setter public class TopNEntity { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/TopNRecord.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/TopNRecord.java index e8baa5d11246..3dda16ebd54c 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/TopNRecord.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/TopNRecord.java @@ -18,11 +18,9 @@ package org.apache.skywalking.oap.server.core.query.entity; -import lombok.*; +import lombok.Getter; +import lombok.Setter; -/** - * @author wusheng - */ @Setter @Getter public class TopNRecord { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Topology.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Topology.java index 4f2c18160512..4e52fe7015b3 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Topology.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Topology.java @@ -18,12 +18,10 @@ package org.apache.skywalking.oap.server.core.query.entity; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import lombok.Getter; -/** - * @author peng-yongsheng - */ @Getter public class Topology { private final List nodes; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Trace.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Trace.java index f08076c74067..669c5d6e0f44 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Trace.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Trace.java @@ -18,12 +18,10 @@ package org.apache.skywalking.oap.server.core.query.entity; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import lombok.Getter; -/** - * @author peng-yongsheng - */ @Getter public class Trace { private final List spans; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/TraceBrief.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/TraceBrief.java index 64a8744790da..9e0f1a7b9b31 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/TraceBrief.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/TraceBrief.java @@ -18,16 +18,16 @@ package org.apache.skywalking.oap.server.core.query.entity; -import java.util.*; -import lombok.*; +import java.util.ArrayList; +import java.util.List; +import lombok.Getter; +import lombok.Setter; -/** - * @author peng-yongsheng - */ @Getter public class TraceBrief { private final List traces; - @Setter private int total; + @Setter + private int total; public TraceBrief() { this.traces = new ArrayList<>(); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/TraceState.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/TraceState.java index a7d3cac3ec62..0e36e6048d28 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/TraceState.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/TraceState.java @@ -18,11 +18,6 @@ package org.apache.skywalking.oap.server.core.query.entity; -/** - * @author peng-yongsheng - */ public enum TraceState { - ALL, - SUCCESS, - ERROR, + ALL, SUCCESS, ERROR, } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/sql/Function.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/sql/Function.java index eb59451ad26d..aae9c580ea0f 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/sql/Function.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/sql/Function.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.core.query.sql; -/** - * @author peng-yongsheng - */ public enum Function { None, Avg, Sum } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/sql/GroupBy.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/sql/GroupBy.java index 76923f500e30..2281a097403c 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/sql/GroupBy.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/sql/GroupBy.java @@ -18,11 +18,9 @@ package org.apache.skywalking.oap.server.core.query.sql; -import lombok.*; +import lombok.Getter; +import lombok.Setter; -/** - * @author peng-yongsheng - */ @Getter @Setter public class GroupBy { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/sql/KeyValues.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/sql/KeyValues.java index 6cb5d76e1934..b19e2a33ee74 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/sql/KeyValues.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/sql/KeyValues.java @@ -18,13 +18,15 @@ package org.apache.skywalking.oap.server.core.query.sql; -import java.util.*; -import lombok.*; +import java.util.LinkedList; +import java.util.List; +import lombok.Getter; +import lombok.Setter; -/** - * @author peng-yongsheng - */ public class KeyValues { - @Getter @Setter private String key; - @Getter private List values = new LinkedList<>(); + @Getter + @Setter + private String key; + @Getter + private List values = new LinkedList<>(); } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/sql/Where.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/sql/Where.java index ad7cf65071e8..b48c75b58314 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/sql/Where.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/sql/Where.java @@ -18,12 +18,10 @@ package org.apache.skywalking.oap.server.core.query.sql; -import java.util.*; +import java.util.LinkedList; +import java.util.List; import lombok.Getter; -/** - * @author peng-yongsheng - */ @Getter public class Where { private List keyValues = new LinkedList<>(); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/EndpointInventory.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/EndpointInventory.java index 7faa783d31fc..c733cb7c0b27 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/EndpointInventory.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/EndpointInventory.java @@ -34,9 +34,6 @@ import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.ENDPOINT_INVENTORY; -/** - * @author peng-yongsheng - */ @ScopeDeclaration(id = ENDPOINT_INVENTORY, name = "EndpointInventory") @Stream(name = EndpointInventory.INDEX_NAME, scopeId = DefaultScopeDefine.ENDPOINT_INVENTORY, builder = EndpointInventory.Builder.class, processor = InventoryStreamProcessor.class) public class EndpointInventory extends RegisterSource { @@ -47,19 +44,30 @@ public class EndpointInventory extends RegisterSource { public static final String NAME = "name"; public static final String DETECT_POINT = "detect_point"; - @Setter @Getter @Column(columnName = SERVICE_ID) private int serviceId; - @Setter @Getter @Column(columnName = NAME, matchQuery = true) private String name = Const.EMPTY_STRING; - @Setter @Getter @Column(columnName = DETECT_POINT) private int detectPoint; + @Setter + @Getter + @Column(columnName = SERVICE_ID) + private int serviceId; + @Setter + @Getter + @Column(columnName = NAME, matchQuery = true) + private String name = Const.EMPTY_STRING; + @Setter + @Getter + @Column(columnName = DETECT_POINT) + private int detectPoint; public static String buildId(int serviceId, String endpointName, int detectPoint) { return serviceId + Const.ID_SPLIT + endpointName + Const.ID_SPLIT + detectPoint; } - @Override public String id() { + @Override + public String id() { return buildId(serviceId, name, detectPoint); } - @Override public int hashCode() { + @Override + public int hashCode() { int result = 17; result = 31 * result + serviceId; result = 31 * result + name.hashCode(); @@ -67,7 +75,8 @@ public static String buildId(int serviceId, String endpointName, int detectPoint return result; } - @Override public boolean equals(Object obj) { + @Override + public boolean equals(Object obj) { if (this == obj) return true; if (obj == null) @@ -75,7 +84,7 @@ public static String buildId(int serviceId, String endpointName, int detectPoint if (getClass() != obj.getClass()) return false; - EndpointInventory source = (EndpointInventory)obj; + EndpointInventory source = (EndpointInventory) obj; if (serviceId != source.getServiceId()) return false; if (!name.equals(source.getName())) @@ -86,7 +95,8 @@ public static String buildId(int serviceId, String endpointName, int detectPoint return true; } - @Override public RemoteData.Builder serialize() { + @Override + public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); remoteBuilder.addDataIntegers(getSequence()); remoteBuilder.addDataIntegers(serviceId); @@ -100,7 +110,8 @@ public static String buildId(int serviceId, String endpointName, int detectPoint return remoteBuilder; } - @Override public void deserialize(RemoteData remoteData) { + @Override + public void deserialize(RemoteData remoteData) { setSequence(remoteData.getDataIntegers(0)); setServiceId(remoteData.getDataIntegers(1)); setDetectPoint(remoteData.getDataIntegers(2)); @@ -112,25 +123,28 @@ public static String buildId(int serviceId, String endpointName, int detectPoint setName(remoteData.getDataStrings(0)); } - @Override public int remoteHashCode() { + @Override + public int remoteHashCode() { return 0; } public static class Builder implements StorageBuilder { - @Override public EndpointInventory map2Data(Map dbMap) { + @Override + public EndpointInventory map2Data(Map dbMap) { EndpointInventory inventory = new EndpointInventory(); - inventory.setSequence(((Number)dbMap.get(SEQUENCE)).intValue()); - inventory.setServiceId(((Number)dbMap.get(SERVICE_ID)).intValue()); - inventory.setName((String)dbMap.get(NAME)); - inventory.setDetectPoint(((Number)dbMap.get(DETECT_POINT)).intValue()); - inventory.setRegisterTime(((Number)dbMap.get(REGISTER_TIME)).longValue()); - inventory.setHeartbeatTime(((Number)dbMap.get(HEARTBEAT_TIME)).longValue()); - inventory.setLastUpdateTime(((Number)dbMap.get(LAST_UPDATE_TIME)).longValue()); + inventory.setSequence(((Number) dbMap.get(SEQUENCE)).intValue()); + inventory.setServiceId(((Number) dbMap.get(SERVICE_ID)).intValue()); + inventory.setName((String) dbMap.get(NAME)); + inventory.setDetectPoint(((Number) dbMap.get(DETECT_POINT)).intValue()); + inventory.setRegisterTime(((Number) dbMap.get(REGISTER_TIME)).longValue()); + inventory.setHeartbeatTime(((Number) dbMap.get(HEARTBEAT_TIME)).longValue()); + inventory.setLastUpdateTime(((Number) dbMap.get(LAST_UPDATE_TIME)).longValue()); return inventory; } - @Override public Map data2Map(EndpointInventory storageData) { + @Override + public Map data2Map(EndpointInventory storageData) { Map map = new HashMap<>(); map.put(SEQUENCE, storageData.getSequence()); map.put(SERVICE_ID, storageData.getServiceId()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/NetworkAddressInventory.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/NetworkAddressInventory.java index 63609b819582..b1c8002710a2 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/NetworkAddressInventory.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/NetworkAddressInventory.java @@ -35,9 +35,6 @@ import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.NETWORK_ADDRESS; -/** - * @author peng-yongsheng - */ @ScopeDeclaration(id = NETWORK_ADDRESS, name = "NetworkAddress") @Stream(name = NetworkAddressInventory.INDEX_NAME, scopeId = DefaultScopeDefine.NETWORK_ADDRESS, builder = NetworkAddressInventory.Builder.class, processor = InventoryStreamProcessor.class) public class NetworkAddressInventory extends RegisterSource { @@ -47,8 +44,14 @@ public class NetworkAddressInventory extends RegisterSource { private static final String NAME = "name"; private static final String NODE_TYPE = "node_type"; - @Setter @Getter @Column(columnName = NAME, matchQuery = true) private String name = Const.EMPTY_STRING; - @Setter(AccessLevel.PRIVATE) @Getter(AccessLevel.PRIVATE) @Column(columnName = NODE_TYPE) private int nodeType; + @Setter + @Getter + @Column(columnName = NAME, matchQuery = true) + private String name = Const.EMPTY_STRING; + @Setter(AccessLevel.PRIVATE) + @Getter(AccessLevel.PRIVATE) + @Column(columnName = NODE_TYPE) + private int nodeType; public void setNetworkAddressNodeType(NodeType nodeType) { this.nodeType = nodeType.value(); @@ -62,17 +65,20 @@ public static String buildId(String networkAddress) { return networkAddress; } - @Override public String id() { + @Override + public String id() { return buildId(name); } - @Override public int hashCode() { + @Override + public int hashCode() { int result = 17; result = 31 * result + name.hashCode(); return result; } - @Override public boolean equals(Object obj) { + @Override + public boolean equals(Object obj) { if (this == obj) return true; if (obj == null) @@ -80,7 +86,7 @@ public static String buildId(String networkAddress) { if (getClass() != obj.getClass()) return false; - NetworkAddressInventory source = (NetworkAddressInventory)obj; + NetworkAddressInventory source = (NetworkAddressInventory) obj; if (!name.equals(source.getName())) return false; @@ -99,9 +105,10 @@ public NetworkAddressInventory getClone() { return inventory; } - @Override public boolean combine(RegisterSource registerSource) { + @Override + public boolean combine(RegisterSource registerSource) { boolean isChanged = super.combine(registerSource); - NetworkAddressInventory inventory = (NetworkAddressInventory)registerSource; + NetworkAddressInventory inventory = (NetworkAddressInventory) registerSource; if (this.nodeType != inventory.getNodeType() && inventory.getLastUpdateTime() >= this.getLastUpdateTime()) { setNodeType(inventory.getNodeType()); @@ -111,7 +118,8 @@ public NetworkAddressInventory getClone() { } } - @Override public RemoteData.Builder serialize() { + @Override + public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); remoteBuilder.addDataIntegers(getSequence()); remoteBuilder.addDataIntegers(getNodeType()); @@ -124,7 +132,8 @@ public NetworkAddressInventory getClone() { return remoteBuilder; } - @Override public void deserialize(RemoteData remoteData) { + @Override + public void deserialize(RemoteData remoteData) { setSequence(remoteData.getDataIntegers(0)); setNodeType(remoteData.getDataIntegers(1)); @@ -135,24 +144,27 @@ public NetworkAddressInventory getClone() { setName(remoteData.getDataStrings(0)); } - @Override public int remoteHashCode() { + @Override + public int remoteHashCode() { return 0; } public static class Builder implements StorageBuilder { - @Override public NetworkAddressInventory map2Data(Map dbMap) { + @Override + public NetworkAddressInventory map2Data(Map dbMap) { NetworkAddressInventory inventory = new NetworkAddressInventory(); - inventory.setSequence(((Number)dbMap.get(SEQUENCE)).intValue()); - inventory.setName((String)dbMap.get(NAME)); - inventory.setNodeType(((Number)dbMap.get(NODE_TYPE)).intValue()); - inventory.setRegisterTime(((Number)dbMap.get(REGISTER_TIME)).longValue()); - inventory.setHeartbeatTime(((Number)dbMap.get(HEARTBEAT_TIME)).longValue()); - inventory.setLastUpdateTime(((Number)dbMap.get(LAST_UPDATE_TIME)).longValue()); + inventory.setSequence(((Number) dbMap.get(SEQUENCE)).intValue()); + inventory.setName((String) dbMap.get(NAME)); + inventory.setNodeType(((Number) dbMap.get(NODE_TYPE)).intValue()); + inventory.setRegisterTime(((Number) dbMap.get(REGISTER_TIME)).longValue()); + inventory.setHeartbeatTime(((Number) dbMap.get(HEARTBEAT_TIME)).longValue()); + inventory.setLastUpdateTime(((Number) dbMap.get(LAST_UPDATE_TIME)).longValue()); return inventory; } - @Override public Map data2Map(NetworkAddressInventory storageData) { + @Override + public Map data2Map(NetworkAddressInventory storageData) { Map map = new HashMap<>(); map.put(SEQUENCE, storageData.getSequence()); map.put(NAME, storageData.getName()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/NodeType.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/NodeType.java index c5d497b67549..b1aa7ff47bbf 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/NodeType.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/NodeType.java @@ -23,11 +23,9 @@ /** * Node type describe which kind of node of Service or Network address represents to. - * + *

* The value comes from 'org.apache.skywalking.apm.network.language.agent.SpanLayer' at first place, but most likely it * will extend and be used directly from different sources, such as Mesh. - * - * @author wusheng */ public enum NodeType { /** @@ -57,8 +55,7 @@ public enum NodeType { /** * Browser = 6; */ - Browser(6), - UNRECOGNIZED(-1); + Browser(6), UNRECOGNIZED(-1); private final int value; @@ -93,9 +90,6 @@ public static NodeType get(int value) { /** * Right now, spanLayerValue is exact same as NodeType value. - * - * @param spanLayerValue - * @return */ public static NodeType fromSpanLayerValue(int spanLayerValue) { return get(spanLayerValue); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/RegisterSource.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/RegisterSource.java index 328a060a6172..7b31d119655b 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/RegisterSource.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/RegisterSource.java @@ -18,14 +18,12 @@ package org.apache.skywalking.oap.server.core.register; -import lombok.*; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.oap.server.core.remote.data.StreamData; import org.apache.skywalking.oap.server.core.storage.StorageData; import org.apache.skywalking.oap.server.core.storage.annotation.Column; -/** - * @author peng-yongsheng - */ public abstract class RegisterSource extends StreamData implements StorageData { public static final String SEQUENCE = "sequence"; @@ -33,10 +31,22 @@ public abstract class RegisterSource extends StreamData implements StorageData { public static final String HEARTBEAT_TIME = "heartbeat_time"; public static final String LAST_UPDATE_TIME = "last_update_time"; - @Getter @Setter @Column(columnName = SEQUENCE) private int sequence; - @Getter @Setter @Column(columnName = REGISTER_TIME) private long registerTime = 0L; - @Getter @Setter @Column(columnName = HEARTBEAT_TIME) private long heartbeatTime = 0L; - @Setter @Getter @Column(columnName = LAST_UPDATE_TIME) private long lastUpdateTime = 0L; + @Getter + @Setter + @Column(columnName = SEQUENCE) + private int sequence; + @Getter + @Setter + @Column(columnName = REGISTER_TIME) + private long registerTime = 0L; + @Getter + @Setter + @Column(columnName = HEARTBEAT_TIME) + private long heartbeatTime = 0L; + @Setter + @Getter + @Column(columnName = LAST_UPDATE_TIME) + private long lastUpdateTime = 0L; public boolean combine(RegisterSource registerSource) { boolean isChanged = false; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInstanceInventory.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInstanceInventory.java index a988a72c546c..1a793e1f988d 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInstanceInventory.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInstanceInventory.java @@ -40,9 +40,6 @@ import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.SERVICE_INSTANCE_INVENTORY; -/** - * @author peng-yongsheng - */ @ScopeDeclaration(id = SERVICE_INSTANCE_INVENTORY, name = "ServiceInstanceInventory") @Stream(name = ServiceInstanceInventory.INDEX_NAME, scopeId = DefaultScopeDefine.SERVICE_INSTANCE_INVENTORY, builder = ServiceInstanceInventory.Builder.class, processor = InventoryStreamProcessor.class) public class ServiceInstanceInventory extends RegisterSource { @@ -59,17 +56,43 @@ public class ServiceInstanceInventory extends RegisterSource { public static final String PROPERTIES = "properties"; private static final Gson GSON = new Gson(); - @Setter @Getter @Column(columnName = INSTANCE_UUID, matchQuery = true) private String instanceUUID = Const.EMPTY_STRING; - @Setter @Getter @Column(columnName = NAME) private String name = Const.EMPTY_STRING; - @Setter @Getter @Column(columnName = SERVICE_ID) private int serviceId; - @Setter @Getter @Column(columnName = IS_ADDRESS) private int isAddress; - @Setter @Getter @Column(columnName = ADDRESS_ID) private int addressId; - @Setter(AccessLevel.PRIVATE) @Getter(AccessLevel.PACKAGE) @Column(columnName = NODE_TYPE) private int nodeType; - @Setter @Getter @Column(columnName = MAPPING_SERVICE_INSTANCE_ID) private int mappingServiceInstanceId; - @Getter(AccessLevel.PRIVATE) @Column(columnName = PROPERTIES) private String prop; - @Getter private JsonObject properties; - - @Setter @Getter private boolean resetServiceInstanceMapping = false; + @Setter + @Getter + @Column(columnName = INSTANCE_UUID, matchQuery = true) + private String instanceUUID = Const.EMPTY_STRING; + @Setter + @Getter + @Column(columnName = NAME) + private String name = Const.EMPTY_STRING; + @Setter + @Getter + @Column(columnName = SERVICE_ID) + private int serviceId; + @Setter + @Getter + @Column(columnName = IS_ADDRESS) + private int isAddress; + @Setter + @Getter + @Column(columnName = ADDRESS_ID) + private int addressId; + @Setter(AccessLevel.PRIVATE) + @Getter(AccessLevel.PACKAGE) + @Column(columnName = NODE_TYPE) + private int nodeType; + @Setter + @Getter + @Column(columnName = MAPPING_SERVICE_INSTANCE_ID) + private int mappingServiceInstanceId; + @Getter(AccessLevel.PRIVATE) + @Column(columnName = PROPERTIES) + private String prop; + @Getter + private JsonObject properties; + + @Setter + @Getter + private boolean resetServiceInstanceMapping = false; public static String buildId(int serviceId, String uuid) { return serviceId + Const.ID_SPLIT + uuid + Const.ID_SPLIT + BooleanUtils.FALSE + Const.ID_SPLIT + Const.NONE; @@ -87,7 +110,8 @@ public void setServiceInstanceNodeType(NodeType nodeType) { this.nodeType = nodeType.value(); } - @Override public String id() { + @Override + public String id() { if (BooleanUtils.TRUE == isAddress) { return buildId(serviceId, addressId); } else { @@ -95,7 +119,8 @@ public void setServiceInstanceNodeType(NodeType nodeType) { } } - @Override public int hashCode() { + @Override + public int hashCode() { int result = 17; result = 31 * result + serviceId; result = 31 * result + instanceUUID.hashCode(); @@ -122,7 +147,8 @@ public boolean hasProperties() { return prop != null && prop.length() > 0; } - @Override public boolean equals(Object obj) { + @Override + public boolean equals(Object obj) { if (this == obj) return true; if (obj == null) @@ -130,7 +156,7 @@ public boolean hasProperties() { if (getClass() != obj.getClass()) return false; - ServiceInstanceInventory source = (ServiceInstanceInventory)obj; + ServiceInstanceInventory source = (ServiceInstanceInventory) obj; if (serviceId != source.getServiceId()) return false; if (!instanceUUID.equals(source.getInstanceUUID())) @@ -163,7 +189,8 @@ public ServiceInstanceInventory getClone() { return inventory; } - @Override public RemoteData.Builder serialize() { + @Override + public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); remoteBuilder.addDataIntegers(getSequence()); remoteBuilder.addDataIntegers(serviceId); @@ -184,7 +211,8 @@ public ServiceInstanceInventory getClone() { return remoteBuilder; } - @Override public void deserialize(RemoteData remoteData) { + @Override + public void deserialize(RemoteData remoteData) { setSequence(remoteData.getDataIntegers(0)); setServiceId(remoteData.getDataIntegers(1)); setIsAddress(remoteData.getDataIntegers(2)); @@ -202,11 +230,13 @@ public ServiceInstanceInventory getClone() { setProp(remoteData.getDataStrings(2)); } - @Override public int remoteHashCode() { + @Override + public int remoteHashCode() { return 0; } - @Override public boolean combine(RegisterSource registerSource) { + @Override + public boolean combine(RegisterSource registerSource) { boolean isChanged = super.combine(registerSource); ServiceInstanceInventory instanceInventory = (ServiceInstanceInventory) registerSource; @@ -227,27 +257,29 @@ public ServiceInstanceInventory getClone() { public static class Builder implements StorageBuilder { - @Override public ServiceInstanceInventory map2Data(Map dbMap) { + @Override + public ServiceInstanceInventory map2Data(Map dbMap) { ServiceInstanceInventory inventory = new ServiceInstanceInventory(); - inventory.setSequence(((Number)dbMap.get(SEQUENCE)).intValue()); - inventory.setServiceId(((Number)dbMap.get(SERVICE_ID)).intValue()); - inventory.setIsAddress(((Number)dbMap.get(IS_ADDRESS)).intValue()); - inventory.setAddressId(((Number)dbMap.get(ADDRESS_ID)).intValue()); + inventory.setSequence(((Number) dbMap.get(SEQUENCE)).intValue()); + inventory.setServiceId(((Number) dbMap.get(SERVICE_ID)).intValue()); + inventory.setIsAddress(((Number) dbMap.get(IS_ADDRESS)).intValue()); + inventory.setAddressId(((Number) dbMap.get(ADDRESS_ID)).intValue()); - inventory.setRegisterTime(((Number)dbMap.get(REGISTER_TIME)).longValue()); - inventory.setHeartbeatTime(((Number)dbMap.get(HEARTBEAT_TIME)).longValue()); - inventory.setLastUpdateTime(((Number)dbMap.get(LAST_UPDATE_TIME)).longValue()); + inventory.setRegisterTime(((Number) dbMap.get(REGISTER_TIME)).longValue()); + inventory.setHeartbeatTime(((Number) dbMap.get(HEARTBEAT_TIME)).longValue()); + inventory.setLastUpdateTime(((Number) dbMap.get(LAST_UPDATE_TIME)).longValue()); - inventory.setNodeType(((Number)dbMap.get(NODE_TYPE)).intValue()); - inventory.setMappingServiceInstanceId(((Number)dbMap.get(MAPPING_SERVICE_INSTANCE_ID)).intValue()); + inventory.setNodeType(((Number) dbMap.get(NODE_TYPE)).intValue()); + inventory.setMappingServiceInstanceId(((Number) dbMap.get(MAPPING_SERVICE_INSTANCE_ID)).intValue()); - inventory.setName((String)dbMap.get(NAME)); - inventory.setInstanceUUID((String)dbMap.get(INSTANCE_UUID)); - inventory.setProp((String)dbMap.get(PROPERTIES)); + inventory.setName((String) dbMap.get(NAME)); + inventory.setInstanceUUID((String) dbMap.get(INSTANCE_UUID)); + inventory.setProp((String) dbMap.get(PROPERTIES)); return inventory; } - @Override public Map data2Map(ServiceInstanceInventory storageData) { + @Override + public Map data2Map(ServiceInstanceInventory storageData) { Map map = new HashMap<>(); map.put(SEQUENCE, storageData.getSequence()); map.put(SERVICE_ID, storageData.getServiceId()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java index de171561202f..dbbdd47d4840 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java @@ -38,9 +38,6 @@ import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.SERVICE_INVENTORY; -/** - * @author peng-yongsheng - */ @ScopeDeclaration(id = SERVICE_INVENTORY, name = "ServiceInventory") @Stream(name = ServiceInventory.INDEX_NAME, scopeId = DefaultScopeDefine.SERVICE_INVENTORY, builder = ServiceInventory.Builder.class, processor = InventoryStreamProcessor.class) public class ServiceInventory extends RegisterSource { @@ -55,18 +52,38 @@ public class ServiceInventory extends RegisterSource { public static final String PROPERTIES = "properties"; private static final Gson GSON = new Gson(); - @Setter @Getter @Column(columnName = NAME, matchQuery = true) private String name = Const.EMPTY_STRING; - @Setter @Getter @Column(columnName = IS_ADDRESS) private int isAddress; - @Setter @Getter @Column(columnName = ADDRESS_ID) private int addressId; + @Setter + @Getter + @Column(columnName = NAME, matchQuery = true) + private String name = Const.EMPTY_STRING; + @Setter + @Getter + @Column(columnName = IS_ADDRESS) + private int isAddress; + @Setter + @Getter + @Column(columnName = ADDRESS_ID) + private int addressId; /** * Node type of the service, default {@link NodeType#Normal} */ - @Setter(AccessLevel.PRIVATE) @Getter(AccessLevel.PRIVATE) @Column(columnName = NODE_TYPE) private int nodeType = 0; - @Setter @Getter @Column(columnName = MAPPING_SERVICE_ID) private int mappingServiceId; - @Getter(AccessLevel.PRIVATE) @Column(columnName = PROPERTIES) private String prop = Const.EMPTY_JSON_OBJECT_STRING; - @Getter private JsonObject properties; - - @Getter @Setter private boolean resetServiceMapping = false; + @Setter(AccessLevel.PRIVATE) + @Getter(AccessLevel.PRIVATE) + @Column(columnName = NODE_TYPE) + private int nodeType = 0; + @Setter + @Getter + @Column(columnName = MAPPING_SERVICE_ID) + private int mappingServiceId; + @Getter(AccessLevel.PRIVATE) + @Column(columnName = PROPERTIES) + private String prop = Const.EMPTY_JSON_OBJECT_STRING; + @Getter + private JsonObject properties; + + @Getter + @Setter + private boolean resetServiceMapping = false; public NodeType getServiceNodeType() { return NodeType.get(this.nodeType); @@ -84,7 +101,8 @@ public void setServiceNodeType(NodeType nodeType) { this.nodeType = nodeType.value(); } - @Override public String id() { + @Override + public String id() { if (BooleanUtils.TRUE == isAddress) { return buildId(addressId); } else { @@ -92,7 +110,8 @@ public void setServiceNodeType(NodeType nodeType) { } } - @Override public int hashCode() { + @Override + public int hashCode() { int result = 17; result = 31 * result + name.hashCode(); result = 31 * result + isAddress; @@ -135,7 +154,8 @@ public ServiceInventory getClone() { return inventory; } - @Override public boolean equals(Object obj) { + @Override + public boolean equals(Object obj) { if (this == obj) return true; if (obj == null) @@ -143,7 +163,7 @@ public ServiceInventory getClone() { if (getClass() != obj.getClass()) return false; - ServiceInventory source = (ServiceInventory)obj; + ServiceInventory source = (ServiceInventory) obj; if (!name.equals(source.getName())) return false; if (isAddress != source.getIsAddress()) @@ -154,7 +174,8 @@ public ServiceInventory getClone() { return true; } - @Override public RemoteData.Builder serialize() { + @Override + public RemoteData.Builder serialize() { RemoteData.Builder remoteBuilder = RemoteData.newBuilder(); remoteBuilder.addDataIntegers(getSequence()); remoteBuilder.addDataIntegers(isAddress); @@ -172,7 +193,8 @@ public ServiceInventory getClone() { return remoteBuilder; } - @Override public void deserialize(RemoteData remoteData) { + @Override + public void deserialize(RemoteData remoteData) { setSequence(remoteData.getDataIntegers(0)); setIsAddress(remoteData.getDataIntegers(1)); setAddressId(remoteData.getDataIntegers(2)); @@ -189,13 +211,15 @@ public ServiceInventory getClone() { } - @Override public int remoteHashCode() { + @Override + public int remoteHashCode() { return 0; } - @Override public boolean combine(RegisterSource registerSource) { + @Override + public boolean combine(RegisterSource registerSource) { boolean isChanged = super.combine(registerSource); - ServiceInventory serviceInventory = (ServiceInventory)registerSource; + ServiceInventory serviceInventory = (ServiceInventory) registerSource; if (serviceInventory.getLastUpdateTime() >= this.getLastUpdateTime()) { this.nodeType = serviceInventory.getNodeType(); @@ -218,22 +242,24 @@ public static class PropertyUtil { public static class Builder implements StorageBuilder { - @Override public ServiceInventory map2Data(Map dbMap) { + @Override + public ServiceInventory map2Data(Map dbMap) { ServiceInventory inventory = new ServiceInventory(); - inventory.setSequence(((Number)dbMap.get(SEQUENCE)).intValue()); - inventory.setIsAddress(((Number)dbMap.get(IS_ADDRESS)).intValue()); - inventory.setMappingServiceId(((Number)dbMap.get(MAPPING_SERVICE_ID)).intValue()); - inventory.setName((String)dbMap.get(NAME)); - inventory.setAddressId(((Number)dbMap.get(ADDRESS_ID)).intValue()); - inventory.setNodeType(((Number)dbMap.get(NODE_TYPE)).intValue()); - inventory.setRegisterTime(((Number)dbMap.get(REGISTER_TIME)).longValue()); - inventory.setHeartbeatTime(((Number)dbMap.get(HEARTBEAT_TIME)).longValue()); - inventory.setLastUpdateTime(((Number)dbMap.get(LAST_UPDATE_TIME)).longValue()); - inventory.setProp((String)dbMap.get(PROPERTIES)); + inventory.setSequence(((Number) dbMap.get(SEQUENCE)).intValue()); + inventory.setIsAddress(((Number) dbMap.get(IS_ADDRESS)).intValue()); + inventory.setMappingServiceId(((Number) dbMap.get(MAPPING_SERVICE_ID)).intValue()); + inventory.setName((String) dbMap.get(NAME)); + inventory.setAddressId(((Number) dbMap.get(ADDRESS_ID)).intValue()); + inventory.setNodeType(((Number) dbMap.get(NODE_TYPE)).intValue()); + inventory.setRegisterTime(((Number) dbMap.get(REGISTER_TIME)).longValue()); + inventory.setHeartbeatTime(((Number) dbMap.get(HEARTBEAT_TIME)).longValue()); + inventory.setLastUpdateTime(((Number) dbMap.get(LAST_UPDATE_TIME)).longValue()); + inventory.setProp((String) dbMap.get(PROPERTIES)); return inventory; } - @Override public Map data2Map(ServiceInventory storageData) { + @Override + public Map data2Map(ServiceInventory storageData) { Map map = new HashMap<>(); map.put(SEQUENCE, storageData.getSequence()); map.put(IS_ADDRESS, storageData.getIsAddress()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/EndpointInventoryRegister.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/EndpointInventoryRegister.java index 1c8e009b6c3c..545281805ba7 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/EndpointInventoryRegister.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/EndpointInventoryRegister.java @@ -19,19 +19,18 @@ package org.apache.skywalking.oap.server.core.register.service; import java.util.Objects; -import org.apache.skywalking.oap.server.core.*; +import org.apache.skywalking.oap.server.core.Const; +import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.cache.EndpointInventoryCache; import org.apache.skywalking.oap.server.core.register.EndpointInventory; import org.apache.skywalking.oap.server.core.register.worker.InventoryStreamProcessor; import org.apache.skywalking.oap.server.core.source.DetectPoint; import org.apache.skywalking.oap.server.library.module.ModuleDefineHolder; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static java.util.Objects.isNull; -/** - * @author peng-yongsheng - */ public class EndpointInventoryRegister implements IEndpointInventoryRegister { private static final Logger logger = LoggerFactory.getLogger(EndpointInventoryRegister.class); @@ -50,7 +49,8 @@ private EndpointInventoryCache getCacheService() { return cacheService; } - @Override public int getOrCreate(int serviceId, String endpointName, DetectPoint detectPoint) { + @Override + public int getOrCreate(int serviceId, String endpointName, DetectPoint detectPoint) { int endpointId = getCacheService().getEndpointId(serviceId, endpointName, detectPoint.ordinal()); if (endpointId == Const.NONE) { @@ -68,11 +68,13 @@ private EndpointInventoryCache getCacheService() { return endpointId; } - @Override public int get(int serviceId, String endpointName, int detectPoint) { + @Override + public int get(int serviceId, String endpointName, int detectPoint) { return getCacheService().getEndpointId(serviceId, endpointName, detectPoint); } - @Override public void heartbeat(int endpointId, long heartBeatTime) { + @Override + public void heartbeat(int endpointId, long heartBeatTime) { EndpointInventory endpointInventory = getCacheService().get(endpointId); if (Objects.nonNull(endpointInventory)) { endpointInventory.setHeartbeatTime(heartBeatTime); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/IEndpointInventoryRegister.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/IEndpointInventoryRegister.java index 6088cc93dbec..c29ef6fcefd8 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/IEndpointInventoryRegister.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/IEndpointInventoryRegister.java @@ -21,9 +21,6 @@ import org.apache.skywalking.oap.server.core.source.DetectPoint; import org.apache.skywalking.oap.server.library.module.Service; -/** - * @author peng-yongsheng - */ public interface IEndpointInventoryRegister extends Service { int getOrCreate(int serviceId, String endpointName, DetectPoint detectPoint); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/INetworkAddressInventoryRegister.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/INetworkAddressInventoryRegister.java index 32e78ea52221..81545f1944bf 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/INetworkAddressInventoryRegister.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/INetworkAddressInventoryRegister.java @@ -22,9 +22,6 @@ import org.apache.skywalking.oap.server.core.register.NodeType; import org.apache.skywalking.oap.server.library.module.Service; -/** - * @author peng-yongsheng - */ public interface INetworkAddressInventoryRegister extends Service { int getOrCreate(String networkAddress, JsonObject properties); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/IServiceInstanceInventoryRegister.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/IServiceInstanceInventoryRegister.java index 5dbb3e5a38af..0e7b066f96a7 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/IServiceInstanceInventoryRegister.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/IServiceInstanceInventoryRegister.java @@ -22,13 +22,9 @@ import org.apache.skywalking.oap.server.core.register.NodeType; import org.apache.skywalking.oap.server.library.module.Service; -/** - * @author peng-yongsheng - */ public interface IServiceInstanceInventoryRegister extends Service { - int getOrCreate(int serviceId, String serviceInstanceName, String uuid, long registerTime, - JsonObject properties); + int getOrCreate(int serviceId, String serviceInstanceName, String uuid, long registerTime, JsonObject properties); int getOrCreate(int serviceId, String serviceInstanceName, int addressId, long registerTime); @@ -41,10 +37,10 @@ int getOrCreate(int serviceId, String serviceInstanceName, String uuid, long reg /** * Reset the {@link org.apache.skywalking.oap.server.core.register.ServiceInstanceInventory#mappingServiceInstanceId} * of a given service id. - * - * There are cases when the mapping service id needs to be reset to {@code 0}, for example, when an - * uninstrumented gateway joins, the mapping service id of the services that are delegated by this gateway - * should be reset to {@code 0}, allowing the gateway to appear in the topology, see #3308 for more detail. + *

+ * There are cases when the mapping service id needs to be reset to {@code 0}, for example, when an uninstrumented + * gateway joins, the mapping service id of the services that are delegated by this gateway should be reset to + * {@code 0}, allowing the gateway to appear in the topology, see #3308 for more detail. * * @param serviceInstanceId id of the service whose mapping service id is to be reset */ diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/IServiceInventoryRegister.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/IServiceInventoryRegister.java index c30ef7e86cbe..678f6ad8452d 100755 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/IServiceInventoryRegister.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/IServiceInventoryRegister.java @@ -22,9 +22,6 @@ import org.apache.skywalking.oap.server.core.register.NodeType; import org.apache.skywalking.oap.server.library.module.Service; -/** - * @author peng-yongsheng - */ public interface IServiceInventoryRegister extends Service { int getOrCreate(String serviceName, JsonObject properties); @@ -40,12 +37,12 @@ public interface IServiceInventoryRegister extends Service { void updateMapping(int serviceId, int mappingServiceId); /** - * Reset the {@link org.apache.skywalking.oap.server.core.register.ServiceInventory#mappingServiceId} - * of a given service id. - * - * There are cases when the mapping service id needs to be reset to {@code 0}, for example, when an - * uninstrumented gateway joins, the mapping service id of the services that are delegated by this gateway - * should be reset to {@code 0}, allowing the gateway to appear in the topology, see #3308 for more detail. + * Reset the {@link org.apache.skywalking.oap.server.core.register.ServiceInventory#mappingServiceId} of a given + * service id. + *

+ * There are cases when the mapping service id needs to be reset to {@code 0}, for example, when an uninstrumented + * gateway joins, the mapping service id of the services that are delegated by this gateway should be reset to + * {@code 0}, allowing the gateway to appear in the topology, see #3308 for more detail. * * @param serviceId id of the service whose mapping service id is to be reset */ diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/NetworkAddressInventoryRegister.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/NetworkAddressInventoryRegister.java index d3123ea329d4..c77bc7dd4e2f 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/NetworkAddressInventoryRegister.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/NetworkAddressInventoryRegister.java @@ -20,18 +20,18 @@ import com.google.gson.JsonObject; import java.util.Objects; -import org.apache.skywalking.oap.server.core.*; +import org.apache.skywalking.oap.server.core.Const; +import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.cache.NetworkAddressInventoryCache; -import org.apache.skywalking.oap.server.core.register.*; +import org.apache.skywalking.oap.server.core.register.NetworkAddressInventory; +import org.apache.skywalking.oap.server.core.register.NodeType; import org.apache.skywalking.oap.server.core.register.worker.InventoryStreamProcessor; import org.apache.skywalking.oap.server.library.module.ModuleDefineHolder; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static java.util.Objects.isNull; -/** - * @author peng-yongsheng - */ public class NetworkAddressInventoryRegister implements INetworkAddressInventoryRegister { private static final Logger logger = LoggerFactory.getLogger(NetworkAddressInventoryRegister.class); @@ -47,33 +47,41 @@ public NetworkAddressInventoryRegister(ModuleDefineHolder moduleDefineHolder) { private NetworkAddressInventoryCache getNetworkAddressInventoryCache() { if (isNull(networkAddressInventoryCache)) { - this.networkAddressInventoryCache = moduleDefineHolder.find(CoreModule.NAME).provider().getService(NetworkAddressInventoryCache.class); + this.networkAddressInventoryCache = moduleDefineHolder.find(CoreModule.NAME) + .provider() + .getService(NetworkAddressInventoryCache.class); } return this.networkAddressInventoryCache; } private IServiceInventoryRegister getServiceInventoryRegister() { if (isNull(serviceInventoryRegister)) { - this.serviceInventoryRegister = moduleDefineHolder.find(CoreModule.NAME).provider().getService(IServiceInventoryRegister.class); + this.serviceInventoryRegister = moduleDefineHolder.find(CoreModule.NAME) + .provider() + .getService(IServiceInventoryRegister.class); } return this.serviceInventoryRegister; } private IServiceInstanceInventoryRegister getServiceInstanceInventoryRegister() { if (isNull(serviceInstanceInventoryRegister)) { - this.serviceInstanceInventoryRegister = moduleDefineHolder.find(CoreModule.NAME).provider().getService(IServiceInstanceInventoryRegister.class); + this.serviceInstanceInventoryRegister = moduleDefineHolder.find(CoreModule.NAME) + .provider() + .getService(IServiceInstanceInventoryRegister.class); } return this.serviceInstanceInventoryRegister; } - @Override public int getOrCreate(String networkAddress, JsonObject properties) { + @Override + public int getOrCreate(String networkAddress, JsonObject properties) { int addressId = getNetworkAddressInventoryCache().getAddressId(networkAddress); if (addressId != Const.NONE) { int serviceId = getServiceInventoryRegister().getOrCreate(addressId, networkAddress, properties); if (serviceId != Const.NONE) { - int serviceInstanceId = getServiceInstanceInventoryRegister().getOrCreate(serviceId, networkAddress, addressId, System.currentTimeMillis()); + int serviceInstanceId = getServiceInstanceInventoryRegister().getOrCreate(serviceId, networkAddress, addressId, System + .currentTimeMillis()); if (serviceInstanceId != Const.NONE) { return addressId; @@ -93,11 +101,13 @@ private IServiceInstanceInventoryRegister getServiceInstanceInventoryRegister() return Const.NONE; } - @Override public int get(String networkAddress) { + @Override + public int get(String networkAddress) { return getNetworkAddressInventoryCache().getAddressId(networkAddress); } - @Override public void heartbeat(int addressId, long heartBeatTime) { + @Override + public void heartbeat(int addressId, long heartBeatTime) { NetworkAddressInventory networkAddress = getNetworkAddressInventoryCache().get(addressId); if (Objects.nonNull(networkAddress)) { networkAddress = networkAddress.getClone(); @@ -109,7 +119,8 @@ private IServiceInstanceInventoryRegister getServiceInstanceInventoryRegister() } } - @Override public void update(int addressId, NodeType nodeType) { + @Override + public void update(int addressId, NodeType nodeType) { NetworkAddressInventory networkAddress = getNetworkAddressInventoryCache().get(addressId); if (!this.compare(networkAddress, nodeType)) { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/ServiceInstanceInventoryRegister.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/ServiceInstanceInventoryRegister.java index a5813055b4cc..7590cba7dba5 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/ServiceInstanceInventoryRegister.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/ServiceInstanceInventoryRegister.java @@ -19,21 +19,20 @@ package org.apache.skywalking.oap.server.core.register.service; import com.google.gson.JsonObject; -import org.apache.skywalking.oap.server.core.*; +import org.apache.skywalking.oap.server.core.Const; +import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.cache.ServiceInstanceInventoryCache; import org.apache.skywalking.oap.server.core.register.NodeType; import org.apache.skywalking.oap.server.core.register.ServiceInstanceInventory; import org.apache.skywalking.oap.server.core.register.worker.InventoryStreamProcessor; import org.apache.skywalking.oap.server.library.module.ModuleDefineHolder; import org.apache.skywalking.oap.server.library.util.BooleanUtils; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static java.util.Objects.isNull; import static java.util.Objects.nonNull; -/** - * @author peng-yongsheng - */ public class ServiceInstanceInventoryRegister implements IServiceInstanceInventoryRegister { private static final Logger logger = LoggerFactory.getLogger(ServiceInstanceInventoryRegister.class); @@ -47,12 +46,15 @@ public ServiceInstanceInventoryRegister(ModuleDefineHolder moduleDefineHolder) { private ServiceInstanceInventoryCache getServiceInstanceInventoryCache() { if (isNull(serviceInstanceInventoryCache)) { - serviceInstanceInventoryCache = moduleDefineHolder.find(CoreModule.NAME).provider().getService(ServiceInstanceInventoryCache.class); + serviceInstanceInventoryCache = moduleDefineHolder.find(CoreModule.NAME) + .provider() + .getService(ServiceInstanceInventoryCache.class); } return serviceInstanceInventoryCache; } - @Override public int getOrCreate(int serviceId, String serviceInstanceName, String uuid, long registerTime, + @Override + public int getOrCreate(int serviceId, String serviceInstanceName, String uuid, long registerTime, JsonObject properties) { if (logger.isDebugEnabled()) { logger.debug("Get or create service instance by service instance name, service id: {}, service instance name: {},uuid: {}, registerTime: {}", serviceId, serviceInstanceName, uuid, registerTime); @@ -79,7 +81,8 @@ private ServiceInstanceInventoryCache getServiceInstanceInventoryCache() { return serviceInstanceId; } - @Override public int getOrCreate(int serviceId, String serviceInstanceName, int addressId, long registerTime) { + @Override + public int getOrCreate(int serviceId, String serviceInstanceName, int addressId, long registerTime) { if (logger.isDebugEnabled()) { logger.debug("get or create service instance by getAddress id, service id: {}, getAddress id: {}, registerTime: {}", serviceId, addressId, registerTime); } @@ -119,7 +122,8 @@ public void update(int serviceInstanceId, NodeType nodeType, JsonObject properti } } - @Override public void heartbeat(int serviceInstanceId, long heartBeatTime) { + @Override + public void heartbeat(int serviceInstanceId, long heartBeatTime) { ServiceInstanceInventory serviceInstanceInventory = getServiceInstanceInventoryCache().get(serviceInstanceId); if (nonNull(serviceInstanceInventory)) { serviceInstanceInventory.setHeartbeatTime(heartBeatTime); @@ -129,7 +133,8 @@ public void update(int serviceInstanceId, NodeType nodeType, JsonObject properti } } - @Override public void updateMapping(int serviceInstanceId, int mappingServiceInstanceId) { + @Override + public void updateMapping(int serviceInstanceId, int mappingServiceInstanceId) { ServiceInstanceInventory instanceInventory = getServiceInstanceInventoryCache().get(serviceInstanceId); if (nonNull(instanceInventory)) { instanceInventory = instanceInventory.getClone(); @@ -142,7 +147,8 @@ public void update(int serviceInstanceId, NodeType nodeType, JsonObject properti } } - @Override public void resetMapping(int serviceInstanceId) { + @Override + public void resetMapping(int serviceInstanceId) { ServiceInstanceInventory instanceInventory = getServiceInstanceInventoryCache().get(serviceInstanceId); if (nonNull(instanceInventory) && instanceInventory.getMappingServiceInstanceId() != Const.NONE) { instanceInventory = instanceInventory.getClone(); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/ServiceInventoryRegister.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/ServiceInventoryRegister.java index 5a45f61f59ce..161ab5f4ab0c 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/ServiceInventoryRegister.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/service/ServiceInventoryRegister.java @@ -19,6 +19,7 @@ package org.apache.skywalking.oap.server.core.register.service; import com.google.gson.JsonObject; +import java.util.Objects; import org.apache.skywalking.oap.server.core.Const; import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.cache.ServiceInventoryCache; @@ -30,13 +31,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Objects; - import static java.util.Objects.isNull; -/** - * @author peng-yongsheng - */ public class ServiceInventoryRegister implements IServiceInventoryRegister { private static final Logger logger = LoggerFactory.getLogger(ServiceInventoryRegister.class); @@ -50,12 +46,15 @@ public ServiceInventoryRegister(ModuleDefineHolder moduleDefineHolder) { private ServiceInventoryCache getServiceInventoryCache() { if (isNull(serviceInventoryCache)) { - this.serviceInventoryCache = moduleDefineHolder.find(CoreModule.NAME).provider().getService(ServiceInventoryCache.class); + this.serviceInventoryCache = moduleDefineHolder.find(CoreModule.NAME) + .provider() + .getService(ServiceInventoryCache.class); } return serviceInventoryCache; } - @Override public int getOrCreate(String serviceName, NodeType nodeType, JsonObject properties) { + @Override + public int getOrCreate(String serviceName, NodeType nodeType, JsonObject properties) { int serviceId = getServiceInventoryCache().getServiceId(serviceName); if (serviceId == Const.NONE) { @@ -77,11 +76,13 @@ private ServiceInventoryCache getServiceInventoryCache() { return serviceId; } - @Override public int getOrCreate(String serviceName, JsonObject properties) { + @Override + public int getOrCreate(String serviceName, JsonObject properties) { return getOrCreate(serviceName, NodeType.Normal, properties); } - @Override public int getOrCreate(int addressId, String serviceName, JsonObject properties) { + @Override + public int getOrCreate(int addressId, String serviceName, JsonObject properties) { int serviceId = getServiceInventoryCache().getServiceId(addressId); if (serviceId == Const.NONE) { @@ -100,7 +101,8 @@ private ServiceInventoryCache getServiceInventoryCache() { return serviceId; } - @Override public void update(int serviceId, NodeType nodeType, JsonObject properties) { + @Override + public void update(int serviceId, NodeType nodeType, JsonObject properties) { ServiceInventory serviceInventory = getServiceInventoryCache().get(serviceId); if (Objects.nonNull(serviceInventory)) { if (properties != null || !compare(serviceInventory, nodeType)) { @@ -116,7 +118,8 @@ private ServiceInventoryCache getServiceInventoryCache() { } } - @Override public void heartbeat(int serviceId, long heartBeatTime) { + @Override + public void heartbeat(int serviceId, long heartBeatTime) { ServiceInventory serviceInventory = getServiceInventoryCache().get(serviceId); if (Objects.nonNull(serviceInventory)) { serviceInventory = serviceInventory.getClone(); @@ -128,7 +131,8 @@ private ServiceInventoryCache getServiceInventoryCache() { } } - @Override public void updateMapping(int serviceId, int mappingServiceId) { + @Override + public void updateMapping(int serviceId, int mappingServiceId) { ServiceInventory serviceInventory = getServiceInventoryCache().get(serviceId); if (Objects.nonNull(serviceInventory)) { serviceInventory = serviceInventory.getClone(); @@ -141,7 +145,8 @@ private ServiceInventoryCache getServiceInventoryCache() { } } - @Override public void resetMapping(int serviceId) { + @Override + public void resetMapping(int serviceId) { ServiceInventory serviceInventory = getServiceInventoryCache().get(serviceId); if (Objects.nonNull(serviceInventory)) { if (serviceInventory.getMappingServiceId() != Const.NONE) { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/worker/InventoryStreamProcessor.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/worker/InventoryStreamProcessor.java index ed47c8001c42..ab16bab9837c 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/worker/InventoryStreamProcessor.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/worker/InventoryStreamProcessor.java @@ -37,9 +37,6 @@ import org.apache.skywalking.oap.server.core.worker.IWorkerInstanceSetter; import org.apache.skywalking.oap.server.library.module.ModuleDefineHolder; -/** - * @author peng-yongsheng - */ public class InventoryStreamProcessor implements StreamProcessor { private static final InventoryStreamProcessor PROCESSOR = new InventoryStreamProcessor(); @@ -68,10 +65,13 @@ public void create(ModuleDefineHolder moduleDefineHolder, Stream stream, IModelSetter modelSetter = moduleDefineHolder.find(CoreModule.NAME).provider().getService(IModelSetter.class); Model model = modelSetter.putIfAbsent(inventoryClass, stream.scopeId(), new Storage(stream.name(), false, false, Downsampling.None), false); - RegisterPersistentWorker persistentWorker = new RegisterPersistentWorker(moduleDefineHolder, model.getName(), registerDAO, stream.scopeId()); + RegisterPersistentWorker persistentWorker = new RegisterPersistentWorker(moduleDefineHolder, model.getName(), registerDAO, stream + .scopeId()); String remoteReceiverWorkerName = stream.name() + "_rec"; - IWorkerInstanceSetter workerInstanceSetter = moduleDefineHolder.find(CoreModule.NAME).provider().getService(IWorkerInstanceSetter.class); + IWorkerInstanceSetter workerInstanceSetter = moduleDefineHolder.find(CoreModule.NAME) + .provider() + .getService(IWorkerInstanceSetter.class); workerInstanceSetter.put(remoteReceiverWorkerName, persistentWorker, inventoryClass); RegisterRemoteWorker remoteWorker = new RegisterRemoteWorker(moduleDefineHolder, remoteReceiverWorkerName); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/worker/RegisterDistinctWorker.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/worker/RegisterDistinctWorker.java index cdb8fb493156..6ca90c5b7523 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/worker/RegisterDistinctWorker.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/worker/RegisterDistinctWorker.java @@ -18,18 +18,21 @@ package org.apache.skywalking.oap.server.core.register.worker; -import java.util.*; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import org.apache.skywalking.apm.commons.datacarrier.DataCarrier; -import org.apache.skywalking.apm.commons.datacarrier.consumer.*; +import org.apache.skywalking.apm.commons.datacarrier.consumer.BulkConsumePool; +import org.apache.skywalking.apm.commons.datacarrier.consumer.ConsumerPoolFactory; +import org.apache.skywalking.apm.commons.datacarrier.consumer.IConsumer; import org.apache.skywalking.oap.server.core.UnexpectedException; import org.apache.skywalking.oap.server.core.register.RegisterSource; import org.apache.skywalking.oap.server.core.worker.AbstractWorker; import org.apache.skywalking.oap.server.library.module.ModuleDefineHolder; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng - */ public class RegisterDistinctWorker extends AbstractWorker { private static final Logger logger = LoggerFactory.getLogger(RegisterDistinctWorker.class); @@ -58,7 +61,8 @@ public class RegisterDistinctWorker extends AbstractWorker { this.dataCarrier.consume(ConsumerPoolFactory.INSTANCE.get(name), new AggregatorConsumer(this)); } - @Override public final void in(RegisterSource source) { + @Override + public final void in(RegisterSource source) { source.resetEndOfBatch(); dataCarrier.produce(source); } @@ -87,10 +91,12 @@ private AggregatorConsumer(RegisterDistinctWorker aggregator) { this.aggregator = aggregator; } - @Override public void init() { + @Override + public void init() { } - @Override public void consume(List sources) { + @Override + public void consume(List sources) { Iterator sourceIterator = sources.iterator(); int i = 0; @@ -104,11 +110,13 @@ private AggregatorConsumer(RegisterDistinctWorker aggregator) { } } - @Override public void onError(List sources, Throwable t) { + @Override + public void onError(List sources, Throwable t) { logger.error(t.getMessage(), t); } - @Override public void onExit() { + @Override + public void onExit() { } } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/worker/RegisterPersistentWorker.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/worker/RegisterPersistentWorker.java index d58adc2c374e..ac4ee9ebcb87 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/worker/RegisterPersistentWorker.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/worker/RegisterPersistentWorker.java @@ -18,25 +18,31 @@ package org.apache.skywalking.oap.server.core.register.worker; -import java.util.*; - +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Objects; import org.apache.skywalking.apm.commons.datacarrier.DataCarrier; -import org.apache.skywalking.apm.commons.datacarrier.consumer.*; -import org.apache.skywalking.oap.server.core.*; +import org.apache.skywalking.apm.commons.datacarrier.consumer.BulkConsumePool; +import org.apache.skywalking.apm.commons.datacarrier.consumer.ConsumerPoolFactory; +import org.apache.skywalking.apm.commons.datacarrier.consumer.IConsumer; +import org.apache.skywalking.oap.server.core.Const; +import org.apache.skywalking.oap.server.core.UnexpectedException; import org.apache.skywalking.oap.server.core.register.RegisterSource; import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine; -import org.apache.skywalking.oap.server.core.storage.*; +import org.apache.skywalking.oap.server.core.storage.IRegisterDAO; +import org.apache.skywalking.oap.server.core.storage.IRegisterLockDAO; +import org.apache.skywalking.oap.server.core.storage.StorageModule; import org.apache.skywalking.oap.server.core.worker.AbstractWorker; import org.apache.skywalking.oap.server.library.module.ModuleDefineHolder; import org.apache.skywalking.oap.server.telemetry.TelemetryModule; import org.apache.skywalking.oap.server.telemetry.api.HistogramMetrics; import org.apache.skywalking.oap.server.telemetry.api.MetricsCreator; import org.apache.skywalking.oap.server.telemetry.api.MetricsTag; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng - */ public class RegisterPersistentWorker extends AbstractWorker { private static final Logger logger = LoggerFactory.getLogger(RegisterPersistentWorker.class); @@ -49,19 +55,22 @@ public class RegisterPersistentWorker extends AbstractWorker { private final DataCarrier dataCarrier; private final HistogramMetrics workerLatencyHistogram; - RegisterPersistentWorker(ModuleDefineHolder moduleDefineHolder, String modelName, - IRegisterDAO registerDAO, int scopeId) { + RegisterPersistentWorker(ModuleDefineHolder moduleDefineHolder, String modelName, IRegisterDAO registerDAO, + int scopeId) { super(moduleDefineHolder); this.modelName = modelName; this.sources = new HashMap<>(); this.registerDAO = registerDAO; - this.registerLockDAO = moduleDefineHolder.find(StorageModule.NAME).provider().getService(IRegisterLockDAO.class); + this.registerLockDAO = moduleDefineHolder.find(StorageModule.NAME) + .provider() + .getService(IRegisterLockDAO.class); this.scopeId = scopeId; this.dataCarrier = new DataCarrier<>("MetricsPersistentWorker." + modelName, 1, 1000); - MetricsCreator metricsCreator = moduleDefineHolder.find(TelemetryModule.NAME).provider().getService(MetricsCreator.class); + MetricsCreator metricsCreator = moduleDefineHolder.find(TelemetryModule.NAME) + .provider() + .getService(MetricsCreator.class); - workerLatencyHistogram = metricsCreator.createHistogramMetric("register_persistent_worker_latency", "The process latency of register persistent worker", - new MetricsTag.Keys("module"), new MetricsTag.Values(modelName)); + workerLatencyHistogram = metricsCreator.createHistogramMetric("register_persistent_worker_latency", "The process latency of register persistent worker", new MetricsTag.Keys("module"), new MetricsTag.Values(modelName)); String name = "REGISTER_L2"; int size = BulkConsumePool.Creator.recommendMaxSize() / 8; @@ -78,7 +87,8 @@ public class RegisterPersistentWorker extends AbstractWorker { this.dataCarrier.consume(ConsumerPoolFactory.INSTANCE.get(name), new RegisterPersistentWorker.PersistentConsumer(this)); } - @Override public final void in(RegisterSource registerSource) { + @Override + public final void in(RegisterSource registerSource) { registerSource.resetEndOfBatch(); dataCarrier.produce(registerSource); } @@ -116,7 +126,8 @@ private void onWork(RegisterSource registerSource) { logger.error(t.getMessage(), t); } } else { - logger.info("{} inventory register try lock and increment sequence failure.", DefaultScopeDefine.nameOf(scopeId)); + logger.info("{} inventory register try lock and increment sequence failure.", DefaultScopeDefine + .nameOf(scopeId)); } } } catch (Throwable t) { @@ -136,11 +147,13 @@ private PersistentConsumer(RegisterPersistentWorker persistent) { this.persistent = persistent; } - @Override public void init() { + @Override + public void init() { } - @Override public void consume(List data) { + @Override + public void consume(List data) { Iterator sourceIterator = data.iterator(); int i = 0; @@ -154,11 +167,13 @@ private PersistentConsumer(RegisterPersistentWorker persistent) { } } - @Override public void onError(List data, Throwable t) { + @Override + public void onError(List data, Throwable t) { logger.error(t.getMessage(), t); } - @Override public void onExit() { + @Override + public void onExit() { } } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/worker/RegisterRemoteWorker.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/worker/RegisterRemoteWorker.java index 8366186cc530..aeb95f5d8ef9 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/worker/RegisterRemoteWorker.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/worker/RegisterRemoteWorker.java @@ -24,11 +24,9 @@ import org.apache.skywalking.oap.server.core.remote.selector.Selector; import org.apache.skywalking.oap.server.core.worker.AbstractWorker; import org.apache.skywalking.oap.server.library.module.ModuleDefineHolder; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng - */ public class RegisterRemoteWorker extends AbstractWorker { private static final Logger logger = LoggerFactory.getLogger(RegisterRemoteWorker.class); @@ -42,7 +40,8 @@ public class RegisterRemoteWorker extends AbstractWorker { this.remoteReceiverWorkerName = remoteReceiverWorkerName; } - @Override public final void in(RegisterSource registerSource) { + @Override + public final void in(RegisterSource registerSource) { try { remoteSender.send(remoteReceiverWorkerName, registerSource, Selector.ForeverFirst); } catch (Throwable e) { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/Deserializable.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/Deserializable.java index b2b3a7ecbdd1..14bdb75f1b57 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/Deserializable.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/Deserializable.java @@ -20,9 +20,6 @@ import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -/** - * @author peng-yongsheng - */ public interface Deserializable { void deserialize(RemoteData remoteData); } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/RemoteSenderService.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/RemoteSenderService.java index d827040007c2..7c2fc5c152dc 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/RemoteSenderService.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/RemoteSenderService.java @@ -32,9 +32,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng - */ public class RemoteSenderService implements Service { private static final Logger logger = LoggerFactory.getLogger(RemoteSenderService.class); @@ -51,7 +48,9 @@ public RemoteSenderService(ModuleManager moduleManager) { } public void send(String nextWorkName, StreamData streamData, Selector selector) { - RemoteClientManager clientManager = moduleManager.find(CoreModule.NAME).provider().getService(RemoteClientManager.class); + RemoteClientManager clientManager = moduleManager.find(CoreModule.NAME) + .provider() + .getService(RemoteClientManager.class); RemoteClient remoteClient = null; List clientList = clientManager.getRemoteClient(); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/RemoteServiceHandler.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/RemoteServiceHandler.java index f8deaa20fdfb..c2c033ebfbf3 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/RemoteServiceHandler.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/RemoteServiceHandler.java @@ -43,8 +43,6 @@ * This class is Server-side streaming RPC implementation. It's a common service for OAP servers to receive message from * each others. The stream data id is used to find the object to deserialize message. The next worker id is used to find * the worker to process message. - * - * @author peng-yongsheng */ public class RemoteServiceHandler extends RemoteServiceGrpc.RemoteServiceImplBase implements GRPCHandler { @@ -60,31 +58,39 @@ public class RemoteServiceHandler extends RemoteServiceGrpc.RemoteServiceImplBas public RemoteServiceHandler(ModuleDefineHolder moduleDefineHolder) { this.moduleDefineHolder = moduleDefineHolder; - remoteInCounter = moduleDefineHolder.find(TelemetryModule.NAME).provider().getService(MetricsCreator.class) - .createCounter("remote_in_count", "The number(server side) of inside remote inside aggregate rpc.", - MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); - remoteInErrorCounter = moduleDefineHolder.find(TelemetryModule.NAME).provider().getService(MetricsCreator.class) - .createCounter("remote_in_error_count", "The error number(server side) of inside remote inside aggregate rpc.", - MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); - remoteInTargetNotFoundCounter = moduleDefineHolder.find(TelemetryModule.NAME).provider().getService(MetricsCreator.class) - .createCounter("remote_in_target_not_found_count", "The error number(server side) of inside remote handler target worker not found. May be caused by unmatched OAL scrips.", - MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); - remoteInHistogram = moduleDefineHolder.find(TelemetryModule.NAME).provider().getService(MetricsCreator.class) - .createHistogramMetric("remote_in_latency", "The latency(server side) of inside remote inside aggregate rpc.", - MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); + remoteInCounter = moduleDefineHolder.find(TelemetryModule.NAME) + .provider() + .getService(MetricsCreator.class) + .createCounter("remote_in_count", "The number(server side) of inside remote inside aggregate rpc.", MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); + remoteInErrorCounter = moduleDefineHolder.find(TelemetryModule.NAME) + .provider() + .getService(MetricsCreator.class) + .createCounter("remote_in_error_count", "The error number(server side) of inside remote inside aggregate rpc.", MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); + remoteInTargetNotFoundCounter = moduleDefineHolder.find(TelemetryModule.NAME) + .provider() + .getService(MetricsCreator.class) + .createCounter("remote_in_target_not_found_count", "The error number(server side) of inside remote handler target worker not found. May be caused by unmatched OAL scrips.", MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); + remoteInHistogram = moduleDefineHolder.find(TelemetryModule.NAME) + .provider() + .getService(MetricsCreator.class) + .createHistogramMetric("remote_in_latency", "The latency(server side) of inside remote inside aggregate rpc.", MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); } - @Override public StreamObserver call(StreamObserver responseObserver) { + @Override + public StreamObserver call(StreamObserver responseObserver) { if (Objects.isNull(workerInstanceGetter)) { synchronized (RemoteServiceHandler.class) { if (Objects.isNull(workerInstanceGetter)) { - workerInstanceGetter = moduleDefineHolder.find(CoreModule.NAME).provider().getService(IWorkerInstanceGetter.class); + workerInstanceGetter = moduleDefineHolder.find(CoreModule.NAME) + .provider() + .getService(IWorkerInstanceGetter.class); } } } return new StreamObserver() { - @Override public void onNext(RemoteMessage message) { + @Override + public void onNext(RemoteMessage message) { remoteInCounter.inc(); HistogramMetrics.Timer timer = remoteInHistogram.createTimer(); try { @@ -111,11 +117,13 @@ public RemoteServiceHandler(ModuleDefineHolder moduleDefineHolder) { } } - @Override public void onError(Throwable throwable) { + @Override + public void onError(Throwable throwable) { logger.error(throwable.getMessage(), throwable); } - @Override public void onCompleted() { + @Override + public void onCompleted() { responseObserver.onNext(Empty.newBuilder().build()); responseObserver.onCompleted(); } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/Serializable.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/Serializable.java index 1a7dbede3ab6..382371c65fa7 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/Serializable.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/Serializable.java @@ -20,9 +20,6 @@ import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -/** - * @author peng-yongsheng - */ public interface Serializable { RemoteData.Builder serialize(); } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/client/Address.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/client/Address.java index 00c36cfdfd7d..0cf6f84f31d7 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/client/Address.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/client/Address.java @@ -18,17 +18,16 @@ package org.apache.skywalking.oap.server.core.remote.client; -import lombok.*; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.oap.server.core.Const; -/** - * @author peng-yongsheng - */ @Getter public class Address implements Comparable

{ private final String host; private final int port; - @Setter private volatile boolean isSelf; + @Setter + private volatile boolean isSelf; public Address(String host, int port, boolean isSelf) { this.host = host; @@ -36,11 +35,13 @@ public Address(String host, int port, boolean isSelf) { this.isSelf = isSelf; } - @Override public int hashCode() { + @Override + public int hashCode() { return toString().hashCode(); } - @Override public boolean equals(Object obj) { + @Override + public boolean equals(Object obj) { if (this == obj) return true; if (obj == null) @@ -48,15 +49,17 @@ public Address(String host, int port, boolean isSelf) { if (getClass() != obj.getClass()) return false; - Address address = (Address)obj; + Address address = (Address) obj; return host.equals(address.host) && port == address.port; } - @Override public String toString() { + @Override + public String toString() { return host + Const.ID_SPLIT + port; } - @Override public int compareTo(Address o) { + @Override + public int compareTo(Address o) { return this.toString().compareTo(o.toString()); } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/client/GRPCRemoteClient.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/client/GRPCRemoteClient.java index d95b709a10f6..5ce949fcb30a 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/client/GRPCRemoteClient.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/client/GRPCRemoteClient.java @@ -42,8 +42,6 @@ /** * This is a wrapper of the gRPC client for sending message to each other OAP server. It contains a block queue to * buffering the message and sending the message by batch. - * - * @author peng-yongsheng */ public class GRPCRemoteClient implements RemoteClient { @@ -60,22 +58,27 @@ public class GRPCRemoteClient implements RemoteClient { private CounterMetrics remoteOutErrorCounter; private int remoteTimeout; - public GRPCRemoteClient(ModuleDefineHolder moduleDefineHolder, Address address, int channelSize, - int bufferSize, int remoteTimeout) { + public GRPCRemoteClient(ModuleDefineHolder moduleDefineHolder, Address address, int channelSize, int bufferSize, + int remoteTimeout) { this.address = address; this.channelSize = channelSize; this.bufferSize = bufferSize; this.remoteTimeout = remoteTimeout; - remoteOutCounter = moduleDefineHolder.find(TelemetryModule.NAME).provider().getService(MetricsCreator.class) - .createCounter("remote_out_count", "The number(client side) of inside remote inside aggregate rpc.", - new MetricsTag.Keys("dest", "self"), new MetricsTag.Values(address.toString(), "N")); - remoteOutErrorCounter = moduleDefineHolder.find(TelemetryModule.NAME).provider().getService(MetricsCreator.class) - .createCounter("remote_out_error_count", "The error number(client side) of inside remote inside aggregate rpc.", - new MetricsTag.Keys("dest", "self"), new MetricsTag.Values(address.toString(), "N")); + remoteOutCounter = moduleDefineHolder.find(TelemetryModule.NAME) + .provider() + .getService(MetricsCreator.class) + .createCounter("remote_out_count", "The number(client side) of inside remote inside aggregate rpc.", new MetricsTag.Keys("dest", "self"), new MetricsTag.Values(address + .toString(), "N")); + remoteOutErrorCounter = moduleDefineHolder.find(TelemetryModule.NAME) + .provider() + .getService(MetricsCreator.class) + .createCounter("remote_out_error_count", "The error number(client side) of inside remote inside aggregate rpc.", new MetricsTag.Keys("dest", "self"), new MetricsTag.Values(address + .toString(), "N")); } - @Override public void connect() { + @Override + public void connect() { if (!isConnect) { this.getClient().connect(); this.getDataCarrier().consume(new RemoteMessageConsumer(), 1); @@ -122,9 +125,10 @@ DataCarrier getDataCarrier() { * Push stream data which need to send to another OAP server. * * @param nextWorkerName the name of a worker which will process this stream data. - * @param streamData the entity contains the values. + * @param streamData the entity contains the values. */ - @Override public void push(String nextWorkerName, StreamData streamData) { + @Override + public void push(String nextWorkerName, StreamData streamData) { RemoteMessage.Builder builder = RemoteMessage.newBuilder(); builder.setNextWorkerName(nextWorkerName); builder.setRemoteData(streamData.serialize()); @@ -133,10 +137,12 @@ DataCarrier getDataCarrier() { } class RemoteMessageConsumer implements IConsumer { - @Override public void init() { + @Override + public void init() { } - @Override public void consume(List remoteMessages) { + @Override + public void consume(List remoteMessages) { try { StreamObserver streamObserver = createStreamObserver(); for (RemoteMessage remoteMessage : remoteMessages) { @@ -150,11 +156,13 @@ class RemoteMessageConsumer implements IConsumer { } } - @Override public void onError(List remoteMessages, Throwable t) { + @Override + public void onError(List remoteMessages, Throwable t) { logger.error(t.getMessage(), t); } - @Override public void onExit() { + @Override + public void onExit() { } } @@ -184,21 +192,25 @@ private StreamObserver createStreamObserver() { } return getStub().withDeadlineAfter(remoteTimeout, TimeUnit.SECONDS).call(new StreamObserver() { - @Override public void onNext(Empty empty) { + @Override + public void onNext(Empty empty) { } - @Override public void onError(Throwable throwable) { + @Override + public void onError(Throwable throwable) { concurrentStreamObserverNumber.addAndGet(-1); logger.error(throwable.getMessage(), throwable); } - @Override public void onCompleted() { + @Override + public void onCompleted() { concurrentStreamObserverNumber.addAndGet(-1); } }); } - @Override public void close() { + @Override + public void close() { if (Objects.nonNull(this.carrier)) { this.carrier.shutdownConsumers(); } @@ -207,11 +219,13 @@ private StreamObserver createStreamObserver() { } } - @Override public Address getAddress() { + @Override + public Address getAddress() { return address; } - @Override public int compareTo(RemoteClient o) { + @Override + public int compareTo(RemoteClient o) { return address.compareTo(o.getAddress()); } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/client/RemoteClient.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/client/RemoteClient.java index 3330f3d4cb74..b69791c4fcff 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/client/RemoteClient.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/client/RemoteClient.java @@ -20,9 +20,6 @@ import org.apache.skywalking.oap.server.core.remote.data.StreamData; -/** - * @author peng-yongsheng - */ public interface RemoteClient extends Comparable { Address getAddress(); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/client/RemoteClientManager.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/client/RemoteClientManager.java index 852bdd3ab367..3927d01b859e 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/client/RemoteClientManager.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/client/RemoteClientManager.java @@ -49,8 +49,6 @@ /** * This class manages the connections between OAP servers. There is a task schedule that will automatically query a * server list from the cluster module. Such as Zookeeper cluster module or Kubernetes cluster module. - * - * @author peng-yongsheng */ public class RemoteClientManager implements Service { @@ -84,15 +82,18 @@ public void start() { */ void refresh() { if (gauge == null) { - gauge = moduleDefineHolder.find(TelemetryModule.NAME).provider().getService(MetricsCreator.class) - .createGauge("cluster_size", "Cluster size of current oap node", - MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); + gauge = moduleDefineHolder.find(TelemetryModule.NAME) + .provider() + .getService(MetricsCreator.class) + .createGauge("cluster_size", "Cluster size of current oap node", MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); } try { if (Objects.isNull(clusterNodesQuery)) { synchronized (RemoteClientManager.class) { if (Objects.isNull(clusterNodesQuery)) { - this.clusterNodesQuery = moduleDefineHolder.find(ClusterModule.NAME).provider().getService(ClusterNodesQuery.class); + this.clusterNodesQuery = moduleDefineHolder.find(ClusterModule.NAME) + .provider() + .getService(ClusterNodesQuery.class); } } } @@ -169,16 +170,17 @@ public List getRemoteClient() { */ private void reBuildRemoteClients(List remoteInstances) { final Map remoteClientCollection = this.usingClients.stream() - .collect(Collectors.toMap(RemoteClient::getAddress, client -> new RemoteClientAction(client, Action.Close))); + .collect(Collectors.toMap(RemoteClient::getAddress, client -> new RemoteClientAction(client, Action.Close))); final Map latestRemoteClients = remoteInstances.stream() - .collect(Collectors.toMap(RemoteInstance::getAddress, remote -> new RemoteClientAction(null, Action.Create))); + .collect(Collectors.toMap(RemoteInstance::getAddress, remote -> new RemoteClientAction(null, Action.Create))); final Set
unChangeAddresses = Sets.intersection(remoteClientCollection.keySet(), latestRemoteClients.keySet()); unChangeAddresses.stream() - .filter(remoteClientCollection::containsKey) - .forEach(unChangeAddress -> remoteClientCollection.get(unChangeAddress).setAction(Action.Unchanged)); + .filter(remoteClientCollection::containsKey) + .forEach(unChangeAddress -> remoteClientCollection.get(unChangeAddress) + .setAction(Action.Unchanged)); // make the latestRemoteClients including the new clients only unChangeAddresses.forEach(latestRemoteClients::remove); @@ -208,9 +210,9 @@ private void reBuildRemoteClients(List remoteInstances) { this.usingClients = ImmutableList.copyOf(newRemoteClients); remoteClientCollection.values() - .stream() - .filter(remoteClientAction -> remoteClientAction.getAction().equals(Action.Close)) - .forEach(remoteClientAction -> remoteClientAction.getRemoteClient().close()); + .stream() + .filter(remoteClientAction -> remoteClientAction.getAction().equals(Action.Close)) + .forEach(remoteClientAction -> remoteClientAction.getRemoteClient().close()); } private boolean compare(List remoteInstances) { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/client/SelfRemoteClient.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/client/SelfRemoteClient.java index 110d9e97bd8f..7d445fd97541 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/client/SelfRemoteClient.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/client/SelfRemoteClient.java @@ -28,9 +28,6 @@ import org.apache.skywalking.oap.server.telemetry.api.MetricsCreator; import org.apache.skywalking.oap.server.telemetry.api.MetricsTag; -/** - * @author peng-yongsheng - */ public class SelfRemoteClient implements RemoteClient { private final Address address; @@ -39,28 +36,37 @@ public class SelfRemoteClient implements RemoteClient { public SelfRemoteClient(ModuleDefineHolder moduleDefineHolder, Address address) { this.address = address; - workerInstanceGetter = moduleDefineHolder.find(CoreModule.NAME).provider().getService(IWorkerInstanceGetter.class); - remoteOutCounter = moduleDefineHolder.find(TelemetryModule.NAME).provider().getService(MetricsCreator.class) - .createCounter("remote_out_count", "The number(client side) of inside remote inside aggregate rpc.", - new MetricsTag.Keys("dest", "self"), new MetricsTag.Values(address.toString(), "Y")); + workerInstanceGetter = moduleDefineHolder.find(CoreModule.NAME) + .provider() + .getService(IWorkerInstanceGetter.class); + remoteOutCounter = moduleDefineHolder.find(TelemetryModule.NAME) + .provider() + .getService(MetricsCreator.class) + .createCounter("remote_out_count", "The number(client side) of inside remote inside aggregate rpc.", new MetricsTag.Keys("dest", "self"), new MetricsTag.Values(address + .toString(), "Y")); } - @Override public Address getAddress() { + @Override + public Address getAddress() { return address; } - @Override public void connect() { + @Override + public void connect() { } - @Override public void close() { + @Override + public void close() { throw new UnexpectedException("Self remote client invoked to close."); } - @Override public void push(String nextWorkerName, StreamData streamData) { + @Override + public void push(String nextWorkerName, StreamData streamData) { workerInstanceGetter.get(nextWorkerName).getWorker().in(streamData); } - @Override public int compareTo(RemoteClient o) { + @Override + public int compareTo(RemoteClient o) { return address.compareTo(o.getAddress()); } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/data/StreamData.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/data/StreamData.java index d2875eb237b4..6b761e7915ed 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/data/StreamData.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/data/StreamData.java @@ -19,24 +19,25 @@ package org.apache.skywalking.oap.server.core.remote.data; import org.apache.skywalking.oap.server.core.analysis.data.QueueData; -import org.apache.skywalking.oap.server.core.remote.*; +import org.apache.skywalking.oap.server.core.remote.Deserializable; +import org.apache.skywalking.oap.server.core.remote.Serializable; -/** - * @author peng-yongsheng - */ public abstract class StreamData implements QueueData, Serializable, Deserializable { private boolean endOfBatch = false; - @Override public void resetEndOfBatch() { + @Override + public void resetEndOfBatch() { this.endOfBatch = false; } - @Override public void asEndOfBatch() { + @Override + public void asEndOfBatch() { this.endOfBatch = true; } - @Override public boolean isEndOfBatch() { + @Override + public boolean isEndOfBatch() { return this.endOfBatch; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/health/HealthCheckServiceHandler.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/health/HealthCheckServiceHandler.java index cfcd7241e2f6..7b83dcb97986 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/health/HealthCheckServiceHandler.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/health/HealthCheckServiceHandler.java @@ -18,14 +18,13 @@ package org.apache.skywalking.oap.server.core.remote.health; -import grpc.health.v1.*; +import grpc.health.v1.HealthCheckService; +import grpc.health.v1.HealthGrpc; import io.grpc.stub.StreamObserver; import org.apache.skywalking.oap.server.library.server.grpc.GRPCHandler; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng - */ public class HealthCheckServiceHandler extends HealthGrpc.HealthImplBase implements GRPCHandler { private static final Logger logger = LoggerFactory.getLogger(HealthCheckServiceHandler.class); @@ -33,10 +32,11 @@ public class HealthCheckServiceHandler extends HealthGrpc.HealthImplBase impleme /** * By my test, consul didn't send the service. * - * @param request service + * @param request service * @param responseObserver status */ - @Override public void check(HealthCheckService.HealthCheckRequest request, + @Override + public void check(HealthCheckService.HealthCheckRequest request, StreamObserver responseObserver) { if (logger.isDebugEnabled()) { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/selector/ForeverFirstSelector.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/selector/ForeverFirstSelector.java index 49e8b1fd5d6d..81a8800f9fa4 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/selector/ForeverFirstSelector.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/selector/ForeverFirstSelector.java @@ -19,18 +19,17 @@ package org.apache.skywalking.oap.server.core.remote.selector; import java.util.List; -import org.apache.skywalking.oap.server.core.remote.data.StreamData; import org.apache.skywalking.oap.server.core.remote.client.RemoteClient; -import org.slf4j.*; +import org.apache.skywalking.oap.server.core.remote.data.StreamData; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng - */ public class ForeverFirstSelector implements RemoteClientSelector { private static final Logger logger = LoggerFactory.getLogger(ForeverFirstSelector.class); - @Override public RemoteClient select(List clients, StreamData streamData) { + @Override + public RemoteClient select(List clients, StreamData streamData) { if (logger.isDebugEnabled()) { logger.debug("clients size: {}", clients.size()); } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/selector/HashCodeSelector.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/selector/HashCodeSelector.java index 63c919666a11..f8a16e28c107 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/selector/HashCodeSelector.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/selector/HashCodeSelector.java @@ -19,15 +19,13 @@ package org.apache.skywalking.oap.server.core.remote.selector; import java.util.List; -import org.apache.skywalking.oap.server.core.remote.data.StreamData; import org.apache.skywalking.oap.server.core.remote.client.RemoteClient; +import org.apache.skywalking.oap.server.core.remote.data.StreamData; -/** - * @author peng-yongsheng - */ public class HashCodeSelector implements RemoteClientSelector { - @Override public RemoteClient select(List clients, StreamData streamData) { + @Override + public RemoteClient select(List clients, StreamData streamData) { int size = clients.size(); int selectIndex = Math.abs(streamData.remoteHashCode()) % size; return clients.get(selectIndex); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/selector/RemoteClientSelector.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/selector/RemoteClientSelector.java index 6764742aaaac..152ec9ad993d 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/selector/RemoteClientSelector.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/selector/RemoteClientSelector.java @@ -19,12 +19,9 @@ package org.apache.skywalking.oap.server.core.remote.selector; import java.util.List; -import org.apache.skywalking.oap.server.core.remote.data.StreamData; import org.apache.skywalking.oap.server.core.remote.client.RemoteClient; +import org.apache.skywalking.oap.server.core.remote.data.StreamData; -/** - * @author peng-yongsheng - */ public interface RemoteClientSelector { RemoteClient select(List clients, StreamData streamData); } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/selector/RollingSelector.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/selector/RollingSelector.java index d48cfb1688c1..327c123b1a4c 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/selector/RollingSelector.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/selector/RollingSelector.java @@ -19,17 +19,15 @@ package org.apache.skywalking.oap.server.core.remote.selector; import java.util.List; -import org.apache.skywalking.oap.server.core.remote.data.StreamData; import org.apache.skywalking.oap.server.core.remote.client.RemoteClient; +import org.apache.skywalking.oap.server.core.remote.data.StreamData; -/** - * @author peng-yongsheng - */ public class RollingSelector implements RemoteClientSelector { private int index = 0; - @Override public RemoteClient select(List clients, StreamData streamData) { + @Override + public RemoteClient select(List clients, StreamData streamData) { int size = clients.size(); index++; int selectIndex = Math.abs(index) % size; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/selector/Selector.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/selector/Selector.java index bd51648961dd..237d65d696ea 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/selector/Selector.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/selector/Selector.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.core.remote.selector; -/** - * @author peng-yongsheng - */ public enum Selector { HashCode, Rolling, ForeverFirst } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/server/GRPCHandlerRegister.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/server/GRPCHandlerRegister.java index c6a39a5f0532..500153ef87ec 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/server/GRPCHandlerRegister.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/server/GRPCHandlerRegister.java @@ -18,12 +18,11 @@ package org.apache.skywalking.oap.server.core.server; -import io.grpc.*; +import io.grpc.BindableService; +import io.grpc.ServerInterceptor; +import io.grpc.ServerServiceDefinition; import org.apache.skywalking.oap.server.library.module.Service; -/** - * @author peng-yongsheng, jian.tan - */ public interface GRPCHandlerRegister extends Service { void addHandler(BindableService handler); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/server/GRPCHandlerRegisterImpl.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/server/GRPCHandlerRegisterImpl.java index ca0b07686324..208070142201 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/server/GRPCHandlerRegisterImpl.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/server/GRPCHandlerRegisterImpl.java @@ -23,9 +23,6 @@ import io.grpc.ServerServiceDefinition; import org.apache.skywalking.oap.server.library.server.grpc.GRPCServer; -/** - * @author peng-yongsheng, jian.tan - */ public class GRPCHandlerRegisterImpl implements GRPCHandlerRegister { private final GRPCServer server; @@ -34,15 +31,18 @@ public GRPCHandlerRegisterImpl(GRPCServer server) { this.server = server; } - @Override public void addHandler(BindableService handler) { + @Override + public void addHandler(BindableService handler) { server.addHandler(handler); } - @Override public void addHandler(ServerServiceDefinition definition) { + @Override + public void addHandler(ServerServiceDefinition definition) { server.addHandler(definition); } - @Override public void addFilter(ServerInterceptor interceptor) { + @Override + public void addFilter(ServerInterceptor interceptor) { } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/server/JettyHandlerRegister.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/server/JettyHandlerRegister.java index ef32bd15f6ff..71fd51f69a9e 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/server/JettyHandlerRegister.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/server/JettyHandlerRegister.java @@ -21,9 +21,6 @@ import org.apache.skywalking.oap.server.library.module.Service; import org.apache.skywalking.oap.server.library.server.jetty.JettyHandler; -/** - * @author peng-yongsheng - */ public interface JettyHandlerRegister extends Service { void addHandler(JettyHandler serverHandler); } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/server/JettyHandlerRegisterImpl.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/server/JettyHandlerRegisterImpl.java index 3a4c2d850369..171c8b46c420 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/server/JettyHandlerRegisterImpl.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/server/JettyHandlerRegisterImpl.java @@ -18,11 +18,9 @@ package org.apache.skywalking.oap.server.core.server; -import org.apache.skywalking.oap.server.library.server.jetty.*; +import org.apache.skywalking.oap.server.library.server.jetty.JettyHandler; +import org.apache.skywalking.oap.server.library.server.jetty.JettyServer; -/** - * @author peng-yongsheng - */ public class JettyHandlerRegisterImpl implements JettyHandlerRegister { private final JettyServer server; @@ -31,7 +29,8 @@ public JettyHandlerRegisterImpl(JettyServer server) { this.server = server; } - @Override public void addHandler(JettyHandler serverHandler) { + @Override + public void addHandler(JettyHandler serverHandler) { server.addHandler(serverHandler); } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/server/auth/AuthenticationInterceptor.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/server/auth/AuthenticationInterceptor.java index 0a688bb2b278..fc1cea3f95fb 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/server/auth/AuthenticationInterceptor.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/server/auth/AuthenticationInterceptor.java @@ -26,8 +26,6 @@ /** * Active the authentication between agent and oap receiver. token checker if expected token exists in application.yml - * - * @author jian.tan */ public class AuthenticationInterceptor implements ServerInterceptor { @@ -58,8 +56,7 @@ public void setExpectedToken(String expectedToken) { */ @Override public ServerCall.Listener interceptCall(ServerCall serverCall, - Metadata metadata, - ServerCallHandler serverCallHandler) { + Metadata metadata, ServerCallHandler serverCallHandler) { String token = metadata.get(AUTH_HEAD_HEADER_NAME); if (expectedToken.equals(token)) { return serverCallHandler.startCall(serverCall, metadata); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/AbstractLog.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/AbstractLog.java index a31efbf0afbe..c91002b7f610 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/AbstractLog.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/AbstractLog.java @@ -18,7 +18,8 @@ package org.apache.skywalking.oap.server.core.source; -import lombok.*; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.oap.server.core.UnexpectedException; import org.apache.skywalking.oap.server.core.query.entity.ContentType; @@ -36,7 +37,8 @@ public abstract class AbstractLog extends Source { private ContentType contentType = ContentType.NONE; private String content; - @Override public String getEntityId() { + @Override + public String getEntityId() { throw new UnexpectedException("getEntityId is not supported in AbstractLog source"); } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/All.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/All.java index ea2830bd29cf..c9070ef48850 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/All.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/All.java @@ -18,25 +18,42 @@ package org.apache.skywalking.oap.server.core.source; -import lombok.*; +import lombok.Getter; +import lombok.Setter; import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.ALL; @ScopeDeclaration(id = ALL, name = "All") public class All extends Source { - @Override public int scope() { + @Override + public int scope() { return DefaultScopeDefine.ALL; } - @Override public String getEntityId() { + @Override + public String getEntityId() { return ""; } - @Getter @Setter private String name; - @Getter @Setter private String serviceInstanceName; - @Getter @Setter private String endpointName; - @Getter @Setter private int latency; - @Getter @Setter private boolean status; - @Getter @Setter private int responseCode; - @Getter @Setter private RequestType type; + @Getter + @Setter + private String name; + @Getter + @Setter + private String serviceInstanceName; + @Getter + @Setter + private String endpointName; + @Getter + @Setter + private int latency; + @Getter + @Setter + private boolean status; + @Getter + @Setter + private int responseCode; + @Getter + @Setter + private RequestType type; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DatabaseAccess.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DatabaseAccess.java index dcf95862d048..4c10689b8fee 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DatabaseAccess.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DatabaseAccess.java @@ -18,13 +18,11 @@ package org.apache.skywalking.oap.server.core.source; -import lombok.*; +import lombok.Getter; +import lombok.Setter; import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.DATABASE_ACCESS; -/** - * @author: liuhaoyang - */ @ScopeDeclaration(id = DATABASE_ACCESS, name = "DatabaseAccess") @ScopeDefaultColumn.VirtualColumnDefinition(fieldName = "entityId", columnName = "entity_id", isID = true, type = String.class) public class DatabaseAccess extends Source { @@ -39,9 +37,19 @@ public String getEntityId() { return String.valueOf(id); } - @Getter @Setter private long id; - @Getter @Setter private String name; - @Getter @Setter private int databaseTypeId; - @Getter @Setter private int latency; - @Getter @Setter private boolean status; + @Getter + @Setter + private long id; + @Getter + @Setter + private String name; + @Getter + @Setter + private int databaseTypeId; + @Getter + @Setter + private int latency; + @Getter + @Setter + private boolean status; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DatabaseSlowStatement.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DatabaseSlowStatement.java index 667d413bcf95..ed1a17eb7015 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DatabaseSlowStatement.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DatabaseSlowStatement.java @@ -18,27 +18,37 @@ package org.apache.skywalking.oap.server.core.source; -import lombok.*; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.oap.server.core.Const; import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.DATABASE_SLOW_STATEMENT; -/** - * @author wusheng - */ @ScopeDeclaration(id = DATABASE_SLOW_STATEMENT, name = "DatabaseSlowStatement") public class DatabaseSlowStatement extends Source { - @Getter @Setter private String id; - @Getter @Setter private int databaseServiceId; - @Getter @Setter private String statement; - @Getter @Setter private long latency; - @Getter @Setter private String traceId; + @Getter + @Setter + private String id; + @Getter + @Setter + private int databaseServiceId; + @Getter + @Setter + private String statement; + @Getter + @Setter + private long latency; + @Getter + @Setter + private String traceId; - @Override public int scope() { + @Override + public int scope() { return DefaultScopeDefine.DATABASE_SLOW_STATEMENT; } - @Override public String getEntityId() { + @Override + public String getEntityId() { return Const.EMPTY_STRING; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DefaultScopeDefine.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DefaultScopeDefine.java index c6741b58a6e5..214f6603fbce 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DefaultScopeDefine.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DefaultScopeDefine.java @@ -27,10 +27,6 @@ import org.apache.skywalking.oap.server.core.UnexpectedException; import org.apache.skywalking.oap.server.core.annotation.AnnotationListener; -/** - * @author peng-yongsheng, wusheng - */ - public class DefaultScopeDefine { private static final Map NAME_2_ID = new HashMap<>(); private static final Map ID_2_NAME = new HashMap<>(); @@ -38,7 +34,7 @@ public class DefaultScopeDefine { /** * All metrics IDs in [0, 10,000) are reserved in Apache SkyWalking. - * + *

* If you want to extend the scope, recommend to start with 10,000. */ public static final int ALL = 0; @@ -83,12 +79,14 @@ public class DefaultScopeDefine { private static final Map ENDPOINT_CATALOG = new HashMap<>(); public static class Listener implements AnnotationListener { - @Override public Class annotation() { + @Override + public Class annotation() { return ScopeDeclaration.class; } - @Override public void notify(Class originalClass) { - ScopeDeclaration declaration = (ScopeDeclaration)originalClass.getAnnotation(ScopeDeclaration.class); + @Override + public void notify(Class originalClass) { + ScopeDeclaration declaration = (ScopeDeclaration) originalClass.getAnnotation(ScopeDeclaration.class); if (declaration != null) { addNewScope(declaration, originalClass); } @@ -98,29 +96,32 @@ public static class Listener implements AnnotationListener { public static final void addNewScope(ScopeDeclaration declaration, Class originalClass) { int id = declaration.id(); if (ID_2_NAME.containsKey(id)) { - throw new UnexpectedException("ScopeDeclaration id=" + id + " at " + originalClass.getName() + " has conflict with another named " + ID_2_NAME.get(id)); + throw new UnexpectedException("ScopeDeclaration id=" + id + " at " + originalClass.getName() + " has conflict with another named " + ID_2_NAME + .get(id)); } String name = declaration.name(); if (NAME_2_ID.containsKey(name)) { - throw new UnexpectedException("ScopeDeclaration fieldName=" + name + " at " + originalClass.getName() + " has conflict with another id= " + NAME_2_ID.get(name)); + throw new UnexpectedException("ScopeDeclaration fieldName=" + name + " at " + originalClass.getName() + " has conflict with another id= " + NAME_2_ID + .get(name)); } ID_2_NAME.put(id, name); NAME_2_ID.put(name, id); List scopeDefaultColumns = new ArrayList<>(); - ScopeDefaultColumn.VirtualColumnDefinition virtualColumn = (ScopeDefaultColumn.VirtualColumnDefinition)originalClass.getAnnotation(ScopeDefaultColumn.VirtualColumnDefinition.class); + ScopeDefaultColumn.VirtualColumnDefinition virtualColumn = (ScopeDefaultColumn.VirtualColumnDefinition) originalClass + .getAnnotation(ScopeDefaultColumn.VirtualColumnDefinition.class); if (virtualColumn != null) { - scopeDefaultColumns.add(new ScopeDefaultColumn(virtualColumn.fieldName(), virtualColumn.columnName(), - virtualColumn.type(), virtualColumn.isID())); + scopeDefaultColumns.add(new ScopeDefaultColumn(virtualColumn.fieldName(), virtualColumn.columnName(), virtualColumn + .type(), virtualColumn.isID())); } Field[] scopeClassField = originalClass.getDeclaredFields(); if (scopeClassField != null) { for (Field field : scopeClassField) { ScopeDefaultColumn.DefinedByField definedByField = field.getAnnotation(ScopeDefaultColumn.DefinedByField.class); if (definedByField != null) { - scopeDefaultColumns.add(new ScopeDefaultColumn(field.getName(), definedByField.columnName(), - field.getType(), definedByField.isID())); + scopeDefaultColumns.add(new ScopeDefaultColumn(field.getName(), definedByField.columnName(), field.getType(), definedByField + .isID())); } } } @@ -179,7 +180,6 @@ public static boolean inEndpointCatalog(int scopeId) { * Get the default columns defined in Scope. All those columns will forward to persistent entity. * * @param scopeName of the default columns - * @return */ public static List getDefaultColumns(String scopeName) { List scopeDefaultColumns = SCOPE_COLUMNS.get(scopeName); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DetectPoint.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DetectPoint.java index 1b63776d1d1d..9e405128960c 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DetectPoint.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DetectPoint.java @@ -20,9 +20,6 @@ import org.apache.skywalking.apm.network.language.agent.SpanType; -/** - * @author peng-yongsheng - */ public enum DetectPoint { SERVER, CLIENT, PROXY, UNRECOGNIZED; @@ -39,7 +36,8 @@ public static DetectPoint fromSpanType(SpanType spanType) { } } - public static DetectPoint fromNetworkProtocolDetectPoint(org.apache.skywalking.apm.network.common.DetectPoint detectPoint) { + public static DetectPoint fromNetworkProtocolDetectPoint( + org.apache.skywalking.apm.network.common.DetectPoint detectPoint) { switch (detectPoint) { case client: return CLIENT; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Endpoint.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Endpoint.java index 8c4ba5b16a71..e2611d7e3840 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Endpoint.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Endpoint.java @@ -18,33 +18,55 @@ package org.apache.skywalking.oap.server.core.source; -import lombok.*; +import lombok.Getter; +import lombok.Setter; import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.ENDPOINT; import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.ENDPOINT_CATALOG_NAME; -/** - * @author peng-yongsheng - */ @ScopeDeclaration(id = ENDPOINT, name = "Endpoint", catalog = ENDPOINT_CATALOG_NAME) @ScopeDefaultColumn.VirtualColumnDefinition(fieldName = "entityId", columnName = "entity_id", isID = true, type = String.class) public class Endpoint extends Source { - @Override public int scope() { + @Override + public int scope() { return DefaultScopeDefine.ENDPOINT; } - @Override public String getEntityId() { + @Override + public String getEntityId() { return String.valueOf(id); } - @Getter @Setter private int id; - @Getter @Setter private String name; - @Getter @Setter @ScopeDefaultColumn.DefinedByField(columnName = "service_id") private int serviceId; - @Getter @Setter private String serviceName; - @Getter @Setter @ScopeDefaultColumn.DefinedByField(columnName = "service_instance_id") private int serviceInstanceId; - @Getter @Setter private String serviceInstanceName; - @Getter @Setter private int latency; - @Getter @Setter private boolean status; - @Getter @Setter private int responseCode; - @Getter @Setter private RequestType type; + @Getter + @Setter + private int id; + @Getter + @Setter + private String name; + @Getter + @Setter + @ScopeDefaultColumn.DefinedByField(columnName = "service_id") + private int serviceId; + @Getter + @Setter + private String serviceName; + @Getter + @Setter + @ScopeDefaultColumn.DefinedByField(columnName = "service_instance_id") + private int serviceInstanceId; + @Getter + @Setter + private String serviceInstanceName; + @Getter + @Setter + private int latency; + @Getter + @Setter + private boolean status; + @Getter + @Setter + private int responseCode; + @Getter + @Setter + private RequestType type; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/EndpointRelation.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/EndpointRelation.java index 47a978755f14..9731037569f2 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/EndpointRelation.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/EndpointRelation.java @@ -18,45 +18,85 @@ package org.apache.skywalking.oap.server.core.source; -import lombok.*; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.oap.server.core.Const; import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.ENDPOINT_RELATION; -/** - * @author peng-yongsheng - */ @ScopeDeclaration(id = ENDPOINT_RELATION, name = "EndpointRelation") @ScopeDefaultColumn.VirtualColumnDefinition(fieldName = "entityId", columnName = "entity_id", isID = true, type = String.class) public class EndpointRelation extends Source { - @Override public int scope() { + @Override + public int scope() { return DefaultScopeDefine.ENDPOINT_RELATION; } - @Override public String getEntityId() { + @Override + public String getEntityId() { return String.valueOf(endpointId) + Const.ID_SPLIT + String.valueOf(childEndpointId); } - @Getter @Setter private int endpointId; - @Getter @Setter private String endpoint; - @Getter @Setter @ScopeDefaultColumn.DefinedByField(columnName = "service_id") private int serviceId; - @Getter @Setter private String serviceName; - @Getter @Setter @ScopeDefaultColumn.DefinedByField(columnName = "service_instance_id") private int serviceInstanceId; - @Getter @Setter private String serviceInstanceName; - - @Getter @Setter private int childEndpointId; - @Getter @Setter private String childEndpoint; - @Getter @Setter @ScopeDefaultColumn.DefinedByField(columnName = "child_service_id") private int childServiceId; - @Getter @Setter private String childServiceName; - @Getter @Setter @ScopeDefaultColumn.DefinedByField(columnName = "child_service_instance_id") private int childServiceInstanceId; - @Getter @Setter private String childServiceInstanceName; - - @Getter @Setter private int componentId; - @Getter @Setter private int rpcLatency; - @Getter @Setter private boolean status; - @Getter @Setter private int responseCode; - @Getter @Setter private RequestType type; - @Getter @Setter private DetectPoint detectPoint; + @Getter + @Setter + private int endpointId; + @Getter + @Setter + private String endpoint; + @Getter + @Setter + @ScopeDefaultColumn.DefinedByField(columnName = "service_id") + private int serviceId; + @Getter + @Setter + private String serviceName; + @Getter + @Setter + @ScopeDefaultColumn.DefinedByField(columnName = "service_instance_id") + private int serviceInstanceId; + @Getter + @Setter + private String serviceInstanceName; + + @Getter + @Setter + private int childEndpointId; + @Getter + @Setter + private String childEndpoint; + @Getter + @Setter + @ScopeDefaultColumn.DefinedByField(columnName = "child_service_id") + private int childServiceId; + @Getter + @Setter + private String childServiceName; + @Getter + @Setter + @ScopeDefaultColumn.DefinedByField(columnName = "child_service_instance_id") + private int childServiceInstanceId; + @Getter + @Setter + private String childServiceInstanceName; + + @Getter + @Setter + private int componentId; + @Getter + @Setter + private int rpcLatency; + @Getter + @Setter + private boolean status; + @Getter + @Setter + private int responseCode; + @Getter + @Setter + private RequestType type; + @Getter + @Setter + private DetectPoint detectPoint; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/EnvoyInstanceMetric.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/EnvoyInstanceMetric.java index dce3f56a3d22..f00f8e0f90ba 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/EnvoyInstanceMetric.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/EnvoyInstanceMetric.java @@ -18,36 +18,50 @@ package org.apache.skywalking.oap.server.core.source; -import lombok.*; +import lombok.Getter; +import lombok.Setter; import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.ENVOY_INSTANCE_METRIC; import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.SERVICE_INSTANCE_CATALOG_NAME; /** * The envoy metrics. This group of metrics are in Prometheus metrics format family. - * + *

* This metrics source supports Counter and Gauge types. - * - * @author wusheng */ @ScopeDeclaration(id = ENVOY_INSTANCE_METRIC, name = "EnvoyInstanceMetric", catalog = SERVICE_INSTANCE_CATALOG_NAME) @ScopeDefaultColumn.VirtualColumnDefinition(fieldName = "entityId", columnName = "entity_id", isID = true, type = String.class) public class EnvoyInstanceMetric extends Source { - @Override public int scope() { + @Override + public int scope() { return ENVOY_INSTANCE_METRIC; } - @Override public String getEntityId() { + @Override + public String getEntityId() { return String.valueOf(id); } /** * Instance id */ - @Getter @Setter private int id; - @Getter @Setter @ScopeDefaultColumn.DefinedByField(columnName = "service_id") private int serviceId; - @Getter @Setter private String name; - @Getter @Setter private String serviceName; - @Getter @Setter private String metricName; - @Getter @Setter private double value; + @Getter + @Setter + private int id; + @Getter + @Setter + @ScopeDefaultColumn.DefinedByField(columnName = "service_id") + private int serviceId; + @Getter + @Setter + private String name; + @Getter + @Setter + private String serviceName; + @Getter + @Setter + private String metricName; + @Getter + @Setter + private double value; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/GCPhrase.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/GCPhrase.java index 1c06ee3f864d..3381f92af162 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/GCPhrase.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/GCPhrase.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.core.source; -/** - * @author peng-yongsheng - */ public enum GCPhrase { NEW, OLD } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/HTTPAccessLog.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/HTTPAccessLog.java index 3d163b4e580c..fbee5a02a367 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/HTTPAccessLog.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/HTTPAccessLog.java @@ -20,12 +20,10 @@ import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.HTTP_ACCESS_LOG; -/** - * @author wusheng - */ @ScopeDeclaration(id = HTTP_ACCESS_LOG, name = "HTTPAccessLog") public class HTTPAccessLog extends AbstractLog { - @Override public int scope() { + @Override + public int scope() { return HTTP_ACCESS_LOG; } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/MemoryPoolType.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/MemoryPoolType.java index 7811715c8d88..2e39271d9c9e 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/MemoryPoolType.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/MemoryPoolType.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.core.source; -/** - * @author peng-yongsheng - */ public enum MemoryPoolType { CODE_CACHE_USAGE, NEWGEN_USAGE, OLDGEN_USAGE, SURVIVOR_USAGE, PERMGEN_USAGE, METASPACE_USAGE } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/RequestType.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/RequestType.java index dfe2c7a3dc0f..9c47f8ccbdc6 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/RequestType.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/RequestType.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.core.source; -/** - * @author peng-yongsheng - */ public enum RequestType { DATABASE, HTTP, RPC, gRPC } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ScopeDeclaration.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ScopeDeclaration.java index 150461af8524..c0ba4fe702ca 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ScopeDeclaration.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ScopeDeclaration.java @@ -18,17 +18,20 @@ package org.apache.skywalking.oap.server.core.source; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * DefaultScopeDefine id declaration. - * - * @author wusheng */ @Target({ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME) public @interface ScopeDeclaration { int id(); + String name(); + String catalog() default ""; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ScopeDefaultColumn.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ScopeDefaultColumn.java index d23bcc7fbc2e..dfc770d26b07 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ScopeDefaultColumn.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ScopeDefaultColumn.java @@ -29,8 +29,6 @@ /** * Define the default columns of source scope. These columns pass down into the persistent entity(OAL metrics entity) * automatically. - * - * @author wusheng */ @Getter(AccessLevel.PUBLIC) @Setter(AccessLevel.PUBLIC) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Segment.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Segment.java index 041cbf6db35f..21bd7274b24c 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Segment.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Segment.java @@ -18,34 +18,58 @@ package org.apache.skywalking.oap.server.core.source; -import lombok.*; +import lombok.Getter; +import lombok.Setter; import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.SEGMENT; -/** - * @author peng-yongsheng - */ @ScopeDeclaration(id = SEGMENT, name = "Segment") public class Segment extends Source { - @Override public int scope() { + @Override + public int scope() { return DefaultScopeDefine.SEGMENT; } - @Override public String getEntityId() { + @Override + public String getEntityId() { return segmentId; } - @Setter @Getter private String segmentId; - @Setter @Getter private String traceId; - @Setter @Getter private int serviceId; - @Setter @Getter private int serviceInstanceId; - @Setter @Getter private String endpointName; - @Setter @Getter private int endpointId; - @Setter @Getter private long startTime; - @Setter @Getter private long endTime; - @Setter @Getter private int latency; - @Setter @Getter private int isError; - @Setter @Getter private byte[] dataBinary; - @Setter @Getter private int version; + @Setter + @Getter + private String segmentId; + @Setter + @Getter + private String traceId; + @Setter + @Getter + private int serviceId; + @Setter + @Getter + private int serviceInstanceId; + @Setter + @Getter + private String endpointName; + @Setter + @Getter + private int endpointId; + @Setter + @Getter + private long startTime; + @Setter + @Getter + private long endTime; + @Setter + @Getter + private int latency; + @Setter + @Getter + private int isError; + @Setter + @Getter + private byte[] dataBinary; + @Setter + @Getter + private int version; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Service.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Service.java index cadfebfcf716..e997df6f7754 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Service.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Service.java @@ -18,30 +18,47 @@ package org.apache.skywalking.oap.server.core.source; -import lombok.*; +import lombok.Getter; +import lombok.Setter; -import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.*; +import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.SERVICE; +import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.SERVICE_CATALOG_NAME; -/** - * @author wusheng, peng-yongsheng - */ @ScopeDeclaration(id = SERVICE, name = "Service", catalog = SERVICE_CATALOG_NAME) @ScopeDefaultColumn.VirtualColumnDefinition(fieldName = "entityId", columnName = "entity_id", isID = true, type = String.class) public class Service extends Source { - @Override public int scope() { + @Override + public int scope() { return DefaultScopeDefine.SERVICE; } - @Override public String getEntityId() { + @Override + public String getEntityId() { return String.valueOf(id); } - @Getter @Setter private int id; - @Getter @Setter private String name; - @Getter @Setter private String serviceInstanceName; - @Getter @Setter private String endpointName; - @Getter @Setter private int latency; - @Getter @Setter private boolean status; - @Getter @Setter private int responseCode; - @Getter @Setter private RequestType type; + @Getter + @Setter + private int id; + @Getter + @Setter + private String name; + @Getter + @Setter + private String serviceInstanceName; + @Getter + @Setter + private String endpointName; + @Getter + @Setter + private int latency; + @Getter + @Setter + private boolean status; + @Getter + @Setter + private int responseCode; + @Getter + @Setter + private RequestType type; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstance.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstance.java index 6f559bdcadf2..8bb0c652d649 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstance.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstance.java @@ -18,32 +18,51 @@ package org.apache.skywalking.oap.server.core.source; -import lombok.*; +import lombok.Getter; +import lombok.Setter; import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.SERVICE_INSTANCE; import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.SERVICE_INSTANCE_CATALOG_NAME; -/** - * @author peng-yongsheng - */ @ScopeDeclaration(id = SERVICE_INSTANCE, name = "ServiceInstance", catalog = SERVICE_INSTANCE_CATALOG_NAME) @ScopeDefaultColumn.VirtualColumnDefinition(fieldName = "entityId", columnName = "entity_id", isID = true, type = String.class) public class ServiceInstance extends Source { - @Override public int scope() { + @Override + public int scope() { return DefaultScopeDefine.SERVICE_INSTANCE; } - @Override public String getEntityId() { + @Override + public String getEntityId() { return String.valueOf(id); } - @Getter @Setter private int id; - @Getter @Setter @ScopeDefaultColumn.DefinedByField(columnName = "service_id") private int serviceId; - @Getter @Setter private String name; - @Getter @Setter private String serviceName; - @Getter @Setter private String endpointName; - @Getter @Setter private int latency; - @Getter @Setter private boolean status; - @Getter @Setter private int responseCode; - @Getter @Setter private RequestType type; + @Getter + @Setter + private int id; + @Getter + @Setter + @ScopeDefaultColumn.DefinedByField(columnName = "service_id") + private int serviceId; + @Getter + @Setter + private String name; + @Getter + @Setter + private String serviceName; + @Getter + @Setter + private String endpointName; + @Getter + @Setter + private int latency; + @Getter + @Setter + private boolean status; + @Getter + @Setter + private int responseCode; + @Getter + @Setter + private RequestType type; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceCLRCPU.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceCLRCPU.java index f6cff55b9231..c73c7c0af4e4 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceCLRCPU.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceCLRCPU.java @@ -25,22 +25,35 @@ import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.SERVICE_INSTANCE_CLR_CPU; /** - * @author liuhaoyang + * **/ @ScopeDeclaration(id = SERVICE_INSTANCE_CLR_CPU, name = "ServiceInstanceCLRCPU", catalog = SERVICE_INSTANCE_CATALOG_NAME) @ScopeDefaultColumn.VirtualColumnDefinition(fieldName = "entityId", columnName = "entity_id", isID = true, type = String.class) public class ServiceInstanceCLRCPU extends Source { - @Override public int scope() { + @Override + public int scope() { return DefaultScopeDefine.SERVICE_INSTANCE_CLR_CPU; } - @Override public String getEntityId() { + @Override + public String getEntityId() { return String.valueOf(id); } - @Getter @Setter private int id; - @Getter @Setter private String name; - @Getter @Setter private String serviceName; - @Getter @Setter @ScopeDefaultColumn.DefinedByField(columnName = "service_id") private int serviceId; - @Getter @Setter private double usePercent; + @Getter + @Setter + private int id; + @Getter + @Setter + private String name; + @Getter + @Setter + private String serviceName; + @Getter + @Setter + @ScopeDefaultColumn.DefinedByField(columnName = "service_id") + private int serviceId; + @Getter + @Setter + private double usePercent; } \ No newline at end of file diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceCLRGC.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceCLRGC.java index 00d6d4e6c5fa..6ee072869f4e 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceCLRGC.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceCLRGC.java @@ -25,25 +25,44 @@ import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.SERVICE_INSTANCE_CLR_GC; /** - * @author liuhaoyang + * **/ @ScopeDeclaration(id = SERVICE_INSTANCE_CLR_GC, name = "ServiceInstanceCLRGC", catalog = SERVICE_INSTANCE_CATALOG_NAME) @ScopeDefaultColumn.VirtualColumnDefinition(fieldName = "entityId", columnName = "entity_id", isID = true, type = String.class) public class ServiceInstanceCLRGC extends Source { - @Override public int scope() { + @Override + public int scope() { return DefaultScopeDefine.SERVICE_INSTANCE_CLR_GC; } - @Override public String getEntityId() { + @Override + public String getEntityId() { return String.valueOf(id); } - @Getter @Setter private int id; - @Getter @Setter private String name; - @Getter @Setter private String serviceName; - @Getter @Setter @ScopeDefaultColumn.DefinedByField(columnName = "service_id") private int serviceId; - @Getter @Setter private long gen0CollectCount; - @Getter @Setter private long gen1CollectCount; - @Getter @Setter private long gen2CollectCount; - @Getter @Setter private long heapMemory; + @Getter + @Setter + private int id; + @Getter + @Setter + private String name; + @Getter + @Setter + private String serviceName; + @Getter + @Setter + @ScopeDefaultColumn.DefinedByField(columnName = "service_id") + private int serviceId; + @Getter + @Setter + private long gen0CollectCount; + @Getter + @Setter + private long gen1CollectCount; + @Getter + @Setter + private long gen2CollectCount; + @Getter + @Setter + private long heapMemory; } \ No newline at end of file diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceCLRThread.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceCLRThread.java index 01a80515a32f..fbe04ecac4e2 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceCLRThread.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceCLRThread.java @@ -25,25 +25,44 @@ import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.SERVICE_INSTANCE_CLR_THREAD; /** - * @author liuhaoyang + * **/ @ScopeDeclaration(id = SERVICE_INSTANCE_CLR_THREAD, name = "ServiceInstanceCLRThread", catalog = SERVICE_INSTANCE_CATALOG_NAME) @ScopeDefaultColumn.VirtualColumnDefinition(fieldName = "entityId", columnName = "entity_id", isID = true, type = String.class) public class ServiceInstanceCLRThread extends Source { - @Override public int scope() { + @Override + public int scope() { return DefaultScopeDefine.SERVICE_INSTANCE_CLR_THREAD; } - @Override public String getEntityId() { + @Override + public String getEntityId() { return String.valueOf(id); } - @Getter @Setter private int id; - @Getter @Setter private String name; - @Getter @Setter private String serviceName; - @Getter @Setter @ScopeDefaultColumn.DefinedByField(columnName = "service_id") private int serviceId; - @Getter @Setter private long availableCompletionPortThreads; - @Getter @Setter private long availableWorkerThreads; - @Getter @Setter private long maxCompletionPortThreads; - @Getter @Setter private long maxWorkerThreads; + @Getter + @Setter + private int id; + @Getter + @Setter + private String name; + @Getter + @Setter + private String serviceName; + @Getter + @Setter + @ScopeDefaultColumn.DefinedByField(columnName = "service_id") + private int serviceId; + @Getter + @Setter + private long availableCompletionPortThreads; + @Getter + @Setter + private long availableWorkerThreads; + @Getter + @Setter + private long maxCompletionPortThreads; + @Getter + @Setter + private long maxWorkerThreads; } \ No newline at end of file diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceJVMCPU.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceJVMCPU.java index 2ac7825f2227..44fc4114f31e 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceJVMCPU.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceJVMCPU.java @@ -24,23 +24,33 @@ import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.SERVICE_INSTANCE_CATALOG_NAME; import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.SERVICE_INSTANCE_JVM_CPU; -/** - * @author peng-yongsheng - */ @ScopeDeclaration(id = SERVICE_INSTANCE_JVM_CPU, name = "ServiceInstanceJVMCPU", catalog = SERVICE_INSTANCE_CATALOG_NAME) @ScopeDefaultColumn.VirtualColumnDefinition(fieldName = "entityId", columnName = "entity_id", isID = true, type = String.class) public class ServiceInstanceJVMCPU extends Source { - @Override public int scope() { + @Override + public int scope() { return DefaultScopeDefine.SERVICE_INSTANCE_JVM_CPU; } - @Override public String getEntityId() { + @Override + public String getEntityId() { return String.valueOf(id); } - @Getter @Setter private int id; - @Getter @Setter private String name; - @Getter @Setter private String serviceName; - @Getter @Setter @ScopeDefaultColumn.DefinedByField(columnName = "service_id") private int serviceId; - @Getter @Setter private double usePercent; + @Getter + @Setter + private int id; + @Getter + @Setter + private String name; + @Getter + @Setter + private String serviceName; + @Getter + @Setter + @ScopeDefaultColumn.DefinedByField(columnName = "service_id") + private int serviceId; + @Getter + @Setter + private double usePercent; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceJVMGC.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceJVMGC.java index 3b1647ecd856..65e513677e03 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceJVMGC.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceJVMGC.java @@ -18,30 +18,45 @@ package org.apache.skywalking.oap.server.core.source; -import lombok.*; +import lombok.Getter; +import lombok.Setter; import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.SERVICE_INSTANCE_CATALOG_NAME; import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.SERVICE_INSTANCE_JVM_GC; -/** - * @author peng-yongsheng - */ @ScopeDeclaration(id = SERVICE_INSTANCE_JVM_GC, name = "ServiceInstanceJVMGC", catalog = SERVICE_INSTANCE_CATALOG_NAME) @ScopeDefaultColumn.VirtualColumnDefinition(fieldName = "entityId", columnName = "entity_id", isID = true, type = String.class) public class ServiceInstanceJVMGC extends Source { - @Override public int scope() { + @Override + public int scope() { return DefaultScopeDefine.SERVICE_INSTANCE_JVM_GC; } - @Override public String getEntityId() { + @Override + public String getEntityId() { return String.valueOf(id); } - @Getter @Setter private int id; - @Getter @Setter private String name; - @Getter @Setter private String serviceName; - @Getter @Setter @ScopeDefaultColumn.DefinedByField(columnName = "service_id") private int serviceId; - @Getter @Setter private GCPhrase phrase; - @Getter @Setter private long time; - @Getter @Setter private long count; + @Getter + @Setter + private int id; + @Getter + @Setter + private String name; + @Getter + @Setter + private String serviceName; + @Getter + @Setter + @ScopeDefaultColumn.DefinedByField(columnName = "service_id") + private int serviceId; + @Getter + @Setter + private GCPhrase phrase; + @Getter + @Setter + private long time; + @Getter + @Setter + private long count; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceJVMMemory.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceJVMMemory.java index 7223b0c561bd..80f8b7995938 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceJVMMemory.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceJVMMemory.java @@ -18,32 +18,51 @@ package org.apache.skywalking.oap.server.core.source; -import lombok.*; +import lombok.Getter; +import lombok.Setter; import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.SERVICE_INSTANCE_CATALOG_NAME; import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.SERVICE_INSTANCE_JVM_MEMORY; -/** - * @author peng-yongsheng - */ @ScopeDeclaration(id = SERVICE_INSTANCE_JVM_MEMORY, name = "ServiceInstanceJVMMemory", catalog = SERVICE_INSTANCE_CATALOG_NAME) @ScopeDefaultColumn.VirtualColumnDefinition(fieldName = "entityId", columnName = "entity_id", isID = true, type = String.class) public class ServiceInstanceJVMMemory extends Source { - @Override public int scope() { + @Override + public int scope() { return DefaultScopeDefine.SERVICE_INSTANCE_JVM_MEMORY; } - @Override public String getEntityId() { + @Override + public String getEntityId() { return String.valueOf(id); } - @Getter @Setter private int id; - @Getter @Setter private String name; - @Getter @Setter private String serviceName; - @Getter @Setter @ScopeDefaultColumn.DefinedByField(columnName = "service_id") private int serviceId; - @Getter @Setter private boolean heapStatus; - @Getter @Setter private long init; - @Getter @Setter private long max; - @Getter @Setter private long used; - @Getter @Setter private long committed; + @Getter + @Setter + private int id; + @Getter + @Setter + private String name; + @Getter + @Setter + private String serviceName; + @Getter + @Setter + @ScopeDefaultColumn.DefinedByField(columnName = "service_id") + private int serviceId; + @Getter + @Setter + private boolean heapStatus; + @Getter + @Setter + private long init; + @Getter + @Setter + private long max; + @Getter + @Setter + private long used; + @Getter + @Setter + private long committed; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceJVMMemoryPool.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceJVMMemoryPool.java index 90f49e0e99ea..b1498712e50b 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceJVMMemoryPool.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceJVMMemoryPool.java @@ -18,32 +18,51 @@ package org.apache.skywalking.oap.server.core.source; -import lombok.*; +import lombok.Getter; +import lombok.Setter; import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.SERVICE_INSTANCE_CATALOG_NAME; import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.SERVICE_INSTANCE_JVM_MEMORY_POOL; -/** - * @author peng-yongsheng - */ @ScopeDeclaration(id = SERVICE_INSTANCE_JVM_MEMORY_POOL, name = "ServiceInstanceJVMMemoryPool", catalog = SERVICE_INSTANCE_CATALOG_NAME) @ScopeDefaultColumn.VirtualColumnDefinition(fieldName = "entityId", columnName = "entity_id", isID = true, type = String.class) public class ServiceInstanceJVMMemoryPool extends Source { - @Override public int scope() { + @Override + public int scope() { return DefaultScopeDefine.SERVICE_INSTANCE_JVM_MEMORY_POOL; } - @Override public String getEntityId() { + @Override + public String getEntityId() { return String.valueOf(id); } - @Getter @Setter private int id; - @Getter @Setter private String name; - @Getter @Setter private String serviceName; - @Getter @Setter @ScopeDefaultColumn.DefinedByField(columnName = "service_id") private int serviceId; - @Getter @Setter private MemoryPoolType poolType; - @Getter @Setter private long init; - @Getter @Setter private long max; - @Getter @Setter private long used; - @Getter @Setter private long committed; + @Getter + @Setter + private int id; + @Getter + @Setter + private String name; + @Getter + @Setter + private String serviceName; + @Getter + @Setter + @ScopeDefaultColumn.DefinedByField(columnName = "service_id") + private int serviceId; + @Getter + @Setter + private MemoryPoolType poolType; + @Getter + @Setter + private long init; + @Getter + @Setter + private long max; + @Getter + @Setter + private long used; + @Getter + @Setter + private long committed; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceRelation.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceRelation.java index 5d42d027f6b8..34b0906d6a23 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceRelation.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceRelation.java @@ -18,39 +18,73 @@ package org.apache.skywalking.oap.server.core.source; -import lombok.*; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.oap.server.core.Const; import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.SERVICE_INSTANCE_RELATION; -/** - * @author peng-yongsheng - */ @ScopeDeclaration(id = SERVICE_INSTANCE_RELATION, name = "ServiceInstanceRelation") @ScopeDefaultColumn.VirtualColumnDefinition(fieldName = "entityId", columnName = "entity_id", isID = true, type = String.class) public class ServiceInstanceRelation extends Source { - @Override public int scope() { + @Override + public int scope() { return DefaultScopeDefine.SERVICE_INSTANCE_RELATION; } - @Override public String getEntityId() { + @Override + public String getEntityId() { return String.valueOf(sourceServiceInstanceId) + Const.ID_SPLIT + String.valueOf(destServiceInstanceId); } - @Getter @Setter @ScopeDefaultColumn.DefinedByField(columnName = "source_service_instance_id") private int sourceServiceInstanceId; - @Getter @Setter @ScopeDefaultColumn.DefinedByField(columnName = "source_service_id") private int sourceServiceId; - @Getter @Setter private String sourceServiceName; - @Getter @Setter private String sourceServiceInstanceName; - @Getter @Setter @ScopeDefaultColumn.DefinedByField(columnName = "dest_service_instance_id") private int destServiceInstanceId; - @Getter @Setter @ScopeDefaultColumn.DefinedByField(columnName = "dest_service_id") private int destServiceId; - @Getter @Setter private String destServiceName; - @Getter @Setter private String destServiceInstanceName; - @Getter @Setter private String endpoint; - @Getter @Setter private int componentId; - @Getter @Setter private int latency; - @Getter @Setter private boolean status; - @Getter @Setter private int responseCode; - @Getter @Setter private RequestType type; - @Getter @Setter private DetectPoint detectPoint; + @Getter + @Setter + @ScopeDefaultColumn.DefinedByField(columnName = "source_service_instance_id") + private int sourceServiceInstanceId; + @Getter + @Setter + @ScopeDefaultColumn.DefinedByField(columnName = "source_service_id") + private int sourceServiceId; + @Getter + @Setter + private String sourceServiceName; + @Getter + @Setter + private String sourceServiceInstanceName; + @Getter + @Setter + @ScopeDefaultColumn.DefinedByField(columnName = "dest_service_instance_id") + private int destServiceInstanceId; + @Getter + @Setter + @ScopeDefaultColumn.DefinedByField(columnName = "dest_service_id") + private int destServiceId; + @Getter + @Setter + private String destServiceName; + @Getter + @Setter + private String destServiceInstanceName; + @Getter + @Setter + private String endpoint; + @Getter + @Setter + private int componentId; + @Getter + @Setter + private int latency; + @Getter + @Setter + private boolean status; + @Getter + @Setter + private int responseCode; + @Getter + @Setter + private RequestType type; + @Getter + @Setter + private DetectPoint detectPoint; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceRelation.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceRelation.java index 3451572f4f1a..f2016bad0c69 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceRelation.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceRelation.java @@ -18,37 +18,63 @@ package org.apache.skywalking.oap.server.core.source; -import lombok.*; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.oap.server.core.Const; import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.SERVICE_RELATION; -/** - * @author peng-yongsheng - */ @ScopeDeclaration(id = SERVICE_RELATION, name = "ServiceRelation") @ScopeDefaultColumn.VirtualColumnDefinition(fieldName = "entityId", columnName = "entity_id", isID = true, type = String.class) public class ServiceRelation extends Source { - @Override public int scope() { + @Override + public int scope() { return DefaultScopeDefine.SERVICE_RELATION; } - @Override public String getEntityId() { + @Override + public String getEntityId() { return String.valueOf(sourceServiceId) + Const.ID_SPLIT + String.valueOf(destServiceId); } - @Getter @Setter private int sourceServiceId; - @Getter @Setter private String sourceServiceName; - @Getter @Setter private String sourceServiceInstanceName; - @Getter @Setter private int destServiceId; - @Getter @Setter private String destServiceName; - @Getter @Setter private String destServiceInstanceName; - @Getter @Setter private String endpoint; - @Getter @Setter private int componentId; - @Getter @Setter private int latency; - @Getter @Setter private boolean status; - @Getter @Setter private int responseCode; - @Getter @Setter private RequestType type; - @Getter @Setter private DetectPoint detectPoint; + @Getter + @Setter + private int sourceServiceId; + @Getter + @Setter + private String sourceServiceName; + @Getter + @Setter + private String sourceServiceInstanceName; + @Getter + @Setter + private int destServiceId; + @Getter + @Setter + private String destServiceName; + @Getter + @Setter + private String destServiceInstanceName; + @Getter + @Setter + private String endpoint; + @Getter + @Setter + private int componentId; + @Getter + @Setter + private int latency; + @Getter + @Setter + private boolean status; + @Getter + @Setter + private int responseCode; + @Getter + @Setter + private RequestType type; + @Getter + @Setter + private DetectPoint detectPoint; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Source.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Source.java index 11e4e226844f..e41b9cc97ffd 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Source.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Source.java @@ -18,15 +18,15 @@ package org.apache.skywalking.oap.server.core.source; -import lombok.*; +import lombok.Getter; +import lombok.Setter; -/** - * @author peng-yongsheng - */ public abstract class Source { public abstract int scope(); - @Getter @Setter private long timeBucket; + @Getter + @Setter + private long timeBucket; public abstract String getEntityId(); } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/SourceReceiver.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/SourceReceiver.java index 825e729d4607..de99afb482f8 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/SourceReceiver.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/SourceReceiver.java @@ -20,9 +20,6 @@ import org.apache.skywalking.oap.server.library.module.Service; -/** - * @author peng-yongsheng - */ public interface SourceReceiver extends Service { void receive(Source source); } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/SourceReceiverImpl.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/SourceReceiverImpl.java index 425e7b527908..eaa17fe38fd8 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/SourceReceiverImpl.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/SourceReceiverImpl.java @@ -22,9 +22,6 @@ import lombok.Getter; import org.apache.skywalking.oap.server.core.analysis.DispatcherManager; -/** - * @author peng-yongsheng - */ public class SourceReceiverImpl implements SourceReceiver { @Getter private final DispatcherManager dispatcherManager; @@ -33,7 +30,8 @@ public SourceReceiverImpl() { this.dispatcherManager = new DispatcherManager(); } - @Override public void receive(Source source) { + @Override + public void receive(Source source) { dispatcherManager.forward(source); } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/AbstractDAO.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/AbstractDAO.java index db65fd79b842..7720562cb7fe 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/AbstractDAO.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/AbstractDAO.java @@ -20,9 +20,6 @@ import org.apache.skywalking.oap.server.library.client.Client; -/** - * @author peng-yongsheng - */ public abstract class AbstractDAO implements DAO { private final C client; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ComparableStorageData.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ComparableStorageData.java index 8e1a63910511..1374d993f8b8 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ComparableStorageData.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ComparableStorageData.java @@ -20,8 +20,6 @@ /** * Storage data with comparable capability. - * - * @author wusheng */ public interface ComparableStorageData extends StorageData, Comparable { } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/DAO.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/DAO.java index ff1af291c8d9..dab0d492fa96 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/DAO.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/DAO.java @@ -20,8 +20,5 @@ import org.apache.skywalking.oap.server.library.module.Service; -/** - * @author peng-yongsheng - */ public interface DAO extends Service { } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IBatchDAO.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IBatchDAO.java index 3c1ed0c4d9c8..883b984a5bee 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IBatchDAO.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IBatchDAO.java @@ -19,11 +19,9 @@ package org.apache.skywalking.oap.server.core.storage; import java.util.List; -import org.apache.skywalking.oap.server.library.client.request.*; +import org.apache.skywalking.oap.server.library.client.request.InsertRequest; +import org.apache.skywalking.oap.server.library.client.request.PrepareRequest; -/** - * @author peng-yongsheng - */ public interface IBatchDAO extends DAO { void asynchronous(InsertRequest insertRequest); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IHistoryDeleteDAO.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IHistoryDeleteDAO.java index bdca6c42eefe..2b7d826b3d02 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IHistoryDeleteDAO.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IHistoryDeleteDAO.java @@ -21,9 +21,6 @@ import java.io.IOException; import org.apache.skywalking.oap.server.core.storage.model.Model; -/** - * @author peng-yongsheng - */ public interface IHistoryDeleteDAO extends DAO { void deleteHistory(Model model, String timeBucketColumnName) throws IOException; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IMetricsDAO.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IMetricsDAO.java index f0ff7bd7c0c4..2cc35dc03a6f 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IMetricsDAO.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IMetricsDAO.java @@ -22,11 +22,9 @@ import java.util.List; import org.apache.skywalking.oap.server.core.analysis.metrics.Metrics; import org.apache.skywalking.oap.server.core.storage.model.Model; -import org.apache.skywalking.oap.server.library.client.request.*; +import org.apache.skywalking.oap.server.library.client.request.InsertRequest; +import org.apache.skywalking.oap.server.library.client.request.UpdateRequest; -/** - * @author peng-yongsheng - */ public interface IMetricsDAO extends DAO { List multiGet(Model model, List ids) throws IOException; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/INoneStreamDAO.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/INoneStreamDAO.java index 9dbc033c46a4..64d4da00dece 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/INoneStreamDAO.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/INoneStreamDAO.java @@ -18,15 +18,12 @@ package org.apache.skywalking.oap.server.core.storage; +import java.io.IOException; import org.apache.skywalking.oap.server.core.analysis.config.NoneStream; import org.apache.skywalking.oap.server.core.storage.model.Model; -import java.io.IOException; - /** * Use synchronize storage to insert none stream data - * - * @author MrPro */ public interface INoneStreamDAO extends DAO { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IRecordDAO.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IRecordDAO.java index e8a0724e9734..97343d5f55ce 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IRecordDAO.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IRecordDAO.java @@ -23,9 +23,6 @@ import org.apache.skywalking.oap.server.core.storage.model.Model; import org.apache.skywalking.oap.server.library.client.request.InsertRequest; -/** - * @author peng-yongsheng - */ public interface IRecordDAO extends DAO { InsertRequest prepareBatchInsert(Model model, Record record) throws IOException; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IRegisterDAO.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IRegisterDAO.java index e4e1380f7364..87fda7037432 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IRegisterDAO.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IRegisterDAO.java @@ -21,11 +21,8 @@ import java.io.IOException; import org.apache.skywalking.oap.server.core.register.RegisterSource; -/** - * @author peng-yongsheng - */ public interface IRegisterDAO extends DAO { - + RegisterSource get(String modelName, String id) throws IOException; void forceInsert(String modelName, RegisterSource source) throws IOException; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IRegisterLockDAO.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IRegisterLockDAO.java index 034e4da1ff55..7cb93efba9a0 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IRegisterLockDAO.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IRegisterLockDAO.java @@ -22,8 +22,6 @@ /** * Entity register and ID generator. - * - * @author peng-yongsheng, wusheng */ public interface IRegisterLockDAO extends DAO { /** diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/PersistenceTimer.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/PersistenceTimer.java index 5a1871649a6d..35730bdd02d5 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/PersistenceTimer.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/PersistenceTimer.java @@ -18,21 +18,26 @@ package org.apache.skywalking.oap.server.core.storage; -import java.util.*; -import java.util.concurrent.*; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import org.apache.skywalking.apm.util.RunnableWithExceptionProtection; import org.apache.skywalking.oap.server.core.CoreModuleConfig; -import org.apache.skywalking.oap.server.core.analysis.worker.*; +import org.apache.skywalking.oap.server.core.analysis.worker.MetricsStreamProcessor; +import org.apache.skywalking.oap.server.core.analysis.worker.PersistenceWorker; +import org.apache.skywalking.oap.server.core.analysis.worker.TopNStreamProcessor; import org.apache.skywalking.oap.server.library.client.request.PrepareRequest; import org.apache.skywalking.oap.server.library.module.ModuleManager; import org.apache.skywalking.oap.server.library.util.CollectionUtils; import org.apache.skywalking.oap.server.telemetry.TelemetryModule; -import org.apache.skywalking.oap.server.telemetry.api.*; -import org.slf4j.*; +import org.apache.skywalking.oap.server.telemetry.api.CounterMetrics; +import org.apache.skywalking.oap.server.telemetry.api.HistogramMetrics; +import org.apache.skywalking.oap.server.telemetry.api.MetricsCreator; +import org.apache.skywalking.oap.server.telemetry.api.MetricsTag; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng - */ public enum PersistenceTimer { INSTANCE; @@ -54,18 +59,17 @@ public void start(ModuleManager moduleManager, CoreModuleConfig moduleConfig) { logger.info("persistence timer start"); IBatchDAO batchDAO = moduleManager.find(StorageModule.NAME).provider().getService(IBatchDAO.class); - MetricsCreator metricsCreator = moduleManager.find(TelemetryModule.NAME).provider().getService(MetricsCreator.class); - errorCounter = metricsCreator.createCounter("persistence_timer_bulk_error_count", "Error execution of the prepare stage in persistence timer", - MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); - prepareLatency = metricsCreator.createHistogramMetric("persistence_timer_bulk_prepare_latency", "Latency of the prepare stage in persistence timer", - MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); - executeLatency = metricsCreator.createHistogramMetric("persistence_timer_bulk_execute_latency", "Latency of the execute stage in persistence timer", - MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); + MetricsCreator metricsCreator = moduleManager.find(TelemetryModule.NAME) + .provider() + .getService(MetricsCreator.class); + errorCounter = metricsCreator.createCounter("persistence_timer_bulk_error_count", "Error execution of the prepare stage in persistence timer", MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); + prepareLatency = metricsCreator.createHistogramMetric("persistence_timer_bulk_prepare_latency", "Latency of the prepare stage in persistence timer", MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); + executeLatency = metricsCreator.createHistogramMetric("persistence_timer_bulk_execute_latency", "Latency of the execute stage in persistence timer", MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); if (!isStarted) { - Executors.newSingleThreadScheduledExecutor().scheduleWithFixedDelay( - new RunnableWithExceptionProtection(() -> extractDataAndSave(batchDAO), - t -> logger.error("Extract data and save failure.", t)), 5, moduleConfig.getPersistentPeriod(), TimeUnit.SECONDS); + Executors.newSingleThreadScheduledExecutor() + .scheduleWithFixedDelay(new RunnableWithExceptionProtection(() -> extractDataAndSave(batchDAO), t -> logger + .error("Extract data and save failure.", t)), 5, moduleConfig.getPersistentPeriod(), TimeUnit.SECONDS); this.isStarted = true; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/StorageBuilder.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/StorageBuilder.java index faf41dd67225..0a07a17dc906 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/StorageBuilder.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/StorageBuilder.java @@ -20,9 +20,6 @@ import java.util.Map; -/** - * @author peng-yongsheng - */ public interface StorageBuilder { T map2Data(Map dbMap); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/StorageDAO.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/StorageDAO.java index 6b7da06ac542..45bbb72ee1f1 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/StorageDAO.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/StorageDAO.java @@ -24,9 +24,6 @@ import org.apache.skywalking.oap.server.core.register.RegisterSource; import org.apache.skywalking.oap.server.library.module.Service; -/** - * @author peng-yongsheng - */ public interface StorageDAO extends Service { IMetricsDAO newMetricsDao(StorageBuilder storageBuilder); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/StorageData.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/StorageData.java index d7de8b828709..ad5d746276e3 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/StorageData.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/StorageData.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.core.storage; -/** - * @author peng-yongsheng - */ public interface StorageData { String id(); } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/StorageException.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/StorageException.java index 8f321a16a7cd..f8c115f9bd2f 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/StorageException.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/StorageException.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.core.storage; -/** - * @author peng-yongsheng - */ public class StorageException extends Exception { public StorageException(String message) { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/StorageModule.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/StorageModule.java index 135976ee5bb0..9f889db8ac37 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/StorageModule.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/StorageModule.java @@ -18,16 +18,23 @@ package org.apache.skywalking.oap.server.core.storage; -import org.apache.skywalking.oap.server.core.storage.cache.*; +import org.apache.skywalking.oap.server.core.storage.cache.IEndpointInventoryCacheDAO; +import org.apache.skywalking.oap.server.core.storage.cache.INetworkAddressInventoryCacheDAO; +import org.apache.skywalking.oap.server.core.storage.cache.IServiceInstanceInventoryCacheDAO; +import org.apache.skywalking.oap.server.core.storage.cache.IServiceInventoryCacheDAO; import org.apache.skywalking.oap.server.core.storage.profile.IProfileTaskLogQueryDAO; import org.apache.skywalking.oap.server.core.storage.profile.IProfileTaskQueryDAO; import org.apache.skywalking.oap.server.core.storage.profile.IProfileThreadSnapshotQueryDAO; -import org.apache.skywalking.oap.server.core.storage.query.*; -import org.apache.skywalking.oap.server.library.module.*; +import org.apache.skywalking.oap.server.core.storage.query.IAggregationQueryDAO; +import org.apache.skywalking.oap.server.core.storage.query.IAlarmQueryDAO; +import org.apache.skywalking.oap.server.core.storage.query.ILogQueryDAO; +import org.apache.skywalking.oap.server.core.storage.query.IMetadataQueryDAO; +import org.apache.skywalking.oap.server.core.storage.query.IMetricsQueryDAO; +import org.apache.skywalking.oap.server.core.storage.query.ITopNRecordsQueryDAO; +import org.apache.skywalking.oap.server.core.storage.query.ITopologyQueryDAO; +import org.apache.skywalking.oap.server.core.storage.query.ITraceQueryDAO; +import org.apache.skywalking.oap.server.library.module.ModuleDefine; -/** - * @author peng-yongsheng - */ public class StorageModule extends ModuleDefine { public static final String NAME = "storage"; @@ -36,13 +43,28 @@ public StorageModule() { super(NAME); } - @Override public Class[] services() { + @Override + public Class[] services() { return new Class[] { - IBatchDAO.class, StorageDAO.class, IRegisterLockDAO.class, + IBatchDAO.class, + StorageDAO.class, + IRegisterLockDAO.class, IHistoryDeleteDAO.class, - IServiceInventoryCacheDAO.class, IServiceInstanceInventoryCacheDAO.class, - IEndpointInventoryCacheDAO.class, INetworkAddressInventoryCacheDAO.class, - ITopologyQueryDAO.class, IMetricsQueryDAO.class, ITraceQueryDAO.class, IMetadataQueryDAO.class, IAggregationQueryDAO.class, IAlarmQueryDAO.class, - ITopNRecordsQueryDAO.class, ILogQueryDAO.class, IProfileTaskQueryDAO.class, IProfileTaskLogQueryDAO.class, IProfileThreadSnapshotQueryDAO.class}; + IServiceInventoryCacheDAO.class, + IServiceInstanceInventoryCacheDAO.class, + IEndpointInventoryCacheDAO.class, + INetworkAddressInventoryCacheDAO.class, + ITopologyQueryDAO.class, + IMetricsQueryDAO.class, + ITraceQueryDAO.class, + IMetadataQueryDAO.class, + IAggregationQueryDAO.class, + IAlarmQueryDAO.class, + ITopNRecordsQueryDAO.class, + ILogQueryDAO.class, + IProfileTaskQueryDAO.class, + IProfileTaskLogQueryDAO.class, + IProfileThreadSnapshotQueryDAO.class + }; } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/Column.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/Column.java index 4e3f880d83a3..f52a74d4e2fb 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/Column.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/Column.java @@ -18,12 +18,12 @@ package org.apache.skywalking.oap.server.core.storage.annotation; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import org.apache.skywalking.oap.server.core.query.sql.Function; -/** - * @author peng-yongsheng - */ @Target({ElementType.FIELD}) @Retention(RetentionPolicy.RUNTIME) public @interface Column { @@ -43,7 +43,7 @@ * Match query means using analyzer(if storage have) to do key word match query. */ boolean matchQuery() default false; - + /** * The column is just saved, never used in query. */ diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/IDColumn.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/IDColumn.java index ba70be6ddecb..2a2ab8b2c50d 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/IDColumn.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/IDColumn.java @@ -25,8 +25,6 @@ /** * IDColumn is the plus annotation for {@link Column}, declares this column is ID for the entity, besides time(bucket). - * - * @author wusheng */ @Target({ElementType.FIELD}) @Retention(RetentionPolicy.RUNTIME) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/Query.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/Query.java index 5f5de015cc29..47f387bbe2c8 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/Query.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/Query.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.core.storage.annotation; -/** - * @author peng-yongsheng - */ public enum Query { Term, Match } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/Storage.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/Storage.java index 9fc8773457b1..865a2e801a8b 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/Storage.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/Storage.java @@ -20,9 +20,6 @@ import lombok.Getter; import org.apache.skywalking.oap.server.core.analysis.Downsampling; -/** - * @author peng-yongsheng - */ @Getter public class Storage { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/ValueColumnIds.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/ValueColumnIds.java index ef003076766a..2b4767d11ff4 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/ValueColumnIds.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/ValueColumnIds.java @@ -18,12 +18,10 @@ package org.apache.skywalking.oap.server.core.storage.annotation; -import java.util.*; +import java.util.HashMap; +import java.util.Map; import org.apache.skywalking.oap.server.core.query.sql.Function; -/** - * @author peng-yongsheng - */ public enum ValueColumnIds { INSTANCE; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/cache/IEndpointInventoryCacheDAO.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/cache/IEndpointInventoryCacheDAO.java index 3197ac6f0db8..6afa34aad30e 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/cache/IEndpointInventoryCacheDAO.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/cache/IEndpointInventoryCacheDAO.java @@ -21,9 +21,6 @@ import org.apache.skywalking.oap.server.core.register.EndpointInventory; import org.apache.skywalking.oap.server.core.storage.DAO; -/** - * @author peng-yongsheng - */ public interface IEndpointInventoryCacheDAO extends DAO { int getEndpointId(int serviceId, String endpointName, int detectPoint); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/cache/INetworkAddressInventoryCacheDAO.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/cache/INetworkAddressInventoryCacheDAO.java index f14bd3cbef94..8700d8d98066 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/cache/INetworkAddressInventoryCacheDAO.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/cache/INetworkAddressInventoryCacheDAO.java @@ -22,9 +22,6 @@ import org.apache.skywalking.oap.server.core.register.NetworkAddressInventory; import org.apache.skywalking.oap.server.core.storage.DAO; -/** - * @author peng-yongsheng - */ public interface INetworkAddressInventoryCacheDAO extends DAO { int getAddressId(String networkAddress); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/cache/IServiceInstanceInventoryCacheDAO.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/cache/IServiceInstanceInventoryCacheDAO.java index ad129025b47b..cd23b6662f11 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/cache/IServiceInstanceInventoryCacheDAO.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/cache/IServiceInstanceInventoryCacheDAO.java @@ -18,14 +18,10 @@ package org.apache.skywalking.oap.server.core.storage.cache; +import java.util.List; import org.apache.skywalking.oap.server.core.register.ServiceInstanceInventory; import org.apache.skywalking.oap.server.core.storage.DAO; -import java.util.List; - -/** - * @author peng-yongsheng - */ public interface IServiceInstanceInventoryCacheDAO extends DAO { ServiceInstanceInventory get(int serviceInstanceId); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/cache/IServiceInventoryCacheDAO.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/cache/IServiceInventoryCacheDAO.java index e547dbdffe63..61cedd0926a1 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/cache/IServiceInventoryCacheDAO.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/cache/IServiceInventoryCacheDAO.java @@ -22,9 +22,6 @@ import org.apache.skywalking.oap.server.core.register.ServiceInventory; import org.apache.skywalking.oap.server.core.storage.DAO; -/** - * @author peng-yongsheng - */ public interface IServiceInventoryCacheDAO extends DAO { int getServiceId(String serviceName); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/ColumnName.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/ColumnName.java index d2469e68dff5..6f848439f595 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/ColumnName.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/ColumnName.java @@ -21,8 +21,6 @@ /** * Short column name unsupported for now. No define in @Column annotation. The storage implementation need to use name * to do match. - * - * @author peng-yongsheng */ public class ColumnName { private String fullName; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/DataTypeMapping.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/DataTypeMapping.java index 31fcc8a65643..4ad3622adb2e 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/DataTypeMapping.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/DataTypeMapping.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.core.storage.model; -/** - * @author peng-yongsheng - */ public interface DataTypeMapping { String transform(Class type); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/IModelGetter.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/IModelGetter.java index 51469f5f105a..11de39747f21 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/IModelGetter.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/IModelGetter.java @@ -21,9 +21,6 @@ import java.util.List; import org.apache.skywalking.oap.server.library.module.Service; -/** - * @author peng-yongsheng - */ public interface IModelGetter extends Service { List getModels(); } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/IModelOverride.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/IModelOverride.java index 3344fb81afe4..91bbeeca11fd 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/IModelOverride.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/IModelOverride.java @@ -22,8 +22,6 @@ /** * Override service provides ways to rename the existing column or table name. - * - * @author wusheng */ public interface IModelOverride extends Service { void overrideColumnName(String columnName, String newName); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/IModelSetter.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/IModelSetter.java index b30c457ce2b9..59d763a81c66 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/IModelSetter.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/IModelSetter.java @@ -21,9 +21,6 @@ import org.apache.skywalking.oap.server.core.storage.annotation.Storage; import org.apache.skywalking.oap.server.library.module.Service; -/** - * @author peng-yongsheng - */ public interface IModelSetter extends Service { Model putIfAbsent(Class aClass, int scopeId, Storage storage, boolean record); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/Model.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/Model.java index 9693ef7f5395..2aa130aa1d94 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/Model.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/Model.java @@ -22,9 +22,6 @@ import lombok.Getter; import org.apache.skywalking.oap.server.core.analysis.Downsampling; -/** - * @author peng-yongsheng - */ @Getter public class Model { @@ -36,7 +33,8 @@ public class Model { private final int scopeId; private final boolean record; - public Model(String name, List columns, boolean capableOfTimeSeries, boolean deleteHistory, int scopeId, Downsampling downsampling, boolean record) { + public Model(String name, List columns, boolean capableOfTimeSeries, boolean deleteHistory, + int scopeId, Downsampling downsampling, boolean record) { this.columns = columns; this.capableOfTimeSeries = capableOfTimeSeries; this.downsampling = downsampling; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/ModelColumn.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/ModelColumn.java index 662754235791..16a6f66c5256 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/ModelColumn.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/ModelColumn.java @@ -20,9 +20,6 @@ import lombok.Getter; -/** - * @author peng-yongsheng - */ @Getter public class ModelColumn { private final ColumnName columnName; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/ModelInstaller.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/ModelInstaller.java index f8eed1a07dac..11f78ee98a12 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/ModelInstaller.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/ModelInstaller.java @@ -19,15 +19,14 @@ package org.apache.skywalking.oap.server.core.storage.model; import java.util.List; -import org.apache.skywalking.oap.server.core.*; +import org.apache.skywalking.oap.server.core.CoreModule; +import org.apache.skywalking.oap.server.core.RunningMode; import org.apache.skywalking.oap.server.core.storage.StorageException; import org.apache.skywalking.oap.server.library.client.Client; import org.apache.skywalking.oap.server.library.module.ModuleManager; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng - */ public abstract class ModelInstaller { private static final Logger logger = LoggerFactory.getLogger(ModelInstaller.class); @@ -47,7 +46,8 @@ public final void install(Client client) throws StorageException { for (Model model : models) { while (!isExists(client, model)) { try { - logger.info("table: {} does not exist. OAP is running in 'no-init' mode, waiting... retry 3s later.", model.getName()); + logger.info("table: {} does not exist. OAP is running in 'no-init' mode, waiting... retry 3s later.", model + .getName()); Thread.sleep(3000L); } catch (InterruptedException e) { logger.error(e.getMessage()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/ModelName.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/ModelName.java index 018ed8f266d3..3485bd01263c 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/ModelName.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/ModelName.java @@ -20,9 +20,6 @@ import org.apache.skywalking.oap.server.core.Const; import org.apache.skywalking.oap.server.core.analysis.Downsampling; -/** - * @author peng-yongsheng - */ public class ModelName { public static String build(Downsampling downsampling, String modelName) { @@ -33,8 +30,8 @@ public static String build(Downsampling downsampling, String modelName) { return modelName + Const.ID_SPLIT + Downsampling.Day.getName(); case Hour: return modelName + Const.ID_SPLIT + Downsampling.Hour.getName(); -// case Second: -// return modelName + Const.ID_SPLIT + Downsampling.Second.getName(); + // case Second: + // return modelName + Const.ID_SPLIT + Downsampling.Second.getName(); default: return modelName; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/StorageModels.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/StorageModels.java index 3ccf594e2290..5f7b7907b054 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/StorageModels.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/StorageModels.java @@ -18,26 +18,30 @@ package org.apache.skywalking.oap.server.core.storage.model; import java.lang.reflect.Field; -import java.util.*; +import java.util.LinkedList; +import java.util.List; +import java.util.Objects; import lombok.Getter; import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine; -import org.apache.skywalking.oap.server.core.storage.annotation.*; -import org.slf4j.*; +import org.apache.skywalking.oap.server.core.storage.annotation.Column; +import org.apache.skywalking.oap.server.core.storage.annotation.Storage; +import org.apache.skywalking.oap.server.core.storage.annotation.ValueColumnIds; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng - */ public class StorageModels implements IModelGetter, IModelSetter, IModelOverride { private static final Logger logger = LoggerFactory.getLogger(StorageModels.class); - @Getter private final List models; + @Getter + private final List models; public StorageModels() { this.models = new LinkedList<>(); } - @Override public Model putIfAbsent(Class aClass, int scopeId, Storage storage, boolean record) { + @Override + public Model putIfAbsent(Class aClass, int scopeId, Storage storage, boolean record) { // Check this scope id is valid. DefaultScopeDefine.nameOf(scopeId); @@ -50,7 +54,8 @@ public StorageModels() { List modelColumns = new LinkedList<>(); retrieval(aClass, storage.getModelName(), modelColumns); - Model model = new Model(storage.getModelName(), modelColumns, storage.isCapableOfTimeSeries(), storage.isDeleteHistory(), scopeId, storage.getDownsampling(), record); + Model model = new Model(storage.getModelName(), modelColumns, storage.isCapableOfTimeSeries(), storage.isDeleteHistory(), scopeId, storage + .getDownsampling(), record); models.add(model); return model; @@ -62,7 +67,8 @@ private void retrieval(Class clazz, String modelName, List modelCol for (Field field : fields) { if (field.isAnnotationPresent(Column.class)) { Column column = field.getAnnotation(Column.class); - modelColumns.add(new ModelColumn(new ColumnName(column.columnName()), field.getType(), column.matchQuery(), column.content())); + modelColumns.add(new ModelColumn(new ColumnName(column.columnName()), field.getType(), column.matchQuery(), column + .content())); if (logger.isDebugEnabled()) { logger.debug("The field named {} with the {} type", column.columnName(), field.getType()); } @@ -77,7 +83,8 @@ private void retrieval(Class clazz, String modelName, List modelCol } } - @Override public void overrideColumnName(String columnName, String newName) { + @Override + public void overrideColumnName(String columnName, String newName) { models.forEach(model -> model.getColumns().forEach(column -> { ColumnName existColumnName = column.getColumnName(); String name = existColumnName.getName(); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/profile/IProfileTaskLogQueryDAO.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/profile/IProfileTaskLogQueryDAO.java index 98110f71a680..064b8f9ed017 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/profile/IProfileTaskLogQueryDAO.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/profile/IProfileTaskLogQueryDAO.java @@ -18,23 +18,20 @@ package org.apache.skywalking.oap.server.core.storage.profile; -import org.apache.skywalking.oap.server.core.query.entity.ProfileTaskLog; -import org.apache.skywalking.oap.server.core.storage.DAO; - import java.io.IOException; import java.util.List; +import org.apache.skywalking.oap.server.core.query.entity.ProfileTaskLog; +import org.apache.skywalking.oap.server.core.storage.DAO; /** * process all profile task log query - * - * @author MrPro */ public interface IProfileTaskLogQueryDAO extends DAO { /** * search all task log list in appoint profile task id + * * @param taskId profile task id, maybe null - * @return */ List getTaskLogList(final String taskId) throws IOException; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/profile/IProfileTaskQueryDAO.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/profile/IProfileTaskQueryDAO.java index 7ca639d290ca..14c5a129aeed 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/profile/IProfileTaskQueryDAO.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/profile/IProfileTaskQueryDAO.java @@ -15,36 +15,33 @@ * limitations under the License. * */ -package org.apache.skywalking.oap.server.core.storage.profile; -import org.apache.skywalking.oap.server.core.query.entity.ProfileTask; -import org.apache.skywalking.oap.server.core.storage.DAO; +package org.apache.skywalking.oap.server.core.storage.profile; import java.io.IOException; import java.util.List; +import org.apache.skywalking.oap.server.core.query.entity.ProfileTask; +import org.apache.skywalking.oap.server.core.storage.DAO; /** * process all profile task query - * - * @author MrPro */ public interface IProfileTaskQueryDAO extends DAO { /** * search task list in appoint time bucket - * @param serviceId monitor service id, maybe null - * @param endpointName endpoint name, maybe empty + * + * @param serviceId monitor service id, maybe null + * @param endpointName endpoint name, maybe empty * @param startTimeBucket time bucket bigger than or equals, nullable - * @param endTimeBucket time bucket small than or equals, nullable - * @param limit limit count, if null means query all - * @return + * @param endTimeBucket time bucket small than or equals, nullable + * @param limit limit count, if null means query all */ - List getTaskList(final Integer serviceId, final String endpointName, final Long startTimeBucket, final Long endTimeBucket, final Integer limit) throws IOException; + List getTaskList(final Integer serviceId, final String endpointName, final Long startTimeBucket, + final Long endTimeBucket, final Integer limit) throws IOException; /** * query profile task by id - * @param id - * @return */ ProfileTask getById(final String id) throws IOException; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/profile/IProfileThreadSnapshotQueryDAO.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/profile/IProfileThreadSnapshotQueryDAO.java index 07f6a2433175..dedda807b16a 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/profile/IProfileThreadSnapshotQueryDAO.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/profile/IProfileThreadSnapshotQueryDAO.java @@ -18,22 +18,20 @@ package org.apache.skywalking.oap.server.core.storage.profile; +import java.io.IOException; +import java.util.List; import org.apache.skywalking.oap.server.core.profile.ProfileThreadSnapshotRecord; import org.apache.skywalking.oap.server.core.query.entity.BasicTrace; import org.apache.skywalking.oap.server.core.storage.DAO; -import java.io.IOException; -import java.util.List; - /** * {@link ProfileThreadSnapshotRecord} database queries */ public interface IProfileThreadSnapshotQueryDAO extends DAO { /** - * search all profiled segments, need appoint taskId and snapshot sequence equals 0 - * sort by segment start time - * @param taskId + * search all profiled segments, need appoint taskId and snapshot sequence equals 0 sort by segment start time + * * @return it represents the segments having profile snapshot data. */ List queryProfiledSegments(String taskId) throws IOException; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IAggregationQueryDAO.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IAggregationQueryDAO.java index b88f1451d4a6..7b1eb164be58 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IAggregationQueryDAO.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IAggregationQueryDAO.java @@ -21,25 +21,24 @@ import java.io.IOException; import java.util.List; import org.apache.skywalking.oap.server.core.analysis.Downsampling; -import org.apache.skywalking.oap.server.core.query.entity.*; -import org.apache.skywalking.oap.server.core.storage.*; +import org.apache.skywalking.oap.server.core.query.entity.Order; +import org.apache.skywalking.oap.server.core.query.entity.TopNEntity; +import org.apache.skywalking.oap.server.core.storage.DAO; -/** - * @author peng-yongsheng - */ public interface IAggregationQueryDAO extends DAO { - List getServiceTopN(final String indName, String valueCName, final int topN, final Downsampling downsampling, - final long startTB, final long endTB, final Order order) throws IOException; + List getServiceTopN(final String indName, String valueCName, final int topN, + final Downsampling downsampling, final long startTB, final long endTB, final Order order) throws IOException; - List getAllServiceInstanceTopN(final String indName, String valueCName, final int topN, final Downsampling downsampling, - final long startTB, final long endTB, final Order order) throws IOException; + List getAllServiceInstanceTopN(final String indName, String valueCName, final int topN, + final Downsampling downsampling, final long startTB, final long endTB, final Order order) throws IOException; List getServiceInstanceTopN(final int serviceId, final String indName, String valueCName, - final int topN, final Downsampling downsampling, final long startTB, final long endTB, final Order order) throws IOException; + final int topN, final Downsampling downsampling, final long startTB, final long endTB, + final Order order) throws IOException; - List getAllEndpointTopN(final String indName, String valueCName, final int topN, final Downsampling downsampling, - final long startTB, final long endTB, final Order order) throws IOException; + List getAllEndpointTopN(final String indName, String valueCName, final int topN, + final Downsampling downsampling, final long startTB, final long endTB, final Order order) throws IOException; List getEndpointTopN(final int serviceId, final String indName, String valueCName, final int topN, final Downsampling downsampling, final long startTB, final long endTB, final Order order) throws IOException; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IAlarmQueryDAO.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IAlarmQueryDAO.java index a4dcb942fffe..9317ebfc942f 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IAlarmQueryDAO.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IAlarmQueryDAO.java @@ -22,9 +22,6 @@ import org.apache.skywalking.oap.server.core.query.entity.Alarms; import org.apache.skywalking.oap.server.core.storage.DAO; -/** - * @author peng-yongsheng - */ public interface IAlarmQueryDAO extends DAO { Alarms getAlarm(final Integer scopeId, final String keyword, final int limit, final int from, final long startTB, diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/ILogQueryDAO.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/ILogQueryDAO.java index ca8ed6a52d99..0dc122f6f721 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/ILogQueryDAO.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/ILogQueryDAO.java @@ -19,13 +19,13 @@ package org.apache.skywalking.oap.server.core.storage.query; import java.io.IOException; -import org.apache.skywalking.oap.server.core.query.entity.*; +import org.apache.skywalking.oap.server.core.query.entity.LogState; +import org.apache.skywalking.oap.server.core.query.entity.Logs; +import org.apache.skywalking.oap.server.core.query.entity.Pagination; import org.apache.skywalking.oap.server.library.module.Service; -/** - * @author wusheng - */ public interface ILogQueryDAO extends Service { - Logs queryLogs(final String metricName, int serviceId, int serviceInstanceId, int endpointId, - String traceId, LogState state, String stateCode, Pagination paging, int from, int limit, final long startTB, final long endTB) throws IOException; + Logs queryLogs(final String metricName, int serviceId, int serviceInstanceId, int endpointId, String traceId, + LogState state, String stateCode, Pagination paging, int from, int limit, final long startTB, + final long endTB) throws IOException; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IMetadataQueryDAO.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IMetadataQueryDAO.java index b3cb6263c113..55ed3d01a81a 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IMetadataQueryDAO.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IMetadataQueryDAO.java @@ -20,12 +20,12 @@ import java.io.IOException; import java.util.List; -import org.apache.skywalking.oap.server.core.query.entity.*; +import org.apache.skywalking.oap.server.core.query.entity.Database; +import org.apache.skywalking.oap.server.core.query.entity.Endpoint; +import org.apache.skywalking.oap.server.core.query.entity.Service; +import org.apache.skywalking.oap.server.core.query.entity.ServiceInstance; import org.apache.skywalking.oap.server.core.storage.DAO; -/** - * @author peng-yongsheng - */ public interface IMetadataQueryDAO extends DAO { int numOfService(final long startTimestamp, final long endTimestamp) throws IOException; @@ -45,8 +45,7 @@ List searchServices(final long startTimestamp, final long endTimestamp, Service searchService(final String serviceCode) throws IOException; - List searchEndpoint(final String keyword, final String serviceId, - final int limit) throws IOException; + List searchEndpoint(final String keyword, final String serviceId, final int limit) throws IOException; List getServiceInstances(final long startTimestamp, final long endTimestamp, final String serviceId) throws IOException; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IMetricsQueryDAO.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IMetricsQueryDAO.java index 512ac5899374..456d4b34319c 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IMetricsQueryDAO.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IMetricsQueryDAO.java @@ -27,9 +27,6 @@ import org.apache.skywalking.oap.server.core.query.sql.Where; import org.apache.skywalking.oap.server.core.storage.DAO; -/** - * @author peng-yongsheng - */ public interface IMetricsQueryDAO extends DAO { IntValues getValues(String indName, Downsampling downsampling, long startTB, long endTB, Where where, diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/ITopNRecordsQueryDAO.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/ITopNRecordsQueryDAO.java index 4b20e53e2820..453a24605915 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/ITopNRecordsQueryDAO.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/ITopNRecordsQueryDAO.java @@ -20,10 +20,11 @@ import java.io.IOException; import java.util.List; -import org.apache.skywalking.oap.server.core.query.entity.*; +import org.apache.skywalking.oap.server.core.query.entity.Order; +import org.apache.skywalking.oap.server.core.query.entity.TopNRecord; import org.apache.skywalking.oap.server.library.module.Service; public interface ITopNRecordsQueryDAO extends Service { - List getTopNRecords(long startSecondTB, long endSecondTB, String metricName, int serviceId, - int topN, Order order) throws IOException; + List getTopNRecords(long startSecondTB, long endSecondTB, String metricName, int serviceId, int topN, + Order order) throws IOException; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/ITopologyQueryDAO.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/ITopologyQueryDAO.java index 6fe777faf3ec..1f9689e1f5f4 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/ITopologyQueryDAO.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/ITopologyQueryDAO.java @@ -24,22 +24,26 @@ import org.apache.skywalking.oap.server.core.query.entity.Call; import org.apache.skywalking.oap.server.library.module.Service; -/** - * @author peng-yongsheng - */ public interface ITopologyQueryDAO extends Service { - List loadSpecifiedServerSideServiceRelations(Downsampling downsampling, long startTB, long endTB, List serviceIds) throws IOException; + List loadSpecifiedServerSideServiceRelations(Downsampling downsampling, long startTB, long endTB, + List serviceIds) throws IOException; - List loadSpecifiedClientSideServiceRelations(Downsampling downsampling, long startTB, long endTB, List serviceIds) throws IOException; + List loadSpecifiedClientSideServiceRelations(Downsampling downsampling, long startTB, long endTB, + List serviceIds) throws IOException; - List loadServerSideServiceRelations(Downsampling downsampling, long startTB, long endTB) throws IOException; + List loadServerSideServiceRelations(Downsampling downsampling, long startTB, + long endTB) throws IOException; - List loadClientSideServiceRelations(Downsampling downsampling, long startTB, long endTB) throws IOException; + List loadClientSideServiceRelations(Downsampling downsampling, long startTB, + long endTB) throws IOException; - List loadServerSideServiceInstanceRelations(int clientServiceId, int serverServiceId, Downsampling downsampling, long startTB, long endTB) throws IOException; + List loadServerSideServiceInstanceRelations(int clientServiceId, int serverServiceId, + Downsampling downsampling, long startTB, long endTB) throws IOException; - List loadClientSideServiceInstanceRelations(int clientServiceId, int serverServiceId, Downsampling downsampling, long startTB, long endTB) throws IOException; + List loadClientSideServiceInstanceRelations(int clientServiceId, int serverServiceId, + Downsampling downsampling, long startTB, long endTB) throws IOException; - List loadSpecifiedDestOfServerSideEndpointRelations(Downsampling downsampling, long startTB, long endTB, int destEndpointId) throws IOException; + List loadSpecifiedDestOfServerSideEndpointRelations(Downsampling downsampling, long startTB, + long endTB, int destEndpointId) throws IOException; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/ITraceQueryDAO.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/ITraceQueryDAO.java index 6517d2f8bcef..693f0a1546a1 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/ITraceQueryDAO.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/ITraceQueryDAO.java @@ -21,25 +21,22 @@ import java.io.IOException; import java.util.List; import org.apache.skywalking.oap.server.core.analysis.manual.segment.SegmentRecord; -import org.apache.skywalking.oap.server.core.query.entity.*; +import org.apache.skywalking.oap.server.core.query.entity.QueryOrder; +import org.apache.skywalking.oap.server.core.query.entity.Span; +import org.apache.skywalking.oap.server.core.query.entity.TraceBrief; +import org.apache.skywalking.oap.server.core.query.entity.TraceState; import org.apache.skywalking.oap.server.library.module.Service; -/** - * @author peng-yongsheng - */ public interface ITraceQueryDAO extends Service { - TraceBrief queryBasicTraces(long startSecondTB, long endSecondTB, long minDuration, - long maxDuration, String endpointName, int serviceId, int serviceInstanceId, int endpointId, String traceId, - int limit, int from, TraceState traceState, QueryOrder queryOrder) throws IOException; + TraceBrief queryBasicTraces(long startSecondTB, long endSecondTB, long minDuration, long maxDuration, + String endpointName, int serviceId, int serviceInstanceId, int endpointId, String traceId, int limit, int from, + TraceState traceState, QueryOrder queryOrder) throws IOException; List queryByTraceId(String traceId) throws IOException; /** * This method gives more flexible for unnative - * @param traceId - * @return - * @throws IOException */ List doFlexibleTraceQuery(String traceId) throws IOException; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/DataTTLKeeperTimer.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/DataTTLKeeperTimer.java index 17b41233ef3c..33d86302ccc1 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/DataTTLKeeperTimer.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/DataTTLKeeperTimer.java @@ -18,6 +18,10 @@ package org.apache.skywalking.oap.server.core.storage.ttl; +import java.io.IOException; +import java.util.List; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import org.apache.skywalking.apm.util.RunnableWithExceptionProtection; import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.CoreModuleConfig; @@ -34,14 +38,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.util.List; -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; - -/** - * @author peng-yongsheng - */ public enum DataTTLKeeperTimer { INSTANCE; @@ -54,9 +50,9 @@ public void start(ModuleManager moduleManager, CoreModuleConfig moduleConfig) { this.moduleManager = moduleManager; this.clusterNodesQuery = moduleManager.find(ClusterModule.NAME).provider().getService(ClusterNodesQuery.class); - Executors.newSingleThreadScheduledExecutor().scheduleAtFixedRate( - new RunnableWithExceptionProtection(this::delete, t -> logger.error("Remove data in background failure.", t)), - moduleConfig.getDataKeeperExecutePeriod(), moduleConfig.getDataKeeperExecutePeriod(), TimeUnit.MINUTES); + Executors.newSingleThreadScheduledExecutor() + .scheduleAtFixedRate(new RunnableWithExceptionProtection(this::delete, t -> logger.error("Remove data in background failure.", t)), moduleConfig + .getDataKeeperExecutePeriod(), moduleConfig.getDataKeeperExecutePeriod(), TimeUnit.MINUTES); } private void delete() { @@ -78,7 +74,10 @@ private void delete() { private void execute(Model model) { try { - moduleManager.find(StorageModule.NAME).provider().getService(IHistoryDeleteDAO.class).deleteHistory(model, Metrics.TIME_BUCKET); + moduleManager.find(StorageModule.NAME) + .provider() + .getService(IHistoryDeleteDAO.class) + .deleteHistory(model, Metrics.TIME_BUCKET); } catch (IOException e) { logger.warn("History of {} delete failure", model.getName()); logger.error(e.getMessage(), e); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/DayTTLCalculator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/DayTTLCalculator.java index 106ca8ec9453..fb0d2a9fe3fe 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/DayTTLCalculator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/DayTTLCalculator.java @@ -20,12 +20,10 @@ import org.apache.skywalking.oap.server.core.DataTTLConfig; import org.joda.time.DateTime; -/** - * @author peng-yongsheng - */ public class DayTTLCalculator implements TTLCalculator { - @Override public long timeBefore(DateTime currentTime, DataTTLConfig dataTTLConfig) { + @Override + public long timeBefore(DateTime currentTime, DataTTLConfig dataTTLConfig) { return Long.valueOf(currentTime.plusDays(0 - dataTTLConfig.getDayMetricsDataTTL()).toString("yyyyMMdd")); } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/GeneralStorageTTL.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/GeneralStorageTTL.java index 971bcb764126..4d8e59b77873 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/GeneralStorageTTL.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/GeneralStorageTTL.java @@ -19,12 +19,10 @@ import org.apache.skywalking.oap.server.core.analysis.Downsampling; -/** - * @author peng-yongsheng - */ public class GeneralStorageTTL implements StorageTTL { - @Override public TTLCalculator metricsCalculator(Downsampling downsampling) { + @Override + public TTLCalculator metricsCalculator(Downsampling downsampling) { switch (downsampling) { case Hour: return new HourTTLCalculator(); @@ -39,7 +37,8 @@ public class GeneralStorageTTL implements StorageTTL { } } - @Override public TTLCalculator recordCalculator() { + @Override + public TTLCalculator recordCalculator() { return new RecordTTLCalculator(); } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/HourTTLCalculator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/HourTTLCalculator.java index 3caf1e999484..5677fece4a95 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/HourTTLCalculator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/HourTTLCalculator.java @@ -20,12 +20,10 @@ import org.apache.skywalking.oap.server.core.DataTTLConfig; import org.joda.time.DateTime; -/** - * @author peng-yongsheng - */ public class HourTTLCalculator implements TTLCalculator { - @Override public long timeBefore(DateTime currentTime, DataTTLConfig dataTTLConfig) { + @Override + public long timeBefore(DateTime currentTime, DataTTLConfig dataTTLConfig) { return Long.valueOf(currentTime.plusHours(0 - dataTTLConfig.getHourMetricsDataTTL()).toString("yyyyMMddHH")); } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/MinuteTTLCalculator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/MinuteTTLCalculator.java index 83d30e6259d0..43004f6b06fb 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/MinuteTTLCalculator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/MinuteTTLCalculator.java @@ -20,12 +20,11 @@ import org.apache.skywalking.oap.server.core.DataTTLConfig; import org.joda.time.DateTime; -/** - * @author peng-yongsheng - */ public class MinuteTTLCalculator implements TTLCalculator { - @Override public long timeBefore(DateTime currentTime, DataTTLConfig dataTTLConfig) { - return Long.valueOf(currentTime.plusMinutes(0 - dataTTLConfig.getMinuteMetricsDataTTL()).toString("yyyyMMddHHmm")); + @Override + public long timeBefore(DateTime currentTime, DataTTLConfig dataTTLConfig) { + return Long.valueOf(currentTime.plusMinutes(0 - dataTTLConfig.getMinuteMetricsDataTTL()) + .toString("yyyyMMddHHmm")); } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/MonthTTLCalculator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/MonthTTLCalculator.java index 46c61cefb03c..510813f9f649 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/MonthTTLCalculator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/MonthTTLCalculator.java @@ -20,12 +20,10 @@ import org.apache.skywalking.oap.server.core.DataTTLConfig; import org.joda.time.DateTime; -/** - * @author peng-yongsheng - */ public class MonthTTLCalculator implements TTLCalculator { - @Override public long timeBefore(DateTime currentTime, DataTTLConfig dataTTLConfig) { + @Override + public long timeBefore(DateTime currentTime, DataTTLConfig dataTTLConfig) { return Long.valueOf(currentTime.plusMonths(0 - dataTTLConfig.getMonthMetricsDataTTL()).toString("yyyyMM")); } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/RecordTTLCalculator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/RecordTTLCalculator.java index c06f26f5f950..b0244cc4f532 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/RecordTTLCalculator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/RecordTTLCalculator.java @@ -23,12 +23,11 @@ /** * Calculate TTL for record. - * - * @author wusheng */ public class RecordTTLCalculator implements TTLCalculator { - @Override public long timeBefore(DateTime currentTime, DataTTLConfig dataTTLConfig) { + @Override + public long timeBefore(DateTime currentTime, DataTTLConfig dataTTLConfig) { return Long.valueOf(currentTime.plusMinutes(0 - dataTTLConfig.getRecordDataTTL()).toString("yyyyMMddHHmmss")); } } \ No newline at end of file diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/SecondTTLCalculator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/SecondTTLCalculator.java index e15aac9cc0d8..fe41d2ccf005 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/SecondTTLCalculator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/SecondTTLCalculator.java @@ -20,12 +20,10 @@ import org.apache.skywalking.oap.server.core.DataTTLConfig; import org.joda.time.DateTime; -/** - * @author peng-yongsheng - */ public class SecondTTLCalculator implements TTLCalculator { - @Override public long timeBefore(DateTime currentTime, DataTTLConfig dataTTLConfig) { + @Override + public long timeBefore(DateTime currentTime, DataTTLConfig dataTTLConfig) { return Long.valueOf(currentTime.plusMinutes(0 - dataTTLConfig.getRecordDataTTL()).toString("yyyyMMddHHmmss")); } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/StorageTTL.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/StorageTTL.java index 7a0b4e9c80d7..90820c19e301 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/StorageTTL.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/StorageTTL.java @@ -19,9 +19,6 @@ import org.apache.skywalking.oap.server.core.analysis.Downsampling; -/** - * @author peng-yongsheng - */ public interface StorageTTL { TTLCalculator metricsCalculator(Downsampling downsampling); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/TTLCalculator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/TTLCalculator.java index 36a522be32dc..80d87e2b3f79 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/TTLCalculator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/TTLCalculator.java @@ -20,9 +20,6 @@ import org.apache.skywalking.oap.server.core.DataTTLConfig; import org.joda.time.DateTime; -/** - * @author peng-yongsheng - */ public interface TTLCalculator { long timeBefore(DateTime currentTime, DataTTLConfig dataTTLConfig); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/type/StorageDataType.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/type/StorageDataType.java index 7b440d5f36db..668f5aa38704 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/type/StorageDataType.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/type/StorageDataType.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.core.storage.type; -/** - * @author peng-yongsheng - */ public interface StorageDataType { String toStorageData(); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/worker/AbstractWorker.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/worker/AbstractWorker.java index 35cc46607eca..60f77dbc99aa 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/worker/AbstractWorker.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/worker/AbstractWorker.java @@ -21,12 +21,10 @@ import lombok.Getter; import org.apache.skywalking.oap.server.library.module.ModuleDefineHolder; -/** - * @author peng-yongsheng - */ public abstract class AbstractWorker { - - @Getter private final ModuleDefineHolder moduleDefineHolder; + + @Getter + private final ModuleDefineHolder moduleDefineHolder; public AbstractWorker(ModuleDefineHolder moduleDefineHolder) { this.moduleDefineHolder = moduleDefineHolder; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/worker/IWorkerInstanceGetter.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/worker/IWorkerInstanceGetter.java index 86f73f046595..c98175abb1c6 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/worker/IWorkerInstanceGetter.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/worker/IWorkerInstanceGetter.java @@ -20,9 +20,6 @@ import org.apache.skywalking.oap.server.library.module.Service; -/** - * @author peng-yongsheng - */ public interface IWorkerInstanceGetter extends Service { RemoteHandleWorker get(String nextWorkerName); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/worker/IWorkerInstanceSetter.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/worker/IWorkerInstanceSetter.java index c6da429ed37e..6336a813d397 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/worker/IWorkerInstanceSetter.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/worker/IWorkerInstanceSetter.java @@ -21,9 +21,6 @@ import org.apache.skywalking.oap.server.core.remote.data.StreamData; import org.apache.skywalking.oap.server.library.module.Service; -/** - * @author peng-yongsheng - */ public interface IWorkerInstanceSetter extends Service { void put(String remoteReceiverWorkName, AbstractWorker instance, Class streamDataClass); } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/worker/RemoteHandleWorker.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/worker/RemoteHandleWorker.java index 270c9d662059..e24799e55fed 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/worker/RemoteHandleWorker.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/worker/RemoteHandleWorker.java @@ -22,9 +22,6 @@ import lombok.Getter; import org.apache.skywalking.oap.server.core.remote.data.StreamData; -/** - * @author wusheng - */ @AllArgsConstructor @Getter public class RemoteHandleWorker { diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/worker/WorkerInstancesService.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/worker/WorkerInstancesService.java index 0852a6aa2635..ec447836f21f 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/worker/WorkerInstancesService.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/worker/WorkerInstancesService.java @@ -27,8 +27,6 @@ /** * Worker Instance Service hosts all remote handler workers with the stream data type. - * - * @author peng-yongsheng, wusheng */ public class WorkerInstancesService implements IWorkerInstanceSetter, IWorkerInstanceGetter { private static final Logger logger = LoggerFactory.getLogger(WorkerInstancesService.class); @@ -39,11 +37,13 @@ public WorkerInstancesService() { this.instances = new HashMap<>(); } - @Override public RemoteHandleWorker get(String nextWorkerName) { + @Override + public RemoteHandleWorker get(String nextWorkerName) { return instances.get(nextWorkerName); } - @Override public void put(String remoteReceiverWorkName, AbstractWorker instance, + @Override + public void put(String remoteReceiverWorkName, AbstractWorker instance, Class streamDataClass) { if (instances.containsKey(remoteReceiverWorkName)) { throw new UnexpectedException("Duplicate worker name:" + remoteReceiverWorkName); diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/ApdexThresholdConfigTest.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/ApdexThresholdConfigTest.java index f150acb02245..8489e8bb8c6b 100644 --- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/ApdexThresholdConfigTest.java +++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/ApdexThresholdConfigTest.java @@ -67,7 +67,8 @@ public MockConfigWatcherRegister(long syncPeriod) { super(syncPeriod); } - @Override public ConfigTable readConfig(Set keys) { + @Override + public ConfigTable readConfig(Set keys) { ConfigTable table = new ConfigTable(); table.add(new ConfigTable.ConfigItem("core.default.apdexThreshold", "default: 1000 \nfoo: 200")); return table; diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/data/LimitedSizeDataCollectionTest.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/data/LimitedSizeDataCollectionTest.java index 852c884124d8..4f506abadcad 100644 --- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/data/LimitedSizeDataCollectionTest.java +++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/data/LimitedSizeDataCollectionTest.java @@ -20,11 +20,9 @@ import java.util.Objects; import org.apache.skywalking.oap.server.core.storage.ComparableStorageData; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -/** - * @author wusheng - */ public class LimitedSizeDataCollectionTest { @Test public void testPut() { @@ -38,7 +36,13 @@ public void testPut() { MockStorageData income = new MockStorageData(4); collection.put(income); - int[] expected = new int[] {3, 4, 5, 7, 9}; + int[] expected = new int[] { + 3, + 4, + 5, + 7, + 9 + }; int i = 0; for (MockStorageData data : collection.collection()) { Assert.assertEquals(expected[i++], data.latency); @@ -52,20 +56,24 @@ public MockStorageData(long latency) { this.latency = latency; } - @Override public int compareTo(Object o) { - MockStorageData target = (MockStorageData)o; - return (int)(latency - target.latency); + @Override + public int compareTo(Object o) { + MockStorageData target = (MockStorageData) o; + return (int) (latency - target.latency); } - @Override public String id() { + @Override + public String id() { return null; } - @Override public boolean equals(Object o) { + @Override + public boolean equals(Object o) { return true; } - @Override public int hashCode() { + @Override + public int hashCode() { return Objects.hash(1); } } diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/ApdexMetricsTest.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/ApdexMetricsTest.java index 4408a13b1c0e..b0dd7bee9c36 100644 --- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/ApdexMetricsTest.java +++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/ApdexMetricsTest.java @@ -23,7 +23,7 @@ import org.junit.Test; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertThat; public class ApdexMetricsTest { @@ -88,7 +88,6 @@ public void testCombine() { apdex1.combine(200, "foo", true); apdex1.combine(1500, "bar", true); - ApdexMetrics apdex2 = new ApdexMetricsImpl(); apdex2.combine(200, "foo", true); apdex2.combine(300, "bar", false); @@ -104,31 +103,38 @@ public void testCombine() { public class ApdexMetricsImpl extends ApdexMetrics { - @Override public String id() { + @Override + public String id() { return null; } - @Override public Metrics toHour() { + @Override + public Metrics toHour() { return null; } - @Override public Metrics toDay() { + @Override + public Metrics toDay() { return null; } - @Override public Metrics toMonth() { + @Override + public Metrics toMonth() { return null; } - @Override public int remoteHashCode() { + @Override + public int remoteHashCode() { return 0; } - @Override public void deserialize(RemoteData remoteData) { + @Override + public void deserialize(RemoteData remoteData) { } - @Override public RemoteData.Builder serialize() { + @Override + public RemoteData.Builder serialize() { return null; } } diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/CountMetricsTest.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/CountMetricsTest.java index b9f33f2e19c6..1e8ff17218c5 100644 --- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/CountMetricsTest.java +++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/CountMetricsTest.java @@ -22,9 +22,6 @@ import org.junit.Assert; import org.junit.Test; -/** - * @author wusheng - */ public class CountMetricsTest { @Test public void testEntranceCombine() { @@ -58,31 +55,38 @@ public void testSelfCombine() { } public class CountMetricsImpl extends CountMetrics { - @Override public String id() { + @Override + public String id() { return null; } - @Override public Metrics toHour() { + @Override + public Metrics toHour() { return null; } - @Override public Metrics toDay() { + @Override + public Metrics toDay() { return null; } - @Override public Metrics toMonth() { + @Override + public Metrics toMonth() { return null; } - @Override public void deserialize(RemoteData remoteData) { + @Override + public void deserialize(RemoteData remoteData) { } - @Override public RemoteData.Builder serialize() { + @Override + public RemoteData.Builder serialize() { return null; } - @Override public int remoteHashCode() { + @Override + public int remoteHashCode() { return 0; } } diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/IntKeyLongValueHashMapTestCase.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/IntKeyLongValueHashMapTestCase.java index 71a2123e946d..8d8a7da33eac 100644 --- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/IntKeyLongValueHashMapTestCase.java +++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/IntKeyLongValueHashMapTestCase.java @@ -17,11 +17,10 @@ package org.apache.skywalking.oap.server.core.analysis.metrics; -import org.junit.*; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; -/** - * @author peng-yongsheng - */ public class IntKeyLongValueHashMapTestCase { private IntKeyLongValueHashMap intKeyLongValueHashMap; diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/LongAvgMetricsTest.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/LongAvgMetricsTest.java index 91fdc0d57bc5..2fa7b31e025a 100644 --- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/LongAvgMetricsTest.java +++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/LongAvgMetricsTest.java @@ -22,9 +22,6 @@ import org.junit.Assert; import org.junit.Test; -/** - * @author wusheng - */ public class LongAvgMetricsTest { @Test public void testEntranceCombine() { @@ -54,31 +51,38 @@ public void testSelfCombine() { public class LongAvgMetricsImpl extends LongAvgMetrics { - @Override public String id() { + @Override + public String id() { return null; } - @Override public Metrics toHour() { + @Override + public Metrics toHour() { return null; } - @Override public Metrics toDay() { + @Override + public Metrics toDay() { return null; } - @Override public Metrics toMonth() { + @Override + public Metrics toMonth() { return null; } - @Override public void deserialize(RemoteData remoteData) { + @Override + public void deserialize(RemoteData remoteData) { } - @Override public RemoteData.Builder serialize() { + @Override + public RemoteData.Builder serialize() { return null; } - @Override public int remoteHashCode() { + @Override + public int remoteHashCode() { return 0; } } diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/MaxLongMetricsTest.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/MaxLongMetricsTest.java index 4244687c8f3e..7bd471ada1c7 100644 --- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/MaxLongMetricsTest.java +++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/MaxLongMetricsTest.java @@ -23,7 +23,7 @@ import org.junit.Test; /** - * @author liuhaoyang + * **/ public class MaxLongMetricsTest { @@ -53,31 +53,38 @@ public void testSelfCombine() { public class MaxLongMetricsImpl extends MaxLongMetrics { - @Override public String id() { + @Override + public String id() { return null; } - @Override public Metrics toHour() { + @Override + public Metrics toHour() { return null; } - @Override public Metrics toDay() { + @Override + public Metrics toDay() { return null; } - @Override public Metrics toMonth() { + @Override + public Metrics toMonth() { return null; } - @Override public int remoteHashCode() { + @Override + public int remoteHashCode() { return 0; } - @Override public void deserialize(RemoteData remoteData) { + @Override + public void deserialize(RemoteData remoteData) { } - @Override public RemoteData.Builder serialize() { + @Override + public RemoteData.Builder serialize() { return null; } } diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/MetricsTest.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/MetricsTest.java index 1986f01b4899..31b2dd530def 100644 --- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/MetricsTest.java +++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/MetricsTest.java @@ -22,9 +22,6 @@ import org.junit.Assert; import org.junit.Test; -/** - * @author wusheng - */ public class MetricsTest { @Test public void testTransferToTimeBucket() { @@ -82,39 +79,48 @@ public void testIllegalTransferToTimeBucket() { public class MetricsMocker extends Metrics { - @Override public String id() { + @Override + public String id() { return null; } - @Override public void combine(Metrics metrics) { + @Override + public void combine(Metrics metrics) { } - @Override public void calculate() { + @Override + public void calculate() { } - @Override public Metrics toHour() { + @Override + public Metrics toHour() { return null; } - @Override public Metrics toDay() { + @Override + public Metrics toDay() { return null; } - @Override public Metrics toMonth() { + @Override + public Metrics toMonth() { return null; } - @Override public void deserialize(RemoteData remoteData) { + @Override + public void deserialize(RemoteData remoteData) { } - @Override public RemoteData.Builder serialize() { + @Override + public RemoteData.Builder serialize() { return null; } - @Override public int remoteHashCode() { + @Override + public int remoteHashCode() { return 0; } } diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/MinLongMetricsTest.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/MinLongMetricsTest.java index b656464d8356..9af12355de65 100644 --- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/MinLongMetricsTest.java +++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/MinLongMetricsTest.java @@ -22,10 +22,6 @@ import org.junit.Assert; import org.junit.Test; -/** - * @author jian.tan - */ - public class MinLongMetricsTest { @Test @@ -62,31 +58,38 @@ public void testSelfCombine() { public class MinLongMetricsImpl extends MinLongMetrics { - @Override public String id() { + @Override + public String id() { return null; } - @Override public Metrics toHour() { + @Override + public Metrics toHour() { return null; } - @Override public Metrics toDay() { + @Override + public Metrics toDay() { return null; } - @Override public Metrics toMonth() { + @Override + public Metrics toMonth() { return null; } - @Override public int remoteHashCode() { + @Override + public int remoteHashCode() { return 0; } - @Override public void deserialize(RemoteData remoteData) { + @Override + public void deserialize(RemoteData remoteData) { } - @Override public RemoteData.Builder serialize() { + @Override + public RemoteData.Builder serialize() { return null; } } diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/PercentMetricsTest.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/PercentMetricsTest.java index 9e976dd10d3a..355ec92ce749 100644 --- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/PercentMetricsTest.java +++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/PercentMetricsTest.java @@ -23,25 +23,22 @@ import org.junit.Assert; import org.junit.Test; -/** - * @author wusheng - */ public class PercentMetricsTest { @Test public void testEntranceCombine() { PercentMetricsImpl impl = new PercentMetricsImpl(); - impl.combine(new EqualMatch().match(true,true)); - impl.combine(new EqualMatch().match(true,false)); - impl.combine(new EqualMatch().match(true,false)); + impl.combine(new EqualMatch().match(true, true)); + impl.combine(new EqualMatch().match(true, false)); + impl.combine(new EqualMatch().match(true, false)); impl.calculate(); Assert.assertEquals(3333, impl.getValue()); impl = new PercentMetricsImpl(); - impl.combine(new EqualMatch().match(true,true)); - impl.combine(new EqualMatch().match(true,true)); - impl.combine(new EqualMatch().match(true,false)); + impl.combine(new EqualMatch().match(true, true)); + impl.combine(new EqualMatch().match(true, true)); + impl.combine(new EqualMatch().match(true, false)); impl.calculate(); @@ -51,14 +48,14 @@ public void testEntranceCombine() { @Test public void testSelfCombine() { PercentMetricsImpl impl = new PercentMetricsImpl(); - impl.combine(new EqualMatch().match(true,true)); - impl.combine(new EqualMatch().match(true,false)); - impl.combine(new EqualMatch().match(true,false)); + impl.combine(new EqualMatch().match(true, true)); + impl.combine(new EqualMatch().match(true, false)); + impl.combine(new EqualMatch().match(true, false)); PercentMetricsImpl impl2 = new PercentMetricsImpl(); - impl2.combine(new EqualMatch().match(true,true)); - impl2.combine(new EqualMatch().match(true,true)); - impl2.combine(new EqualMatch().match(true,false)); + impl2.combine(new EqualMatch().match(true, true)); + impl2.combine(new EqualMatch().match(true, true)); + impl2.combine(new EqualMatch().match(true, false)); impl.combine(impl2); @@ -69,31 +66,38 @@ public void testSelfCombine() { public class PercentMetricsImpl extends PercentMetrics { - @Override public String id() { + @Override + public String id() { return null; } - @Override public Metrics toHour() { + @Override + public Metrics toHour() { return null; } - @Override public Metrics toDay() { + @Override + public Metrics toDay() { return null; } - @Override public Metrics toMonth() { + @Override + public Metrics toMonth() { return null; } - @Override public void deserialize(RemoteData remoteData) { + @Override + public void deserialize(RemoteData remoteData) { } - @Override public RemoteData.Builder serialize() { + @Override + public RemoteData.Builder serialize() { return null; } - @Override public int remoteHashCode() { + @Override + public int remoteHashCode() { return 0; } } diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/PercentileMetricsTest.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/PercentileMetricsTest.java index 917842aebe80..e330206afcef 100644 --- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/PercentileMetricsTest.java +++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/PercentileMetricsTest.java @@ -22,11 +22,8 @@ import org.junit.Assert; import org.junit.Test; -/** - * @author wusheng - */ public class PercentileMetricsTest { - private int precision = 10;//ms + private int precision = 10; //ms @Test public void percentileTest() { @@ -46,7 +43,13 @@ public void percentileTest() { metricsMocker.calculate(); - Assert.assertArrayEquals(new int[] {70, 90, 90, 90, 110}, metricsMocker.getValues()); + Assert.assertArrayEquals(new int[] { + 70, + 90, + 90, + 90, + 110 + }, metricsMocker.getValues()); } @Test @@ -67,7 +70,13 @@ public void percentileTest2() { metricsMocker.calculate(); - Assert.assertArrayEquals(new int[] {90, 90, 90, 90, 90}, metricsMocker.getValues()); + Assert.assertArrayEquals(new int[] { + 90, + 90, + 90, + 90, + 90 + }, metricsMocker.getValues()); } @Test @@ -79,7 +88,13 @@ public void percentileTest3() { metricsMocker.calculate(); - Assert.assertArrayEquals(new int[] {90, 110, 110, 110, 110}, metricsMocker.getValues()); + Assert.assertArrayEquals(new int[] { + 90, + 110, + 110, + 110, + 110 + }, metricsMocker.getValues()); } @Test @@ -91,36 +106,49 @@ public void percentileTest4() { metricsMocker.calculate(); - Assert.assertArrayEquals(new int[] {0, 0, 0, 0, 0}, metricsMocker.getValues()); + Assert.assertArrayEquals(new int[] { + 0, + 0, + 0, + 0, + 0 + }, metricsMocker.getValues()); } public class PercentileMetricsMocker extends PercentileMetrics { - @Override public String id() { + @Override + public String id() { return null; } - @Override public Metrics toHour() { + @Override + public Metrics toHour() { return null; } - @Override public Metrics toDay() { + @Override + public Metrics toDay() { return null; } - @Override public Metrics toMonth() { + @Override + public Metrics toMonth() { return null; } - @Override public int remoteHashCode() { + @Override + public int remoteHashCode() { return 0; } - @Override public void deserialize(RemoteData remoteData) { + @Override + public void deserialize(RemoteData remoteData) { } - @Override public RemoteData.Builder serialize() { + @Override + public RemoteData.Builder serialize() { return null; } } diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/PxxMetricsTest.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/PxxMetricsTest.java index 2324660e6648..4034676ead92 100644 --- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/PxxMetricsTest.java +++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/PxxMetricsTest.java @@ -22,11 +22,8 @@ import org.junit.Assert; import org.junit.Test; -/** - * @author wusheng - */ public class PxxMetricsTest { - private int precision = 10;//ms + private int precision = 10; //ms @Test public void p99Test() { @@ -99,31 +96,38 @@ public PxxMetricsMocker(int percentileRank) { super(percentileRank); } - @Override public String id() { + @Override + public String id() { return null; } - @Override public Metrics toHour() { + @Override + public Metrics toHour() { return null; } - @Override public Metrics toDay() { + @Override + public Metrics toDay() { return null; } - @Override public Metrics toMonth() { + @Override + public Metrics toMonth() { return null; } - @Override public void deserialize(RemoteData remoteData) { + @Override + public void deserialize(RemoteData remoteData) { } - @Override public RemoteData.Builder serialize() { + @Override + public RemoteData.Builder serialize() { return null; } - @Override public int remoteHashCode() { + @Override + public int remoteHashCode() { return 0; } } diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/ThermodynamicMetricsTest.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/ThermodynamicMetricsTest.java index bce19379677a..10697f233909 100644 --- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/ThermodynamicMetricsTest.java +++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/ThermodynamicMetricsTest.java @@ -20,14 +20,12 @@ import java.util.Map; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -/** - * @author wusheng - */ public class ThermodynamicMetricsTest { - private int step = 10;//ms - private int maxNumOfSteps = 10;//count + private int step = 10; //ms + private int maxNumOfSteps = 10; //count @Test public void testEntrance() { @@ -90,31 +88,38 @@ public void testMerge() { public class ThermodynamicMetricsMocker extends ThermodynamicMetrics { - @Override public String id() { + @Override + public String id() { return null; } - @Override public Metrics toHour() { + @Override + public Metrics toHour() { return null; } - @Override public Metrics toDay() { + @Override + public Metrics toDay() { return null; } - @Override public Metrics toMonth() { + @Override + public Metrics toMonth() { return null; } - @Override public void deserialize(RemoteData remoteData) { + @Override + public void deserialize(RemoteData remoteData) { } - @Override public RemoteData.Builder serialize() { + @Override + public RemoteData.Builder serialize() { return null; } - @Override public int remoteHashCode() { + @Override + public int remoteHashCode() { return 0; } } diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/EqualMatchTest.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/EqualMatchTest.java index e288d2543eb2..b0ccf85ca7c2 100644 --- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/EqualMatchTest.java +++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/EqualMatchTest.java @@ -20,11 +20,8 @@ import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertTrue; -/** - * @author kezhenxu94 - */ public class EqualMatchTest { @Test diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/config/ComponentLibraryCatalogFileTest.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/config/ComponentLibraryCatalogFileTest.java index 0c73715ae5ba..8b656bedeb09 100644 --- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/config/ComponentLibraryCatalogFileTest.java +++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/config/ComponentLibraryCatalogFileTest.java @@ -21,9 +21,6 @@ import org.junit.Assert; import org.junit.Test; -/** - * @author wusheng - */ public class ComponentLibraryCatalogFileTest { @Test public void testInitAndSettings() { diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/profile/analyze/ProfileStackAnalyze.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/profile/analyze/ProfileStackAnalyze.java index ea4c8b7134ba..e1e850f9e82e 100644 --- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/profile/analyze/ProfileStackAnalyze.java +++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/profile/analyze/ProfileStackAnalyze.java @@ -15,14 +15,15 @@ * limitations under the License. * */ + package org.apache.skywalking.oap.server.core.profile.analyze; +import java.util.List; import lombok.Data; import org.apache.skywalking.oap.server.core.query.entity.ProfileStackTree; -import java.util.List; - -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; @Data public class ProfileStackAnalyze { diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/profile/analyze/ProfileStackAnalyzeHolder.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/profile/analyze/ProfileStackAnalyzeHolder.java index 10cfc45c98bc..b2739e323970 100644 --- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/profile/analyze/ProfileStackAnalyzeHolder.java +++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/profile/analyze/ProfileStackAnalyzeHolder.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.oap.server.core.profile.analyze; import lombok.Data; diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/profile/analyze/ProfileStackData.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/profile/analyze/ProfileStackData.java index 9b88332cb444..9d935b9b3a23 100644 --- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/profile/analyze/ProfileStackData.java +++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/profile/analyze/ProfileStackData.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.oap.server.core.profile.analyze; import com.google.common.base.Splitter; diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/profile/analyze/ProfileStackElementMatcher.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/profile/analyze/ProfileStackElementMatcher.java index a6b1850c3549..696037f8b9b8 100644 --- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/profile/analyze/ProfileStackElementMatcher.java +++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/profile/analyze/ProfileStackElementMatcher.java @@ -15,13 +15,8 @@ * limitations under the License. * */ -package org.apache.skywalking.oap.server.core.profile.analyze; -import lombok.Data; -import org.apache.skywalking.oap.server.core.query.entity.ProfileStackElement; -import org.apache.skywalking.oap.server.core.query.entity.ProfileStackTree; -import org.apache.skywalking.oap.server.library.util.CollectionUtils; -import org.junit.Assert; +package org.apache.skywalking.oap.server.core.profile.analyze; import java.util.Collections; import java.util.Comparator; @@ -29,8 +24,13 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; +import lombok.Data; +import org.apache.skywalking.oap.server.core.query.entity.ProfileStackElement; +import org.apache.skywalking.oap.server.core.query.entity.ProfileStackTree; +import org.apache.skywalking.oap.server.library.util.CollectionUtils; +import org.junit.Assert; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; @Data public class ProfileStackElementMatcher { @@ -66,7 +66,7 @@ private void assertChildren(ProfileStackTree tree, ProfileStackElement parent) { // children code signature not sorted, need sort it, then verify Collections.sort(children, Comparator.comparing(c -> c.code)); - Collections.sort(analyzedChildren, Comparator.comparing(c -> c.getCodeSignature())); + Collections.sort(analyzedChildren, Comparator.comparing(ProfileStackElement::getCodeSignature)); for (int i = 0; i < children.size(); i++) { children.get(i).setId(analyzedChildren.get(i).getId()); diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/remote/RemoteServiceHandlerTestCase.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/remote/RemoteServiceHandlerTestCase.java index e029456e2115..f5ccab8a4e67 100644 --- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/remote/RemoteServiceHandlerTestCase.java +++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/remote/RemoteServiceHandlerTestCase.java @@ -18,25 +18,38 @@ package org.apache.skywalking.oap.server.core.remote; -import io.grpc.inprocess.*; +import io.grpc.inprocess.InProcessChannelBuilder; +import io.grpc.inprocess.InProcessServerBuilder; import io.grpc.stub.StreamObserver; import io.grpc.testing.GrpcCleanupRule; import java.io.IOException; import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.remote.data.StreamData; -import org.apache.skywalking.oap.server.core.remote.grpc.proto.*; -import org.apache.skywalking.oap.server.core.worker.*; -import org.apache.skywalking.oap.server.library.module.*; +import org.apache.skywalking.oap.server.core.remote.grpc.proto.Empty; +import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; +import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteMessage; +import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteServiceGrpc; +import org.apache.skywalking.oap.server.core.worker.AbstractWorker; +import org.apache.skywalking.oap.server.core.worker.IWorkerInstanceGetter; +import org.apache.skywalking.oap.server.core.worker.IWorkerInstanceSetter; +import org.apache.skywalking.oap.server.core.worker.WorkerInstancesService; +import org.apache.skywalking.oap.server.library.module.DuplicateProviderException; +import org.apache.skywalking.oap.server.library.module.ModuleDefineHolder; +import org.apache.skywalking.oap.server.library.module.ProviderNotFoundException; import org.apache.skywalking.oap.server.telemetry.TelemetryModule; -import org.apache.skywalking.oap.server.telemetry.api.*; -import org.apache.skywalking.oap.server.testing.module.*; -import org.junit.*; +import org.apache.skywalking.oap.server.telemetry.api.CounterMetrics; +import org.apache.skywalking.oap.server.telemetry.api.HistogramMetrics; +import org.apache.skywalking.oap.server.telemetry.api.MetricsCreator; +import org.apache.skywalking.oap.server.testing.module.ModuleDefineTesting; +import org.apache.skywalking.oap.server.testing.module.ModuleManagerTesting; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; + +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; -import static org.mockito.Mockito.*; - -/** - * @author peng-yongsheng - */ public class RemoteServiceHandlerTestCase { @Rule @@ -60,20 +73,24 @@ public void callTest() throws DuplicateProviderException, ProviderNotFoundExcept String serverName = InProcessServerBuilder.generateName(); MetricsCreator metricsCreator = mock(MetricsCreator.class); when(metricsCreator.createCounter(any(), any(), any(), any())).thenReturn(new CounterMetrics() { - @Override public void inc() { + @Override + public void inc() { } - @Override public void inc(double value) { + @Override + public void inc(double value) { } }); when(metricsCreator.createHistogramMetric(any(), any(), any(), any())).thenReturn(new HistogramMetrics() { - @Override public Timer createTimer() { + @Override + public Timer createTimer() { return super.createTimer(); } - @Override public void observe(double value) { + @Override + public void observe(double value) { } }); @@ -82,22 +99,30 @@ public void callTest() throws DuplicateProviderException, ProviderNotFoundExcept moduleManager.put(TelemetryModule.NAME, telemetryModuleDefine); telemetryModuleDefine.provider().registerServiceImplementation(MetricsCreator.class, metricsCreator); - gRPCCleanup.register(InProcessServerBuilder - .forName(serverName).directExecutor().addService(new RemoteServiceHandler(moduleManager)).build().start()); + gRPCCleanup.register(InProcessServerBuilder.forName(serverName) + .directExecutor() + .addService(new RemoteServiceHandler(moduleManager)) + .build() + .start()); - RemoteServiceGrpc.RemoteServiceStub remoteServiceStub = RemoteServiceGrpc.newStub( - gRPCCleanup.register(InProcessChannelBuilder.forName(serverName).directExecutor().build())); + RemoteServiceGrpc.RemoteServiceStub remoteServiceStub = RemoteServiceGrpc.newStub(gRPCCleanup.register(InProcessChannelBuilder + .forName(serverName) + .directExecutor() + .build())); StreamObserver streamObserver = remoteServiceStub.call(new StreamObserver() { - @Override public void onNext(Empty empty) { + @Override + public void onNext(Empty empty) { } - @Override public void onError(Throwable throwable) { + @Override + public void onError(Throwable throwable) { } - @Override public void onCompleted() { + @Override + public void onCompleted() { } }); @@ -124,11 +149,13 @@ static class TestRemoteData extends StreamData { private long long1; private long long2; - @Override public int remoteHashCode() { + @Override + public int remoteHashCode() { return 10; } - @Override public void deserialize(RemoteData remoteData) { + @Override + public void deserialize(RemoteData remoteData) { str1 = remoteData.getDataStrings(0); str2 = remoteData.getDataStrings(1); long1 = remoteData.getDataLongs(0); @@ -140,7 +167,8 @@ static class TestRemoteData extends StreamData { Assert.assertEquals(20, long2); } - @Override public RemoteData.Builder serialize() { + @Override + public RemoteData.Builder serialize() { return null; } } @@ -151,8 +179,9 @@ public TestWorker(ModuleDefineHolder moduleDefineHolder) { super(moduleDefineHolder); } - @Override public void in(Object o) { - TestRemoteData data = (TestRemoteData)o; + @Override + public void in(Object o) { + TestRemoteData data = (TestRemoteData) o; Assert.assertEquals("test1", data.str1); Assert.assertEquals("test2", data.str2); diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/remote/client/GRPCRemoteClientRealClient.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/remote/client/GRPCRemoteClientRealClient.java index bdc53fbb8afd..5793189a983e 100644 --- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/remote/client/GRPCRemoteClientRealClient.java +++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/remote/client/GRPCRemoteClientRealClient.java @@ -35,9 +35,6 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; -/** - * @author peng-yongsheng - */ public class GRPCRemoteClientRealClient { public static void main(String[] args) throws InterruptedException { @@ -45,11 +42,13 @@ public static void main(String[] args) throws InterruptedException { ModuleManagerTesting moduleManager = new ModuleManagerTesting(); MetricsCreator metricsCreator = mock(MetricsCreator.class); when(metricsCreator.createCounter(any(), any(), any(), any())).thenReturn(new CounterMetrics() { - @Override public void inc() { + @Override + public void inc() { } - @Override public void inc(double value) { + @Override + public void inc(double value) { } }); @@ -72,15 +71,18 @@ public static class TestStreamData extends StreamData { private long value; - @Override public int remoteHashCode() { + @Override + public int remoteHashCode() { return 0; } - @Override public void deserialize(RemoteData remoteData) { + @Override + public void deserialize(RemoteData remoteData) { this.value = remoteData.getDataLongs(0); } - @Override public RemoteData.Builder serialize() { + @Override + public RemoteData.Builder serialize() { RemoteData.Builder builder = RemoteData.newBuilder(); builder.addDataLongs(987); return builder; @@ -93,8 +95,9 @@ public TestWorker(ModuleDefineHolder moduleDefineHolder) { super(moduleDefineHolder); } - @Override public void in(Object o) { - TestStreamData streamData = (TestStreamData)o; + @Override + public void in(Object o) { + TestStreamData streamData = (TestStreamData) o; Assert.assertEquals(987, streamData.value); } } diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/remote/client/GRPCRemoteClientRealServer.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/remote/client/GRPCRemoteClientRealServer.java index a0c2113af745..85465061d05b 100644 --- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/remote/client/GRPCRemoteClientRealServer.java +++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/remote/client/GRPCRemoteClientRealServer.java @@ -26,9 +26,6 @@ import org.apache.skywalking.oap.server.testing.module.ModuleDefineTesting; import org.apache.skywalking.oap.server.testing.module.ModuleManagerTesting; -/** - * @author peng-yongsheng - */ public class GRPCRemoteClientRealServer { public static void main(String[] args) throws ServerException, InterruptedException { diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/remote/client/GRPCRemoteClientTestCase.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/remote/client/GRPCRemoteClientTestCase.java index b0a3e6ee817d..8b7a58010998 100644 --- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/remote/client/GRPCRemoteClientTestCase.java +++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/remote/client/GRPCRemoteClientTestCase.java @@ -24,23 +24,34 @@ import org.apache.skywalking.oap.server.core.remote.RemoteServiceHandler; import org.apache.skywalking.oap.server.core.remote.data.StreamData; import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData; -import org.apache.skywalking.oap.server.core.worker.*; +import org.apache.skywalking.oap.server.core.worker.AbstractWorker; +import org.apache.skywalking.oap.server.core.worker.IWorkerInstanceGetter; +import org.apache.skywalking.oap.server.core.worker.IWorkerInstanceSetter; +import org.apache.skywalking.oap.server.core.worker.WorkerInstancesService; import org.apache.skywalking.oap.server.library.module.ModuleDefineHolder; import org.apache.skywalking.oap.server.telemetry.TelemetryModule; -import org.apache.skywalking.oap.server.telemetry.api.*; -import org.apache.skywalking.oap.server.testing.module.*; -import org.junit.*; +import org.apache.skywalking.oap.server.telemetry.api.CounterMetrics; +import org.apache.skywalking.oap.server.telemetry.api.HistogramMetrics; +import org.apache.skywalking.oap.server.telemetry.api.MetricsCreator; +import org.apache.skywalking.oap.server.testing.module.ModuleDefineTesting; +import org.apache.skywalking.oap.server.testing.module.ModuleManagerTesting; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; -import static org.mockito.Mockito.*; - -/** - * @author peng-yongsheng - */ public class GRPCRemoteClientTestCase { private final String nextWorkerName = "mock-worker"; private ModuleManagerTesting moduleManager; - @Rule public final GrpcServerRule grpcServerRule = new GrpcServerRule().directExecutor(); + @Rule + public final GrpcServerRule grpcServerRule = new GrpcServerRule().directExecutor(); @Before public void before() { @@ -60,21 +71,25 @@ public void before() { public void testPush() throws InterruptedException { MetricsCreator metricsCreator = mock(MetricsCreator.class); when(metricsCreator.createCounter(any(), any(), any(), any())).thenReturn(new CounterMetrics() { - @Override public void inc() { + @Override + public void inc() { } - @Override public void inc(double value) { + @Override + public void inc(double value) { } }); when(metricsCreator.createHistogramMetric(any(), any(), any(), any())).thenReturn(new HistogramMetrics() { - @Override public Timer createTimer() { + @Override + public Timer createTimer() { return super.createTimer(); } - @Override public void observe(double value) { + @Override + public void observe(double value) { } }); @@ -102,15 +117,18 @@ public static class TestStreamData extends StreamData { private long value; - @Override public int remoteHashCode() { + @Override + public int remoteHashCode() { return 0; } - @Override public void deserialize(RemoteData remoteData) { + @Override + public void deserialize(RemoteData remoteData) { this.value = remoteData.getDataLongs(0); } - @Override public RemoteData.Builder serialize() { + @Override + public RemoteData.Builder serialize() { RemoteData.Builder builder = RemoteData.newBuilder(); builder.addDataLongs(987); return builder; @@ -123,8 +141,9 @@ public TestWorker(ModuleDefineHolder moduleDefineHolder) { super(moduleDefineHolder); } - @Override public void in(Object o) { - TestStreamData streamData = (TestStreamData)o; + @Override + public void in(Object o) { + TestStreamData streamData = (TestStreamData) o; Assert.assertEquals(987, streamData.value); } } diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/remote/client/RemoteClientManagerTestCase.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/remote/client/RemoteClientManagerTestCase.java index 8c825538d783..996286a72b89 100644 --- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/remote/client/RemoteClientManagerTestCase.java +++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/remote/client/RemoteClientManagerTestCase.java @@ -18,6 +18,13 @@ package org.apache.skywalking.oap.server.core.remote.client; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.BrokenBarrierException; +import java.util.concurrent.CyclicBarrier; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; import lombok.extern.slf4j.Slf4j; import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.cluster.ClusterModule; @@ -33,19 +40,12 @@ import org.junit.Test; import org.mockito.internal.verification.AtLeast; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.BrokenBarrierException; -import java.util.concurrent.CyclicBarrier; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; - -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; -/** - * @author peng-yongsheng - */ @Slf4j public class RemoteClientManagerTestCase { @@ -64,26 +64,30 @@ public void setup() { this.clusterNodesQuery = mock(ClusterNodesQuery.class); clusterModuleDefine.provider().registerServiceImplementation(ClusterNodesQuery.class, clusterNodesQuery); - MetricsCreator metricsCreator = mock(MetricsCreator.class); when(metricsCreator.createGauge(any(), any(), any(), any())).thenReturn(new GaugeMetrics() { - @Override public void inc() { + @Override + public void inc() { } - @Override public void inc(double value) { + @Override + public void inc(double value) { } - @Override public void dec() { + @Override + public void dec() { } - @Override public void dec(double value) { + @Override + public void dec(double value) { } - @Override public void setValue(double value) { + @Override + public void setValue(double value) { } }); @@ -207,7 +211,6 @@ public void testCompare() { List groupOneRemoteClients = clientManager.getRemoteClient(); - when(clusterNodesQuery.queryRemoteNodes()).thenReturn(groupOneInstances()); clientManager.refresh(); @@ -230,7 +233,6 @@ public void testUnChangeRefresh() { List newGroupOneRemoteClients = clientManager.getRemoteClient(); - Assert.assertEquals(groupOneRemoteClients.get(0).getAddress(), newGroupOneRemoteClients.get(0).getAddress()); Assert.assertEquals(newGroupOneRemoteClients.get(3).getAddress().getHost(), "host4"); } diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/storage/StorageInstallerTestCase.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/storage/StorageInstallerTestCase.java index 6cfcd3755d16..b96571b435a0 100644 --- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/storage/StorageInstallerTestCase.java +++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/storage/StorageInstallerTestCase.java @@ -29,9 +29,6 @@ import org.mockito.Mockito; import org.powermock.reflect.Whitebox; -/** - * @author peng-yongsheng - */ public class StorageInstallerTestCase { @Test @@ -44,10 +41,10 @@ public void testInstall() throws StorageException, ServiceNotProvidedException { Mockito.when(moduleManager.find(CoreModule.NAME)).thenReturn(moduleDefine); -// streamDataMapping.generate(); + // streamDataMapping.generate(); -// TestStorageInstaller installer = new TestStorageInstaller(moduleManager); -// installer.install(null); + // TestStorageInstaller installer = new TestStorageInstaller(moduleManager); + // installer.install(null); } class TestStorageInstaller extends ModelInstaller { @@ -56,11 +53,13 @@ public TestStorageInstaller(ModuleManager moduleManager) { super(moduleManager); } - @Override protected boolean isExists(Client client, Model tableDefine) throws StorageException { + @Override + protected boolean isExists(Client client, Model tableDefine) throws StorageException { return false; } - @Override protected void createTable(Client client, Model tableDefine) throws StorageException { + @Override + protected void createTable(Client client, Model tableDefine) throws StorageException { } } diff --git a/oap-server/server-library/library-buffer/pom.xml b/oap-server/server-library/library-buffer/pom.xml index b4d5e3b48b60..8c35572bfc23 100644 --- a/oap-server/server-library/library-buffer/pom.xml +++ b/oap-server/server-library/library-buffer/pom.xml @@ -17,7 +17,8 @@ ~ --> - + server-library org.apache.skywalking diff --git a/oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/BufferData.java b/oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/BufferData.java index 6feef6b0d658..4e9b4c7e79bd 100644 --- a/oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/BufferData.java +++ b/oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/BufferData.java @@ -23,13 +23,11 @@ import lombok.Setter; import org.apache.skywalking.apm.network.language.agent.v2.SegmentObject; -/** - * @author peng-yongsheng - */ @Getter public class BufferData { private MESSAGE_TYPE messageType; - @Setter private SegmentObject v2Segment; + @Setter + private SegmentObject v2Segment; public BufferData(MESSAGE_TYPE messageType) { this.messageType = messageType; diff --git a/oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/BufferDataCollection.java b/oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/BufferDataCollection.java index 89e48461c811..83f3da1e0ac0 100644 --- a/oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/BufferDataCollection.java +++ b/oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/BufferDataCollection.java @@ -19,12 +19,10 @@ package org.apache.skywalking.oap.server.library.buffer; import com.google.protobuf.GeneratedMessageV3; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -/** - * @author peng-yongsheng - */ public class BufferDataCollection { private AtomicInteger index = new AtomicInteger(0); diff --git a/oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/BufferFileUtils.java b/oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/BufferFileUtils.java index e27d688690a2..206d22fae004 100644 --- a/oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/BufferFileUtils.java +++ b/oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/BufferFileUtils.java @@ -21,10 +21,8 @@ import java.util.Arrays; /** - * This class is a util for sort or build file name for the gRPC streaming data. - * Sort the files by the created time in order to read the data file sequential. - * - * @author peng-yongsheng + * This class is a util for sort or build file name for the gRPC streaming data. Sort the files by the created time in + * order to read the data file sequential. */ class BufferFileUtils { @@ -42,7 +40,7 @@ static void sort(String[] fileList) { long t1 = Long.parseLong(f1.substring(0, f1.length() - 3).split(SEPARATOR)[1]); long t2 = Long.parseLong(f2.substring(0, f2.length() - 3).split(SEPARATOR)[1]); - return (int)(t1 - t2); + return (int) (t1 - t2); }); } diff --git a/oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/BufferStream.java b/oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/BufferStream.java index eeae8ccbd415..eb06839033fe 100644 --- a/oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/BufferStream.java +++ b/oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/BufferStream.java @@ -18,15 +18,17 @@ package org.apache.skywalking.oap.server.library.buffer; -import com.google.protobuf.*; -import java.io.*; +import com.google.protobuf.AbstractMessageLite; +import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.Parser; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; import java.nio.channels.FileLock; import org.apache.commons.io.FileUtils; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng - */ public class BufferStream { private static final Logger logger = LoggerFactory.getLogger(BufferStream.class); @@ -78,7 +80,8 @@ private void tryLock(File directory) { } if (lock == null) { - throw new RuntimeException("The buffer directory is reading or writing by another thread, directory is: " + directory.getAbsolutePath()); + throw new RuntimeException("The buffer directory is reading or writing by another thread, directory is: " + directory + .getAbsolutePath()); } logger.info("Lock buffer directory successfully, directory is: " + directory.getAbsolutePath()); @@ -121,8 +124,7 @@ public Builder parser(Parser parser) { return this; } - public Builder callBack( - DataStreamReader.CallBack callBack) { + public Builder callBack(DataStreamReader.CallBack callBack) { this.callBack = callBack; return this; } diff --git a/oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/DataStream.java b/oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/DataStream.java index 54394d714fe8..d2ac97d0aa8b 100644 --- a/oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/DataStream.java +++ b/oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/DataStream.java @@ -18,24 +18,26 @@ package org.apache.skywalking.oap.server.library.buffer; -import com.google.protobuf.*; -import java.io.*; +import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.Parser; +import java.io.File; +import java.io.IOException; import lombok.Getter; import org.apache.commons.io.FileUtils; import org.apache.commons.io.filefilter.PrefixFileFilter; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng - */ class DataStream { private static final Logger logger = LoggerFactory.getLogger(DataStream.class); private final File directory; private final OffsetStream offsetStream; - @Getter private final DataStreamReader reader; - @Getter private final DataStreamWriter writer; + @Getter + private final DataStreamReader reader; + @Getter + private final DataStreamWriter writer; private boolean initialized = false; DataStream(File directory, int dataFileMaxSize, int offsetFileMaxSize, Parser parser, diff --git a/oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/DataStreamReader.java b/oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/DataStreamReader.java index 8f72c1e98816..bb9e14249ba4 100644 --- a/oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/DataStreamReader.java +++ b/oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/DataStreamReader.java @@ -18,18 +18,24 @@ package org.apache.skywalking.oap.server.library.buffer; -import com.google.protobuf.*; -import java.io.*; -import java.util.*; -import java.util.concurrent.*; +import com.google.protobuf.CodedOutputStream; +import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.Parser; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.List; +import java.util.Objects; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import org.apache.commons.io.FileUtils; import org.apache.commons.io.filefilter.PrefixFileFilter; -import org.apache.skywalking.apm.util.*; -import org.slf4j.*; +import org.apache.skywalking.apm.util.RunnableWithExceptionProtection; +import org.apache.skywalking.apm.util.StringUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng - */ public class DataStreamReader { private static final Logger logger = LoggerFactory.getLogger(DataStreamReader.class); @@ -55,9 +61,8 @@ public class DataStreamReader { void initialize() { preRead(); - Executors.newSingleThreadScheduledExecutor().scheduleWithFixedDelay( - new RunnableWithExceptionProtection(this::read, - t -> logger.error("Buffer data pre read failure.", t)), 3, 1, TimeUnit.SECONDS); + Executors.newSingleThreadScheduledExecutor() + .scheduleWithFixedDelay(new RunnableWithExceptionProtection(this::read, t -> logger.error("Buffer data pre read failure.", t)), 3, 1, TimeUnit.SECONDS); } private void preRead() { diff --git a/oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/DataStreamWriter.java b/oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/DataStreamWriter.java index d4d0c87c534c..021ed6cc96dc 100644 --- a/oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/DataStreamWriter.java +++ b/oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/DataStreamWriter.java @@ -18,15 +18,16 @@ package org.apache.skywalking.oap.server.library.buffer; -import com.google.protobuf.*; -import java.io.*; +import com.google.protobuf.AbstractMessageLite; +import com.google.protobuf.GeneratedMessageV3; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; import org.apache.commons.io.FileUtils; import org.apache.skywalking.apm.util.StringUtil; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng - */ class DataStreamWriter { private static final Logger logger = LoggerFactory.getLogger(DataStreamWriter.class); diff --git a/oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/Offset.java b/oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/Offset.java index 5119bb940431..488783a576c9 100644 --- a/oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/Offset.java +++ b/oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/Offset.java @@ -18,17 +18,17 @@ package org.apache.skywalking.oap.server.library.buffer; -import lombok.*; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.apm.util.StringUtil; -/** - * @author peng-yongsheng - */ class Offset { private static final String SPLIT_CHARACTER = ","; - @Getter private final ReadOffset readOffset; - @Getter private final WriteOffset writeOffset; + @Getter + private final ReadOffset readOffset; + @Getter + private final WriteOffset writeOffset; Offset() { writeOffset = new WriteOffset(); @@ -36,8 +36,8 @@ class Offset { } String serialize() { - return readOffset.getFileName() + SPLIT_CHARACTER + String.valueOf(readOffset.getOffset()) - + SPLIT_CHARACTER + writeOffset.getFileName() + SPLIT_CHARACTER + String.valueOf(writeOffset.getOffset()); + return readOffset.getFileName() + SPLIT_CHARACTER + String.valueOf(readOffset.getOffset()) + SPLIT_CHARACTER + writeOffset + .getFileName() + SPLIT_CHARACTER + String.valueOf(writeOffset.getOffset()); } void deserialize(String value) { @@ -53,8 +53,12 @@ void deserialize(String value) { } static class ReadOffset { - @Getter @Setter private String fileName; - @Getter @Setter private long offset = 0; + @Getter + @Setter + private String fileName; + @Getter + @Setter + private long offset = 0; private final WriteOffset writeOffset; private ReadOffset(WriteOffset writeOffset) { @@ -67,7 +71,11 @@ boolean isCurrentWriteFile() { } static class WriteOffset { - @Getter @Setter private String fileName; - @Getter @Setter private long offset = 0; + @Getter + @Setter + private String fileName; + @Getter + @Setter + private long offset = 0; } } diff --git a/oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/OffsetStream.java b/oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/OffsetStream.java index a20f7c9a6b04..c2fb63ede869 100644 --- a/oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/OffsetStream.java +++ b/oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/OffsetStream.java @@ -18,19 +18,22 @@ package org.apache.skywalking.oap.server.library.buffer; -import java.io.*; +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.OutputStream; import java.nio.charset.Charset; -import java.util.concurrent.*; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import lombok.Getter; -import org.apache.commons.io.*; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; import org.apache.commons.io.filefilter.PrefixFileFilter; import org.apache.commons.io.input.ReversedLinesFileReader; import org.apache.skywalking.apm.util.RunnableWithExceptionProtection; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng - */ class OffsetStream { private static final Logger logger = LoggerFactory.getLogger(OffsetStream.class); @@ -38,7 +41,8 @@ class OffsetStream { private final File directory; private final int offsetFileMaxSize; - @Getter private final Offset offset; + @Getter + private final Offset offset; private File offsetFile; private boolean initialized = false; private String lastOffsetRecord = ""; @@ -74,10 +78,8 @@ synchronized void initialize() throws IOException { offset.deserialize(readLastLine()); initialized = true; - Executors.newSingleThreadScheduledExecutor().scheduleAtFixedRate( - new RunnableWithExceptionProtection(this::flush, - t -> logger.error("Flush offset file in background failure.", t) - ), 2, 1, TimeUnit.SECONDS); + Executors.newSingleThreadScheduledExecutor() + .scheduleAtFixedRate(new RunnableWithExceptionProtection(this::flush, t -> logger.error("Flush offset file in background failure.", t)), 2, 1, TimeUnit.SECONDS); } } diff --git a/oap-server/server-library/library-buffer/src/test/java/org/apache/skywalking/oap/server/library/buffer/BufferFileUtilsTestCase.java b/oap-server/server-library/library-buffer/src/test/java/org/apache/skywalking/oap/server/library/buffer/BufferFileUtilsTestCase.java index 3eb69b11e270..6a4726a3e985 100644 --- a/oap-server/server-library/library-buffer/src/test/java/org/apache/skywalking/oap/server/library/buffer/BufferFileUtilsTestCase.java +++ b/oap-server/server-library/library-buffer/src/test/java/org/apache/skywalking/oap/server/library/buffer/BufferFileUtilsTestCase.java @@ -18,12 +18,11 @@ package org.apache.skywalking.oap.server.library.buffer; -import java.util.*; -import org.junit.*; +import java.util.ArrayList; +import java.util.List; +import org.junit.Assert; +import org.junit.Test; -/** - * @author peng-yongsheng - */ public class BufferFileUtilsTestCase { @Test diff --git a/oap-server/server-library/library-client/pom.xml b/oap-server/server-library/library-client/pom.xml index 40a2eb8386cf..4b52c603f746 100755 --- a/oap-server/server-library/library-client/pom.xml +++ b/oap-server/server-library/library-client/pom.xml @@ -17,7 +17,8 @@ ~ --> - + server-library org.apache.skywalking diff --git a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/Client.java b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/Client.java index bf7f399f2785..957c59536ae3 100644 --- a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/Client.java +++ b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/Client.java @@ -20,9 +20,6 @@ import java.io.IOException; -/** - * @author peng-yongsheng - */ public interface Client { void connect() throws Exception; diff --git a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/ClientException.java b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/ClientException.java index bd0c3a6a8659..6374b9f346a4 100644 --- a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/ClientException.java +++ b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/ClientException.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.library.client; -/** - * @author peng-yongsheng - */ public abstract class ClientException extends Exception { public ClientException(String message) { super(message); diff --git a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java index 4fde4f8078b1..01abbeb52289 100644 --- a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java +++ b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java @@ -86,9 +86,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng - */ public class ElasticSearchClient implements Client { private static final Logger logger = LoggerFactory.getLogger(ElasticSearchClient.class); @@ -121,7 +118,8 @@ public void connect() throws IOException, KeyStoreException, NoSuchAlgorithmExce client.ping(); } - protected RestHighLevelClient createClient(final List pairsList) throws KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException, KeyManagementException { + protected RestHighLevelClient createClient( + final List pairsList) throws KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException, KeyManagementException { RestClientBuilder builder; if (StringUtil.isNotEmpty(user) && StringUtil.isNotEmpty(password)) { final CredentialsProvider credentialsProvider = new BasicCredentialsProvider(); @@ -129,17 +127,17 @@ protected RestHighLevelClient createClient(final List pairsList) throw if (StringUtil.isEmpty(trustStorePath)) { builder = RestClient.builder(pairsList.toArray(new HttpHost[0])) - .setHttpClientConfigCallback(httpClientBuilder -> httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider)); + .setHttpClientConfigCallback(httpClientBuilder -> httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider)); } else { KeyStore truststore = KeyStore.getInstance("jks"); try (InputStream is = Files.newInputStream(Paths.get(trustStorePath))) { truststore.load(is, trustStorePass.toCharArray()); } - SSLContextBuilder sslBuilder = SSLContexts.custom() - .loadTrustMaterial(truststore, null); + SSLContextBuilder sslBuilder = SSLContexts.custom().loadTrustMaterial(truststore, null); final SSLContext sslContext = sslBuilder.build(); builder = RestClient.builder(pairsList.toArray(new HttpHost[0])) - .setHttpClientConfigCallback(httpClientBuilder -> httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider).setSSLContext(sslContext)); + .setHttpClientConfigCallback(httpClientBuilder -> httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider) + .setSSLContext(sslContext)); } } else { builder = RestClient.builder(pairsList.toArray(new HttpHost[0])); @@ -148,7 +146,8 @@ protected RestHighLevelClient createClient(final List pairsList) throw return new RestHighLevelClient(builder); } - @Override public void shutdown() throws IOException { + @Override + public void shutdown() throws IOException { client.close(); } @@ -175,7 +174,8 @@ public boolean createIndex(String indexName) throws IOException { return response.isAcknowledged(); } - public boolean createIndex(String indexName, Map settings, Map mapping) throws IOException { + public boolean createIndex(String indexName, Map settings, + Map mapping) throws IOException { indexName = formatIndexName(indexName); CreateIndexRequest request = new CreateIndexRequest(indexName); Gson gson = new Gson(); @@ -253,7 +253,8 @@ public boolean isExistsTemplate(String indexName) throws IOException { } } - public boolean createTemplate(String indexName, Map settings, Map mapping) throws IOException { + public boolean createTemplate(String indexName, Map settings, + Map mapping) throws IOException { indexName = formatIndexName(indexName); String[] patterns = new String[] {indexName + "-*"}; @@ -269,14 +270,16 @@ public boolean createTemplate(String indexName, Map settings, Ma HttpEntity entity = new NStringEntity(new Gson().toJson(template), ContentType.APPLICATION_JSON); - Response response = client.getLowLevelClient().performRequest(HttpPut.METHOD_NAME, "/_template/" + indexName, Collections.emptyMap(), entity); + Response response = client.getLowLevelClient() + .performRequest(HttpPut.METHOD_NAME, "/_template/" + indexName, Collections.emptyMap(), entity); return response.getStatusLine().getStatusCode() == HttpStatus.SC_OK; } public boolean deleteTemplate(String indexName) throws IOException { indexName = formatIndexName(indexName); - Response response = client.getLowLevelClient().performRequest(HttpDelete.METHOD_NAME, "/_template/" + indexName); + Response response = client.getLowLevelClient() + .performRequest(HttpDelete.METHOD_NAME, "/_template/" + indexName); return response.getStatusLine().getStatusCode() == HttpStatus.SC_OK; } @@ -310,14 +313,14 @@ public void forceInsert(String indexName, String id, XContentBuilder source) thr } public void forceUpdate(String indexName, String id, XContentBuilder source, long version) throws IOException { - org.elasticsearch.action.update.UpdateRequest request = (org.elasticsearch.action.update.UpdateRequest) prepareUpdate(indexName, id, source); + org.elasticsearch.action.update.UpdateRequest request = (org.elasticsearch.action.update.UpdateRequest) prepareUpdate(indexName, id, source); request.version(version); request.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE); client.update(request); } public void forceUpdate(String indexName, String id, XContentBuilder source) throws IOException { - org.elasticsearch.action.update.UpdateRequest request = (org.elasticsearch.action.update.UpdateRequest) prepareUpdate(indexName, id, source); + org.elasticsearch.action.update.UpdateRequest request = (org.elasticsearch.action.update.UpdateRequest) prepareUpdate(indexName, id, source); request.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE); client.update(request); } @@ -335,17 +338,10 @@ public UpdateRequest prepareUpdate(String indexName, String id, XContentBuilder public int delete(String indexName, String timeBucketColumnName, long endTimeBucket) throws IOException { indexName = formatIndexName(indexName); Map params = Collections.singletonMap("conflicts", "proceed"); - String jsonString = "{" + - " \"query\": {" + - " \"range\": {" + - " \"" + timeBucketColumnName + "\": {" + - " \"lte\": " + endTimeBucket + - " }" + - " }" + - " }" + - "}"; + String jsonString = "{" + " \"query\": {" + " \"range\": {" + " \"" + timeBucketColumnName + "\": {" + " \"lte\": " + endTimeBucket + " }" + " }" + " }" + "}"; HttpEntity entity = new NStringEntity(jsonString, ContentType.APPLICATION_JSON); - Response response = client.getLowLevelClient().performRequest(HttpPost.METHOD_NAME, "/" + indexName + "/_delete_by_query", params, entity); + Response response = client.getLowLevelClient() + .performRequest(HttpPost.METHOD_NAME, "/" + indexName + "/_delete_by_query", params, entity); logger.debug("delete indexName: {}, jsonString : {}", indexName, jsonString); return response.getStatusLine().getStatusCode(); } @@ -367,35 +363,38 @@ public BulkProcessor createBulkProcessor(int bulkActions, int flushInterval, int BulkProcessor.Listener listener = createBulkListener(); return BulkProcessor.builder(client::bulkAsync, listener) - .setBulkActions(bulkActions) - .setFlushInterval(TimeValue.timeValueSeconds(flushInterval)) - .setConcurrentRequests(concurrentRequests) - .setBackoffPolicy(BackoffPolicy.exponentialBackoff(TimeValue.timeValueMillis(100), 3)) - .build(); + .setBulkActions(bulkActions) + .setFlushInterval(TimeValue.timeValueSeconds(flushInterval)) + .setConcurrentRequests(concurrentRequests) + .setBackoffPolicy(BackoffPolicy.exponentialBackoff(TimeValue.timeValueMillis(100), 3)) + .build(); } protected BulkProcessor.Listener createBulkListener() { return new BulkProcessor.Listener() { - @Override - public void beforeBulk(long executionId, BulkRequest request) { - int numberOfActions = request.numberOfActions(); - logger.debug("Executing bulk [{}] with {} requests", executionId, numberOfActions); - } + @Override + public void beforeBulk(long executionId, BulkRequest request) { + int numberOfActions = request.numberOfActions(); + logger.debug("Executing bulk [{}] with {} requests", executionId, numberOfActions); + } - @Override - public void afterBulk(long executionId, BulkRequest request, BulkResponse response) { - if (response.hasFailures()) { - logger.warn("Bulk [{}] executed with failures", executionId); - } else { - logger.info("Bulk execution id [{}] completed in {} milliseconds, size: {}", executionId, response.getTook().getMillis(), request.requests().size()); - } + @Override + public void afterBulk(long executionId, BulkRequest request, BulkResponse response) { + if (response.hasFailures()) { + logger.warn("Bulk [{}] executed with failures", executionId); + } else { + logger.info("Bulk execution id [{}] completed in {} milliseconds, size: {}", executionId, response.getTook() + .getMillis(), request + .requests() + .size()); } + } - @Override - public void afterBulk(long executionId, BulkRequest request, Throwable failure) { - logger.error("Failed to execute bulk", failure); - } - }; + @Override + public void afterBulk(long executionId, BulkRequest request, Throwable failure) { + logger.error("Failed to execute bulk", failure); + } + }; } public String formatIndexName(String indexName) { diff --git a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClientException.java b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClientException.java index bb71d07d5d7e..e6640f182887 100644 --- a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClientException.java +++ b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClientException.java @@ -20,9 +20,6 @@ import org.apache.skywalking.oap.server.library.client.ClientException; -/** - * @author peng-yongsheng - */ public class ElasticSearchClientException extends ClientException { public ElasticSearchClientException(String message) { diff --git a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchInsertRequest.java b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchInsertRequest.java index 19e974ce9e35..9c0655c1f090 100644 --- a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchInsertRequest.java +++ b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchInsertRequest.java @@ -21,16 +21,14 @@ import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.common.xcontent.XContentBuilder; -/** - * @author peng-yongsheng - */ public class ElasticSearchInsertRequest extends IndexRequest implements InsertRequest { public ElasticSearchInsertRequest(String index, String type, String id) { super(index, type, id); } - @Override public ElasticSearchInsertRequest source(XContentBuilder sourceBuilder) { + @Override + public ElasticSearchInsertRequest source(XContentBuilder sourceBuilder) { super.source(sourceBuilder); return this; } diff --git a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchUpdateRequest.java b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchUpdateRequest.java index 9429d93d8d7f..266385628747 100644 --- a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchUpdateRequest.java +++ b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchUpdateRequest.java @@ -20,16 +20,14 @@ import org.elasticsearch.action.update.UpdateRequest; import org.elasticsearch.common.xcontent.XContentBuilder; -/** - * @author peng-yongsheng - */ public class ElasticSearchUpdateRequest extends UpdateRequest implements org.apache.skywalking.oap.server.library.client.request.UpdateRequest { public ElasticSearchUpdateRequest(String index, String type, String id) { super(index, type, id); } - @Override public ElasticSearchUpdateRequest doc(XContentBuilder source) { + @Override + public ElasticSearchUpdateRequest doc(XContentBuilder source) { super.doc(source); return this; } diff --git a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/grpc/GRPCClient.java b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/grpc/GRPCClient.java index 7ea0e2703eae..d096813f3c96 100644 --- a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/grpc/GRPCClient.java +++ b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/grpc/GRPCClient.java @@ -18,21 +18,22 @@ package org.apache.skywalking.oap.server.library.client.grpc; -import io.grpc.*; +import io.grpc.ManagedChannel; +import io.grpc.ManagedChannelBuilder; import lombok.Getter; import org.apache.skywalking.oap.server.library.client.Client; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng - */ public class GRPCClient implements Client { private static final Logger logger = LoggerFactory.getLogger(GRPCClient.class); - @Getter private final String host; + @Getter + private final String host; - @Getter private final int port; + @Getter + private final int port; private ManagedChannel channel; @@ -41,11 +42,13 @@ public GRPCClient(String host, int port) { this.port = port; } - @Override public void connect() { + @Override + public void connect() { channel = ManagedChannelBuilder.forAddress(host, port).usePlaintext().build(); } - @Override public void shutdown() { + @Override + public void shutdown() { try { channel.shutdownNow(); } catch (Throwable t) { @@ -57,7 +60,8 @@ public ManagedChannel getChannel() { return channel; } - @Override public String toString() { + @Override + public String toString() { return host + ":" + port; } } diff --git a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/grpc/GRPCClientConfig.java b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/grpc/GRPCClientConfig.java index 887342b2601c..2457d37dade9 100644 --- a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/grpc/GRPCClientConfig.java +++ b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/grpc/GRPCClientConfig.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.library.client.grpc; -/** - * @author peng-yongsheng - */ public abstract class GRPCClientConfig { private String host; diff --git a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/grpc/GRPCClientException.java b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/grpc/GRPCClientException.java index e5cbab6615a5..7b004737d325 100644 --- a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/grpc/GRPCClientException.java +++ b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/grpc/GRPCClientException.java @@ -20,9 +20,6 @@ import org.apache.skywalking.oap.server.library.client.ClientException; -/** - * @author peng-yongsheng - */ public class GRPCClientException extends ClientException { public GRPCClientException(String message) { diff --git a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/jdbc/JDBCClientException.java b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/jdbc/JDBCClientException.java index 4e1a8ad1e4ec..d88a85e16f2e 100644 --- a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/jdbc/JDBCClientException.java +++ b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/jdbc/JDBCClientException.java @@ -20,9 +20,6 @@ import java.io.IOException; -/** - * @author wusheng - */ public class JDBCClientException extends IOException { public JDBCClientException(String message) { diff --git a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/jdbc/hikaricp/JDBCHikariCPClient.java b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/jdbc/hikaricp/JDBCHikariCPClient.java index 540d15d11571..95575710d6d5 100644 --- a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/jdbc/hikaricp/JDBCHikariCPClient.java +++ b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/jdbc/hikaricp/JDBCHikariCPClient.java @@ -18,17 +18,21 @@ package org.apache.skywalking.oap.server.library.client.jdbc.hikaricp; -import com.zaxxer.hikari.*; -import java.sql.*; +import com.zaxxer.hikari.HikariConfig; +import com.zaxxer.hikari.HikariDataSource; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; import java.util.Properties; import org.apache.skywalking.oap.server.library.client.Client; import org.apache.skywalking.oap.server.library.client.jdbc.JDBCClientException; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * JDBC Client uses HikariCP connection management lib to execute SQL. - * - * @author wusheng */ public class JDBCHikariCPClient implements Client { private static final Logger logger = LoggerFactory.getLogger(JDBCHikariCPClient.class); @@ -40,18 +44,17 @@ public JDBCHikariCPClient(Properties properties) { hikariConfig = new HikariConfig(properties); } - @Override public void connect() { + @Override + public void connect() { dataSource = new HikariDataSource(hikariConfig); } - @Override public void shutdown() { + @Override + public void shutdown() { } /** * Default getConnection is set in auto-commit. - * - * @return - * @throws JDBCClientException */ public Connection getConnection() throws JDBCClientException { return getConnection(true); @@ -124,8 +127,8 @@ public ResultSet executeQuery(Connection connection, String sql, Object... param return rs; } - private void setStatementParam(PreparedStatement statement, Object[] params) - throws SQLException, JDBCClientException { + private void setStatementParam(PreparedStatement statement, + Object[] params) throws SQLException, JDBCClientException { if (params != null) { for (int i = 0; i < params.length; i++) { Object param = params[i]; @@ -138,8 +141,7 @@ private void setStatementParam(PreparedStatement statement, Object[] params) } else if (param instanceof Long) { statement.setLong(i + 1, (long) param); } else { - throw new JDBCClientException( - "Unsupported data type, type=" + param.getClass().getName()); + throw new JDBCClientException("Unsupported data type, type=" + param.getClass().getName()); } } } diff --git a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/request/InsertRequest.java b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/request/InsertRequest.java index c3308d330aea..a9dbdab1af9e 100644 --- a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/request/InsertRequest.java +++ b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/request/InsertRequest.java @@ -17,8 +17,5 @@ package org.apache.skywalking.oap.server.library.client.request; -/** - * @author peng-yongsheng - */ public interface InsertRequest extends PrepareRequest { } diff --git a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/request/PrepareRequest.java b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/request/PrepareRequest.java index 05fbd949ccd6..a9105152bb2f 100644 --- a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/request/PrepareRequest.java +++ b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/request/PrepareRequest.java @@ -17,8 +17,5 @@ package org.apache.skywalking.oap.server.library.client.request; -/** - * @author peng-yongsheng - */ public interface PrepareRequest { } diff --git a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/request/UpdateRequest.java b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/request/UpdateRequest.java index 209cc43edc1b..ea914913c9da 100644 --- a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/request/UpdateRequest.java +++ b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/request/UpdateRequest.java @@ -17,8 +17,5 @@ package org.apache.skywalking.oap.server.library.client.request; -/** - * @author peng-yongsheng - */ public interface UpdateRequest extends PrepareRequest { } diff --git a/oap-server/server-library/library-client/src/test/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ITElasticSearchClient.java b/oap-server/server-library/library-client/src/test/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ITElasticSearchClient.java index cc267c061899..5f1abccbb7e2 100644 --- a/oap-server/server-library/library-client/src/test/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ITElasticSearchClient.java +++ b/oap-server/server-library/library-client/src/test/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ITElasticSearchClient.java @@ -47,9 +47,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng - */ public class ITElasticSearchClient { private static final Logger logger = LoggerFactory.getLogger(ITElasticSearchClient.class); @@ -101,10 +98,24 @@ public void indexOperate() throws IOException { JsonObject index = getIndex(indexName); logger.info(index.toString()); - Assert.assertEquals(2, index.getAsJsonObject(indexName).getAsJsonObject("settings").getAsJsonObject("index").get("number_of_shards").getAsInt()); - Assert.assertEquals(2, index.getAsJsonObject(indexName).getAsJsonObject("settings").getAsJsonObject("index").get("number_of_replicas").getAsInt()); - - Assert.assertEquals("text", index.getAsJsonObject(indexName).getAsJsonObject("mappings").getAsJsonObject("type").getAsJsonObject("properties").getAsJsonObject("column1").get("type").getAsString()); + Assert.assertEquals(2, index.getAsJsonObject(indexName) + .getAsJsonObject("settings") + .getAsJsonObject("index") + .get("number_of_shards") + .getAsInt()); + Assert.assertEquals(2, index.getAsJsonObject(indexName) + .getAsJsonObject("settings") + .getAsJsonObject("index") + .get("number_of_replicas") + .getAsInt()); + + Assert.assertEquals("text", index.getAsJsonObject(indexName) + .getAsJsonObject("mappings") + .getAsJsonObject("type") + .getAsJsonObject("properties") + .getAsJsonObject("column1") + .get("type") + .getAsString()); Assert.assertTrue(client.deleteByModelName(indexName)); } @@ -114,11 +125,11 @@ public void documentOperate() throws IOException { String id = String.valueOf(System.currentTimeMillis()); XContentBuilder builder = XContentFactory.jsonBuilder() - .startObject() - .field("user", "kimchy") - .field("post_date", "2009-11-15T14:12:12") - .field("message", "trying out Elasticsearch") - .endObject(); + .startObject() + .field("user", "kimchy") + .field("post_date", "2009-11-15T14:12:12") + .field("message", "trying out Elasticsearch") + .endObject(); String indexName = "test_document_operate"; client.forceInsert(indexName, id, builder); @@ -127,10 +138,7 @@ public void documentOperate() throws IOException { Assert.assertEquals("kimchy", response.getSource().get("user")); Assert.assertEquals("trying out Elasticsearch", response.getSource().get("message")); - builder = XContentFactory.jsonBuilder() - .startObject() - .field("user", "pengys") - .endObject(); + builder = XContentFactory.jsonBuilder().startObject().field("user", "pengys").endObject(); client.forceUpdate(indexName, id, builder); response = client.get(indexName, id); @@ -140,7 +148,8 @@ public void documentOperate() throws IOException { SearchSourceBuilder sourceBuilder = new SearchSourceBuilder(); sourceBuilder.query(QueryBuilders.termQuery("user", "pengys")); SearchResponse searchResponse = client.search(indexName, sourceBuilder); - Assert.assertEquals("trying out Elasticsearch", searchResponse.getHits().getHits()[0].getSourceAsMap().get("message")); + Assert.assertEquals("trying out Elasticsearch", searchResponse.getHits().getHits()[0].getSourceAsMap() + .get("message")); } @Test @@ -168,16 +177,22 @@ public void templateOperate() throws IOException { Assert.assertTrue(client.isExistsTemplate(indexName)); - XContentBuilder builder = XContentFactory.jsonBuilder().startObject() - .field("name", "pengys") - .endObject(); + XContentBuilder builder = XContentFactory.jsonBuilder().startObject().field("name", "pengys").endObject(); client.forceInsert(indexName + "-2019", "testid", builder); JsonObject index = getIndex(indexName + "-2019"); logger.info(index.toString()); - Assert.assertEquals(1, index.getAsJsonObject(indexName + "-2019").getAsJsonObject("settings").getAsJsonObject("index").get("number_of_shards").getAsInt()); - Assert.assertEquals(0, index.getAsJsonObject(indexName + "-2019").getAsJsonObject("settings").getAsJsonObject("index").get("number_of_replicas").getAsInt()); + Assert.assertEquals(1, index.getAsJsonObject(indexName + "-2019") + .getAsJsonObject("settings") + .getAsJsonObject("index") + .get("number_of_shards") + .getAsInt()); + Assert.assertEquals(0, index.getAsJsonObject(indexName + "-2019") + .getAsJsonObject("settings") + .getAsJsonObject("index") + .get("number_of_replicas") + .getAsInt()); client.deleteTemplate(indexName); Assert.assertFalse(client.isExistsTemplate(indexName)); @@ -219,9 +234,7 @@ public void timeSeriesOperate() throws IOException { client.createTemplate(indexName, new HashMap<>(), mapping); - XContentBuilder builder = XContentFactory.jsonBuilder().startObject() - .field("name", "pengys") - .endObject(); + XContentBuilder builder = XContentFactory.jsonBuilder().startObject().field("name", "pengys").endObject(); client.forceInsert(timeSeriesIndexName, "testid", builder); List indexes = client.retrievalIndexByAliases(indexName); @@ -236,14 +249,15 @@ private JsonObject getIndex(String indexName) throws IOException { GetIndexRequest request = new GetIndexRequest(); request.indices(indexName); - Response response = getRestHighLevelClient().getLowLevelClient().performRequest(HttpGet.METHOD_NAME, "/" + indexName); + Response response = getRestHighLevelClient().getLowLevelClient() + .performRequest(HttpGet.METHOD_NAME, "/" + indexName); InputStreamReader reader = new InputStreamReader(response.getEntity().getContent()); Gson gson = new Gson(); return undoFormatIndexName(gson.fromJson(reader, JsonObject.class)); } private RestHighLevelClient getRestHighLevelClient() { - return (RestHighLevelClient)Whitebox.getInternalState(client, "client"); + return (RestHighLevelClient) Whitebox.getInternalState(client, "client"); } private JsonObject undoFormatIndexName(JsonObject index) { @@ -256,7 +270,8 @@ private JsonObject undoFormatIndexName(JsonObject index) { index.add(oldIndexName.substring(namespacePrefix.length()), entry.getValue()); index.remove(oldIndexName); } else { - throw new RuntimeException("The indexName must contain the " + namespace + " prefix, but it is " + entry.getKey()); + throw new RuntimeException("The indexName must contain the " + namespace + " prefix, but it is " + entry + .getKey()); } }); logger.info("UndoFormatIndexName after " + index.toString()); diff --git a/oap-server/server-library/library-client/src/test/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ITElasticSearchClientOfNamespace.java b/oap-server/server-library/library-client/src/test/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ITElasticSearchClientOfNamespace.java index 1c11ca477136..79602993190b 100644 --- a/oap-server/server-library/library-client/src/test/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ITElasticSearchClientOfNamespace.java +++ b/oap-server/server-library/library-client/src/test/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ITElasticSearchClientOfNamespace.java @@ -18,12 +18,8 @@ package org.apache.skywalking.oap.server.library.client.elasticsearch; -/** - * @author: zhangwei - */ public class ITElasticSearchClientOfNamespace extends ITElasticSearchClient { - public ITElasticSearchClientOfNamespace() { super("test"); } diff --git a/oap-server/server-library/library-module/pom.xml b/oap-server/server-library/library-module/pom.xml index c81488eae62e..e611d9575036 100644 --- a/oap-server/server-library/library-module/pom.xml +++ b/oap-server/server-library/library-module/pom.xml @@ -17,7 +17,8 @@ ~ --> - + server-library org.apache.skywalking diff --git a/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ApplicationConfiguration.java b/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ApplicationConfiguration.java index 0fe2d943bef1..abb5e1e548f6 100644 --- a/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ApplicationConfiguration.java +++ b/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ApplicationConfiguration.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.oap.server.library.module; import java.util.HashMap; @@ -24,8 +23,6 @@ /** * Modulization configurations. The {@link ModuleManager} is going to start, lookup, start modules based on this. - * - * @author wu-sheng, peng-yongsheng */ public class ApplicationConfiguration { private HashMap modules = new HashMap<>(); diff --git a/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/BootstrapFlow.java b/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/BootstrapFlow.java index e24192c89b09..5abda348c6ca 100644 --- a/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/BootstrapFlow.java +++ b/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/BootstrapFlow.java @@ -26,9 +26,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * @author wu-sheng, peng-yongsheng - */ class BootstrapFlow { private static final Logger logger = LoggerFactory.getLogger(BootstrapFlow.class); @@ -50,8 +47,8 @@ void start( if (requiredModules != null) { for (String module : requiredModules) { if (!moduleManager.has(module)) { - throw new ModuleNotFoundException(module + " is required by " + provider.getModuleName() - + "." + provider.name() + ", but not found."); + throw new ModuleNotFoundException(module + " is required by " + provider.getModuleName() + "." + provider + .name() + ", but not found."); } } } @@ -108,8 +105,12 @@ private void makeSequence() throws CycleDependencyException { if (numOfToBeSequenced == allProviders.size()) { StringBuilder unSequencedProviders = new StringBuilder(); - allProviders.forEach(provider -> unSequencedProviders.append(provider.getModuleName()).append("[provider=").append(provider.getClass().getName()).append("]\n")); - throw new CycleDependencyException("Exist cycle module dependencies in \n" + unSequencedProviders.substring(0, unSequencedProviders.length() - 1)); + allProviders.forEach(provider -> unSequencedProviders.append(provider.getModuleName()) + .append("[provider=") + .append(provider.getClass().getName()) + .append("]\n")); + throw new CycleDependencyException("Exist cycle module dependencies in \n" + unSequencedProviders.substring(0, unSequencedProviders + .length() - 1)); } } while (allProviders.size() != 0); diff --git a/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/CycleDependencyException.java b/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/CycleDependencyException.java index 0897120d03e4..889d888953b7 100644 --- a/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/CycleDependencyException.java +++ b/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/CycleDependencyException.java @@ -16,12 +16,8 @@ * */ - package org.apache.skywalking.oap.server.library.module; -/** - * @author wu-sheng - */ public class CycleDependencyException extends RuntimeException { public CycleDependencyException(String message) { super(message); diff --git a/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleConfig.java b/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleConfig.java index 08b5fcf1cb84..d784e6c96335 100644 --- a/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleConfig.java +++ b/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleConfig.java @@ -18,8 +18,5 @@ package org.apache.skywalking.oap.server.library.module; -/** - * @author peng-yongsheng - */ public abstract class ModuleConfig { } diff --git a/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleConfigException.java b/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleConfigException.java index 428f1cbb77e8..b70829dae04f 100644 --- a/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleConfigException.java +++ b/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleConfigException.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.library.module; -/** - * @author peng-yongsheng - */ public class ModuleConfigException extends Exception { public ModuleConfigException(String message, Throwable cause) { diff --git a/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleDefine.java b/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleDefine.java index 60982fd7096f..9839ca810ed6 100644 --- a/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleDefine.java +++ b/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleDefine.java @@ -18,18 +18,15 @@ package org.apache.skywalking.oap.server.library.module; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.lang.reflect.Field; import java.util.Enumeration; import java.util.Properties; import java.util.ServiceLoader; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A module definition. - * - * @author wu-sheng, peng-yongsheng */ public abstract class ModuleDefine implements ModuleProviderHolder { @@ -75,8 +72,10 @@ void prepare(ModuleManager moduleManager, ApplicationConfiguration.ModuleConfigu loadedProvider.setManager(moduleManager); loadedProvider.setModuleDefine(this); } else { - throw new DuplicateProviderException(this.name() + " module has one " + loadedProvider.name() + "[" + loadedProvider.getClass().getName() + "] provider already, " - + provider.name() + "[" + provider.getClass().getName() + "] is defined as 2nd provider."); + throw new DuplicateProviderException(this.name() + " module has one " + loadedProvider.name() + "[" + loadedProvider + .getClass() + .getName() + "] provider already, " + provider.name() + "[" + provider.getClass() + .getName() + "] is defined as 2nd provider."); } } @@ -88,13 +87,14 @@ void prepare(ModuleManager moduleManager, ApplicationConfiguration.ModuleConfigu logger.info("Prepare the {} provider in {} module.", loadedProvider.name(), this.name()); try { - copyProperties(loadedProvider.createConfigBeanIfAbsent(), configuration.getProviderConfiguration(loadedProvider.name()), this.name(), loadedProvider.name()); + copyProperties(loadedProvider.createConfigBeanIfAbsent(), configuration.getProviderConfiguration(loadedProvider + .name()), this.name(), loadedProvider.name()); } catch (IllegalAccessException e) { throw new ModuleConfigException(this.name() + " module config transport to config bean failure.", e); } loadedProvider.prepare(); } - + private void copyProperties(ModuleConfig dest, Properties src, String moduleName, String providerName) throws IllegalAccessException { if (dest == null) { @@ -102,7 +102,7 @@ private void copyProperties(ModuleConfig dest, Properties src, String moduleName } Enumeration propertyNames = src.propertyNames(); while (propertyNames.hasMoreElements()) { - String propertyName = (String)propertyNames.nextElement(); + String propertyName = (String) propertyNames.nextElement(); Class destClass = dest.getClass(); try { Field field = getDeclaredField(destClass, propertyName); @@ -128,7 +128,8 @@ private Field getDeclaredField(Class destClass, String fieldName) throws NoSu throw new NoSuchFieldException(); } - @Override public final ModuleProvider provider() throws DuplicateProviderException, ProviderNotFoundException { + @Override + public final ModuleProvider provider() throws DuplicateProviderException, ProviderNotFoundException { if (loadedProvider == null) { throw new ProviderNotFoundException("There is no module provider in " + this.name() + " module!"); } diff --git a/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleDefineHolder.java b/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleDefineHolder.java index 314f7a9982cc..3d936e904e1f 100644 --- a/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleDefineHolder.java +++ b/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleDefineHolder.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.library.module; -/** - * @author peng-yongsheng - */ public interface ModuleDefineHolder { boolean has(String moduleName); diff --git a/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleManager.java b/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleManager.java index 33b1b00b3e7d..12e8f6b714af 100644 --- a/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleManager.java +++ b/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleManager.java @@ -18,12 +18,14 @@ package org.apache.skywalking.oap.server.library.module; -import java.util.*; +import java.util.Arrays; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.Map; +import java.util.ServiceLoader; /** * The ModuleManager takes charge of all {@link ModuleDefine}s in collector. - * - * @author wu-sheng, peng-yongsheng */ public class ModuleManager implements ModuleDefineHolder { @@ -68,11 +70,13 @@ public void init( bootstrapFlow.notifyAfterCompleted(); } - @Override public boolean has(String moduleName) { + @Override + public boolean has(String moduleName) { return loadedModules.get(moduleName) != null; } - @Override public ModuleProviderHolder find(String moduleName) throws ModuleNotFoundRuntimeException { + @Override + public ModuleProviderHolder find(String moduleName) throws ModuleNotFoundRuntimeException { assertPreparedStage(); ModuleDefine module = loadedModules.get(moduleName); if (module != null) diff --git a/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleNotFoundException.java b/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleNotFoundException.java index 6564c87e7bb5..3ca8e685bac4 100644 --- a/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleNotFoundException.java +++ b/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleNotFoundException.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.oap.server.library.module; public class ModuleNotFoundException extends Exception { diff --git a/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleNotFoundRuntimeException.java b/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleNotFoundRuntimeException.java index 1dbb59154be3..684e21998634 100644 --- a/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleNotFoundRuntimeException.java +++ b/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleNotFoundRuntimeException.java @@ -16,12 +16,8 @@ * */ - package org.apache.skywalking.oap.server.library.module; -/** - * @author peng-yongsheng - */ public class ModuleNotFoundRuntimeException extends RuntimeException { public ModuleNotFoundRuntimeException(Throwable cause) { diff --git a/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleProvider.java b/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleProvider.java index 684e27b5e371..515212f6b9db 100644 --- a/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleProvider.java +++ b/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleProvider.java @@ -18,19 +18,20 @@ package org.apache.skywalking.oap.server.library.module; -import java.util.*; +import java.util.HashMap; +import java.util.Map; import lombok.Setter; /** * The ModuleProvider is an implementation of a {@link ModuleDefine}. - * + *

* And each moduleDefine can have one or more implementation, which depends on `application.yml` - * - * @author wu-sheng, peng-yongsheng */ public abstract class ModuleProvider implements ModuleServiceHolder { - @Setter private ModuleManager manager; - @Setter private ModuleDefine moduleDefine; + @Setter + private ModuleManager manager; + @Setter + private ModuleDefine moduleDefine; private final Map, Service> services = new HashMap<>(); public ModuleProvider() { @@ -51,7 +52,7 @@ protected final ModuleManager getManager() { public abstract Class module(); /** - * @return ModuleConfig + * */ public abstract ModuleConfig createConfigBeanIfAbsent(); @@ -78,7 +79,8 @@ protected final ModuleManager getManager() { /** * Register an implementation for the service of this moduleDefine provider. */ - @Override public final void registerServiceImplementation(Class serviceType, + @Override + public final void registerServiceImplementation(Class serviceType, Service service) throws ServiceNotProvidedException { if (serviceType.isInstance(service)) { this.services.put(serviceType, service); @@ -108,11 +110,12 @@ void requiredCheck(Class[] requiredServices) throws ServiceNo } } - @Override public @SuppressWarnings("unchecked") T getService( - Class serviceType) throws ServiceNotProvidedException { + @Override + public @SuppressWarnings("unchecked") + T getService(Class serviceType) throws ServiceNotProvidedException { Service serviceImpl = services.get(serviceType); if (serviceImpl != null) { - return (T)serviceImpl; + return (T) serviceImpl; } throw new ServiceNotProvidedException("Service " + serviceType.getName() + " should not be provided, based on moduleDefine define."); diff --git a/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleProviderHolder.java b/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleProviderHolder.java index 1d3ff9c5f303..f99f3f03fceb 100644 --- a/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleProviderHolder.java +++ b/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleProviderHolder.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.library.module; -/** - * @author peng-yongsheng - */ public interface ModuleProviderHolder { ModuleServiceHolder provider() throws DuplicateProviderException, ProviderNotFoundException; diff --git a/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleServiceHolder.java b/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleServiceHolder.java index b55d65dc67ca..088d3c478dba 100644 --- a/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleServiceHolder.java +++ b/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleServiceHolder.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.library.module; -/** - * @author peng-yongsheng - */ public interface ModuleServiceHolder { void registerServiceImplementation(Class serviceType, diff --git a/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleStartException.java b/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleStartException.java index 01be5957c8cd..5456a90de0a6 100644 --- a/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleStartException.java +++ b/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ModuleStartException.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.library.module; -/** - * @author peng-yongsheng - */ public class ModuleStartException extends Exception { public ModuleStartException(String message) { super(message); diff --git a/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/Service.java b/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/Service.java index ef5805aadd1e..967aa09277cb 100644 --- a/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/Service.java +++ b/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/Service.java @@ -20,10 +20,8 @@ /** * The Service implementation is a service provided by its own modules. - * + *

* And every {@link ModuleProvider} must provide all the given services of the {@link ModuleDefine}. - * - * @author wu-sheng */ public interface Service { } diff --git a/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ServiceNotProvidedRuntimeException.java b/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ServiceNotProvidedRuntimeException.java index 340ed78e28c3..f167d200e03e 100644 --- a/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ServiceNotProvidedRuntimeException.java +++ b/oap-server/server-library/library-module/src/main/java/org/apache/skywalking/oap/server/library/module/ServiceNotProvidedRuntimeException.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.oap.server.library.module; public class ServiceNotProvidedRuntimeException extends RuntimeException { diff --git a/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ApplicationConfigurationTest.java b/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ApplicationConfigurationTest.java index 7f957824853f..2374ae2391fc 100644 --- a/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ApplicationConfigurationTest.java +++ b/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ApplicationConfigurationTest.java @@ -16,14 +16,12 @@ * */ - package org.apache.skywalking.oap.server.library.module; +import java.util.Properties; import org.junit.Assert; import org.junit.Test; -import java.util.Properties; - public class ApplicationConfigurationTest { @Test public void testBuildConfig() { @@ -37,7 +35,9 @@ public void testBuildConfig() { configuration.addModule("MO-1").addProviderConfiguration("MO-1-P1", p1).addProviderConfiguration("MO-1-P2", p2); Assert.assertArrayEquals(new String[] {"MO-1"}, configuration.moduleList()); - Assert.assertEquals("value2-prop", configuration.getModuleConfiguration("MO-1").getProviderConfiguration("MO-1-P2").getProperty("prop2")); + Assert.assertEquals("value2-prop", configuration.getModuleConfiguration("MO-1") + .getProviderConfiguration("MO-1-P2") + .getProperty("prop2")); Assert.assertEquals(p1, configuration.getModuleConfiguration("MO-1").getProviderConfiguration("MO-1-P1")); } } diff --git a/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/BaseModuleA.java b/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/BaseModuleA.java index 308c12e791b9..d38df98615b7 100644 --- a/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/BaseModuleA.java +++ b/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/BaseModuleA.java @@ -18,17 +18,18 @@ package org.apache.skywalking.oap.server.library.module; -/** - * @author wu-sheng - */ public class BaseModuleA extends ModuleDefine { public BaseModuleA() { super("BaseA"); } - @Override public Class[] services() { - return new Class[] {ServiceABusiness1.class, ServiceABusiness2.class}; + @Override + public Class[] services() { + return new Class[] { + ServiceABusiness1.class, + ServiceABusiness2.class + }; } public interface ServiceABusiness1 extends Service { diff --git a/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/BaseModuleB.java b/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/BaseModuleB.java index f7171dd71deb..eb29e1e2c0f6 100644 --- a/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/BaseModuleB.java +++ b/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/BaseModuleB.java @@ -18,17 +18,18 @@ package org.apache.skywalking.oap.server.library.module; -/** - * @author wu-sheng - */ public class BaseModuleB extends ModuleDefine { public BaseModuleB() { super("BaseB"); } - @Override public Class[] services() { - return new Class[] {BaseModuleB.ServiceBBusiness1.class, BaseModuleB.ServiceBBusiness2.class}; + @Override + public Class[] services() { + return new Class[] { + BaseModuleB.ServiceBBusiness1.class, + BaseModuleB.ServiceBBusiness2.class + }; } public interface ServiceBBusiness1 extends Service { diff --git a/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleABusiness1Impl.java b/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleABusiness1Impl.java index 5a00e546cba4..7d15a9e8ae99 100644 --- a/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleABusiness1Impl.java +++ b/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleABusiness1Impl.java @@ -16,14 +16,11 @@ * */ - package org.apache.skywalking.oap.server.library.module; -/** - * @author wu-sheng - */ public class ModuleABusiness1Impl implements BaseModuleA.ServiceABusiness1 { - @Override public void print() { + @Override + public void print() { } } diff --git a/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleABusiness2Impl.java b/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleABusiness2Impl.java index 8fb1480d95d2..adc6e44ce91c 100644 --- a/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleABusiness2Impl.java +++ b/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleABusiness2Impl.java @@ -16,12 +16,8 @@ * */ - package org.apache.skywalking.oap.server.library.module; -/** - * @author wu-sheng - */ public class ModuleABusiness2Impl implements BaseModuleA.ServiceABusiness2 { } diff --git a/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleAProvider.java b/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleAProvider.java index dd6690baf106..39349418c166 100644 --- a/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleAProvider.java +++ b/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleAProvider.java @@ -18,34 +18,38 @@ package org.apache.skywalking.oap.server.library.module; -/** - * @author wu-sheng - */ public class ModuleAProvider extends ModuleProvider { - @Override public String name() { + @Override + public String name() { return "P-A"; } - @Override public ModuleConfig createConfigBeanIfAbsent() { + @Override + public ModuleConfig createConfigBeanIfAbsent() { return null; } - @Override public Class module() { + @Override + public Class module() { return BaseModuleA.class; } - @Override public void prepare() throws ServiceNotProvidedException { + @Override + public void prepare() throws ServiceNotProvidedException { this.registerServiceImplementation(BaseModuleA.ServiceABusiness1.class, new ModuleABusiness1Impl()); this.registerServiceImplementation(BaseModuleA.ServiceABusiness2.class, new ModuleABusiness2Impl()); } - @Override public void start() { + @Override + public void start() { } - @Override public void notifyAfterCompleted() { + @Override + public void notifyAfterCompleted() { } - @Override public String[] requiredModules() { + @Override + public String[] requiredModules() { return new String[0]; } diff --git a/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleBBusiness1Impl.java b/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleBBusiness1Impl.java index cc9cf3be5c8a..63f34333e8aa 100644 --- a/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleBBusiness1Impl.java +++ b/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleBBusiness1Impl.java @@ -16,11 +16,7 @@ * */ - package org.apache.skywalking.oap.server.library.module; -/** - * @author wu-sheng - */ public class ModuleBBusiness1Impl implements BaseModuleB.ServiceBBusiness1 { } diff --git a/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleBBusiness2Impl.java b/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleBBusiness2Impl.java index b9ef4b283dea..2bd026c9731f 100644 --- a/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleBBusiness2Impl.java +++ b/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleBBusiness2Impl.java @@ -16,11 +16,7 @@ * */ - package org.apache.skywalking.oap.server.library.module; -/** - * @author wu-sheng - */ public class ModuleBBusiness2Impl implements BaseModuleB.ServiceBBusiness2 { } diff --git a/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleBProvider.java b/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleBProvider.java index 08e483092a26..6b9fe9de3c70 100644 --- a/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleBProvider.java +++ b/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleBProvider.java @@ -18,35 +18,39 @@ package org.apache.skywalking.oap.server.library.module; -/** - * @author wu-sheng - */ public class ModuleBProvider extends ModuleProvider { - @Override public String name() { + @Override + public String name() { return "P-B"; } - @Override public ModuleConfig createConfigBeanIfAbsent() { + @Override + public ModuleConfig createConfigBeanIfAbsent() { return null; } - @Override public Class module() { + @Override + public Class module() { return BaseModuleB.class; } - @Override public void prepare() throws ServiceNotProvidedException { + @Override + public void prepare() throws ServiceNotProvidedException { this.registerServiceImplementation(BaseModuleB.ServiceBBusiness1.class, new ModuleBBusiness1Impl()); this.registerServiceImplementation(BaseModuleB.ServiceBBusiness2.class, new ModuleBBusiness2Impl()); } - @Override public void start() { + @Override + public void start() { } - @Override public void notifyAfterCompleted() { + @Override + public void notifyAfterCompleted() { } - @Override public String[] requiredModules() { + @Override + public String[] requiredModules() { return new String[0]; } diff --git a/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleManagerTest.java b/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleManagerTest.java index 2be233896586..4f2308357879 100644 --- a/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleManagerTest.java +++ b/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleManagerTest.java @@ -19,11 +19,9 @@ package org.apache.skywalking.oap.server.library.module; import java.util.Properties; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -/** - * @author wu-sheng - */ public class ModuleManagerTest { @Test public void testInit() throws ServiceNotProvidedException, ModuleNotFoundException, ProviderNotFoundException, DuplicateProviderException, ModuleConfigException, ModuleStartException { @@ -35,7 +33,9 @@ public void testInit() throws ServiceNotProvidedException, ModuleNotFoundExcepti ModuleManager manager = new ModuleManager(); manager.init(configuration); - BaseModuleA.ServiceABusiness1 serviceABusiness1 = manager.find("BaseA").provider().getService(BaseModuleA.ServiceABusiness1.class); + BaseModuleA.ServiceABusiness1 serviceABusiness1 = manager.find("BaseA") + .provider() + .getService(BaseModuleA.ServiceABusiness1.class); Assert.assertTrue(serviceABusiness1 != null); } } diff --git a/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/TestModule.java b/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/TestModule.java index 0d1d80387ffa..ed7ba72fea21 100644 --- a/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/TestModule.java +++ b/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/TestModule.java @@ -18,16 +18,14 @@ package org.apache.skywalking.oap.server.library.module; -/** - * @author wu-sheng - */ public class TestModule extends ModuleDefine { public TestModule() { super("Test"); } - @Override public Class[] services() { + @Override + public Class[] services() { return new Class[0]; } } diff --git a/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/TestModuleProvider.java b/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/TestModuleProvider.java index 03b59b416451..c77064a2543d 100644 --- a/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/TestModuleProvider.java +++ b/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/TestModuleProvider.java @@ -18,33 +18,40 @@ package org.apache.skywalking.oap.server.library.module; -/** - * @author wu-sheng - */ public class TestModuleProvider extends ModuleProvider { - @Override public String name() { + @Override + public String name() { return "TestModule-Provider"; } - @Override public Class module() { + @Override + public Class module() { return TestModule.class; } - @Override public ModuleConfig createConfigBeanIfAbsent() { + @Override + public ModuleConfig createConfigBeanIfAbsent() { return null; } - @Override public void prepare() { + @Override + public void prepare() { } - @Override public void start() { + @Override + public void start() { } - @Override public void notifyAfterCompleted() { + @Override + public void notifyAfterCompleted() { } - @Override public String[] requiredModules() { - return new String[] {"BaseA", "BaseB"}; + @Override + public String[] requiredModules() { + return new String[] { + "BaseA", + "BaseB" + }; } class Config { diff --git a/oap-server/server-library/library-server/pom.xml b/oap-server/server-library/library-server/pom.xml index e94369887faa..98a8a482d722 100644 --- a/oap-server/server-library/library-server/pom.xml +++ b/oap-server/server-library/library-server/pom.xml @@ -17,7 +17,8 @@ ~ --> - + server-library org.apache.skywalking diff --git a/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/Server.java b/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/Server.java index 765778a00b36..15bce03d5509 100644 --- a/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/Server.java +++ b/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/Server.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.library.server; -/** - * @author peng-yongsheng, wusheng - */ public interface Server { String hostPort(); diff --git a/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/ServerException.java b/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/ServerException.java index bc7dd9c48f49..7c593c311c3b 100644 --- a/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/ServerException.java +++ b/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/ServerException.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.library.server; -/** - * @author peng-yongsheng - */ public abstract class ServerException extends Exception { public ServerException(String message) { diff --git a/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/ServerHandler.java b/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/ServerHandler.java index f582b06aab39..f0112a535a33 100644 --- a/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/ServerHandler.java +++ b/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/ServerHandler.java @@ -18,8 +18,5 @@ package org.apache.skywalking.oap.server.library.server; -/** - * @author peng-yongsheng - */ public interface ServerHandler { } diff --git a/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/grpc/CustomThreadFactory.java b/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/grpc/CustomThreadFactory.java index 19087148a3e1..4cfe2e171e80 100644 --- a/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/grpc/CustomThreadFactory.java +++ b/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/grpc/CustomThreadFactory.java @@ -21,9 +21,6 @@ import java.util.concurrent.ThreadFactory; import java.util.concurrent.atomic.AtomicInteger; -/** - * @author yantaowu - */ public class CustomThreadFactory implements ThreadFactory { private final AtomicInteger poolNumber = new AtomicInteger(1); private final ThreadGroup group; @@ -32,17 +29,12 @@ public class CustomThreadFactory implements ThreadFactory { CustomThreadFactory(String name) { SecurityManager s = System.getSecurityManager(); - group = (s != null) ? s.getThreadGroup() : - Thread.currentThread().getThreadGroup(); - namePrefix = name + "-" + - poolNumber.getAndIncrement() + - "-thread-"; + group = (s != null) ? s.getThreadGroup() : Thread.currentThread().getThreadGroup(); + namePrefix = name + "-" + poolNumber.getAndIncrement() + "-thread-"; } public Thread newThread(Runnable r) { - Thread t = new Thread(group, r, - namePrefix + threadNumber.getAndIncrement(), - 0); + Thread t = new Thread(group, r, namePrefix + threadNumber.getAndIncrement(), 0); if (t.isDaemon()) t.setDaemon(false); if (t.getPriority() != Thread.NORM_PRIORITY) diff --git a/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/grpc/GRPCHandler.java b/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/grpc/GRPCHandler.java index 01903bb4257d..dea501ff711f 100644 --- a/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/grpc/GRPCHandler.java +++ b/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/grpc/GRPCHandler.java @@ -20,8 +20,5 @@ import org.apache.skywalking.oap.server.library.server.ServerHandler; -/** - * @author peng-yongsheng - */ public interface GRPCHandler extends ServerHandler { } diff --git a/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/grpc/GRPCServer.java b/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/grpc/GRPCServer.java index 8ae2fc1ba085..031b2aacbc85 100644 --- a/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/grpc/GRPCServer.java +++ b/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/grpc/GRPCServer.java @@ -18,21 +18,26 @@ package org.apache.skywalking.oap.server.library.server.grpc; -import io.grpc.*; -import io.grpc.netty.*; -import io.netty.handler.ssl.*; -import java.io.*; +import io.grpc.BindableService; +import io.grpc.ServerServiceDefinition; +import io.grpc.netty.GrpcSslContexts; +import io.grpc.netty.NettyServerBuilder; +import io.netty.handler.ssl.SslContextBuilder; +import io.netty.handler.ssl.SslProvider; +import java.io.File; +import java.io.IOException; import java.net.InetSocketAddress; import java.util.Objects; -import java.util.concurrent.*; - +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.RejectedExecutionHandler; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; import org.apache.skywalking.oap.server.library.server.Server; -import org.apache.skywalking.oap.server.library.server.*; -import org.slf4j.*; +import org.apache.skywalking.oap.server.library.server.ServerException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng, wusheng, yantaowu - */ public class GRPCServer implements Server { private static final Logger logger = LoggerFactory.getLogger(GRPCServer.class); @@ -72,13 +77,10 @@ public void setThreadPoolQueueSize(int threadPoolQueueSize) { this.threadPoolQueueSize = threadPoolQueueSize; } - /** * Require for `server.crt` and `server.pem` for open ssl at server side. * - * @param host - * @param port - * @param certChainFile `server.crt` file + * @param certChainFile `server.crt` file * @param privateKeyFile `server.pem` file */ public GRPCServer(String host, int port, File certChainFile, File privateKeyFile) { @@ -86,8 +88,7 @@ public GRPCServer(String host, int port, File certChainFile, File privateKeyFile this.port = port; this.certChainFile = certChainFile; this.privateKeyFile = privateKeyFile; - this.sslContextBuilder = SslContextBuilder.forServer(certChainFile, - privateKeyFile); + this.sslContextBuilder = SslContextBuilder.forServer(certChainFile, privateKeyFile); } @Override @@ -104,10 +105,11 @@ public String serverClassify() { public void initialize() { InetSocketAddress address = new InetSocketAddress(host, port); ArrayBlockingQueue blockingQueue = new ArrayBlockingQueue(threadPoolQueueSize); - ExecutorService executor = new ThreadPoolExecutor(threadPoolSize, threadPoolSize, 60, - TimeUnit.SECONDS, blockingQueue, new CustomThreadFactory("grpcServerPool"), new CustomRejectedExecutionHandler()); + ExecutorService executor = new ThreadPoolExecutor(threadPoolSize, threadPoolSize, 60, TimeUnit.SECONDS, blockingQueue, new CustomThreadFactory("grpcServerPool"), new CustomRejectedExecutionHandler()); nettyServerBuilder = NettyServerBuilder.forAddress(address); - nettyServerBuilder = nettyServerBuilder.maxConcurrentCallsPerConnection(maxConcurrentCallsPerConnection).maxMessageSize(maxMessageSize).executor(executor); + nettyServerBuilder = nettyServerBuilder.maxConcurrentCallsPerConnection(maxConcurrentCallsPerConnection) + .maxMessageSize(maxMessageSize) + .executor(executor); logger.info("Server started, host {} listening on {}", host, port); } @@ -123,9 +125,8 @@ public void rejectedExecution(Runnable r, ThreadPoolExecutor executor) { public void start() throws ServerException { try { if (sslContextBuilder != null) { - nettyServerBuilder = nettyServerBuilder.sslContext( - GrpcSslContexts.configure(sslContextBuilder, - SslProvider.OPENSSL).build()); + nettyServerBuilder = nettyServerBuilder.sslContext(GrpcSslContexts.configure(sslContextBuilder, SslProvider.OPENSSL) + .build()); } server = nettyServerBuilder.build(); server.start(); @@ -155,10 +156,8 @@ public boolean isStatusEqual(Server target) { return true; if (target == null || getClass() != target.getClass()) return false; - GRPCServer that = (GRPCServer)target; - return port == that.port && - Objects.equals(host, that.host) && - Objects.equals(certChainFile, that.certChainFile) && - Objects.equals(privateKeyFile, that.privateKeyFile); + GRPCServer that = (GRPCServer) target; + return port == that.port && Objects.equals(host, that.host) && Objects.equals(certChainFile, that.certChainFile) && Objects + .equals(privateKeyFile, that.privateKeyFile); } } diff --git a/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/grpc/GRPCServerException.java b/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/grpc/GRPCServerException.java index 4ba69edb8418..1b5d77210909 100644 --- a/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/grpc/GRPCServerException.java +++ b/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/grpc/GRPCServerException.java @@ -20,9 +20,6 @@ import org.apache.skywalking.oap.server.library.server.ServerException; -/** - * @author peng-yongsheng - */ public class GRPCServerException extends ServerException { public GRPCServerException(String message) { diff --git a/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/jetty/ArgumentsParseException.java b/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/jetty/ArgumentsParseException.java index e12cb6220308..5c87f19d8b2c 100644 --- a/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/jetty/ArgumentsParseException.java +++ b/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/jetty/ArgumentsParseException.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.library.server.jetty; -/** - * @author peng-yongsheng - */ public class ArgumentsParseException extends Exception { public ArgumentsParseException(String message) { diff --git a/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/jetty/JettyHandler.java b/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/jetty/JettyHandler.java index e9ba86d57771..151c789c8436 100644 --- a/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/jetty/JettyHandler.java +++ b/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/jetty/JettyHandler.java @@ -21,9 +21,6 @@ import javax.servlet.http.HttpServlet; import org.apache.skywalking.oap.server.library.server.ServerHandler; -/** - * @author peng-yongsheng - */ public abstract class JettyHandler extends HttpServlet implements ServerHandler { public abstract String pathSpec(); } diff --git a/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/jetty/JettyJsonHandler.java b/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/jetty/JettyJsonHandler.java index 53be1adffca0..f2bbdedcc828 100644 --- a/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/jetty/JettyJsonHandler.java +++ b/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/jetty/JettyJsonHandler.java @@ -19,17 +19,21 @@ package org.apache.skywalking.oap.server.library.server.jetty; import com.google.gson.JsonElement; -import java.io.*; +import java.io.IOException; +import java.io.PrintWriter; import java.util.Enumeration; -import javax.servlet.*; -import javax.servlet.http.*; -import org.slf4j.*; +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static java.util.Objects.nonNull; -/** - * @author wusheng - */ public abstract class JettyJsonHandler extends JettyHandler { private static final Logger logger = LoggerFactory.getLogger(JettyJsonHandler.class); @@ -68,7 +72,8 @@ protected final void doHead(HttpServletRequest req, HttpServletResponse resp) th super.doHead(req, resp); } - @Override protected final long getLastModified(HttpServletRequest req) { + @Override + protected final long getLastModified(HttpServletRequest req) { return super.getLastModified(req); } @@ -101,51 +106,63 @@ protected final void service(HttpServletRequest req, super.service(req, resp); } - @Override public final void service(ServletRequest req, ServletResponse res) throws ServletException, IOException { + @Override + public final void service(ServletRequest req, ServletResponse res) throws ServletException, IOException { super.service(req, res); } - @Override public final void destroy() { + @Override + public final void destroy() { super.destroy(); } - @Override public final String getInitParameter(String name) { + @Override + public final String getInitParameter(String name) { return super.getInitParameter(name); } - @Override public final Enumeration getInitParameterNames() { + @Override + public final Enumeration getInitParameterNames() { return super.getInitParameterNames(); } - @Override public final ServletConfig getServletConfig() { + @Override + public final ServletConfig getServletConfig() { return super.getServletConfig(); } - @Override public final ServletContext getServletContext() { + @Override + public final ServletContext getServletContext() { return super.getServletContext(); } - @Override public final String getServletInfo() { + @Override + public final String getServletInfo() { return super.getServletInfo(); } - @Override public final void init(ServletConfig config) throws ServletException { + @Override + public final void init(ServletConfig config) throws ServletException { super.init(config); } - @Override public final void init() throws ServletException { + @Override + public final void init() throws ServletException { super.init(); } - @Override public final void log(String msg) { + @Override + public final void log(String msg) { super.log(msg); } - @Override public final void log(String message, Throwable t) { + @Override + public final void log(String message, Throwable t) { super.log(message, t); } - @Override public final String getServletName() { + @Override + public final String getServletName() { return super.getServletName(); } diff --git a/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/jetty/JettyServer.java b/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/jetty/JettyServer.java index ec96327a2338..85d991edd087 100644 --- a/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/jetty/JettyServer.java +++ b/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/jetty/JettyServer.java @@ -20,13 +20,14 @@ import java.net.InetSocketAddress; import java.util.Objects; -import org.apache.skywalking.oap.server.library.server.*; -import org.eclipse.jetty.servlet.*; -import org.slf4j.*; +import org.apache.skywalking.oap.server.library.server.Server; +import org.apache.skywalking.oap.server.library.server.ServerException; +import org.eclipse.jetty.servlet.ServletContextHandler; +import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.servlet.ServletMapping; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng, wusheng - */ public class JettyServer implements Server { private static final Logger logger = LoggerFactory.getLogger(JettyServer.class); @@ -93,9 +94,12 @@ public void start() throws ServerException { logger.info("start server, host: {}, port: {}", host, port); try { if (logger.isDebugEnabled()) { - if (servletContextHandler.getServletHandler() != null && servletContextHandler.getServletHandler().getServletMappings() != null) { - for (ServletMapping servletMapping : servletContextHandler.getServletHandler().getServletMappings()) { - logger.debug("jetty servlet mappings: {} register by {}", servletMapping.getPathSpecs(), servletMapping.getServletName()); + if (servletContextHandler.getServletHandler() != null && servletContextHandler.getServletHandler() + .getServletMappings() != null) { + for (ServletMapping servletMapping : servletContextHandler.getServletHandler() + .getServletMappings()) { + logger.debug("jetty servlet mappings: {} register by {}", servletMapping.getPathSpecs(), servletMapping + .getServletName()); } } } @@ -112,9 +116,8 @@ public boolean equals(Object o) { return true; if (o == null || getClass() != o.getClass()) return false; - JettyServer that = (JettyServer)o; - return port == that.port && - Objects.equals(host, that.host); + JettyServer that = (JettyServer) o; + return port == that.port && Objects.equals(host, that.host); } @Override diff --git a/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/jetty/JettyServerConfig.java b/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/jetty/JettyServerConfig.java index 0902c02a5a64..aee61ab1f9f5 100644 --- a/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/jetty/JettyServerConfig.java +++ b/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/jetty/JettyServerConfig.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.library.server.jetty; -/** - * @author peng-yongsheng - */ public abstract class JettyServerConfig { private String host; diff --git a/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/jetty/JettyServerException.java b/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/jetty/JettyServerException.java index 242ca23c6e8f..36ff991887ec 100644 --- a/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/jetty/JettyServerException.java +++ b/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/jetty/JettyServerException.java @@ -20,9 +20,6 @@ import org.apache.skywalking.oap.server.library.server.ServerException; -/** - * @author peng-yongsheng - */ public class JettyServerException extends ServerException { public JettyServerException(String message) { diff --git a/oap-server/server-library/library-util/pom.xml b/oap-server/server-library/library-util/pom.xml index 38ade23e8e59..93b2fa78e824 100644 --- a/oap-server/server-library/library-util/pom.xml +++ b/oap-server/server-library/library-util/pom.xml @@ -17,7 +17,8 @@ ~ --> - + server-library org.apache.skywalking diff --git a/oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/Address.java b/oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/Address.java index 4e97e33a5ca0..d21b563a9610 100644 --- a/oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/Address.java +++ b/oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/Address.java @@ -18,11 +18,9 @@ package org.apache.skywalking.oap.server.library.util; -import lombok.*; +import lombok.Getter; +import lombok.Setter; -/** - * @author peng-yongsheng - */ @Getter @Setter public class Address { diff --git a/oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/BooleanUtils.java b/oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/BooleanUtils.java index 8239110d76a6..01faa08b93f8 100644 --- a/oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/BooleanUtils.java +++ b/oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/BooleanUtils.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.library.util; -/** - * @author peng-yongsheng - */ public class BooleanUtils { public static final int TRUE = 1; diff --git a/oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/CollectionUtils.java b/oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/CollectionUtils.java index c3b657c169ce..d41bce7f2b49 100644 --- a/oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/CollectionUtils.java +++ b/oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/CollectionUtils.java @@ -18,11 +18,10 @@ package org.apache.skywalking.oap.server.library.util; -import java.util.*; +import java.util.List; +import java.util.Map; +import java.util.Set; -/** - * @author peng-yongsheng - */ public class CollectionUtils { public static boolean isEmpty(Map map) { diff --git a/oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/ConnectStringParseException.java b/oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/ConnectStringParseException.java index 959542a2fe24..0211d540896e 100644 --- a/oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/ConnectStringParseException.java +++ b/oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/ConnectStringParseException.java @@ -20,8 +20,6 @@ /** * Thrown if the given string which build with hosts and ports is incorrect. - * - * @author peng-yongsheng */ public class ConnectStringParseException extends Exception { diff --git a/oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/ConnectUtils.java b/oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/ConnectUtils.java index 6f0939d3c3a0..c00f8b13a61a 100644 --- a/oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/ConnectUtils.java +++ b/oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/ConnectUtils.java @@ -19,11 +19,9 @@ package org.apache.skywalking.oap.server.library.util; import com.google.common.base.Strings; -import java.util.*; +import java.util.ArrayList; +import java.util.List; -/** - * @author peng-yongsheng - */ public class ConnectUtils { private ConnectUtils() { diff --git a/oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/ResourceUtils.java b/oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/ResourceUtils.java index 49949390a4d8..ba7ea1b552b3 100644 --- a/oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/ResourceUtils.java +++ b/oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/ResourceUtils.java @@ -18,12 +18,12 @@ package org.apache.skywalking.oap.server.library.util; -import java.io.*; +import java.io.FileNotFoundException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; import java.net.URL; -/** - * @author peng-yongsheng - */ public class ResourceUtils { public static Reader read(String fileName) throws FileNotFoundException { diff --git a/oap-server/server-library/library-util/src/test/java/org/apache/skywalking/oap/server/library/util/BooleanUtilsTest.java b/oap-server/server-library/library-util/src/test/java/org/apache/skywalking/oap/server/library/util/BooleanUtilsTest.java index 30976c18d1fb..1305ca5ef526 100644 --- a/oap-server/server-library/library-util/src/test/java/org/apache/skywalking/oap/server/library/util/BooleanUtilsTest.java +++ b/oap-server/server-library/library-util/src/test/java/org/apache/skywalking/oap/server/library/util/BooleanUtilsTest.java @@ -19,11 +19,10 @@ import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; -/** - * @author kezhenxu94 - */ public class BooleanUtilsTest { @Test diff --git a/oap-server/server-library/library-util/src/test/java/org/apache/skywalking/oap/server/library/util/CollectionUtilsTest.java b/oap-server/server-library/library-util/src/test/java/org/apache/skywalking/oap/server/library/util/CollectionUtilsTest.java index 3d90bca0762d..9fe74e4e9c27 100644 --- a/oap-server/server-library/library-util/src/test/java/org/apache/skywalking/oap/server/library/util/CollectionUtilsTest.java +++ b/oap-server/server-library/library-util/src/test/java/org/apache/skywalking/oap/server/library/util/CollectionUtilsTest.java @@ -18,21 +18,17 @@ package org.apache.skywalking.oap.server.library.util; import com.google.common.collect.ImmutableMap; -import org.junit.Test; - import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; +import org.junit.Test; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -/** - * @author kezhenxu94 - */ public class CollectionUtilsTest { @Test diff --git a/oap-server/server-library/library-util/src/test/java/org/apache/skywalking/oap/server/library/util/ConnectUtilTestCase.java b/oap-server/server-library/library-util/src/test/java/org/apache/skywalking/oap/server/library/util/ConnectUtilTestCase.java index 72cc169e121c..4e8453417d12 100644 --- a/oap-server/server-library/library-util/src/test/java/org/apache/skywalking/oap/server/library/util/ConnectUtilTestCase.java +++ b/oap-server/server-library/library-util/src/test/java/org/apache/skywalking/oap/server/library/util/ConnectUtilTestCase.java @@ -19,11 +19,9 @@ package org.apache.skywalking.oap.server.library.util; import java.util.List; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -/** - * @author peng-yongsheng - */ public class ConnectUtilTestCase { @Test diff --git a/oap-server/server-library/library-util/src/test/java/org/apache/skywalking/oap/server/library/util/PropertyPlaceholderHelperTest.java b/oap-server/server-library/library-util/src/test/java/org/apache/skywalking/oap/server/library/util/PropertyPlaceholderHelperTest.java index 0771e8f3314e..38aad4a5a2d4 100644 --- a/oap-server/server-library/library-util/src/test/java/org/apache/skywalking/oap/server/library/util/PropertyPlaceholderHelperTest.java +++ b/oap-server/server-library/library-util/src/test/java/org/apache/skywalking/oap/server/library/util/PropertyPlaceholderHelperTest.java @@ -31,9 +31,6 @@ import org.junit.contrib.java.lang.system.EnvironmentVariables; import org.yaml.snakeyaml.Yaml; -/** - * @author jian.tan - */ public class PropertyPlaceholderHelperTest { private PropertyPlaceholderHelper placeholderHelper; private Properties properties = new Properties(); @@ -68,16 +65,13 @@ public void init() throws FileNotFoundException { @Test public void testDataType() { //tests that do not use ${name} to set config. - Assert.assertEquals("grpc.skywalking.apache.org", - yaml.load(placeholderHelper.replacePlaceholders(properties.getProperty("gRPCHost"), properties))); + Assert.assertEquals("grpc.skywalking.apache.org", yaml.load(placeholderHelper.replacePlaceholders(properties.getProperty("gRPCHost"), properties))); //tests that use ${REST_HOST:0.0.0.0} but not set REST_HOST in environmentVariables. - Assert.assertEquals("0.0.0.0", - yaml.load(placeholderHelper.replacePlaceholders(properties.getProperty("restHost"), properties))); + Assert.assertEquals("0.0.0.0", yaml.load(placeholderHelper.replacePlaceholders(properties.getProperty("restHost"), properties))); //tests that use ${REST_PORT:12800} and set REST_PORT in environmentVariables. - Assert.assertEquals(12801, - yaml.load(placeholderHelper.replacePlaceholders(properties.getProperty("restPort"), properties))); + Assert.assertEquals(12801, yaml.load(placeholderHelper.replacePlaceholders(properties.getProperty("restPort"), properties))); } @Test diff --git a/oap-server/server-library/library-util/src/test/java/org/apache/skywalking/oap/server/library/util/ResourceUtilsTest.java b/oap-server/server-library/library-util/src/test/java/org/apache/skywalking/oap/server/library/util/ResourceUtilsTest.java index 8ed8e229f4b1..054a3660e120 100644 --- a/oap-server/server-library/library-util/src/test/java/org/apache/skywalking/oap/server/library/util/ResourceUtilsTest.java +++ b/oap-server/server-library/library-util/src/test/java/org/apache/skywalking/oap/server/library/util/ResourceUtilsTest.java @@ -17,13 +17,9 @@ package org.apache.skywalking.oap.server.library.util; -import org.junit.Test; - import java.io.FileNotFoundException; +import org.junit.Test; -/** - * @author kezhenxu94 - */ public class ResourceUtilsTest { @Test(expected = FileNotFoundException.class) diff --git a/oap-server/server-library/library-util/src/test/java/org/apache/skywalking/oap/server/library/util/TimestampUtils.java b/oap-server/server-library/library-util/src/test/java/org/apache/skywalking/oap/server/library/util/TimestampUtils.java index 050971284f8d..7d991f987b87 100644 --- a/oap-server/server-library/library-util/src/test/java/org/apache/skywalking/oap/server/library/util/TimestampUtils.java +++ b/oap-server/server-library/library-util/src/test/java/org/apache/skywalking/oap/server/library/util/TimestampUtils.java @@ -20,11 +20,9 @@ import java.sql.Timestamp; import java.text.SimpleDateFormat; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng - */ public class TimestampUtils { private static final Logger logger = LoggerFactory.getLogger(TimestampUtils.class); diff --git a/oap-server/server-library/pom.xml b/oap-server/server-library/pom.xml index 47544d740bb1..266b5cdd18bb 100644 --- a/oap-server/server-library/pom.xml +++ b/oap-server/server-library/pom.xml @@ -17,7 +17,8 @@ ~ --> - + oap-server org.apache.skywalking diff --git a/oap-server/server-query-plugin/pom.xml b/oap-server/server-query-plugin/pom.xml index d38227f56110..6fc6cffa206c 100644 --- a/oap-server/server-query-plugin/pom.xml +++ b/oap-server/server-query-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + oap-server org.apache.skywalking diff --git a/oap-server/server-query-plugin/query-graphql-plugin/pom.xml b/oap-server/server-query-plugin/query-graphql-plugin/pom.xml index b1e4c33533f2..8b4b5fba7509 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/pom.xml +++ b/oap-server/server-query-plugin/query-graphql-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + server-query-plugin org.apache.skywalking diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryConfig.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryConfig.java index 328dd0972f52..dddfe80dca55 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryConfig.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryConfig.java @@ -25,8 +25,6 @@ /** * The config of {@code query.graphql}. - * - * @author gaohongtao */ @Getter(AccessLevel.PACKAGE) @Setter(AccessLevel.PUBLIC) diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryHandler.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryHandler.java index ad4dcf6d02bc..d6da7be9d260 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryHandler.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryHandler.java @@ -59,16 +59,18 @@ public class GraphQLQueryHandler extends JettyJsonHandler { private final GraphQL graphQL; - - @Override public String pathSpec() { + @Override + public String pathSpec() { return path; } - @Override protected JsonElement doGet(HttpServletRequest req) { + @Override + protected JsonElement doGet(HttpServletRequest req) { throw new UnsupportedOperationException("GraphQL only supports POST method"); } - @Override protected JsonElement doPost(HttpServletRequest req) throws IOException { + @Override + protected JsonElement doPost(HttpServletRequest req) throws IOException { BufferedReader reader = new BufferedReader(new InputStreamReader(req.getInputStream())); String line; StringBuilder request = new StringBuilder(); @@ -78,12 +80,16 @@ public class GraphQLQueryHandler extends JettyJsonHandler { JsonObject requestJson = gson.fromJson(request.toString(), JsonObject.class); - return execute(requestJson.get(QUERY).getAsString(), gson.fromJson(requestJson.get(VARIABLES), mapOfStringObjectType)); + return execute(requestJson.get(QUERY) + .getAsString(), gson.fromJson(requestJson.get(VARIABLES), mapOfStringObjectType)); } private JsonObject execute(String request, Map variables) { try { - ExecutionInput executionInput = ExecutionInput.newExecutionInput().query(request).variables(variables).build(); + ExecutionInput executionInput = ExecutionInput.newExecutionInput() + .query(request) + .variables(variables) + .build(); ExecutionResult executionResult = graphQL.execute(executionInput); logger.debug("Execution result is {}", executionResult); Object data = executionResult.getData(); diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryProvider.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryProvider.java index b9ce7d6c194e..51f0ad396bf9 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryProvider.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryProvider.java @@ -21,16 +21,29 @@ import com.coxautodev.graphql.tools.SchemaParser; import graphql.GraphQL; import graphql.schema.GraphQLSchema; -import org.apache.skywalking.oap.query.graphql.resolver.*; +import org.apache.skywalking.oap.query.graphql.resolver.AggregationQuery; +import org.apache.skywalking.oap.query.graphql.resolver.AlarmQuery; +import org.apache.skywalking.oap.query.graphql.resolver.LogQuery; +import org.apache.skywalking.oap.query.graphql.resolver.MetadataQuery; +import org.apache.skywalking.oap.query.graphql.resolver.MetricQuery; +import org.apache.skywalking.oap.query.graphql.resolver.Mutation; +import org.apache.skywalking.oap.query.graphql.resolver.ProfileMutation; +import org.apache.skywalking.oap.query.graphql.resolver.ProfileQuery; +import org.apache.skywalking.oap.query.graphql.resolver.Query; +import org.apache.skywalking.oap.query.graphql.resolver.TopNRecordsQuery; +import org.apache.skywalking.oap.query.graphql.resolver.TopologyQuery; +import org.apache.skywalking.oap.query.graphql.resolver.TraceQuery; import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.query.QueryModule; import org.apache.skywalking.oap.server.core.server.JettyHandlerRegister; -import org.apache.skywalking.oap.server.library.module.*; +import org.apache.skywalking.oap.server.library.module.ModuleConfig; +import org.apache.skywalking.oap.server.library.module.ModuleDefine; +import org.apache.skywalking.oap.server.library.module.ModuleProvider; +import org.apache.skywalking.oap.server.library.module.ModuleStartException; +import org.apache.skywalking.oap.server.library.module.ServiceNotProvidedException; /** * GraphQL query provider. - * - * @author gaohongtao */ public class GraphQLQueryProvider extends ModuleProvider { @@ -38,55 +51,64 @@ public class GraphQLQueryProvider extends ModuleProvider { private GraphQL graphQL; - @Override public String name() { + @Override + public String name() { return "graphql"; } - @Override public Class module() { + @Override + public Class module() { return QueryModule.class; } - @Override public ModuleConfig createConfigBeanIfAbsent() { + @Override + public ModuleConfig createConfigBeanIfAbsent() { return config; } - @Override public void prepare() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void prepare() throws ServiceNotProvidedException, ModuleStartException { GraphQLSchema schema = SchemaParser.newParser() - .file("query-protocol/common.graphqls") - .resolvers(new Query(), new Mutation()) - .file("query-protocol/metadata.graphqls") - .resolvers(new MetadataQuery(getManager())) - .file("query-protocol/metric.graphqls") - .resolvers(new MetricQuery(getManager())) - .file("query-protocol/topology.graphqls") - .resolvers(new TopologyQuery(getManager())) - .file("query-protocol/trace.graphqls") - .resolvers(new TraceQuery(getManager())) - .file("query-protocol/aggregation.graphqls") - .resolvers(new AggregationQuery(getManager())) - .file("query-protocol/alarm.graphqls") - .resolvers(new AlarmQuery(getManager())) - .file("query-protocol/top-n-records.graphqls") - .resolvers(new TopNRecordsQuery(getManager())) - .file("query-protocol/log.graphqls") - .resolvers(new LogQuery(getManager())) - .file("query-protocol/profile.graphqls") - .resolvers(new ProfileQuery(getManager()), new ProfileMutation(getManager())) - .build() - .makeExecutableSchema(); + .file("query-protocol/common.graphqls") + .resolvers(new Query(), new Mutation()) + .file("query-protocol/metadata.graphqls") + .resolvers(new MetadataQuery(getManager())) + .file("query-protocol/metric.graphqls") + .resolvers(new MetricQuery(getManager())) + .file("query-protocol/topology.graphqls") + .resolvers(new TopologyQuery(getManager())) + .file("query-protocol/trace.graphqls") + .resolvers(new TraceQuery(getManager())) + .file("query-protocol/aggregation.graphqls") + .resolvers(new AggregationQuery(getManager())) + .file("query-protocol/alarm.graphqls") + .resolvers(new AlarmQuery(getManager())) + .file("query-protocol/top-n-records.graphqls") + .resolvers(new TopNRecordsQuery(getManager())) + .file("query-protocol/log.graphqls") + .resolvers(new LogQuery(getManager())) + .file("query-protocol/profile.graphqls") + .resolvers(new ProfileQuery(getManager()), new ProfileMutation(getManager())) + .build() + .makeExecutableSchema(); this.graphQL = GraphQL.newGraphQL(schema).build(); } - @Override public void start() throws ServiceNotProvidedException, ModuleStartException { - JettyHandlerRegister service = getManager().find(CoreModule.NAME).provider().getService(JettyHandlerRegister.class); + @Override + public void start() throws ServiceNotProvidedException, ModuleStartException { + JettyHandlerRegister service = getManager().find(CoreModule.NAME) + .provider() + .getService(JettyHandlerRegister.class); service.addHandler(new GraphQLQueryHandler(config.getPath(), graphQL)); } - @Override public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleStartException { } - @Override public String[] requiredModules() { + @Override + public String[] requiredModules() { return new String[0]; } } diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AggregationQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AggregationQuery.java index 2eccd7d55909..cd7524c1106b 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AggregationQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AggregationQuery.java @@ -23,13 +23,13 @@ import java.util.List; import org.apache.skywalking.oap.query.graphql.type.Duration; import org.apache.skywalking.oap.server.core.CoreModule; -import org.apache.skywalking.oap.server.core.query.*; -import org.apache.skywalking.oap.server.core.query.entity.*; +import org.apache.skywalking.oap.server.core.query.AggregationQueryService; +import org.apache.skywalking.oap.server.core.query.DurationUtils; +import org.apache.skywalking.oap.server.core.query.StepToDownsampling; +import org.apache.skywalking.oap.server.core.query.entity.Order; +import org.apache.skywalking.oap.server.core.query.entity.TopNEntity; import org.apache.skywalking.oap.server.library.module.ModuleManager; -/** - * @author peng-yongsheng - */ public class AggregationQuery implements GraphQLQueryResolver { private final ModuleManager moduleManager; @@ -41,7 +41,9 @@ public AggregationQuery(ModuleManager moduleManager) { private AggregationQueryService getQueryService() { if (queryService == null) { - this.queryService = moduleManager.find(CoreModule.NAME).provider().getService(AggregationQueryService.class); + this.queryService = moduleManager.find(CoreModule.NAME) + .provider() + .getService(AggregationQueryService.class); } return queryService; } @@ -70,8 +72,8 @@ public List getServiceInstanceTopN(final int serviceId, final String return getQueryService().getServiceInstanceTopN(serviceId, name, topN, StepToDownsampling.transform(duration.getStep()), startTimeBucket, endTimeBucket, order); } - public List getAllEndpointTopN(final String name, final int topN, - final Duration duration, final Order order) throws IOException { + public List getAllEndpointTopN(final String name, final int topN, final Duration duration, + final Order order) throws IOException { long startTimeBucket = DurationUtils.INSTANCE.exchangeToTimeBucket(duration.getStart()); long endTimeBucket = DurationUtils.INSTANCE.exchangeToTimeBucket(duration.getEnd()); diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AlarmQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AlarmQuery.java index acbec882476a..ed7e3cad3e51 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AlarmQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AlarmQuery.java @@ -20,15 +20,16 @@ import com.coxautodev.graphql.tools.GraphQLQueryResolver; import java.io.IOException; -import org.apache.skywalking.oap.query.graphql.type.*; +import org.apache.skywalking.oap.query.graphql.type.Duration; import org.apache.skywalking.oap.server.core.CoreModule; -import org.apache.skywalking.oap.server.core.query.*; -import org.apache.skywalking.oap.server.core.query.entity.*; +import org.apache.skywalking.oap.server.core.query.AlarmQueryService; +import org.apache.skywalking.oap.server.core.query.DurationUtils; +import org.apache.skywalking.oap.server.core.query.entity.AlarmTrend; +import org.apache.skywalking.oap.server.core.query.entity.Alarms; +import org.apache.skywalking.oap.server.core.query.entity.Pagination; +import org.apache.skywalking.oap.server.core.query.entity.Scope; import org.apache.skywalking.oap.server.library.module.ModuleManager; -/** - * @author peng-yongsheng - */ public class AlarmQuery implements GraphQLQueryResolver { private final ModuleManager moduleManager; diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogQuery.java index cd48a3dceda7..b52efc0e38fb 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogQuery.java @@ -22,15 +22,13 @@ import java.io.IOException; import org.apache.skywalking.oap.query.graphql.type.LogQueryCondition; import org.apache.skywalking.oap.server.core.CoreModule; -import org.apache.skywalking.oap.server.core.query.*; +import org.apache.skywalking.oap.server.core.query.DurationUtils; +import org.apache.skywalking.oap.server.core.query.LogQueryService; import org.apache.skywalking.oap.server.core.query.entity.Logs; import org.apache.skywalking.oap.server.library.module.ModuleManager; import static java.util.Objects.nonNull; -/** - * @author wusheng - */ public class LogQuery implements GraphQLQueryResolver { private final ModuleManager moduleManager; private LogQueryService logQueryService; @@ -50,11 +48,15 @@ public Logs queryLogs(LogQueryCondition condition) throws IOException { long startSecondTB = 0; long endSecondTB = 0; if (nonNull(condition.getQueryDuration())) { - startSecondTB = DurationUtils.INSTANCE.startTimeDurationToSecondTimeBucket(condition.getQueryDuration().getStep(), condition.getQueryDuration().getStart()); - endSecondTB = DurationUtils.INSTANCE.endTimeDurationToSecondTimeBucket(condition.getQueryDuration().getStep(), condition.getQueryDuration().getEnd()); + startSecondTB = DurationUtils.INSTANCE.startTimeDurationToSecondTimeBucket(condition.getQueryDuration() + .getStep(), condition.getQueryDuration() + .getStart()); + endSecondTB = DurationUtils.INSTANCE.endTimeDurationToSecondTimeBucket(condition.getQueryDuration() + .getStep(), condition.getQueryDuration() + .getEnd()); } - return getQueryService().queryLogs(condition.getMetricName(), condition.getServiceId(), condition.getServiceInstanceId(), condition.getEndpointId(), - condition.getTraceId(), condition.getState(), condition.getStateCode(), condition.getPaging(), startSecondTB, endSecondTB); + return getQueryService().queryLogs(condition.getMetricName(), condition.getServiceId(), condition.getServiceInstanceId(), condition + .getEndpointId(), condition.getTraceId(), condition.getState(), condition.getStateCode(), condition.getPaging(), startSecondTB, endSecondTB); } } diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetadataQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetadataQuery.java index bded832a8621..bfe4adf2761f 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetadataQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetadataQuery.java @@ -27,13 +27,16 @@ import org.apache.skywalking.oap.query.graphql.type.Duration; import org.apache.skywalking.oap.query.graphql.type.TimeInfo; import org.apache.skywalking.oap.server.core.CoreModule; -import org.apache.skywalking.oap.server.core.query.*; -import org.apache.skywalking.oap.server.core.query.entity.*; +import org.apache.skywalking.oap.server.core.query.DurationUtils; +import org.apache.skywalking.oap.server.core.query.MetadataQueryService; +import org.apache.skywalking.oap.server.core.query.entity.ClusterBrief; +import org.apache.skywalking.oap.server.core.query.entity.Database; +import org.apache.skywalking.oap.server.core.query.entity.Endpoint; +import org.apache.skywalking.oap.server.core.query.entity.EndpointInfo; +import org.apache.skywalking.oap.server.core.query.entity.Service; +import org.apache.skywalking.oap.server.core.query.entity.ServiceInstance; import org.apache.skywalking.oap.server.library.module.ModuleManager; -/** - * @author peng-yongsheng - */ public class MetadataQuery implements GraphQLQueryResolver { private final ModuleManager moduleManager; @@ -45,7 +48,9 @@ public MetadataQuery(ModuleManager moduleManager) { private MetadataQueryService getMetadataQueryService() { if (metadataQueryService == null) { - this.metadataQueryService = moduleManager.find(CoreModule.NAME).provider().getService(MetadataQueryService.class); + this.metadataQueryService = moduleManager.find(CoreModule.NAME) + .provider() + .getService(MetadataQueryService.class); } return metadataQueryService; } @@ -71,8 +76,8 @@ public List getAllBrowserServices(final Duration duration) throws IOExc return getMetadataQueryService().getAllBrowserServices(startTimestamp, endTimestamp); } - public List searchServices(final Duration duration, final String keyword) - throws IOException, ParseException { + public List searchServices(final Duration duration, + final String keyword) throws IOException, ParseException { long startTimestamp = DurationUtils.INSTANCE.startTimeToTimestamp(duration.getStep(), duration.getStart()); long endTimestamp = DurationUtils.INSTANCE.endTimeToTimestamp(duration.getStep(), duration.getEnd()); diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricQuery.java index 5a3a9f195dfd..7c5da3da17af 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricQuery.java @@ -33,9 +33,6 @@ import org.apache.skywalking.oap.server.core.query.entity.Thermodynamic; import org.apache.skywalking.oap.server.library.module.ModuleManager; -/** - * @author peng-yongsheng - */ public class MetricQuery implements GraphQLQueryResolver { private final ModuleManager moduleManager; @@ -47,7 +44,9 @@ public MetricQuery(ModuleManager moduleManager) { private MetricQueryService getMetricQueryService() { if (metricQueryService == null) { - this.metricQueryService = moduleManager.find(CoreModule.NAME).provider().getService(MetricQueryService.class); + this.metricQueryService = moduleManager.find(CoreModule.NAME) + .provider() + .getService(MetricQueryService.class); } return metricQueryService; } @@ -56,7 +55,8 @@ public IntValues getValues(final BatchMetricConditions metrics, final Duration d long startTimeBucket = DurationUtils.INSTANCE.exchangeToTimeBucket(duration.getStart()); long endTimeBucket = DurationUtils.INSTANCE.exchangeToTimeBucket(duration.getEnd()); - return getMetricQueryService().getValues(metrics.getName(), metrics.getIds(), StepToDownsampling.transform(duration.getStep()), startTimeBucket, endTimeBucket); + return getMetricQueryService().getValues(metrics.getName(), metrics.getIds(), StepToDownsampling.transform(duration + .getStep()), startTimeBucket, endTimeBucket); } public IntValues getLinearIntValues(final MetricCondition metrics, @@ -64,7 +64,8 @@ public IntValues getLinearIntValues(final MetricCondition metrics, long startTimeBucket = DurationUtils.INSTANCE.exchangeToTimeBucket(duration.getStart()); long endTimeBucket = DurationUtils.INSTANCE.exchangeToTimeBucket(duration.getEnd()); - return getMetricQueryService().getLinearIntValues(metrics.getName(), metrics.getId(), StepToDownsampling.transform(duration.getStep()), startTimeBucket, endTimeBucket); + return getMetricQueryService().getLinearIntValues(metrics.getName(), metrics.getId(), StepToDownsampling.transform(duration + .getStep()), startTimeBucket, endTimeBucket); } public List getMultipleLinearIntValues(final MetricCondition metrics, final int numOfLinear, @@ -72,7 +73,8 @@ public List getMultipleLinearIntValues(final MetricCondition metrics, long startTimeBucket = DurationUtils.INSTANCE.exchangeToTimeBucket(duration.getStart()); long endTimeBucket = DurationUtils.INSTANCE.exchangeToTimeBucket(duration.getEnd()); - return getMetricQueryService().getMultipleLinearIntValues(metrics.getName(), metrics.getId(), numOfLinear, StepToDownsampling.transform(duration.getStep()), startTimeBucket, endTimeBucket); + return getMetricQueryService().getMultipleLinearIntValues(metrics.getName(), metrics.getId(), numOfLinear, StepToDownsampling + .transform(duration.getStep()), startTimeBucket, endTimeBucket); } public List getSubsetOfMultipleLinearIntValues(final MetricCondition metrics, @@ -80,7 +82,8 @@ public List getSubsetOfMultipleLinearIntValues(final MetricCondition long startTimeBucket = DurationUtils.INSTANCE.exchangeToTimeBucket(duration.getStart()); long endTimeBucket = DurationUtils.INSTANCE.exchangeToTimeBucket(duration.getEnd()); - return getMetricQueryService().getSubsetOfMultipleLinearIntValues(metrics.getName(), metrics.getId(), linearIndex, StepToDownsampling.transform(duration.getStep()), startTimeBucket, endTimeBucket); + return getMetricQueryService().getSubsetOfMultipleLinearIntValues(metrics.getName(), metrics.getId(), linearIndex, StepToDownsampling + .transform(duration.getStep()), startTimeBucket, endTimeBucket); } public Thermodynamic getThermodynamic(final MetricCondition metrics, @@ -88,6 +91,7 @@ public Thermodynamic getThermodynamic(final MetricCondition metrics, long startTimeBucket = DurationUtils.INSTANCE.exchangeToTimeBucket(duration.getStart()); long endTimeBucket = DurationUtils.INSTANCE.exchangeToTimeBucket(duration.getEnd()); - return getMetricQueryService().getThermodynamic(metrics.getName(), metrics.getId(), StepToDownsampling.transform(duration.getStep()), startTimeBucket, endTimeBucket); + return getMetricQueryService().getThermodynamic(metrics.getName(), metrics.getId(), StepToDownsampling.transform(duration + .getStep()), startTimeBucket, endTimeBucket); } } diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/Mutation.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/Mutation.java index 769cec1c2fa8..cf3abdba88d8 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/Mutation.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/Mutation.java @@ -22,8 +22,6 @@ /** * Root mutation resolver. - * - * @author gaohongtao */ public class Mutation implements GraphQLMutationResolver { private String version; diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ProfileMutation.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ProfileMutation.java index b9b861b1a2f6..4849c9e27a92 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ProfileMutation.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ProfileMutation.java @@ -15,21 +15,19 @@ * limitations under the License. * */ + package org.apache.skywalking.oap.query.graphql.resolver; import com.coxautodev.graphql.tools.GraphQLMutationResolver; +import java.io.IOException; import org.apache.skywalking.oap.query.graphql.type.ProfileTaskCreationRequest; import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.profile.ProfileTaskMutationService; import org.apache.skywalking.oap.server.core.profile.entity.ProfileTaskCreationResult; import org.apache.skywalking.oap.server.library.module.ModuleManager; -import java.io.IOException; - /** * profile mutation GraphQL resolver - * - * @author MrPro */ public class ProfileMutation implements GraphQLMutationResolver { @@ -42,20 +40,17 @@ public ProfileMutation(ModuleManager moduleManager) { private ProfileTaskMutationService getProfileTaskService() { if (profileTaskService == null) { - this.profileTaskService = moduleManager.find(CoreModule.NAME).provider().getService(ProfileTaskMutationService.class); + this.profileTaskService = moduleManager.find(CoreModule.NAME) + .provider() + .getService(ProfileTaskMutationService.class); } return profileTaskService; } public ProfileTaskCreationResult createProfileTask(ProfileTaskCreationRequest creationRequest) throws IOException { - return getProfileTaskService().createTask( - creationRequest.getServiceId(), - creationRequest.getEndpointName() == null ? null : creationRequest.getEndpointName().trim(), - creationRequest.getStartTime() == null ? -1 : creationRequest.getStartTime(), - creationRequest.getDuration(), - creationRequest.getMinDurationThreshold(), - creationRequest.getDumpPeriod(), - creationRequest.getMaxSamplingCount() - ); + return getProfileTaskService().createTask(creationRequest.getServiceId(), creationRequest.getEndpointName() == null ? null : creationRequest + .getEndpointName() + .trim(), creationRequest.getStartTime() == null ? -1 : creationRequest.getStartTime(), creationRequest.getDuration(), creationRequest + .getMinDurationThreshold(), creationRequest.getDumpPeriod(), creationRequest.getMaxSamplingCount()); } } diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ProfileQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ProfileQuery.java index f7e23eab7fac..750f33d6475f 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ProfileQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ProfileQuery.java @@ -31,8 +31,6 @@ /** * profile query GraphQL resolver - * - * @author MrPro */ public class ProfileQuery implements GraphQLQueryResolver { @@ -45,7 +43,9 @@ public ProfileQuery(ModuleManager moduleManager) { private ProfileTaskQueryService getProfileTaskQueryService() { if (profileTaskQueryService == null) { - this.profileTaskQueryService = moduleManager.find(CoreModule.NAME).provider().getService(ProfileTaskQueryService.class); + this.profileTaskQueryService = moduleManager.find(CoreModule.NAME) + .provider() + .getService(ProfileTaskQueryService.class); } return profileTaskQueryService; } @@ -58,7 +58,8 @@ public List getProfileTaskSegmentList(final String taskID) throws IO return getProfileTaskQueryService().getTaskTraces(taskID); } - public ProfileAnalyzation getProfileAnalyze(final String segmentId, final long start, final long end) throws IOException { + public ProfileAnalyzation getProfileAnalyze(final String segmentId, final long start, + final long end) throws IOException { return getProfileTaskQueryService().getProfileAnalyze(segmentId, start, end); } diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/Query.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/Query.java index 1735a8617817..8f4a018ead0d 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/Query.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/Query.java @@ -22,8 +22,6 @@ /** * Root Query Resolver. - * - * @author gaohongtao */ public class Query implements GraphQLQueryResolver { private String version = "6.0"; diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TopNRecordsQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TopNRecordsQuery.java index 63545210cfdb..63f0d6d6868c 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TopNRecordsQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TopNRecordsQuery.java @@ -23,13 +23,12 @@ import java.util.List; import org.apache.skywalking.oap.query.graphql.type.TopNRecordsCondition; import org.apache.skywalking.oap.server.core.CoreModule; -import org.apache.skywalking.oap.server.core.query.*; -import org.apache.skywalking.oap.server.core.query.entity.*; +import org.apache.skywalking.oap.server.core.query.DurationUtils; +import org.apache.skywalking.oap.server.core.query.TopNRecordsQueryService; +import org.apache.skywalking.oap.server.core.query.entity.Order; +import org.apache.skywalking.oap.server.core.query.entity.TopNRecord; import org.apache.skywalking.oap.server.library.module.ModuleManager; -/** - * @author wusheng - */ public class TopNRecordsQuery implements GraphQLQueryResolver { private final ModuleManager moduleManager; private TopNRecordsQueryService topNRecordsQueryService; @@ -40,14 +39,20 @@ public TopNRecordsQuery(ModuleManager moduleManager) { private TopNRecordsQueryService getTopNRecordsQueryService() { if (topNRecordsQueryService == null) { - this.topNRecordsQueryService = moduleManager.find(CoreModule.NAME).provider().getService(TopNRecordsQueryService.class); + this.topNRecordsQueryService = moduleManager.find(CoreModule.NAME) + .provider() + .getService(TopNRecordsQueryService.class); } return topNRecordsQueryService; } public List getTopNRecords(TopNRecordsCondition condition) throws IOException { - long startSecondTB = DurationUtils.INSTANCE.startTimeDurationToSecondTimeBucket(condition.getDuration().getStep(), condition.getDuration().getStart()); - long endSecondTB = DurationUtils.INSTANCE.endTimeDurationToSecondTimeBucket(condition.getDuration().getStep(), condition.getDuration().getEnd()); + long startSecondTB = DurationUtils.INSTANCE.startTimeDurationToSecondTimeBucket(condition.getDuration() + .getStep(), condition.getDuration() + .getStart()); + long endSecondTB = DurationUtils.INSTANCE.endTimeDurationToSecondTimeBucket(condition.getDuration() + .getStep(), condition.getDuration() + .getEnd()); String metricName = condition.getMetricName(); Order order = condition.getOrder(); diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TopologyQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TopologyQuery.java index 1f0f77c695f1..596cb9d89687 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TopologyQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TopologyQuery.java @@ -19,6 +19,7 @@ package org.apache.skywalking.oap.query.graphql.resolver; import com.coxautodev.graphql.tools.GraphQLQueryResolver; +import java.io.IOException; import org.apache.skywalking.oap.query.graphql.type.Duration; import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.query.DurationUtils; @@ -28,11 +29,6 @@ import org.apache.skywalking.oap.server.core.query.entity.Topology; import org.apache.skywalking.oap.server.library.module.ModuleManager; -import java.io.IOException; - -/** - * @author peng-yongsheng - */ public class TopologyQuery implements GraphQLQueryResolver { private final ModuleManager moduleManager; @@ -63,11 +59,13 @@ public Topology getServiceTopology(final int serviceId, final Duration duration) return getQueryService().getServiceTopology(StepToDownsampling.transform(duration.getStep()), startTimeBucket, endTimeBucket, serviceId); } - public ServiceInstanceTopology getServiceInstanceTopology(final int clientServiceId, final int serverServiceId, final Duration duration) throws IOException { + public ServiceInstanceTopology getServiceInstanceTopology(final int clientServiceId, final int serverServiceId, + final Duration duration) throws IOException { long startTimeBucket = DurationUtils.INSTANCE.exchangeToTimeBucket(duration.getStart()); long endTimeBucket = DurationUtils.INSTANCE.exchangeToTimeBucket(duration.getEnd()); - return getQueryService().getServiceInstanceTopology(clientServiceId, serverServiceId, StepToDownsampling.transform(duration.getStep()), startTimeBucket, endTimeBucket); + return getQueryService().getServiceInstanceTopology(clientServiceId, serverServiceId, StepToDownsampling.transform(duration + .getStep()), startTimeBucket, endTimeBucket); } public Topology getEndpointTopology(final int endpointId, final Duration duration) throws IOException { diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TraceQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TraceQuery.java index 9eb6bbc1fc98..ce4c2e5be61e 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TraceQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TraceQuery.java @@ -23,16 +23,20 @@ import java.io.IOException; import org.apache.commons.lang3.StringUtils; import org.apache.skywalking.oap.query.graphql.type.TraceQueryCondition; -import org.apache.skywalking.oap.server.core.*; -import org.apache.skywalking.oap.server.core.query.*; -import org.apache.skywalking.oap.server.core.query.entity.*; +import org.apache.skywalking.oap.server.core.Const; +import org.apache.skywalking.oap.server.core.CoreModule; +import org.apache.skywalking.oap.server.core.UnexpectedException; +import org.apache.skywalking.oap.server.core.query.DurationUtils; +import org.apache.skywalking.oap.server.core.query.TraceQueryService; +import org.apache.skywalking.oap.server.core.query.entity.Pagination; +import org.apache.skywalking.oap.server.core.query.entity.QueryOrder; +import org.apache.skywalking.oap.server.core.query.entity.Trace; +import org.apache.skywalking.oap.server.core.query.entity.TraceBrief; +import org.apache.skywalking.oap.server.core.query.entity.TraceState; import org.apache.skywalking.oap.server.library.module.ModuleManager; import static java.util.Objects.nonNull; -/** - * @author peng-yongsheng - */ public class TraceQuery implements GraphQLQueryResolver { private final ModuleManager moduleManager; @@ -57,8 +61,12 @@ public TraceBrief queryBasicTraces(final TraceQueryCondition condition) throws I if (!Strings.isNullOrEmpty(condition.getTraceId())) { traceId = condition.getTraceId(); } else if (nonNull(condition.getQueryDuration())) { - startSecondTB = DurationUtils.INSTANCE.startTimeDurationToSecondTimeBucket(condition.getQueryDuration().getStep(), condition.getQueryDuration().getStart()); - endSecondTB = DurationUtils.INSTANCE.endTimeDurationToSecondTimeBucket(condition.getQueryDuration().getStep(), condition.getQueryDuration().getEnd()); + startSecondTB = DurationUtils.INSTANCE.startTimeDurationToSecondTimeBucket(condition.getQueryDuration() + .getStep(), condition.getQueryDuration() + .getStart()); + endSecondTB = DurationUtils.INSTANCE.endTimeDurationToSecondTimeBucket(condition.getQueryDuration() + .getStep(), condition.getQueryDuration() + .getEnd()); } else { throw new UnexpectedException("The condition must contains either queryDuration or traceId."); } diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/BatchMetricConditions.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/BatchMetricConditions.java index 420ef7f81aa7..f76dcf8ec28e 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/BatchMetricConditions.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/BatchMetricConditions.java @@ -15,13 +15,15 @@ * limitations under the License. * */ + package org.apache.skywalking.oap.query.graphql.type; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import lombok.Getter; /** - * @author liu-xinyuan + * **/ @Getter public class BatchMetricConditions { diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/LogQueryCondition.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/LogQueryCondition.java index 3dc1130d16b7..d4a15c11ea2d 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/LogQueryCondition.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/LogQueryCondition.java @@ -18,12 +18,11 @@ package org.apache.skywalking.oap.query.graphql.type; -import lombok.*; -import org.apache.skywalking.oap.server.core.query.entity.*; +import lombok.Getter; +import lombok.Setter; +import org.apache.skywalking.oap.server.core.query.entity.LogState; +import org.apache.skywalking.oap.server.core.query.entity.Pagination; -/** - * @author wusheng - */ @Getter @Setter public class LogQueryCondition { diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/MetricCondition.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/MetricCondition.java index 6692962a34dc..5762fc7051ad 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/MetricCondition.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/MetricCondition.java @@ -18,7 +18,8 @@ package org.apache.skywalking.oap.query.graphql.type; -import lombok.*; +import lombok.Getter; +import lombok.Setter; @Getter @Setter diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/ProfileTaskCreationRequest.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/ProfileTaskCreationRequest.java index e7dec26b713e..37d44e6f76ee 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/ProfileTaskCreationRequest.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/ProfileTaskCreationRequest.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.oap.query.graphql.type; import lombok.Getter; @@ -23,8 +24,6 @@ /** * Profile task create need data - * - * @author MrPro */ @Setter @Getter diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/TopNRecordsCondition.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/TopNRecordsCondition.java index d698f1a12c99..694d8da34e33 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/TopNRecordsCondition.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/TopNRecordsCondition.java @@ -18,7 +18,8 @@ package org.apache.skywalking.oap.query.graphql.type; -import lombok.*; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.oap.server.core.query.entity.Order; @Getter diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/TraceQueryCondition.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/TraceQueryCondition.java index 0b315c265c88..645e58efaa97 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/TraceQueryCondition.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/TraceQueryCondition.java @@ -18,8 +18,11 @@ package org.apache.skywalking.oap.query.graphql.type; -import lombok.*; -import org.apache.skywalking.oap.server.core.query.entity.*; +import lombok.Getter; +import lombok.Setter; +import org.apache.skywalking.oap.server.core.query.entity.Pagination; +import org.apache.skywalking.oap.server.core.query.entity.QueryOrder; +import org.apache.skywalking.oap.server.core.query.entity.TraceState; @Getter @Setter diff --git a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/pom.xml index 6b3808c06c1c..a3efb921f3b9 100644 --- a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + server-receiver-plugin org.apache.skywalking diff --git a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/AccessLogServiceGRPCHandler.java b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/AccessLogServiceGRPCHandler.java index f534a87cd66c..61f562bfbba7 100644 --- a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/AccessLogServiceGRPCHandler.java +++ b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/AccessLogServiceGRPCHandler.java @@ -18,16 +18,26 @@ package org.apache.skywalking.oap.server.receiver.envoy; -import io.envoyproxy.envoy.service.accesslog.v2.*; +import io.envoyproxy.envoy.service.accesslog.v2.AccessLogServiceGrpc; +import io.envoyproxy.envoy.service.accesslog.v2.StreamAccessLogsMessage; +import io.envoyproxy.envoy.service.accesslog.v2.StreamAccessLogsResponse; import io.grpc.stub.StreamObserver; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.ServiceLoader; import org.apache.skywalking.oap.server.core.CoreModule; -import org.apache.skywalking.oap.server.core.source.*; +import org.apache.skywalking.oap.server.core.source.Source; +import org.apache.skywalking.oap.server.core.source.SourceReceiver; import org.apache.skywalking.oap.server.library.module.ModuleManager; -import org.apache.skywalking.oap.server.receiver.envoy.als.*; +import org.apache.skywalking.oap.server.receiver.envoy.als.ALSHTTPAnalysis; +import org.apache.skywalking.oap.server.receiver.envoy.als.Role; import org.apache.skywalking.oap.server.telemetry.TelemetryModule; -import org.apache.skywalking.oap.server.telemetry.api.*; -import org.slf4j.*; +import org.apache.skywalking.oap.server.telemetry.api.CounterMetrics; +import org.apache.skywalking.oap.server.telemetry.api.HistogramMetrics; +import org.apache.skywalking.oap.server.telemetry.api.MetricsCreator; +import org.apache.skywalking.oap.server.telemetry.api.MetricsTag; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class AccessLogServiceGRPCHandler extends AccessLogServiceGrpc.AccessLogServiceImplBase { private static final Logger logger = LoggerFactory.getLogger(AccessLogServiceGRPCHandler.class); @@ -54,12 +64,9 @@ public AccessLogServiceGRPCHandler(ModuleManager manager, EnvoyMetricReceiverCon sourceReceiver = manager.find(CoreModule.NAME).provider().getService(SourceReceiver.class); MetricsCreator metricCreator = manager.find(TelemetryModule.NAME).provider().getService(MetricsCreator.class); - counter = metricCreator.createCounter("envoy_als_in_count", "The count of envoy ALS metric received", - MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); - histogram = metricCreator.createHistogramMetric("envoy_als_in_latency", "The process latency of service ALS metric receiver", - MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); - sourceDispatcherCounter = metricCreator.createCounter("envoy_als_source_dispatch_count", "The count of envoy ALS metric received", - MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); + counter = metricCreator.createCounter("envoy_als_in_count", "The count of envoy ALS metric received", MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); + histogram = metricCreator.createHistogramMetric("envoy_als_in_latency", "The process latency of service ALS metric receiver", MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); + sourceDispatcherCounter = metricCreator.createCounter("envoy_als_source_dispatch_count", "The count of envoy ALS metric received", MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); } public StreamObserver streamAccessLogs( @@ -69,7 +76,8 @@ public StreamObserver streamAccessLogs( private Role role; private StreamAccessLogsMessage.Identifier identifier; - @Override public void onNext(StreamAccessLogsMessage message) { + @Override + public void onNext(StreamAccessLogsMessage message) { counter.inc(); HistogramMetrics.Timer timer = histogram.createTimer(); @@ -86,8 +94,9 @@ public StreamObserver streamAccessLogs( StreamAccessLogsMessage.LogEntriesCase logCase = message.getLogEntriesCase(); if (logger.isDebugEnabled()) { - logger.debug("Messaged is identified from Envoy[{}], role[{}] in [{}]. Received msg {}", - identifier.getNode().getId(), role, logCase, message); + logger.debug("Messaged is identified from Envoy[{}], role[{}] in [{}]. Received msg {}", identifier + .getNode() + .getId(), role, logCase, message); } switch (logCase) { @@ -109,12 +118,14 @@ public StreamObserver streamAccessLogs( } } - @Override public void onError(Throwable throwable) { + @Override + public void onError(Throwable throwable) { logger.error("Error in receiving access log from envoy", throwable); responseObserver.onCompleted(); } - @Override public void onCompleted() { + @Override + public void onCompleted() { responseObserver.onNext(StreamAccessLogsResponse.newBuilder().build()); responseObserver.onCompleted(); } diff --git a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverConfig.java b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverConfig.java index 108f96555b88..6f637715baac 100644 --- a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverConfig.java +++ b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverConfig.java @@ -19,13 +19,12 @@ package org.apache.skywalking.oap.server.receiver.envoy; import com.google.common.base.Strings; -import java.util.*; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; import java.util.stream.Collectors; import org.apache.skywalking.oap.server.library.module.ModuleConfig; -/** - * @author wusheng, gaohongtao - */ public class EnvoyMetricReceiverConfig extends ModuleConfig { private String alsHTTPAnalysis; diff --git a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverModule.java b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverModule.java index d43042877955..52cebf4a2790 100644 --- a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverModule.java +++ b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverModule.java @@ -22,8 +22,6 @@ /** * Envoy metrics receiver module - * - * @author wusheng */ public class EnvoyMetricReceiverModule extends ModuleDefine { public static final String NAME = "envoy-metric"; @@ -32,7 +30,8 @@ public EnvoyMetricReceiverModule() { super(NAME); } - @Override public Class[] services() { + @Override + public Class[] services() { return new Class[0]; } } diff --git a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverProvider.java b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverProvider.java index c37b3d5a7505..0d57be1c3a5b 100644 --- a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverProvider.java +++ b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverProvider.java @@ -20,13 +20,14 @@ import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.server.GRPCHandlerRegister; -import org.apache.skywalking.oap.server.library.module.*; +import org.apache.skywalking.oap.server.library.module.ModuleConfig; +import org.apache.skywalking.oap.server.library.module.ModuleDefine; +import org.apache.skywalking.oap.server.library.module.ModuleProvider; +import org.apache.skywalking.oap.server.library.module.ModuleStartException; +import org.apache.skywalking.oap.server.library.module.ServiceNotProvidedException; import org.apache.skywalking.oap.server.receiver.sharing.server.SharingServerModule; import org.apache.skywalking.oap.server.telemetry.TelemetryModule; -/** - * @author wusheng - */ public class EnvoyMetricReceiverProvider extends ModuleProvider { private final EnvoyMetricReceiverConfig config; @@ -34,33 +35,46 @@ public EnvoyMetricReceiverProvider() { config = new EnvoyMetricReceiverConfig(); } - @Override public String name() { + @Override + public String name() { return "default"; } - @Override public Class module() { + @Override + public Class module() { return EnvoyMetricReceiverModule.class; } - @Override public ModuleConfig createConfigBeanIfAbsent() { + @Override + public ModuleConfig createConfigBeanIfAbsent() { return config; } - @Override public void prepare() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void prepare() throws ServiceNotProvidedException, ModuleStartException { } - @Override public void start() throws ServiceNotProvidedException, ModuleStartException { - GRPCHandlerRegister service = getManager().find(SharingServerModule.NAME).provider().getService(GRPCHandlerRegister.class); + @Override + public void start() throws ServiceNotProvidedException, ModuleStartException { + GRPCHandlerRegister service = getManager().find(SharingServerModule.NAME) + .provider() + .getService(GRPCHandlerRegister.class); service.addHandler(new MetricServiceGRPCHandler(getManager())); service.addHandler(new AccessLogServiceGRPCHandler(getManager(), config)); } - @Override public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleStartException { } - @Override public String[] requiredModules() { - return new String[] {TelemetryModule.NAME, CoreModule.NAME, SharingServerModule.NAME}; + @Override + public String[] requiredModules() { + return new String[] { + TelemetryModule.NAME, + CoreModule.NAME, + SharingServerModule.NAME + }; } } diff --git a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/MetricServiceGRPCHandler.java b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/MetricServiceGRPCHandler.java index 9030eb55c0f8..40452936ac53 100644 --- a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/MetricServiceGRPCHandler.java +++ b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/MetricServiceGRPCHandler.java @@ -19,23 +19,29 @@ package org.apache.skywalking.oap.server.receiver.envoy; import io.envoyproxy.envoy.api.v2.core.Node; -import io.envoyproxy.envoy.service.metrics.v2.*; +import io.envoyproxy.envoy.service.metrics.v2.MetricsServiceGrpc; +import io.envoyproxy.envoy.service.metrics.v2.StreamMetricsMessage; +import io.envoyproxy.envoy.service.metrics.v2.StreamMetricsResponse; import io.grpc.stub.StreamObserver; import io.prometheus.client.Metrics; import java.util.List; import org.apache.skywalking.apm.util.StringUtil; -import org.apache.skywalking.oap.server.core.*; -import org.apache.skywalking.oap.server.core.register.service.*; -import org.apache.skywalking.oap.server.core.source.*; -import org.apache.skywalking.oap.server.library.module.ModuleManager; +import org.apache.skywalking.oap.server.core.Const; +import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.analysis.TimeBucket; +import org.apache.skywalking.oap.server.core.register.service.IServiceInstanceInventoryRegister; +import org.apache.skywalking.oap.server.core.register.service.IServiceInventoryRegister; +import org.apache.skywalking.oap.server.core.source.EnvoyInstanceMetric; +import org.apache.skywalking.oap.server.core.source.SourceReceiver; +import org.apache.skywalking.oap.server.library.module.ModuleManager; import org.apache.skywalking.oap.server.telemetry.TelemetryModule; -import org.apache.skywalking.oap.server.telemetry.api.*; -import org.slf4j.*; +import org.apache.skywalking.oap.server.telemetry.api.CounterMetrics; +import org.apache.skywalking.oap.server.telemetry.api.HistogramMetrics; +import org.apache.skywalking.oap.server.telemetry.api.MetricsCreator; +import org.apache.skywalking.oap.server.telemetry.api.MetricsTag; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author wusheng - */ public class MetricServiceGRPCHandler extends MetricsServiceGrpc.MetricsServiceImplBase { private static final Logger logger = LoggerFactory.getLogger(MetricServiceGRPCHandler.class); @@ -46,14 +52,18 @@ public class MetricServiceGRPCHandler extends MetricsServiceGrpc.MetricsServiceI private HistogramMetrics histogram; public MetricServiceGRPCHandler(ModuleManager moduleManager) { - serviceInventoryRegister = moduleManager.find(CoreModule.NAME).provider().getService(IServiceInventoryRegister.class); - serviceInstanceInventoryRegister = moduleManager.find(CoreModule.NAME).provider().getService(IServiceInstanceInventoryRegister.class); + serviceInventoryRegister = moduleManager.find(CoreModule.NAME) + .provider() + .getService(IServiceInventoryRegister.class); + serviceInstanceInventoryRegister = moduleManager.find(CoreModule.NAME) + .provider() + .getService(IServiceInstanceInventoryRegister.class); sourceReceiver = moduleManager.find(CoreModule.NAME).provider().getService(SourceReceiver.class); - MetricsCreator metricsCreator = moduleManager.find(TelemetryModule.NAME).provider().getService(MetricsCreator.class); - counter = metricsCreator.createCounter("envoy_metric_in_count", "The count of envoy service metrics received", - MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); - histogram = metricsCreator.createHistogramMetric("envoy_metric_in_latency", "The process latency of service metrics receiver", - MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); + MetricsCreator metricsCreator = moduleManager.find(TelemetryModule.NAME) + .provider() + .getService(MetricsCreator.class); + counter = metricsCreator.createCounter("envoy_metric_in_count", "The count of envoy service metrics received", MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); + histogram = metricsCreator.createHistogramMetric("envoy_metric_in_latency", "The process latency of service metrics receiver", MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); } @Override @@ -65,7 +75,8 @@ public StreamObserver streamMetrics(StreamObserver streamMetrics(StreamObserver analysis(StreamAccessLogsMessage.Identifier identifier, - HTTPAccessLogEntry entry, Role role); + List analysis(StreamAccessLogsMessage.Identifier identifier, HTTPAccessLogEntry entry, Role role); - Role identify(StreamAccessLogsMessage.Identifier alsIdentifier, - Role prev); + Role identify(StreamAccessLogsMessage.Identifier alsIdentifier, Role prev); } diff --git a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/als/K8sALSServiceMeshHTTPAnalysis.java b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/als/K8sALSServiceMeshHTTPAnalysis.java index 3c0a32049774..8413af10e56f 100644 --- a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/als/K8sALSServiceMeshHTTPAnalysis.java +++ b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/als/K8sALSServiceMeshHTTPAnalysis.java @@ -33,8 +33,21 @@ import io.kubernetes.client.Configuration; import io.kubernetes.client.apis.CoreV1Api; import io.kubernetes.client.apis.ExtensionsV1beta1Api; -import io.kubernetes.client.models.*; +import io.kubernetes.client.models.V1ObjectMeta; +import io.kubernetes.client.models.V1OwnerReference; +import io.kubernetes.client.models.V1Pod; +import io.kubernetes.client.models.V1PodList; import io.kubernetes.client.util.Config; +import java.time.Instant; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicReference; import lombok.AccessLevel; import lombok.Getter; import org.apache.skywalking.aop.server.receiver.mesh.TelemetryDataDispatcher; @@ -46,17 +59,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.time.Instant; -import java.util.*; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicReference; - /** * Analysis log based on ingress and mesh scenarios. - * - * @author wusheng */ public class K8sALSServiceMeshHTTPAnalysis implements ALSHTTPAnalysis { private static final Logger logger = LoggerFactory.getLogger(K8sALSServiceMeshHTTPAnalysis.class); @@ -69,14 +73,18 @@ public class K8sALSServiceMeshHTTPAnalysis implements ALSHTTPAnalysis { private final AtomicReference> ipServiceMap = new AtomicReference<>(); private final ScheduledExecutorService executorService = Executors.newScheduledThreadPool(1, new ThreadFactoryBuilder() - .setNameFormat("load-pod-%d").setDaemon(true).build()); + .setNameFormat("load-pod-%d") + .setDaemon(true) + .build()); - @Override public String name() { + @Override + public String name() { return "k8s-mesh"; } - @Override public void init(EnvoyMetricReceiverConfig config) { - executorService.scheduleAtFixedRate(this::loadPodInfo, 0,15, TimeUnit.SECONDS); + @Override + public void init(EnvoyMetricReceiverConfig config) { + executorService.scheduleAtFixedRate(this::loadPodInfo, 0, 15, TimeUnit.SECONDS); } private boolean invalidPodList() { @@ -90,18 +98,20 @@ private void loadPodInfo() { client.getHttpClient().setReadTimeout(20, TimeUnit.SECONDS); Configuration.setDefaultApiClient(client); CoreV1Api api = new CoreV1Api(); - V1PodList list = api.listPodForAllNamespaces(null, null, null, - null, null, null, null, null, null); + V1PodList list = api.listPodForAllNamespaces(null, null, null, null, null, null, null, null, null); Map ipMap = new HashMap<>(list.getItems().size()); long startTime = System.nanoTime(); for (V1Pod item : list.getItems()) { if (!item.getStatus().getPhase().equals(VALID_PHASE)) { - logger.debug("Invalid pod {} is not in a valid phase {}", item.getMetadata().getName(), item.getStatus().getPhase()); + logger.debug("Invalid pod {} is not in a valid phase {}", item.getMetadata() + .getName(), item.getStatus() + .getPhase()); continue; } if (item.getStatus().getPodIP().equals(item.getStatus().getHostIP())) { - logger.debug("Pod {}.{} is removed because hostIP and podIP are identical ", item.getMetadata().getName(), - item.getMetadata().getNamespace()); + logger.debug("Pod {}.{} is removed because hostIP and podIP are identical ", item.getMetadata() + .getName(), item.getMetadata() + .getNamespace()); continue; } ipMap.put(item.getStatus().getPodIP(), createServiceMetaInfo(item.getMetadata())); @@ -116,16 +126,15 @@ private void loadPodInfo() { private ServiceMetaInfo createServiceMetaInfo(final V1ObjectMeta podMeta) { ExtensionsV1beta1Api extensionsApi = new ExtensionsV1beta1Api(); DependencyResource dr = new DependencyResource(podMeta); - DependencyResource meta = dr - .getOwnerResource("ReplicaSet", ownerReference -> - extensionsApi.readNamespacedReplicaSet(ownerReference.getName(), podMeta.getNamespace(), - "", true, true).getMetadata()); + DependencyResource meta = dr.getOwnerResource("ReplicaSet", ownerReference -> extensionsApi.readNamespacedReplicaSet(ownerReference + .getName(), podMeta.getNamespace(), "", true, true).getMetadata()); ServiceMetaInfo result = new ServiceMetaInfo(); if (meta.getMetadata().getOwnerReferences() != null && meta.getMetadata().getOwnerReferences().size() > 0) { V1OwnerReference owner = meta.getMetadata().getOwnerReferences().get(0); result.setServiceName(String.format("%s.%s", owner.getName(), meta.getMetadata().getNamespace())); } else { - result.setServiceName(String.format("%s.%s", meta.getMetadata().getName(), meta.getMetadata().getNamespace())); + result.setServiceName(String.format("%s.%s", meta.getMetadata().getName(), meta.getMetadata() + .getNamespace())); } result.setServiceInstanceName(String.format("%s.%s", podMeta.getName(), podMeta.getNamespace())); result.setTags(transformLabelsToTags(podMeta.getLabels())); @@ -143,8 +152,8 @@ private List transformLabelsToTags(final Map analysis(StreamAccessLogsMessage.Identifier identifier, - HTTPAccessLogEntry entry, Role role) { + @Override + public List analysis(StreamAccessLogsMessage.Identifier identifier, HTTPAccessLogEntry entry, Role role) { if (invalidPodList()) { return Collections.emptyList(); } @@ -159,8 +168,7 @@ private List transformLabelsToTags(final Map analysisSideCar(StreamAccessLogsMessage.Identifier identifier, - HTTPAccessLogEntry entry) { + protected List analysisSideCar(StreamAccessLogsMessage.Identifier identifier, HTTPAccessLogEntry entry) { List sources = new ArrayList<>(); AccessLogCommon properties = entry.getCommonProperties(); if (properties != null) { @@ -189,41 +197,49 @@ protected List analysisSideCar(StreamAccessLogsMessage.Identifier identi boolean status = responseCode >= 200 && responseCode < 400; Address downstreamRemoteAddress = properties.getDownstreamRemoteAddress(); - ServiceMetaInfo downstreamService = find(downstreamRemoteAddress.getSocketAddress().getAddress(), - downstreamRemoteAddress.getSocketAddress().getPortValue()); + ServiceMetaInfo downstreamService = find(downstreamRemoteAddress.getSocketAddress() + .getAddress(), downstreamRemoteAddress.getSocketAddress() + .getPortValue()); Address downstreamLocalAddress = properties.getDownstreamLocalAddress(); - ServiceMetaInfo localService = find(downstreamLocalAddress.getSocketAddress().getAddress(), - downstreamLocalAddress.getSocketAddress().getPortValue()); + ServiceMetaInfo localService = find(downstreamLocalAddress.getSocketAddress() + .getAddress(), downstreamLocalAddress.getSocketAddress() + .getPortValue()); if (cluster.startsWith("inbound|")) { // Server side if (downstreamService.equals(ServiceMetaInfo.UNKNOWN)) { // Ingress -> sidecar(server side) // Mesh telemetry without source, the relation would be generated. - ServiceMeshMetric metric = ServiceMeshMetric.newBuilder().setStartTime(startTime) - .setEndTime(startTime + duration) - .setDestServiceName(localService.getServiceName()) - .setDestServiceInstance(localService.getServiceInstanceName()) - .setEndpoint(endpoint).setLatency((int)duration) - .setResponseCode(Math.toIntExact(responseCode)) - .setStatus(status).setProtocol(protocol) - .setDetectPoint(DetectPoint.server) - .build(); + ServiceMeshMetric metric = ServiceMeshMetric.newBuilder() + .setStartTime(startTime) + .setEndTime(startTime + duration) + .setDestServiceName(localService.getServiceName()) + .setDestServiceInstance(localService.getServiceInstanceName()) + .setEndpoint(endpoint) + .setLatency((int) duration) + .setResponseCode(Math.toIntExact(responseCode)) + .setStatus(status) + .setProtocol(protocol) + .setDetectPoint(DetectPoint.server) + .build(); logger.debug("Transformed ingress->sidecar inbound mesh metric {}", metric); forward(metric); } else { // sidecar -> sidecar(server side) - ServiceMeshMetric metric = ServiceMeshMetric.newBuilder().setStartTime(startTime) - .setEndTime(startTime + duration) - .setSourceServiceName(downstreamService.getServiceName()) - .setSourceServiceInstance(downstreamService.getServiceInstanceName()) - .setDestServiceName(localService.getServiceName()) - .setDestServiceInstance(localService.getServiceInstanceName()) - .setEndpoint(endpoint).setLatency((int)duration) - .setResponseCode(Math.toIntExact(responseCode)) - .setStatus(status).setProtocol(protocol) - .setDetectPoint(DetectPoint.server) - .build(); + ServiceMeshMetric metric = ServiceMeshMetric.newBuilder() + .setStartTime(startTime) + .setEndTime(startTime + duration) + .setSourceServiceName(downstreamService.getServiceName()) + .setSourceServiceInstance(downstreamService.getServiceInstanceName()) + .setDestServiceName(localService.getServiceName()) + .setDestServiceInstance(localService.getServiceInstanceName()) + .setEndpoint(endpoint) + .setLatency((int) duration) + .setResponseCode(Math.toIntExact(responseCode)) + .setStatus(status) + .setProtocol(protocol) + .setDetectPoint(DetectPoint.server) + .build(); logger.debug("Transformed sidecar->sidecar(server side) inbound mesh metric {}", metric); forward(metric); @@ -231,20 +247,24 @@ protected List analysisSideCar(StreamAccessLogsMessage.Identifier identi } else if (cluster.startsWith("outbound|")) { // sidecar(client side) -> sidecar Address upstreamRemoteAddress = properties.getUpstreamRemoteAddress(); - ServiceMetaInfo destService = find(upstreamRemoteAddress.getSocketAddress().getAddress(), - upstreamRemoteAddress.getSocketAddress().getPortValue()); - - ServiceMeshMetric metric = ServiceMeshMetric.newBuilder().setStartTime(startTime) - .setEndTime(startTime + duration) - .setSourceServiceName(downstreamService.getServiceName()) - .setSourceServiceInstance(downstreamService.getServiceInstanceName()) - .setDestServiceName(destService.getServiceName()) - .setDestServiceInstance(destService.getServiceInstanceName()) - .setEndpoint(endpoint).setLatency((int)duration) - .setResponseCode(Math.toIntExact(responseCode)) - .setStatus(status).setProtocol(protocol) - .setDetectPoint(DetectPoint.client) - .build(); + ServiceMetaInfo destService = find(upstreamRemoteAddress.getSocketAddress() + .getAddress(), upstreamRemoteAddress.getSocketAddress() + .getPortValue()); + + ServiceMeshMetric metric = ServiceMeshMetric.newBuilder() + .setStartTime(startTime) + .setEndTime(startTime + duration) + .setSourceServiceName(downstreamService.getServiceName()) + .setSourceServiceInstance(downstreamService.getServiceInstanceName()) + .setDestServiceName(destService.getServiceName()) + .setDestServiceInstance(destService.getServiceInstanceName()) + .setEndpoint(endpoint) + .setLatency((int) duration) + .setResponseCode(Math.toIntExact(responseCode)) + .setStatus(status) + .setProtocol(protocol) + .setDetectPoint(DetectPoint.client) + .build(); logger.debug("Transformed sidecar->sidecar(server side) inbound mesh metric {}", metric); forward(metric); @@ -255,8 +275,7 @@ protected List analysisSideCar(StreamAccessLogsMessage.Identifier identi return sources; } - protected void analysisProxy(StreamAccessLogsMessage.Identifier identifier, - HTTPAccessLogEntry entry) { + protected void analysisProxy(StreamAccessLogsMessage.Identifier identifier, HTTPAccessLogEntry entry) { AccessLogCommon properties = entry.getCommonProperties(); if (properties != null) { Address downstreamLocalAddress = properties.getDownstreamLocalAddress(); @@ -264,10 +283,12 @@ protected void analysisProxy(StreamAccessLogsMessage.Identifier identifier, Address upstreamRemoteAddress = properties.getUpstreamRemoteAddress(); if (downstreamLocalAddress != null && downstreamRemoteAddress != null && upstreamRemoteAddress != null) { SocketAddress downstreamRemoteAddressSocketAddress = downstreamRemoteAddress.getSocketAddress(); - ServiceMetaInfo outside = find(downstreamRemoteAddressSocketAddress.getAddress(), downstreamRemoteAddressSocketAddress.getPortValue()); + ServiceMetaInfo outside = find(downstreamRemoteAddressSocketAddress.getAddress(), downstreamRemoteAddressSocketAddress + .getPortValue()); SocketAddress downstreamLocalAddressSocketAddress = downstreamLocalAddress.getSocketAddress(); - ServiceMetaInfo ingress = find(downstreamLocalAddressSocketAddress.getAddress(), downstreamLocalAddressSocketAddress.getPortValue()); + ServiceMetaInfo ingress = find(downstreamLocalAddressSocketAddress.getAddress(), downstreamLocalAddressSocketAddress + .getPortValue()); long startTime = formatAsLong(properties.getStartTime()); long duration = formatAsLong(properties.getTimeToLastDownstreamTxByte()); @@ -291,38 +312,45 @@ protected void analysisProxy(StreamAccessLogsMessage.Identifier identifier, } boolean status = responseCode >= 200 && responseCode < 400; - ServiceMeshMetric metric = ServiceMeshMetric.newBuilder().setStartTime(startTime) - .setEndTime(startTime + duration) - .setSourceServiceName(outside.getServiceName()) - .setSourceServiceInstance(outside.getServiceInstanceName()) - .setDestServiceName(ingress.getServiceName()) - .setDestServiceInstance(ingress.getServiceInstanceName()) - .setEndpoint(endpoint).setLatency((int)duration) - .setResponseCode(Math.toIntExact(responseCode)) - .setStatus(status).setProtocol(protocol) - .setDetectPoint(DetectPoint.server) - .build(); + ServiceMeshMetric metric = ServiceMeshMetric.newBuilder() + .setStartTime(startTime) + .setEndTime(startTime + duration) + .setSourceServiceName(outside.getServiceName()) + .setSourceServiceInstance(outside.getServiceInstanceName()) + .setDestServiceName(ingress.getServiceName()) + .setDestServiceInstance(ingress.getServiceInstanceName()) + .setEndpoint(endpoint) + .setLatency((int) duration) + .setResponseCode(Math.toIntExact(responseCode)) + .setStatus(status) + .setProtocol(protocol) + .setDetectPoint(DetectPoint.server) + .build(); logger.debug("Transformed ingress inbound mesh metric {}", metric); forward(metric); SocketAddress upstreamRemoteAddressSocketAddress = upstreamRemoteAddress.getSocketAddress(); - ServiceMetaInfo targetService = find(upstreamRemoteAddressSocketAddress.getAddress(), upstreamRemoteAddressSocketAddress.getPortValue()); + ServiceMetaInfo targetService = find(upstreamRemoteAddressSocketAddress.getAddress(), upstreamRemoteAddressSocketAddress + .getPortValue()); long outboundStartTime = startTime + formatAsLong(properties.getTimeToFirstUpstreamTxByte()); long outboundEndTime = startTime + formatAsLong(properties.getTimeToLastUpstreamRxByte()); - ServiceMeshMetric outboundMetric = ServiceMeshMetric.newBuilder().setStartTime(outboundStartTime) - .setEndTime(outboundEndTime) - .setSourceServiceName(ingress.getServiceName()) - .setSourceServiceInstance(ingress.getServiceInstanceName()) - .setDestServiceName(targetService.getServiceName()) - .setDestServiceInstance(targetService.getServiceInstanceName()) - .setEndpoint(endpoint).setLatency((int)(outboundEndTime - outboundStartTime)) - .setResponseCode(Math.toIntExact(responseCode)) - .setStatus(status).setProtocol(protocol) - .setDetectPoint(DetectPoint.client) - .build(); + ServiceMeshMetric outboundMetric = ServiceMeshMetric.newBuilder() + .setStartTime(outboundStartTime) + .setEndTime(outboundEndTime) + .setSourceServiceName(ingress.getServiceName()) + .setSourceServiceInstance(ingress.getServiceInstanceName()) + .setDestServiceName(targetService.getServiceName()) + .setDestServiceInstance(targetService.getServiceInstanceName()) + .setEndpoint(endpoint) + .setLatency((int) (outboundEndTime - outboundStartTime)) + .setResponseCode(Math.toIntExact(responseCode)) + .setStatus(status) + .setProtocol(protocol) + .setDetectPoint(DetectPoint.client) + .build(); logger.debug("Transformed ingress outbound mesh metric {}", outboundMetric); forward(outboundMetric); @@ -330,8 +358,8 @@ protected void analysisProxy(StreamAccessLogsMessage.Identifier identifier, } } - @Override public Role identify(StreamAccessLogsMessage.Identifier alsIdentifier, - Role prev) { + @Override + public Role identify(StreamAccessLogsMessage.Identifier alsIdentifier, Role prev) { if (alsIdentifier != null) { Node node = alsIdentifier.getNode(); if (node != null) { @@ -348,8 +376,6 @@ protected void analysisProxy(StreamAccessLogsMessage.Identifier identifier, } /** - * @param ip - * @param port * @return found service info, or {@link ServiceMetaInfo#UNKNOWN} to represent not found. */ protected ServiceMetaInfo find(String ip, int port) { diff --git a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/als/ServiceMetaInfo.java b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/als/ServiceMetaInfo.java index 822f87307c17..41ba0e59da5c 100644 --- a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/als/ServiceMetaInfo.java +++ b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/als/ServiceMetaInfo.java @@ -18,12 +18,13 @@ package org.apache.skywalking.oap.server.receiver.envoy.als; -import java.util.*; -import lombok.*; +import java.util.List; +import java.util.Objects; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import lombok.Setter; +import lombok.ToString; -/** - * @author wusheng - */ @Getter @Setter @ToString @@ -49,17 +50,18 @@ public static class KeyValue { private final String value; } - @Override public boolean equals(Object o) { + @Override + public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - ServiceMetaInfo info = (ServiceMetaInfo)o; - return Objects.equals(serviceName, info.serviceName) && - Objects.equals(serviceInstanceName, info.serviceInstanceName); + ServiceMetaInfo info = (ServiceMetaInfo) o; + return Objects.equals(serviceName, info.serviceName) && Objects.equals(serviceInstanceName, info.serviceInstanceName); } - @Override public int hashCode() { + @Override + public int hashCode() { return Objects.hash(serviceName, serviceInstanceName); } diff --git a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/envoy/MetricServiceGRPCHandlerTestMain.java b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/envoy/MetricServiceGRPCHandlerTestMain.java index a3f0feace1df..373f067a7f99 100644 --- a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/envoy/MetricServiceGRPCHandlerTestMain.java +++ b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/envoy/MetricServiceGRPCHandlerTestMain.java @@ -19,16 +19,20 @@ package org.apache.skywalking.oap.server.receiver.envoy; import com.google.protobuf.TextFormat; -import io.envoyproxy.envoy.service.metrics.v2.*; -import io.grpc.*; +import io.envoyproxy.envoy.service.metrics.v2.MetricsServiceGrpc; +import io.envoyproxy.envoy.service.metrics.v2.StreamMetricsMessage; +import io.envoyproxy.envoy.service.metrics.v2.StreamMetricsResponse; +import io.grpc.ManagedChannel; +import io.grpc.ManagedChannelBuilder; import io.grpc.stub.StreamObserver; import io.prometheus.client.Metrics; -import java.io.*; -import java.util.concurrent.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; -/** - * @author wusheng - */ public class MetricServiceGRPCHandlerTestMain { public static void main(String[] args) throws InterruptedException { @@ -53,15 +57,18 @@ public static void main(String[] args) throws InterruptedException { private static void send( final MetricsServiceGrpc.MetricsServiceStub stub) throws IOException, InterruptedException { StreamObserver messageStreamObserver = stub.streamMetrics(new StreamObserver() { - @Override public void onNext(StreamMetricsResponse response) { + @Override + public void onNext(StreamMetricsResponse response) { } - @Override public void onError(Throwable throwable) { + @Override + public void onError(Throwable throwable) { } - @Override public void onCompleted() { + @Override + public void onCompleted() { } }); diff --git a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/envoy/als/DependencyResourceTest.java b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/envoy/als/DependencyResourceTest.java index b37ebedeb822..dc3bc83582b2 100644 --- a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/envoy/als/DependencyResourceTest.java +++ b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/envoy/als/DependencyResourceTest.java @@ -45,22 +45,44 @@ public class DependencyResourceTest { @Parameterized.Parameters(name = "{index}: {0}") public static Collection data() { return Arrays.asList(new Object[][] { - {"deploy1", (ThrowableFunction) result -> result}, - {"pod1", (ThrowableFunction) result -> { throw new RuntimeException(); } }, - {"pod1", (ThrowableFunction) result -> { throw new ApiException(); } }, - {"pod1", (ThrowableFunction) result -> null}, - {"rs1", (ThrowableFunction) result -> { + { + "deploy1", + (ThrowableFunction) result -> result + }, + { + "pod1", + (ThrowableFunction) result -> { + throw new RuntimeException(); + } + }, + { + "pod1", + (ThrowableFunction) result -> { + throw new ApiException(); + } + }, + { + "pod1", + (ThrowableFunction) result -> null + }, + { + "rs1", + (ThrowableFunction) result -> { result.setOwnerReferences(null); return result; - } }, - {"rs1", (ThrowableFunction) result -> { + } + }, + { + "rs1", + (ThrowableFunction) result -> { V1OwnerReference reference1 = new V1OwnerReference(); reference1.setKind("StatefulSet"); reference1.setName("ss1"); result.setOwnerReferences(Collections.singletonList(reference1)); return result; - } }, - }); + } + }, + }); } @Test @@ -72,7 +94,7 @@ public void test() { reference.setName("rs1"); meta.addOwnerReferencesItem(reference); DependencyResource dr = new DependencyResource(meta); - DependencyResource drr = dr.getOwnerResource("ReplicaSet", ownerReference -> { + DependencyResource drr = dr.getOwnerResource("ReplicaSet", ownerReference -> { assertThat(ownerReference.getName(), is("rs1")); V1ObjectMeta result = new V1ObjectMeta(); result.setName("rs1"); diff --git a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/envoy/als/K8sHTTPAnalysisTest.java b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/envoy/als/K8sHTTPAnalysisTest.java index f54a22b0d41e..63bdf174fe90 100644 --- a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/envoy/als/K8sHTTPAnalysisTest.java +++ b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/envoy/als/K8sHTTPAnalysisTest.java @@ -21,13 +21,18 @@ import com.google.common.collect.ImmutableMap; import com.google.protobuf.util.JsonFormat; import io.envoyproxy.envoy.service.accesslog.v2.StreamAccessLogsMessage; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.ArrayList; +import java.util.List; import org.apache.skywalking.apm.network.common.DetectPoint; import org.apache.skywalking.apm.network.servicemesh.ServiceMeshMetric; import org.apache.skywalking.oap.server.receiver.envoy.EnvoyMetricReceiverConfig; import org.apache.skywalking.oap.server.receiver.envoy.MetricServiceGRPCHandlerTestMain; -import org.junit.*; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; public class K8sHTTPAnalysisTest { @@ -89,7 +94,8 @@ public void testIngress2SidecarMetric() throws IOException { StreamAccessLogsMessage.Builder requestBuilder = StreamAccessLogsMessage.newBuilder(); JsonFormat.parser().merge(isr, requestBuilder); - analysis.analysis(requestBuilder.getIdentifier(), requestBuilder.getHttpLogs().getLogEntry(0), Role.SIDECAR); + analysis.analysis(requestBuilder.getIdentifier(), requestBuilder.getHttpLogs() + .getLogEntry(0), Role.SIDECAR); Assert.assertEquals(1, analysis.metrics.size()); @@ -106,7 +112,8 @@ public void testSidecar2SidecarServerMetric() throws IOException { StreamAccessLogsMessage.Builder requestBuilder = StreamAccessLogsMessage.newBuilder(); JsonFormat.parser().merge(isr, requestBuilder); - analysis.analysis(requestBuilder.getIdentifier(), requestBuilder.getHttpLogs().getLogEntry(0), Role.SIDECAR); + analysis.analysis(requestBuilder.getIdentifier(), requestBuilder.getHttpLogs() + .getLogEntry(0), Role.SIDECAR); Assert.assertEquals(1, analysis.metrics.size()); @@ -123,7 +130,8 @@ public void testSidecar2SidecarClientMetric() throws IOException { StreamAccessLogsMessage.Builder requestBuilder = StreamAccessLogsMessage.newBuilder(); JsonFormat.parser().merge(isr, requestBuilder); - analysis.analysis(requestBuilder.getIdentifier(), requestBuilder.getHttpLogs().getLogEntry(0), Role.SIDECAR); + analysis.analysis(requestBuilder.getIdentifier(), requestBuilder.getHttpLogs() + .getLogEntry(0), Role.SIDECAR); Assert.assertEquals(1, analysis.metrics.size()); @@ -139,12 +147,7 @@ public static class MockK8sAnalysis extends K8sALSServiceMeshHTTPAnalysis { @Override public void init(EnvoyMetricReceiverConfig config) { - getIpServiceMap().set(ImmutableMap.of( - "10.44.2.56", new ServiceMetaInfo("ingress", "ingress-Inst"), - "10.44.2.54", new ServiceMetaInfo("productpage", "productpage-Inst"), - "10.44.6.66", new ServiceMetaInfo("detail", "detail-Inst"), - "10.44.2.55", new ServiceMetaInfo("review", "detail-Inst") - )); + getIpServiceMap().set(ImmutableMap.of("10.44.2.56", new ServiceMetaInfo("ingress", "ingress-Inst"), "10.44.2.54", new ServiceMetaInfo("productpage", "productpage-Inst"), "10.44.6.66", new ServiceMetaInfo("detail", "detail-Inst"), "10.44.2.55", new ServiceMetaInfo("review", "detail-Inst"))); } @Override diff --git a/oap-server/server-receiver-plugin/jaeger-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/jaeger-receiver-plugin/pom.xml index 80094944c574..cff334726937 100644 --- a/oap-server/server-receiver-plugin/jaeger-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/jaeger-receiver-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + server-receiver-plugin org.apache.skywalking diff --git a/oap-server/server-receiver-plugin/jaeger-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/jaeger/JaegerGRPCHandler.java b/oap-server/server-receiver-plugin/jaeger-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/jaeger/JaegerGRPCHandler.java index defcf4ed22e7..b18ebf8484b8 100644 --- a/oap-server/server-receiver-plugin/jaeger-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/jaeger/JaegerGRPCHandler.java +++ b/oap-server/server-receiver-plugin/jaeger-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/jaeger/JaegerGRPCHandler.java @@ -21,29 +21,29 @@ import com.google.gson.JsonObject; import com.google.protobuf.ByteString; import io.grpc.stub.StreamObserver; -import io.jaegertracing.api_v2.*; +import io.jaegertracing.api_v2.Collector; +import io.jaegertracing.api_v2.CollectorServiceGrpc; +import io.jaegertracing.api_v2.Model; import java.time.Instant; import java.util.Base64; import org.apache.skywalking.apm.util.StringUtil; import org.apache.skywalking.oap.server.core.Const; import org.apache.skywalking.oap.server.core.analysis.TimeBucket; -import org.apache.skywalking.oap.server.core.source.*; -import org.apache.skywalking.oap.server.library.util.*; +import org.apache.skywalking.oap.server.core.source.DetectPoint; +import org.apache.skywalking.oap.server.core.source.SourceReceiver; +import org.apache.skywalking.oap.server.library.util.BooleanUtils; import org.apache.skywalking.oap.server.receiver.sharing.server.CoreRegisterLinker; import org.apache.skywalking.oap.server.storage.plugin.jaeger.JaegerSpan; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author wusheng - */ public class JaegerGRPCHandler extends CollectorServiceGrpc.CollectorServiceImplBase { private static final Logger logger = LoggerFactory.getLogger(JaegerGRPCHandler.class); private SourceReceiver receiver; private JaegerReceiverConfig config; - public JaegerGRPCHandler(SourceReceiver receiver, - JaegerReceiverConfig config) { + public JaegerGRPCHandler(SourceReceiver receiver, JaegerReceiverConfig config) { this.receiver = receiver; this.config = config; } @@ -98,11 +98,13 @@ public void postSpans(Collector.PostSpansRequest request, } long duration = span.getDuration().getNanos() / 1_000_000; - jaegerSpan.setStartTime(Instant.ofEpochSecond(span.getStartTime().getSeconds(), span.getStartTime().getNanos()).toEpochMilli()); + jaegerSpan.setStartTime(Instant.ofEpochSecond(span.getStartTime().getSeconds(), span.getStartTime() + .getNanos()) + .toEpochMilli()); long timeBucket = TimeBucket.getRecordTimeBucket(jaegerSpan.getStartTime()); jaegerSpan.setTimeBucket(timeBucket); jaegerSpan.setEndTime(jaegerSpan.getStartTime() + duration); - jaegerSpan.setLatency((int)duration); + jaegerSpan.setLatency((int) duration); jaegerSpan.setDataBinary(span.toByteArray()); jaegerSpan.setEndpointName(span.getOperationName()); @@ -117,10 +119,12 @@ public void postSpans(Collector.PostSpansRequest request, if ("server".equals(kind) || "consumer".equals(kind)) { String endpointName = span.getOperationName(); jaegerSpan.setEndpointName(endpointName); - int endpointId = CoreRegisterLinker.getEndpointInventoryCache().getEndpointId(finalServiceId, endpointName, - DetectPoint.SERVER.ordinal()); + int endpointId = CoreRegisterLinker.getEndpointInventoryCache() + .getEndpointId(finalServiceId, endpointName, DetectPoint.SERVER + .ordinal()); if (endpointId != Const.NONE) { - CoreRegisterLinker.getEndpointInventoryRegister().getOrCreate(finalServiceId, endpointName, DetectPoint.SERVER); + CoreRegisterLinker.getEndpointInventoryRegister() + .getOrCreate(finalServiceId, endpointName, DetectPoint.SERVER); } } } diff --git a/oap-server/server-receiver-plugin/jaeger-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/jaeger/JaegerReceiverConfig.java b/oap-server/server-receiver-plugin/jaeger-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/jaeger/JaegerReceiverConfig.java index 91df23f2cd17..75fe473a925a 100644 --- a/oap-server/server-receiver-plugin/jaeger-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/jaeger/JaegerReceiverConfig.java +++ b/oap-server/server-receiver-plugin/jaeger-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/jaeger/JaegerReceiverConfig.java @@ -18,7 +18,8 @@ package org.apache.skywalking.aop.server.receiver.jaeger; -import lombok.*; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.oap.server.library.module.ModuleConfig; @Setter diff --git a/oap-server/server-receiver-plugin/jaeger-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/jaeger/JaegerReceiverModule.java b/oap-server/server-receiver-plugin/jaeger-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/jaeger/JaegerReceiverModule.java index e8a958e24750..3eebf9ae3706 100644 --- a/oap-server/server-receiver-plugin/jaeger-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/jaeger/JaegerReceiverModule.java +++ b/oap-server/server-receiver-plugin/jaeger-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/jaeger/JaegerReceiverModule.java @@ -22,8 +22,6 @@ /** * Adapt Jaeger gRPC backend service. - * - * @author wusheng */ public class JaegerReceiverModule extends ModuleDefine { public static final String NAME = "receiver_jaeger"; @@ -32,7 +30,8 @@ public JaegerReceiverModule() { super(NAME); } - @Override public Class[] services() { + @Override + public Class[] services() { return new Class[0]; } } diff --git a/oap-server/server-receiver-plugin/jaeger-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/jaeger/JaegerReceiverProvider.java b/oap-server/server-receiver-plugin/jaeger-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/jaeger/JaegerReceiverProvider.java index 3a4e084d1e54..8a5c7ce08981 100644 --- a/oap-server/server-receiver-plugin/jaeger-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/jaeger/JaegerReceiverProvider.java +++ b/oap-server/server-receiver-plugin/jaeger-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/jaeger/JaegerReceiverProvider.java @@ -23,35 +23,42 @@ import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.server.GRPCHandlerRegister; import org.apache.skywalking.oap.server.core.source.SourceReceiver; -import org.apache.skywalking.oap.server.library.module.*; +import org.apache.skywalking.oap.server.library.module.ModuleConfig; +import org.apache.skywalking.oap.server.library.module.ModuleDefine; +import org.apache.skywalking.oap.server.library.module.ModuleProvider; +import org.apache.skywalking.oap.server.library.module.ModuleStartException; +import org.apache.skywalking.oap.server.library.module.ServiceNotProvidedException; import org.apache.skywalking.oap.server.library.server.ServerException; import org.apache.skywalking.oap.server.library.server.grpc.GRPCServer; -import org.apache.skywalking.oap.server.receiver.sharing.server.*; +import org.apache.skywalking.oap.server.receiver.sharing.server.CoreRegisterLinker; +import org.apache.skywalking.oap.server.receiver.sharing.server.SharingServerModule; -/** - * @author wusheng - */ public class JaegerReceiverProvider extends ModuleProvider { public static final String NAME = "default"; private JaegerReceiverConfig config; private GRPCServer grpcServer = null; - @Override public String name() { + @Override + public String name() { return NAME; } - @Override public Class module() { + @Override + public Class module() { return JaegerReceiverModule.class; } - @Override public ModuleConfig createConfigBeanIfAbsent() { + @Override + public ModuleConfig createConfigBeanIfAbsent() { config = new JaegerReceiverConfig(); return config; } - @Override public void prepare() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void prepare() throws ServiceNotProvidedException, ModuleStartException { if (config.getGRPCPort() > 0) { - grpcServer = new GRPCServer(Strings.isBlank(config.getGRPCHost()) ? "0.0.0.0" : config.getGRPCHost(), config.getGRPCPort()); + grpcServer = new GRPCServer(Strings.isBlank(config.getGRPCHost()) ? "0.0.0.0" : config.getGRPCHost(), config + .getGRPCPort()); if (config.getMaxMessageSize() > 0) { grpcServer.setMaxMessageSize(config.getMaxMessageSize()); } @@ -68,7 +75,8 @@ public class JaegerReceiverProvider extends ModuleProvider { } } - @Override public void start() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void start() throws ServiceNotProvidedException, ModuleStartException { CoreRegisterLinker.setModuleManager(getManager()); SourceReceiver sourceReceiver = getManager().find(CoreModule.NAME).provider().getService(SourceReceiver.class); @@ -76,13 +84,16 @@ public class JaegerReceiverProvider extends ModuleProvider { if (Objects.nonNull(grpcServer)) { grpcServer.addHandler(new JaegerGRPCHandler(sourceReceiver, config)); } else { - GRPCHandlerRegister grpcHandlerRegister = getManager().find(SharingServerModule.NAME).provider().getService(GRPCHandlerRegister.class); + GRPCHandlerRegister grpcHandlerRegister = getManager().find(SharingServerModule.NAME) + .provider() + .getService(GRPCHandlerRegister.class); grpcHandlerRegister.addHandler(new JaegerGRPCHandler(sourceReceiver, config)); } } - @Override public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleStartException { try { if (Objects.nonNull(grpcServer)) { grpcServer.start(); @@ -92,7 +103,8 @@ public class JaegerReceiverProvider extends ModuleProvider { } } - @Override public String[] requiredModules() { + @Override + public String[] requiredModules() { return new String[] {SharingServerModule.NAME}; } } diff --git a/oap-server/server-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/pom.xml index 33657f614d62..2463464892d8 100644 --- a/oap-server/server-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + oap-server org.apache.skywalking diff --git a/oap-server/server-receiver-plugin/skywalking-clr-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/skywalking-clr-receiver-plugin/pom.xml index 8739904de034..d099eac65a7e 100644 --- a/oap-server/server-receiver-plugin/skywalking-clr-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/skywalking-clr-receiver-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + server-receiver-plugin org.apache.skywalking diff --git a/oap-server/server-receiver-plugin/skywalking-clr-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/clr/module/CLRModule.java b/oap-server/server-receiver-plugin/skywalking-clr-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/clr/module/CLRModule.java index dacc436c27f9..b9986ceea575 100644 --- a/oap-server/server-receiver-plugin/skywalking-clr-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/clr/module/CLRModule.java +++ b/oap-server/server-receiver-plugin/skywalking-clr-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/clr/module/CLRModule.java @@ -21,7 +21,7 @@ import org.apache.skywalking.oap.server.library.module.ModuleDefine; /** - * @author liuhaoyang + * **/ public class CLRModule extends ModuleDefine { @@ -29,7 +29,8 @@ public CLRModule() { super("receiver-clr"); } - @Override public Class[] services() { + @Override + public Class[] services() { return new Class[0]; } } diff --git a/oap-server/server-receiver-plugin/skywalking-clr-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/clr/provider/CLRModuleProvider.java b/oap-server/server-receiver-plugin/skywalking-clr-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/clr/provider/CLRModuleProvider.java index 505cb0ddcbd4..e4c19141fe2d 100644 --- a/oap-server/server-receiver-plugin/skywalking-clr-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/clr/provider/CLRModuleProvider.java +++ b/oap-server/server-receiver-plugin/skywalking-clr-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/clr/provider/CLRModuleProvider.java @@ -30,36 +30,48 @@ import org.apache.skywalking.oap.server.receiver.sharing.server.SharingServerModule; /** - * @author liuhaoyang + * **/ public class CLRModuleProvider extends ModuleProvider { - @Override public String name() { + @Override + public String name() { return "default"; } - @Override public Class module() { + @Override + public Class module() { return CLRModule.class; } - @Override public ModuleConfig createConfigBeanIfAbsent() { + @Override + public ModuleConfig createConfigBeanIfAbsent() { return null; } - @Override public void prepare() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void prepare() throws ServiceNotProvidedException, ModuleStartException { } - @Override public void start() throws ServiceNotProvidedException, ModuleStartException { - GRPCHandlerRegister grpcHandlerRegister = getManager().find(SharingServerModule.NAME).provider().getService(GRPCHandlerRegister.class); + @Override + public void start() throws ServiceNotProvidedException, ModuleStartException { + GRPCHandlerRegister grpcHandlerRegister = getManager().find(SharingServerModule.NAME) + .provider() + .getService(GRPCHandlerRegister.class); grpcHandlerRegister.addHandler(new CLRMetricReportServiceHandler(getManager())); } - @Override public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleStartException { } - @Override public String[] requiredModules() { - return new String[] {CoreModule.NAME, SharingServerModule.NAME}; + @Override + public String[] requiredModules() { + return new String[] { + CoreModule.NAME, + SharingServerModule.NAME + }; } } diff --git a/oap-server/server-receiver-plugin/skywalking-clr-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/clr/provider/handler/CLRMetricReportServiceHandler.java b/oap-server/server-receiver-plugin/skywalking-clr-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/clr/provider/handler/CLRMetricReportServiceHandler.java index 9288dba59b83..d1ed06810b5d 100644 --- a/oap-server/server-receiver-plugin/skywalking-clr-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/clr/provider/handler/CLRMetricReportServiceHandler.java +++ b/oap-server/server-receiver-plugin/skywalking-clr-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/clr/provider/handler/CLRMetricReportServiceHandler.java @@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory; /** - * @author liuhaoyang + * **/ public class CLRMetricReportServiceHandler extends CLRMetricReportServiceGrpc.CLRMetricReportServiceImplBase implements GRPCHandler { @@ -41,7 +41,8 @@ public CLRMetricReportServiceHandler(ModuleManager moduleManager) { clrSourceDispatcher = new CLRSourceDispatcher(moduleManager); } - @Override public void collect(CLRMetricCollection request, StreamObserver responseObserver) { + @Override + public void collect(CLRMetricCollection request, StreamObserver responseObserver) { int serviceInstanceId = request.getServiceInstanceId(); if (logger.isDebugEnabled()) { diff --git a/oap-server/server-receiver-plugin/skywalking-clr-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/clr/provider/handler/CLRSourceDispatcher.java b/oap-server/server-receiver-plugin/skywalking-clr-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/clr/provider/handler/CLRSourceDispatcher.java index ed029f7b7745..0169599a2820 100644 --- a/oap-server/server-receiver-plugin/skywalking-clr-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/clr/provider/handler/CLRSourceDispatcher.java +++ b/oap-server/server-receiver-plugin/skywalking-clr-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/clr/provider/handler/CLRSourceDispatcher.java @@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory; /** - * @author liuhaoyang + * **/ public class CLRSourceDispatcher { @@ -46,7 +46,9 @@ public class CLRSourceDispatcher { public CLRSourceDispatcher(ModuleManager moduleManager) { sourceReceiver = moduleManager.find(CoreModule.NAME).provider().getService(SourceReceiver.class); - instanceInventoryCache = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInstanceInventoryCache.class); + instanceInventoryCache = moduleManager.find(CoreModule.NAME) + .provider() + .getService(ServiceInstanceInventoryCache.class); } void sendMetric(int serviceInstanceId, long minuteTimeBucket, CLRMetric metrics) { diff --git a/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/pom.xml index 061d019e0f74..b36205f859d7 100644 --- a/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + server-receiver-plugin org.apache.skywalking @@ -61,10 +62,12 @@ protobuf-java directly, you will be transitively depending on the protobuf-java version that grpc depends on. --> - com.google.protobuf:protoc:${com.google.protobuf.protoc.version}:exe:${os.detected.classifier} + + com.google.protobuf:protoc:${com.google.protobuf.protoc.version}:exe:${os.detected.classifier} grpc-java - io.grpc:protoc-gen-grpc-java:${protoc-gen-grpc-java.plugin.version}:exe:${os.detected.classifier} + + io.grpc:protoc-gen-grpc-java:${protoc-gen-grpc-java.plugin.version}:exe:${os.detected.classifier} diff --git a/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/istio/telemetry/module/IstioTelemetryReceiverModule.java b/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/istio/telemetry/module/IstioTelemetryReceiverModule.java index ad9f1275336f..f1900fd5121d 100644 --- a/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/istio/telemetry/module/IstioTelemetryReceiverModule.java +++ b/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/istio/telemetry/module/IstioTelemetryReceiverModule.java @@ -27,7 +27,8 @@ public IstioTelemetryReceiverModule() { super(NAME); } - @Override public Class[] services() { + @Override + public Class[] services() { return new Class[0]; } } diff --git a/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/istio/telemetry/provider/IstioTelemetryGRPCHandler.java b/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/istio/telemetry/provider/IstioTelemetryGRPCHandler.java index 5307a5aa7a1a..5ab7db1185a6 100644 --- a/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/istio/telemetry/provider/IstioTelemetryGRPCHandler.java +++ b/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/istio/telemetry/provider/IstioTelemetryGRPCHandler.java @@ -21,23 +21,28 @@ import com.google.common.base.Joiner; import com.google.protobuf.Timestamp; import io.grpc.stub.StreamObserver; -import io.istio.*; +import io.istio.HandleMetricServiceGrpc; +import io.istio.IstioMetricProto; import io.istio.api.mixer.adapter.model.v1beta1.ReportProto; import io.istio.api.policy.v1beta1.TypeProto; -import java.time.*; +import java.time.Duration; +import java.time.Instant; import java.util.Map; import org.apache.skywalking.aop.server.receiver.mesh.TelemetryDataDispatcher; import org.apache.skywalking.apm.network.common.DetectPoint; -import org.apache.skywalking.apm.network.servicemesh.*; +import org.apache.skywalking.apm.network.servicemesh.Protocol; +import org.apache.skywalking.apm.network.servicemesh.ServiceMeshMetric; import org.apache.skywalking.oap.server.library.module.ModuleManager; import org.apache.skywalking.oap.server.telemetry.TelemetryModule; -import org.apache.skywalking.oap.server.telemetry.api.*; -import org.slf4j.*; +import org.apache.skywalking.oap.server.telemetry.api.CounterMetrics; +import org.apache.skywalking.oap.server.telemetry.api.HistogramMetrics; +import org.apache.skywalking.oap.server.telemetry.api.MetricsCreator; +import org.apache.skywalking.oap.server.telemetry.api.MetricsTag; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Handle istio telemetry data. - * - * @author gaohongtao */ public class IstioTelemetryGRPCHandler extends HandleMetricServiceGrpc.HandleMetricServiceImplBase { @@ -49,14 +54,15 @@ public class IstioTelemetryGRPCHandler extends HandleMetricServiceGrpc.HandleMet private HistogramMetrics histogram; public IstioTelemetryGRPCHandler(ModuleManager moduleManager) { - MetricsCreator metricsCreator = moduleManager.find(TelemetryModule.NAME).provider().getService(MetricsCreator.class); - counter = metricsCreator.createCounter("istio_mesh_grpc_in_count", "The count of istio service mesh telemetry", - MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); - histogram = metricsCreator.createHistogramMetric("istio_mesh_grpc_in_latency", "The process latency of istio service mesh telemetry", - MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); + MetricsCreator metricsCreator = moduleManager.find(TelemetryModule.NAME) + .provider() + .getService(MetricsCreator.class); + counter = metricsCreator.createCounter("istio_mesh_grpc_in_count", "The count of istio service mesh telemetry", MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); + histogram = metricsCreator.createHistogramMetric("istio_mesh_grpc_in_latency", "The process latency of istio service mesh telemetry", MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); } - @Override public void handleMetric(IstioMetricProto.HandleMetricRequest request, + @Override + public void handleMetric(IstioMetricProto.HandleMetricRequest request, StreamObserver responseObserver) { if (logger.isDebugEnabled()) { logger.debug("Received msg {}", request); @@ -76,7 +82,8 @@ public IstioTelemetryGRPCHandler(ModuleManager moduleManager) { String endpoint; boolean status = true; Protocol netProtocol; - if (protocol.equals("http") || protocol.equals("https") || requestScheme.equals("http") || requestScheme.equals("https")) { + if (protocol.equals("http") || protocol.equals("https") || requestScheme.equals("http") || requestScheme + .equals("https")) { endpoint = requestScheme + "/" + requestMethod + "/" + requestPath; status = responseCode >= 200 && responseCode < 400; netProtocol = Protocol.HTTP; @@ -110,11 +117,20 @@ public IstioTelemetryGRPCHandler(ModuleManager moduleManager) { destServiceName = string(i, "destinationService"); } - ServiceMeshMetric metrics = ServiceMeshMetric.newBuilder().setStartTime(requestTime.toEpochMilli()) - .setEndTime(responseTime.toEpochMilli()).setSourceServiceName(sourceServiceName) - .setSourceServiceInstance(string(i, "sourceUID")).setDestServiceName(destServiceName) - .setDestServiceInstance(string(i, "destinationUID")).setEndpoint(endpoint).setLatency(latency) - .setResponseCode(Math.toIntExact(responseCode)).setStatus(status).setProtocol(netProtocol).setDetectPoint(detectPoint).build(); + ServiceMeshMetric metrics = ServiceMeshMetric.newBuilder() + .setStartTime(requestTime.toEpochMilli()) + .setEndTime(responseTime.toEpochMilli()) + .setSourceServiceName(sourceServiceName) + .setSourceServiceInstance(string(i, "sourceUID")) + .setDestServiceName(destServiceName) + .setDestServiceInstance(string(i, "destinationUID")) + .setEndpoint(endpoint) + .setLatency(latency) + .setResponseCode(Math.toIntExact(responseCode)) + .setStatus(status) + .setProtocol(netProtocol) + .setDetectPoint(detectPoint) + .build(); logger.debug("Transformed metrics {}", metrics); TelemetryDataDispatcher.preProcess(metrics); diff --git a/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/istio/telemetry/provider/IstioTelemetryReceiverProvider.java b/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/istio/telemetry/provider/IstioTelemetryReceiverProvider.java index 3c878875d66b..7e5a551dfb1b 100644 --- a/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/istio/telemetry/provider/IstioTelemetryReceiverProvider.java +++ b/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/istio/telemetry/provider/IstioTelemetryReceiverProvider.java @@ -21,37 +21,55 @@ import org.apache.skywalking.aop.server.receiver.mesh.MeshReceiverModule; import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.server.GRPCHandlerRegister; -import org.apache.skywalking.oap.server.library.module.*; +import org.apache.skywalking.oap.server.library.module.ModuleConfig; +import org.apache.skywalking.oap.server.library.module.ModuleDefine; +import org.apache.skywalking.oap.server.library.module.ModuleProvider; +import org.apache.skywalking.oap.server.library.module.ModuleStartException; +import org.apache.skywalking.oap.server.library.module.ServiceNotProvidedException; import org.apache.skywalking.oap.server.receiver.istio.telemetry.module.IstioTelemetryReceiverModule; import org.apache.skywalking.oap.server.receiver.sharing.server.SharingServerModule; import org.apache.skywalking.oap.server.telemetry.TelemetryModule; public class IstioTelemetryReceiverProvider extends ModuleProvider { - @Override public String name() { + @Override + public String name() { return "default"; } - @Override public Class module() { + @Override + public Class module() { return IstioTelemetryReceiverModule.class; } - @Override public ModuleConfig createConfigBeanIfAbsent() { + @Override + public ModuleConfig createConfigBeanIfAbsent() { return null; } - @Override public void prepare() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void prepare() throws ServiceNotProvidedException, ModuleStartException { } - @Override public void start() throws ServiceNotProvidedException, ModuleStartException { - GRPCHandlerRegister service = getManager().find(SharingServerModule.NAME).provider().getService(GRPCHandlerRegister.class); + @Override + public void start() throws ServiceNotProvidedException, ModuleStartException { + GRPCHandlerRegister service = getManager().find(SharingServerModule.NAME) + .provider() + .getService(GRPCHandlerRegister.class); service.addHandler(new IstioTelemetryGRPCHandler(getManager())); } - @Override public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleStartException { } - @Override public String[] requiredModules() { - return new String[] {TelemetryModule.NAME, CoreModule.NAME, MeshReceiverModule.NAME, SharingServerModule.NAME}; + @Override + public String[] requiredModules() { + return new String[] { + TelemetryModule.NAME, + CoreModule.NAME, + MeshReceiverModule.NAME, + SharingServerModule.NAME + }; } } \ No newline at end of file diff --git a/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/istio/telemetry/handler/IstioTelemetryHandlerMainTest.java b/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/istio/telemetry/handler/IstioTelemetryHandlerMainTest.java index d0dfe78f01c0..55ae10df62e6 100644 --- a/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/istio/telemetry/handler/IstioTelemetryHandlerMainTest.java +++ b/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/istio/telemetry/handler/IstioTelemetryHandlerMainTest.java @@ -51,7 +51,7 @@ public static void main(String[] args) throws InterruptedException { executor.shutdown(); } - private static void send(final HandleMetricServiceGrpc.HandleMetricServiceBlockingStub stub) throws IOException { + private static void send(final HandleMetricServiceGrpc.HandleMetricServiceBlockingStub stub) throws IOException { for (String s : readData()) { IstioMetricProto.HandleMetricRequest.Builder requestBuilder = IstioMetricProto.HandleMetricRequest.newBuilder(); try (InputStreamReader isr = new InputStreamReader(getResourceAsStream(String.format("fixture/%s", s)))) { @@ -63,13 +63,11 @@ private static void send(final HandleMetricServiceGrpc.HandleMetricServiceBlocki private static Iterable readData() throws IOException { Iterable result = new LinkedList<>(); - try ( - InputStream in = getResourceAsStream("fixture"); - BufferedReader br = new BufferedReader(new InputStreamReader(in))) { + try (InputStream in = getResourceAsStream("fixture"); BufferedReader br = new BufferedReader(new InputStreamReader(in))) { String resource; while ((resource = br.readLine()) != null) { - ((LinkedList)result).add(resource); + ((LinkedList) result).add(resource); } } return result; diff --git a/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/pom.xml index d7f9be7f8112..186257d64f9f 100644 --- a/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + server-receiver-plugin org.apache.skywalking diff --git a/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/jvm/module/JVMModule.java b/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/jvm/module/JVMModule.java index ed81b9408d5a..44fb762a7662 100644 --- a/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/jvm/module/JVMModule.java +++ b/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/jvm/module/JVMModule.java @@ -18,18 +18,16 @@ package org.apache.skywalking.oap.server.receiver.jvm.module; -import org.apache.skywalking.oap.server.library.module.*; +import org.apache.skywalking.oap.server.library.module.ModuleDefine; -/** - * @author peng-yongsheng - */ public class JVMModule extends ModuleDefine { public JVMModule() { super("receiver-jvm"); } - @Override public Class[] services() { + @Override + public Class[] services() { return new Class[0]; } } diff --git a/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/jvm/provider/JVMModuleProvider.java b/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/jvm/provider/JVMModuleProvider.java index b9bde06753a1..a97e8279d61f 100644 --- a/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/jvm/provider/JVMModuleProvider.java +++ b/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/jvm/provider/JVMModuleProvider.java @@ -20,41 +20,52 @@ import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.server.GRPCHandlerRegister; -import org.apache.skywalking.oap.server.library.module.*; +import org.apache.skywalking.oap.server.library.module.ModuleConfig; +import org.apache.skywalking.oap.server.library.module.ModuleDefine; +import org.apache.skywalking.oap.server.library.module.ModuleProvider; import org.apache.skywalking.oap.server.receiver.jvm.module.JVMModule; -import org.apache.skywalking.oap.server.receiver.jvm.provider.handler.*; +import org.apache.skywalking.oap.server.receiver.jvm.provider.handler.JVMMetricReportServiceHandler; import org.apache.skywalking.oap.server.receiver.sharing.server.SharingServerModule; -/** - * @author peng-yongsheng - */ public class JVMModuleProvider extends ModuleProvider { - @Override public String name() { + @Override + public String name() { return "default"; } - @Override public Class module() { + @Override + public Class module() { return JVMModule.class; } - @Override public ModuleConfig createConfigBeanIfAbsent() { + @Override + public ModuleConfig createConfigBeanIfAbsent() { return null; } - @Override public void prepare() { + @Override + public void prepare() { } - @Override public void start() { - GRPCHandlerRegister grpcHandlerRegister = getManager().find(SharingServerModule.NAME).provider().getService(GRPCHandlerRegister.class); + @Override + public void start() { + GRPCHandlerRegister grpcHandlerRegister = getManager().find(SharingServerModule.NAME) + .provider() + .getService(GRPCHandlerRegister.class); grpcHandlerRegister.addHandler(new JVMMetricReportServiceHandler(getManager())); } - @Override public void notifyAfterCompleted() { + @Override + public void notifyAfterCompleted() { } - @Override public String[] requiredModules() { - return new String[] {CoreModule.NAME, SharingServerModule.NAME}; + @Override + public String[] requiredModules() { + return new String[] { + CoreModule.NAME, + SharingServerModule.NAME + }; } } diff --git a/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/jvm/provider/handler/JVMMetricReportServiceHandler.java b/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/jvm/provider/handler/JVMMetricReportServiceHandler.java index 6ca927cfbc16..147d79510891 100644 --- a/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/jvm/provider/handler/JVMMetricReportServiceHandler.java +++ b/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/jvm/provider/handler/JVMMetricReportServiceHandler.java @@ -20,11 +20,13 @@ import io.grpc.stub.StreamObserver; import org.apache.skywalking.apm.network.common.Commands; -import org.apache.skywalking.apm.network.language.agent.v2.*; +import org.apache.skywalking.apm.network.language.agent.v2.JVMMetricCollection; +import org.apache.skywalking.apm.network.language.agent.v2.JVMMetricReportServiceGrpc; +import org.apache.skywalking.oap.server.core.analysis.TimeBucket; import org.apache.skywalking.oap.server.library.module.ModuleManager; import org.apache.skywalking.oap.server.library.server.grpc.GRPCHandler; -import org.apache.skywalking.oap.server.core.analysis.TimeBucket; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class JVMMetricReportServiceHandler extends JVMMetricReportServiceGrpc.JVMMetricReportServiceImplBase implements GRPCHandler { @@ -36,7 +38,8 @@ public JVMMetricReportServiceHandler(ModuleManager moduleManager) { this.jvmSourceDispatcher = new JVMSourceDispatcher(moduleManager); } - @Override public void collect(JVMMetricCollection request, StreamObserver responseObserver) { + @Override + public void collect(JVMMetricCollection request, StreamObserver responseObserver) { int serviceInstanceId = request.getServiceInstanceId(); if (logger.isDebugEnabled()) { diff --git a/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/jvm/provider/handler/JVMSourceDispatcher.java b/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/jvm/provider/handler/JVMSourceDispatcher.java index a2c335c5aa5c..f46147bcdb03 100644 --- a/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/jvm/provider/handler/JVMSourceDispatcher.java +++ b/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/jvm/provider/handler/JVMSourceDispatcher.java @@ -18,20 +18,28 @@ package org.apache.skywalking.oap.server.receiver.jvm.provider.handler; -import java.util.*; +import java.util.List; +import java.util.Objects; import org.apache.skywalking.apm.network.common.CPU; -import org.apache.skywalking.apm.network.language.agent.*; -import org.apache.skywalking.oap.server.core.*; +import org.apache.skywalking.apm.network.language.agent.GC; +import org.apache.skywalking.apm.network.language.agent.JVMMetric; +import org.apache.skywalking.apm.network.language.agent.Memory; +import org.apache.skywalking.apm.network.language.agent.MemoryPool; +import org.apache.skywalking.oap.server.core.Const; +import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.cache.ServiceInstanceInventoryCache; import org.apache.skywalking.oap.server.core.register.ServiceInstanceInventory; import org.apache.skywalking.oap.server.core.source.GCPhrase; -import org.apache.skywalking.oap.server.core.source.*; +import org.apache.skywalking.oap.server.core.source.MemoryPoolType; +import org.apache.skywalking.oap.server.core.source.ServiceInstanceJVMCPU; +import org.apache.skywalking.oap.server.core.source.ServiceInstanceJVMGC; +import org.apache.skywalking.oap.server.core.source.ServiceInstanceJVMMemory; +import org.apache.skywalking.oap.server.core.source.ServiceInstanceJVMMemoryPool; +import org.apache.skywalking.oap.server.core.source.SourceReceiver; import org.apache.skywalking.oap.server.library.module.ModuleManager; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author wusheng - */ public class JVMSourceDispatcher { private static final Logger logger = LoggerFactory.getLogger(JVMSourceDispatcher.class); private final SourceReceiver sourceReceiver; @@ -39,7 +47,9 @@ public class JVMSourceDispatcher { public JVMSourceDispatcher(ModuleManager moduleManager) { this.sourceReceiver = moduleManager.find(CoreModule.NAME).provider().getService(SourceReceiver.class); - this.instanceInventoryCache = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInstanceInventoryCache.class); + this.instanceInventoryCache = moduleManager.find(CoreModule.NAME) + .provider() + .getService(ServiceInstanceInventoryCache.class); } void sendMetric(int serviceInstanceId, long minuteTimeBucket, JVMMetric metrics) { diff --git a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/pom.xml index 5dafd93d3baa..014e31a6859f 100644 --- a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + server-receiver-plugin org.apache.skywalking diff --git a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/EndpointNameFormater.java b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/EndpointNameFormater.java index 0a6ff6e358cb..203a13c41d3a 100644 --- a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/EndpointNameFormater.java +++ b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/EndpointNameFormater.java @@ -18,16 +18,16 @@ package org.apache.skywalking.aop.server.receiver.mesh; -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.InputStream; +import java.util.Map; +import java.util.Properties; import java.util.concurrent.ConcurrentHashMap; import org.apache.skywalking.apm.util.StringFormatGroup; import org.apache.skywalking.oap.server.library.util.ResourceUtils; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author wusheng - */ public class EndpointNameFormater { private static final Logger logger = LoggerFactory.getLogger(EndpointNameFormater.class); private static Map ALL_RULES = new ConcurrentHashMap<>(); @@ -39,7 +39,8 @@ private static void init(String service) { StringFormatGroup endpointRule = new StringFormatGroup(); Properties properties = new Properties(); try { - InputStream stream = ResourceUtils.class.getClassLoader().getResourceAsStream(service + "_endpoint_naming_rules.properties"); + InputStream stream = ResourceUtils.class.getClassLoader() + .getResourceAsStream(service + "_endpoint_naming_rules.properties"); if (stream == null) { logger.info("{}_endpoint_naming_rules.properties not found. Try to find global endpoint rule file.", service); stream = ResourceUtils.class.getClassLoader().getResourceAsStream("endpoint_naming_rules.properties"); @@ -50,7 +51,7 @@ private static void init(String service) { } else { properties.load(stream); properties.forEach((key, value) -> { - endpointRule.addRule((String)key, (String)value); + endpointRule.addRule((String) key, (String) value); logger.debug("endpoint naming rule of service {} found, name[{}] and rule[{}]", service, key, value); }); } diff --git a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/MeshDataBufferFileCache.java b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/MeshDataBufferFileCache.java index 2dff78033c43..828ca9aeace2 100644 --- a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/MeshDataBufferFileCache.java +++ b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/MeshDataBufferFileCache.java @@ -23,10 +23,14 @@ import org.apache.skywalking.apm.commons.datacarrier.DataCarrier; import org.apache.skywalking.apm.commons.datacarrier.consumer.IConsumer; import org.apache.skywalking.apm.network.servicemesh.ServiceMeshMetric; -import org.apache.skywalking.oap.server.library.buffer.*; +import org.apache.skywalking.oap.server.library.buffer.BufferData; +import org.apache.skywalking.oap.server.library.buffer.BufferStream; +import org.apache.skywalking.oap.server.library.buffer.DataStreamReader; import org.apache.skywalking.oap.server.library.module.ModuleManager; import org.apache.skywalking.oap.server.telemetry.TelemetryModule; -import org.apache.skywalking.oap.server.telemetry.api.*; +import org.apache.skywalking.oap.server.telemetry.api.CounterMetrics; +import org.apache.skywalking.oap.server.telemetry.api.MetricsCreator; +import org.apache.skywalking.oap.server.telemetry.api.MetricsTag; public class MeshDataBufferFileCache implements IConsumer, DataStreamReader.CallBack { private MeshModuleConfig config; @@ -39,13 +43,12 @@ public class MeshDataBufferFileCache implements IConsumer("MeshDataBufferFileCache", 3, 1024); - MetricsCreator metricsCreator = moduleManager.find(TelemetryModule.NAME).provider().getService(MetricsCreator.class); - meshBufferFileIn = metricsCreator.createCounter("mesh_buffer_file_in", "The number of mesh telemetry into the buffer file", - MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); - meshBufferFileRetry = metricsCreator.createCounter("mesh_buffer_file_retry", "The number of retry mesh telemetry from the buffer file, but haven't registered successfully.", - MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); - meshBufferFileOut = metricsCreator.createCounter("mesh_buffer_file_out", "The number of mesh telemetry out of the buffer file", - MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); + MetricsCreator metricsCreator = moduleManager.find(TelemetryModule.NAME) + .provider() + .getService(MetricsCreator.class); + meshBufferFileIn = metricsCreator.createCounter("mesh_buffer_file_in", "The number of mesh telemetry into the buffer file", MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); + meshBufferFileRetry = metricsCreator.createCounter("mesh_buffer_file_retry", "The number of retry mesh telemetry from the buffer file, but haven't registered successfully.", MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); + meshBufferFileOut = metricsCreator.createCounter("mesh_buffer_file_out", "The number of mesh telemetry out of the buffer file", MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); } void start() throws IOException { @@ -61,7 +64,8 @@ void start() throws IOException { stream.initialize(); } - @Override public void init() { + @Override + public void init() { } @@ -71,10 +75,9 @@ public void in(ServiceMeshMetric metrics) { /** * Queue callback, make sure concurrency doesn't happen - * - * @param data */ - @Override public void consume(List data) { + @Override + public void consume(List data) { for (ServiceMeshMetricDataDecorator decorator : data) { if (decorator.tryMetaDataRegister()) { TelemetryDataDispatcher.doDispatch(decorator); @@ -85,21 +88,21 @@ public void in(ServiceMeshMetric metrics) { } } - @Override public void onError(List data, Throwable t) { + @Override + public void onError(List data, Throwable t) { } - @Override public void onExit() { + @Override + public void onExit() { } /** * File buffer callback. Block reading from buffer file, until metadata register done. - * - * @param bufferData - * @return */ - @Override public boolean call(BufferData bufferData) { + @Override + public boolean call(BufferData bufferData) { ServiceMeshMetricDataDecorator decorator = new ServiceMeshMetricDataDecorator(bufferData.getMessageType()); if (decorator.tryMetaDataRegister()) { meshBufferFileOut.inc(); diff --git a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/MeshGRPCHandler.java b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/MeshGRPCHandler.java index b760adefa355..4d6f1d92c282 100644 --- a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/MeshGRPCHandler.java +++ b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/MeshGRPCHandler.java @@ -19,11 +19,16 @@ package org.apache.skywalking.aop.server.receiver.mesh; import io.grpc.stub.StreamObserver; -import org.apache.skywalking.apm.network.servicemesh.*; +import org.apache.skywalking.apm.network.servicemesh.MeshProbeDownstream; +import org.apache.skywalking.apm.network.servicemesh.ServiceMeshMetric; +import org.apache.skywalking.apm.network.servicemesh.ServiceMeshMetricServiceGrpc; import org.apache.skywalking.oap.server.library.module.ModuleManager; import org.apache.skywalking.oap.server.telemetry.TelemetryModule; -import org.apache.skywalking.oap.server.telemetry.api.*; -import org.slf4j.*; +import org.apache.skywalking.oap.server.telemetry.api.HistogramMetrics; +import org.apache.skywalking.oap.server.telemetry.api.MetricsCreator; +import org.apache.skywalking.oap.server.telemetry.api.MetricsTag; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class MeshGRPCHandler extends ServiceMeshMetricServiceGrpc.ServiceMeshMetricServiceImplBase { private static final Logger logger = LoggerFactory.getLogger(MeshGRPCHandler.class); @@ -31,15 +36,17 @@ public class MeshGRPCHandler extends ServiceMeshMetricServiceGrpc.ServiceMeshMet private HistogramMetrics histogram; public MeshGRPCHandler(ModuleManager moduleManager) { - MetricsCreator metricsCreator = moduleManager.find(TelemetryModule.NAME).provider().getService(MetricsCreator.class); - histogram = metricsCreator.createHistogramMetric("mesh_grpc_in_latency", "The process latency of service mesh telemetry", - MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); + MetricsCreator metricsCreator = moduleManager.find(TelemetryModule.NAME) + .provider() + .getService(MetricsCreator.class); + histogram = metricsCreator.createHistogramMetric("mesh_grpc_in_latency", "The process latency of service mesh telemetry", MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); } @Override public StreamObserver collect(StreamObserver responseObserver) { return new StreamObserver() { - @Override public void onNext(ServiceMeshMetric metrics) { + @Override + public void onNext(ServiceMeshMetric metrics) { if (logger.isDebugEnabled()) { logger.debug("Received mesh metrics: {}", metrics); } @@ -51,12 +58,14 @@ public StreamObserver collect(StreamObserver module() { + @Override + public Class module() { return MeshReceiverModule.class; } - @Override public ModuleConfig createConfigBeanIfAbsent() { + @Override + public ModuleConfig createConfigBeanIfAbsent() { return config; } - @Override public void prepare() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void prepare() throws ServiceNotProvidedException, ModuleStartException { } - @Override public void start() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void start() throws ServiceNotProvidedException, ModuleStartException { MeshDataBufferFileCache cache = new MeshDataBufferFileCache(config, getManager()); try { cache.start(); @@ -56,15 +66,23 @@ public MeshReceiverProvider() { throw new ModuleStartException(e.getMessage(), e); } CoreRegisterLinker.setModuleManager(getManager()); - GRPCHandlerRegister service = getManager().find(SharingServerModule.NAME).provider().getService(GRPCHandlerRegister.class); + GRPCHandlerRegister service = getManager().find(SharingServerModule.NAME) + .provider() + .getService(GRPCHandlerRegister.class); service.addHandler(new MeshGRPCHandler(getManager())); } - @Override public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleStartException { } - @Override public String[] requiredModules() { - return new String[] {TelemetryModule.NAME, CoreModule.NAME, SharingServerModule.NAME}; + @Override + public String[] requiredModules() { + return new String[] { + TelemetryModule.NAME, + CoreModule.NAME, + SharingServerModule.NAME + }; } } diff --git a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/ServiceMeshMetricDataDecorator.java b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/ServiceMeshMetricDataDecorator.java index e00124f6c815..0e1d5f77542f 100644 --- a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/ServiceMeshMetricDataDecorator.java +++ b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/ServiceMeshMetricDataDecorator.java @@ -26,9 +26,6 @@ import org.apache.skywalking.oap.server.core.register.ServiceInstanceInventory; import org.apache.skywalking.oap.server.receiver.sharing.server.CoreRegisterLinker; -/** - * @author wusheng - */ public class ServiceMeshMetricDataDecorator { private ServiceMeshMetric origin; private ServiceMeshMetric rebuiltData; @@ -63,9 +60,9 @@ boolean tryMetaDataRegister() { sourceServiceInstanceId = origin.getSourceServiceInstanceId(); if (sourceServiceId != Const.NONE && sourceServiceInstanceId == Const.NONE) { sourceServiceInstanceId = CoreRegisterLinker.getServiceInstanceInventoryRegister() - .getOrCreate(sourceServiceId, origin.getSourceServiceInstance(), origin.getSourceServiceInstance(), - origin.getEndTime(), - getOSInfoForMesh(origin.getSourceServiceInstance())); + .getOrCreate(sourceServiceId, origin.getSourceServiceInstance(), origin + .getSourceServiceInstance(), origin.getEndTime(), getOSInfoForMesh(origin + .getSourceServiceInstance())); if (sourceServiceInstanceId != Const.NONE) { getNewDataBuilder().setSourceServiceInstanceId(sourceServiceInstanceId); } else { @@ -74,7 +71,8 @@ boolean tryMetaDataRegister() { } destServiceId = origin.getDestServiceId(); if (destServiceId == Const.NONE) { - destServiceId = CoreRegisterLinker.getServiceInventoryRegister().getOrCreate(origin.getDestServiceName(), null); + destServiceId = CoreRegisterLinker.getServiceInventoryRegister() + .getOrCreate(origin.getDestServiceName(), null); if (destServiceId != Const.NONE) { getNewDataBuilder().setDestServiceId(destServiceId); } else { @@ -84,9 +82,9 @@ boolean tryMetaDataRegister() { destServiceInstanceId = origin.getDestServiceInstanceId(); if (destServiceId != Const.NONE && destServiceInstanceId == Const.NONE) { destServiceInstanceId = CoreRegisterLinker.getServiceInstanceInventoryRegister() - .getOrCreate(destServiceId, origin.getDestServiceInstance(), origin.getDestServiceInstance(), - origin.getEndTime(), - getOSInfoForMesh(origin.getDestServiceInstance())); + .getOrCreate(destServiceId, origin.getDestServiceInstance(), origin + .getDestServiceInstance(), origin.getEndTime(), getOSInfoForMesh(origin + .getDestServiceInstance())); if (destServiceInstanceId != Const.NONE) { getNewDataBuilder().setDestServiceInstanceId(destServiceInstanceId); } else { @@ -99,8 +97,9 @@ boolean tryMetaDataRegister() { DetectPoint point = origin.getDetectPoint(); if (DetectPoint.server.equals(point)) { if (destServiceId != Const.NONE) { - endpointId = CoreRegisterLinker.getEndpointInventoryRegister().getOrCreate(destServiceId, endpoint, - org.apache.skywalking.oap.server.core.source.DetectPoint.fromNetworkProtocolDetectPoint(point)); + endpointId = CoreRegisterLinker.getEndpointInventoryRegister() + .getOrCreate(destServiceId, endpoint, org.apache.skywalking.oap.server.core.source.DetectPoint + .fromNetworkProtocolDetectPoint(point)); } } diff --git a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/TelemetryDataDispatcher.java b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/TelemetryDataDispatcher.java index d74478a4e75d..1023162486b4 100644 --- a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/TelemetryDataDispatcher.java +++ b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/TelemetryDataDispatcher.java @@ -20,22 +20,33 @@ import java.util.Objects; import org.apache.logging.log4j.util.Strings; -import org.apache.skywalking.apm.network.servicemesh.*; +import org.apache.skywalking.apm.network.servicemesh.Protocol; +import org.apache.skywalking.apm.network.servicemesh.ServiceMeshMetric; import org.apache.skywalking.apm.util.StringFormatGroup; -import org.apache.skywalking.oap.server.core.*; -import org.apache.skywalking.oap.server.core.cache.*; +import org.apache.skywalking.oap.server.core.Const; +import org.apache.skywalking.oap.server.core.CoreModule; +import org.apache.skywalking.oap.server.core.analysis.TimeBucket; +import org.apache.skywalking.oap.server.core.cache.ServiceInstanceInventoryCache; +import org.apache.skywalking.oap.server.core.cache.ServiceInventoryCache; import org.apache.skywalking.oap.server.core.register.ServiceInstanceInventory; -import org.apache.skywalking.oap.server.core.register.service.*; -import org.apache.skywalking.oap.server.core.source.*; +import org.apache.skywalking.oap.server.core.register.service.IServiceInstanceInventoryRegister; +import org.apache.skywalking.oap.server.core.register.service.IServiceInventoryRegister; +import org.apache.skywalking.oap.server.core.source.All; +import org.apache.skywalking.oap.server.core.source.DetectPoint; +import org.apache.skywalking.oap.server.core.source.Endpoint; +import org.apache.skywalking.oap.server.core.source.RequestType; +import org.apache.skywalking.oap.server.core.source.Service; +import org.apache.skywalking.oap.server.core.source.ServiceInstance; +import org.apache.skywalking.oap.server.core.source.ServiceInstanceRelation; +import org.apache.skywalking.oap.server.core.source.ServiceRelation; +import org.apache.skywalking.oap.server.core.source.SourceReceiver; import org.apache.skywalking.oap.server.library.module.ModuleManager; -import org.apache.skywalking.oap.server.core.analysis.TimeBucket; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * TelemetryDataDispatcher processes the {@link ServiceMeshMetric} format telemetry data, transfers it to source * dispatcher. - * - * @author wusheng */ public class TelemetryDataDispatcher { private static final Logger logger = LoggerFactory.getLogger(TelemetryDataDispatcher.class); @@ -54,15 +65,21 @@ private TelemetryDataDispatcher() { public static void setCache(MeshDataBufferFileCache cache, ModuleManager moduleManager) { CACHE = cache; SERVICE_CACHE = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInventoryCache.class); - SERVICE_INSTANCE_CACHE = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInstanceInventoryCache.class); + SERVICE_INSTANCE_CACHE = moduleManager.find(CoreModule.NAME) + .provider() + .getService(ServiceInstanceInventoryCache.class); SOURCE_RECEIVER = moduleManager.find(CoreModule.NAME).provider().getService(SourceReceiver.class); - SERVICE_INSTANCE_INVENTORY_REGISTER = moduleManager.find(CoreModule.NAME).provider().getService(IServiceInstanceInventoryRegister.class); - SERVICE_INVENTORY_REGISTER = moduleManager.find(CoreModule.NAME).provider().getService(IServiceInventoryRegister.class); + SERVICE_INSTANCE_INVENTORY_REGISTER = moduleManager.find(CoreModule.NAME) + .provider() + .getService(IServiceInstanceInventoryRegister.class); + SERVICE_INVENTORY_REGISTER = moduleManager.find(CoreModule.NAME) + .provider() + .getService(IServiceInventoryRegister.class); } public static void preProcess(ServiceMeshMetric data) { - String service = data.getDestServiceId() == Const.NONE ? data.getDestServiceName() : - SERVICE_CACHE.get(data.getDestServiceId()).getName(); + String service = data.getDestServiceId() == Const.NONE ? data.getDestServiceName() : SERVICE_CACHE.get(data.getDestServiceId()) + .getName(); String endpointName = data.getEndpoint(); StringFormatGroup.FormatResult formatResult = EndpointNameFormater.format(service, endpointName); if (formatResult.isMatch()) { @@ -84,8 +101,6 @@ public static void preProcess(ServiceMeshMetric data) { /** * The {@link ServiceMeshMetricDataDecorator} is standard, all metadata registered through {@link #CACHE} - * - * @param decorator */ static void doDispatch(ServiceMeshMetricDataDecorator decorator) { ServiceMeshMetric metrics = decorator.getMetric(); @@ -178,7 +193,8 @@ private static void toServiceRelation(ServiceMeshMetricDataDecorator decorator, serviceRelation.setTimeBucket(minuteTimeBucket); serviceRelation.setSourceServiceId(metrics.getSourceServiceId()); serviceRelation.setSourceServiceName(getServiceName(metrics.getSourceServiceId(), metrics.getSourceServiceName())); - serviceRelation.setSourceServiceInstanceName(getServiceInstanceName(metrics.getSourceServiceInstanceId(), metrics.getSourceServiceInstance())); + serviceRelation.setSourceServiceInstanceName(getServiceInstanceName(metrics.getSourceServiceInstanceId(), metrics + .getSourceServiceInstance())); serviceRelation.setDestServiceId(metrics.getDestServiceId()); serviceRelation.setDestServiceName(getServiceName(metrics.getDestServiceId(), metrics.getDestServiceName())); @@ -217,7 +233,8 @@ private static void toServiceInstanceRelation(ServiceMeshMetricDataDecorator dec ServiceInstanceRelation serviceRelation = new ServiceInstanceRelation(); serviceRelation.setTimeBucket(minuteTimeBucket); serviceRelation.setSourceServiceInstanceId(metrics.getSourceServiceInstanceId()); - serviceRelation.setSourceServiceInstanceName(getServiceInstanceName(metrics.getSourceServiceInstanceId(), metrics.getSourceServiceInstance())); + serviceRelation.setSourceServiceInstanceName(getServiceInstanceName(metrics.getSourceServiceInstanceId(), metrics + .getSourceServiceInstance())); serviceRelation.setSourceServiceId(metrics.getSourceServiceId()); serviceRelation.setSourceServiceName(getServiceName(metrics.getSourceServiceId(), metrics.getSourceServiceName())); diff --git a/oap-server/server-receiver-plugin/skywalking-profile-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/profile/module/ProfileModule.java b/oap-server/server-receiver-plugin/skywalking-profile-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/profile/module/ProfileModule.java index 171e0c9648a7..3a9c57e411ba 100644 --- a/oap-server/server-receiver-plugin/skywalking-profile-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/profile/module/ProfileModule.java +++ b/oap-server/server-receiver-plugin/skywalking-profile-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/profile/module/ProfileModule.java @@ -22,8 +22,6 @@ /** * profile task receiver - * - * @author MrPro */ public class ProfileModule extends ModuleDefine { diff --git a/oap-server/server-receiver-plugin/skywalking-profile-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/profile/provider/ProfileModuleProvider.java b/oap-server/server-receiver-plugin/skywalking-profile-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/profile/provider/ProfileModuleProvider.java index 7936e4365785..a1b9941483fd 100644 --- a/oap-server/server-receiver-plugin/skywalking-profile-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/profile/provider/ProfileModuleProvider.java +++ b/oap-server/server-receiver-plugin/skywalking-profile-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/profile/provider/ProfileModuleProvider.java @@ -20,15 +20,17 @@ import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.server.GRPCHandlerRegister; -import org.apache.skywalking.oap.server.library.module.*; +import org.apache.skywalking.oap.server.library.module.ModuleConfig; +import org.apache.skywalking.oap.server.library.module.ModuleDefine; +import org.apache.skywalking.oap.server.library.module.ModuleProvider; +import org.apache.skywalking.oap.server.library.module.ModuleStartException; +import org.apache.skywalking.oap.server.library.module.ServiceNotProvidedException; import org.apache.skywalking.oap.server.receiver.profile.module.ProfileModule; import org.apache.skywalking.oap.server.receiver.profile.provider.handler.ProfileTaskServiceHandler; import org.apache.skywalking.oap.server.receiver.sharing.server.SharingServerModule; /** * profile task receiver default provider - * - * @author MrPro */ public class ProfileModuleProvider extends ModuleProvider { @Override @@ -52,7 +54,9 @@ public void prepare() throws ServiceNotProvidedException, ModuleStartException { @Override public void start() throws ServiceNotProvidedException, ModuleStartException { - GRPCHandlerRegister grpcHandlerRegister = getManager().find(SharingServerModule.NAME).provider().getService(GRPCHandlerRegister.class); + GRPCHandlerRegister grpcHandlerRegister = getManager().find(SharingServerModule.NAME) + .provider() + .getService(GRPCHandlerRegister.class); grpcHandlerRegister.addHandler(new ProfileTaskServiceHandler(getManager())); } @@ -62,6 +66,9 @@ public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleSta @Override public String[] requiredModules() { - return new String[] {CoreModule.NAME, SharingServerModule.NAME}; + return new String[] { + CoreModule.NAME, + SharingServerModule.NAME + }; } } diff --git a/oap-server/server-receiver-plugin/skywalking-profile-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/profile/provider/handler/ProfileTaskServiceHandler.java b/oap-server/server-receiver-plugin/skywalking-profile-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/profile/provider/handler/ProfileTaskServiceHandler.java index 6c7e5b894f89..5cb33b813ee1 100644 --- a/oap-server/server-receiver-plugin/skywalking-profile-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/profile/provider/handler/ProfileTaskServiceHandler.java +++ b/oap-server/server-receiver-plugin/skywalking-profile-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/profile/provider/handler/ProfileTaskServiceHandler.java @@ -43,9 +43,6 @@ import java.util.List; import java.util.concurrent.TimeUnit; -/** - * @author MrPro - */ public class ProfileTaskServiceHandler extends ProfileTaskGrpc.ProfileTaskImplBase implements GRPCHandler { private static final Logger LOGGER = LoggerFactory.getLogger(ProfileTaskServiceHandler.class); diff --git a/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/pom.xml index be93d46fc3a6..b68ea2c1183e 100644 --- a/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + server-receiver-plugin org.apache.skywalking diff --git a/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/module/RegisterModule.java b/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/module/RegisterModule.java index 5df3e47952cd..b98c590a0cc9 100644 --- a/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/module/RegisterModule.java +++ b/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/module/RegisterModule.java @@ -18,18 +18,16 @@ package org.apache.skywalking.oap.server.receiver.register.module; -import org.apache.skywalking.oap.server.library.module.*; +import org.apache.skywalking.oap.server.library.module.ModuleDefine; -/** - * @author peng-yongsheng - */ public class RegisterModule extends ModuleDefine { public RegisterModule() { super("receiver-register"); } - @Override public Class[] services() { + @Override + public Class[] services() { return new Class[0]; } } diff --git a/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/RegisterModuleProvider.java b/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/RegisterModuleProvider.java index 85ffe556f654..798dea3d7739 100644 --- a/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/RegisterModuleProvider.java +++ b/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/RegisterModuleProvider.java @@ -28,37 +28,46 @@ import org.apache.skywalking.oap.server.receiver.register.provider.handler.v6.grpc.ServiceInstancePingServiceHandler; import org.apache.skywalking.oap.server.receiver.sharing.server.SharingServerModule; -/** - * @author peng-yongsheng - */ public class RegisterModuleProvider extends ModuleProvider { - @Override public String name() { + @Override + public String name() { return "default"; } - @Override public Class module() { + @Override + public Class module() { return RegisterModule.class; } - @Override public ModuleConfig createConfigBeanIfAbsent() { + @Override + public ModuleConfig createConfigBeanIfAbsent() { return null; } - @Override public void prepare() { + @Override + public void prepare() { } - @Override public void start() { - GRPCHandlerRegister grpcHandlerRegister = getManager().find(SharingServerModule.NAME).provider().getService(GRPCHandlerRegister.class); + @Override + public void start() { + GRPCHandlerRegister grpcHandlerRegister = getManager().find(SharingServerModule.NAME) + .provider() + .getService(GRPCHandlerRegister.class); grpcHandlerRegister.addHandler(new RegisterServiceHandler(getManager())); grpcHandlerRegister.addHandler(new ServiceInstancePingServiceHandler(getManager())); } - @Override public void notifyAfterCompleted() { + @Override + public void notifyAfterCompleted() { } - @Override public String[] requiredModules() { - return new String[] {CoreModule.NAME, SharingServerModule.NAME}; + @Override + public String[] requiredModules() { + return new String[] { + CoreModule.NAME, + SharingServerModule.NAME + }; } } diff --git a/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v6/grpc/RegisterServiceHandler.java b/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v6/grpc/RegisterServiceHandler.java index 63f547c4f3af..ec72b3200f67 100644 --- a/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v6/grpc/RegisterServiceHandler.java +++ b/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v6/grpc/RegisterServiceHandler.java @@ -61,9 +61,6 @@ import static org.apache.skywalking.oap.server.core.register.ServiceInstanceInventory.PropertyUtil.OS_NAME; import static org.apache.skywalking.oap.server.core.register.ServiceInstanceInventory.PropertyUtil.PROCESS_NO; -/** - * @author wusheng - */ public class RegisterServiceHandler extends RegisterGrpc.RegisterImplBase implements GRPCHandler { private static final Logger logger = LoggerFactory.getLogger(RegisterServiceHandler.class); @@ -77,15 +74,28 @@ public class RegisterServiceHandler extends RegisterGrpc.RegisterImplBase implem private final INetworkAddressInventoryRegister networkAddressInventoryRegister; public RegisterServiceHandler(ModuleManager moduleManager) { - this.serviceInventoryCache = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInventoryCache.class); - this.serviceInstanceInventoryCache = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInstanceInventoryCache.class); - this.serviceInventoryRegister = moduleManager.find(CoreModule.NAME).provider().getService(IServiceInventoryRegister.class); - this.serviceInstanceInventoryRegister = moduleManager.find(CoreModule.NAME).provider().getService(IServiceInstanceInventoryRegister.class); - this.inventoryService = moduleManager.find(CoreModule.NAME).provider().getService(IEndpointInventoryRegister.class); - this.networkAddressInventoryRegister = moduleManager.find(CoreModule.NAME).provider().getService(INetworkAddressInventoryRegister.class); + this.serviceInventoryCache = moduleManager.find(CoreModule.NAME) + .provider() + .getService(ServiceInventoryCache.class); + this.serviceInstanceInventoryCache = moduleManager.find(CoreModule.NAME) + .provider() + .getService(ServiceInstanceInventoryCache.class); + this.serviceInventoryRegister = moduleManager.find(CoreModule.NAME) + .provider() + .getService(IServiceInventoryRegister.class); + this.serviceInstanceInventoryRegister = moduleManager.find(CoreModule.NAME) + .provider() + .getService(IServiceInstanceInventoryRegister.class); + this.inventoryService = moduleManager.find(CoreModule.NAME) + .provider() + .getService(IEndpointInventoryRegister.class); + this.networkAddressInventoryRegister = moduleManager.find(CoreModule.NAME) + .provider() + .getService(INetworkAddressInventoryRegister.class); } - @Override public void doServiceRegister(Services request, StreamObserver responseObserver) { + @Override + public void doServiceRegister(Services request, StreamObserver responseObserver) { ServiceRegisterMapping.Builder builder = ServiceRegisterMapping.newBuilder(); request.getServicesList().forEach(service -> { String serviceName = service.getServiceName(); @@ -111,7 +121,8 @@ public RegisterServiceHandler(ModuleManager moduleManager) { responseObserver.onCompleted(); } - @Override public void doServiceInstanceRegister(ServiceInstances request, + @Override + public void doServiceInstanceRegister(ServiceInstances request, StreamObserver responseObserver) { ServiceInstanceRegisterMapping.Builder builder = ServiceInstanceRegisterMapping.newBuilder(); @@ -165,11 +176,14 @@ public RegisterServiceHandler(ModuleManager moduleManager) { } } - int serviceInstanceId = serviceInstanceInventoryRegister.getOrCreate(instance.getServiceId(), instanceName, instanceUUID, instance.getTime(), instanceProperties); + int serviceInstanceId = serviceInstanceInventoryRegister.getOrCreate(instance.getServiceId(), instanceName, instanceUUID, instance + .getTime(), instanceProperties); if (serviceInstanceId != Const.NONE) { logger.info("register service instance id={} [UUID:{}]", serviceInstanceId, instanceUUID); - builder.addServiceInstances(KeyIntValuePair.newBuilder().setKey(instanceUUID).setValue(serviceInstanceId)); + builder.addServiceInstances(KeyIntValuePair.newBuilder() + .setKey(instanceUUID) + .setValue(serviceInstanceId)); } }); @@ -177,7 +191,8 @@ public RegisterServiceHandler(ModuleManager moduleManager) { responseObserver.onCompleted(); } - @Override public void doEndpointRegister(Endpoints request, StreamObserver responseObserver) { + @Override + public void doEndpointRegister(Endpoints request, StreamObserver responseObserver) { EndpointMapping.Builder builder = EndpointMapping.newBuilder(); request.getEndpointsList().forEach(endpoint -> { @@ -190,10 +205,10 @@ public RegisterServiceHandler(ModuleManager moduleManager) { if (endpointId != Const.NONE) { builder.addElements(EndpointMappingElement.newBuilder() - .setServiceId(serviceId) - .setEndpointName(endpointName) - .setEndpointId(endpointId) - .setFrom(endpoint.getFrom())); + .setServiceId(serviceId) + .setEndpointName(endpointName) + .setEndpointId(endpointId) + .setFrom(endpoint.getFrom())); } } else { logger.warn("Unexpected endpoint register, endpoint isn't detected from server side. {}", request); @@ -220,7 +235,8 @@ public void doNetworkAddressRegister(NetAddresses request, StreamObserver responseObserver) { request.getMappingsList().forEach(mapping -> { diff --git a/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v6/grpc/ServiceInstancePingServiceHandler.java b/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v6/grpc/ServiceInstancePingServiceHandler.java index 616587ab0884..24e8b55e94b6 100755 --- a/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v6/grpc/ServiceInstancePingServiceHandler.java +++ b/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v6/grpc/ServiceInstancePingServiceHandler.java @@ -37,9 +37,6 @@ import java.util.Objects; -/** - * @author wusheng - */ public class ServiceInstancePingServiceHandler extends ServiceInstancePingGrpc.ServiceInstancePingImplBase implements GRPCHandler { private static final Logger logger = LoggerFactory.getLogger(ServiceInstancePingServiceHandler.class); @@ -49,13 +46,20 @@ public class ServiceInstancePingServiceHandler extends ServiceInstancePingGrpc.S private final CommandService commandService; public ServiceInstancePingServiceHandler(ModuleManager moduleManager) { - this.serviceInstanceInventoryCache = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInstanceInventoryCache.class); - this.serviceInventoryRegister = moduleManager.find(CoreModule.NAME).provider().getService(IServiceInventoryRegister.class); - this.serviceInstanceInventoryRegister = moduleManager.find(CoreModule.NAME).provider().getService(IServiceInstanceInventoryRegister.class); + this.serviceInstanceInventoryCache = moduleManager.find(CoreModule.NAME) + .provider() + .getService(ServiceInstanceInventoryCache.class); + this.serviceInventoryRegister = moduleManager.find(CoreModule.NAME) + .provider() + .getService(IServiceInventoryRegister.class); + this.serviceInstanceInventoryRegister = moduleManager.find(CoreModule.NAME) + .provider() + .getService(IServiceInstanceInventoryRegister.class); this.commandService = moduleManager.find(CoreModule.NAME).provider().getService(CommandService.class); } - @Override public void doPing(ServiceInstancePingPkg request, StreamObserver responseObserver) { + @Override + public void doPing(ServiceInstancePingPkg request, StreamObserver responseObserver) { int serviceInstanceId = request.getServiceInstanceId(); long heartBeatTime = request.getTime(); serviceInstanceInventoryRegister.heartbeat(serviceInstanceId, heartBeatTime); @@ -65,10 +69,10 @@ public ServiceInstancePingServiceHandler(ModuleManager moduleManager) { serviceInventoryRegister.heartbeat(serviceInstanceInventory.getServiceId(), heartBeatTime); responseObserver.onNext(Commands.getDefaultInstance()); } else { - logger.warn("Can't find service by service instance id from cache," + - " service instance id is: {}, will send a reset command to agent side", serviceInstanceId); + logger.warn("Can't find service by service instance id from cache," + " service instance id is: {}, will send a reset command to agent side", serviceInstanceId); - final ServiceResetCommand resetCommand = commandService.newResetCommand(request.getServiceInstanceId(), request.getTime(), request.getServiceInstanceUUID()); + final ServiceResetCommand resetCommand = commandService.newResetCommand(request.getServiceInstanceId(), request + .getTime(), request.getServiceInstanceUUID()); final Command command = resetCommand.serialize().build(); final Commands nextCommands = Commands.newBuilder().addCommands(command).build(); responseObserver.onNext(nextCommands); diff --git a/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/pom.xml b/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/pom.xml index 3c57564e9a13..19bbf3a78710 100644 --- a/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + server-receiver-plugin org.apache.skywalking diff --git a/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/sharing/server/CoreRegisterLinker.java b/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/sharing/server/CoreRegisterLinker.java index f894590e7fd9..98316fb192dc 100644 --- a/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/sharing/server/CoreRegisterLinker.java +++ b/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/sharing/server/CoreRegisterLinker.java @@ -19,8 +19,11 @@ package org.apache.skywalking.oap.server.receiver.sharing.server; import org.apache.skywalking.oap.server.core.CoreModule; -import org.apache.skywalking.oap.server.core.cache.*; -import org.apache.skywalking.oap.server.core.register.service.*; +import org.apache.skywalking.oap.server.core.cache.EndpointInventoryCache; +import org.apache.skywalking.oap.server.core.cache.ServiceInventoryCache; +import org.apache.skywalking.oap.server.core.register.service.IEndpointInventoryRegister; +import org.apache.skywalking.oap.server.core.register.service.IServiceInstanceInventoryRegister; +import org.apache.skywalking.oap.server.core.register.service.IServiceInventoryRegister; import org.apache.skywalking.oap.server.library.module.ModuleManager; public class CoreRegisterLinker { @@ -37,35 +40,45 @@ public static void setModuleManager(ModuleManager moduleManager) { public static IServiceInventoryRegister getServiceInventoryRegister() { if (SERVICE_INVENTORY_REGISTER == null) { - SERVICE_INVENTORY_REGISTER = MODULE_MANAGER.find(CoreModule.NAME).provider().getService(IServiceInventoryRegister.class); + SERVICE_INVENTORY_REGISTER = MODULE_MANAGER.find(CoreModule.NAME) + .provider() + .getService(IServiceInventoryRegister.class); } return SERVICE_INVENTORY_REGISTER; } public static IServiceInstanceInventoryRegister getServiceInstanceInventoryRegister() { if (SERVICE_INSTANCE_INVENTORY_REGISTER == null) { - SERVICE_INSTANCE_INVENTORY_REGISTER = MODULE_MANAGER.find(CoreModule.NAME).provider().getService(IServiceInstanceInventoryRegister.class); + SERVICE_INSTANCE_INVENTORY_REGISTER = MODULE_MANAGER.find(CoreModule.NAME) + .provider() + .getService(IServiceInstanceInventoryRegister.class); } return SERVICE_INSTANCE_INVENTORY_REGISTER; } public static IEndpointInventoryRegister getEndpointInventoryRegister() { if (ENDPOINT_INVENTORY_REGISTER == null) { - ENDPOINT_INVENTORY_REGISTER = MODULE_MANAGER.find(CoreModule.NAME).provider().getService(IEndpointInventoryRegister.class); + ENDPOINT_INVENTORY_REGISTER = MODULE_MANAGER.find(CoreModule.NAME) + .provider() + .getService(IEndpointInventoryRegister.class); } return ENDPOINT_INVENTORY_REGISTER; } public static ServiceInventoryCache getServiceInventoryCache() { if (SERVICE_INVENTORY_CACHE == null) { - SERVICE_INVENTORY_CACHE = MODULE_MANAGER.find(CoreModule.NAME).provider().getService(ServiceInventoryCache.class); + SERVICE_INVENTORY_CACHE = MODULE_MANAGER.find(CoreModule.NAME) + .provider() + .getService(ServiceInventoryCache.class); } return SERVICE_INVENTORY_CACHE; } public static EndpointInventoryCache getEndpointInventoryCache() { if (ENDPOINT_INVENTORY_CACHE == null) { - ENDPOINT_INVENTORY_CACHE = MODULE_MANAGER.find(CoreModule.NAME).provider().getService(EndpointInventoryCache.class); + ENDPOINT_INVENTORY_CACHE = MODULE_MANAGER.find(CoreModule.NAME) + .provider() + .getService(EndpointInventoryCache.class); } return ENDPOINT_INVENTORY_CACHE; } diff --git a/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/sharing/server/ReceiverGRPCHandlerRegister.java b/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/sharing/server/ReceiverGRPCHandlerRegister.java index 4c62fa5a1e2d..9bacdb94cdcd 100644 --- a/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/sharing/server/ReceiverGRPCHandlerRegister.java +++ b/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/sharing/server/ReceiverGRPCHandlerRegister.java @@ -27,15 +27,14 @@ import lombok.Setter; import org.apache.skywalking.oap.server.core.server.GRPCHandlerRegister; -/** - * @author peng-yongsheng, jian.tan - */ public class ReceiverGRPCHandlerRegister implements GRPCHandlerRegister { - @Setter private GRPCHandlerRegister grpcHandlerRegister; + @Setter + private GRPCHandlerRegister grpcHandlerRegister; private List interceptors = new LinkedList<>(); - @Override public void addHandler(BindableService handler) { + @Override + public void addHandler(BindableService handler) { if (interceptors.isEmpty()) { grpcHandlerRegister.addHandler(handler); } else { @@ -45,17 +44,19 @@ public class ReceiverGRPCHandlerRegister implements GRPCHandlerRegister { } } - @Override public void addHandler(ServerServiceDefinition definition) { + @Override + public void addHandler(ServerServiceDefinition definition) { grpcHandlerRegister.addHandler(definition); } /** - * If you want to bind @{io.grpc.ServerInterceptor} on a handler, - * you must call this method before register a handler. + * If you want to bind @{io.grpc.ServerInterceptor} on a handler, you must call this method before register a + * handler. * * @param interceptor of @{io.grpc.ServerInterceptor} */ - @Override public void addFilter(ServerInterceptor interceptor) { + @Override + public void addFilter(ServerInterceptor interceptor) { this.interceptors.add(interceptor); } diff --git a/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/sharing/server/ReceiverJettyHandlerRegister.java b/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/sharing/server/ReceiverJettyHandlerRegister.java index 8d7f98124bc4..ad251e9dacd0 100644 --- a/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/sharing/server/ReceiverJettyHandlerRegister.java +++ b/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/sharing/server/ReceiverJettyHandlerRegister.java @@ -22,14 +22,13 @@ import org.apache.skywalking.oap.server.core.server.JettyHandlerRegister; import org.apache.skywalking.oap.server.library.server.jetty.JettyHandler; -/** - * @author peng-yongsheng - */ public class ReceiverJettyHandlerRegister implements JettyHandlerRegister { - @Setter private JettyHandlerRegister jettyHandlerRegister; + @Setter + private JettyHandlerRegister jettyHandlerRegister; - @Override public void addHandler(JettyHandler serverHandler) { + @Override + public void addHandler(JettyHandler serverHandler) { jettyHandlerRegister.addHandler(serverHandler); } } diff --git a/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/sharing/server/SharingServerConfig.java b/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/sharing/server/SharingServerConfig.java index f7fa0f955b83..375576eb2616 100644 --- a/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/sharing/server/SharingServerConfig.java +++ b/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/sharing/server/SharingServerConfig.java @@ -18,12 +18,10 @@ package org.apache.skywalking.oap.server.receiver.sharing.server; -import lombok.*; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.oap.server.library.module.ModuleConfig; -/** - * @author peng-yongsheng,yantaowu,jian.tan - */ @Getter @Setter public class SharingServerConfig extends ModuleConfig { diff --git a/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/sharing/server/SharingServerModule.java b/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/sharing/server/SharingServerModule.java index cd858dc9d503..b3f3f286a3ef 100644 --- a/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/sharing/server/SharingServerModule.java +++ b/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/sharing/server/SharingServerModule.java @@ -18,12 +18,10 @@ package org.apache.skywalking.oap.server.receiver.sharing.server; -import org.apache.skywalking.oap.server.core.server.*; +import org.apache.skywalking.oap.server.core.server.GRPCHandlerRegister; +import org.apache.skywalking.oap.server.core.server.JettyHandlerRegister; import org.apache.skywalking.oap.server.library.module.ModuleDefine; -/** - * @author peng-yongsheng - */ public class SharingServerModule extends ModuleDefine { public static final String NAME = "receiver-sharing-server"; @@ -32,7 +30,11 @@ public SharingServerModule() { super(NAME); } - @Override public Class[] services() { - return new Class[] {GRPCHandlerRegister.class, JettyHandlerRegister.class}; + @Override + public Class[] services() { + return new Class[] { + GRPCHandlerRegister.class, + JettyHandlerRegister.class + }; } } diff --git a/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/sharing/server/SharingServerModuleProvider.java b/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/sharing/server/SharingServerModuleProvider.java index 9eb080363f6c..9635e32c0343 100644 --- a/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/sharing/server/SharingServerModuleProvider.java +++ b/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/sharing/server/SharingServerModuleProvider.java @@ -36,9 +36,6 @@ import org.apache.skywalking.oap.server.library.server.grpc.GRPCServer; import org.apache.skywalking.oap.server.library.server.jetty.JettyServer; -/** - * @author peng-yongsheng, jian.tan - */ public class SharingServerModuleProvider extends ModuleProvider { private final SharingServerConfig config; @@ -52,21 +49,26 @@ public SharingServerModuleProvider() { this.config = new SharingServerConfig(); } - @Override public String name() { + @Override + public String name() { return "default"; } - @Override public Class module() { + @Override + public Class module() { return SharingServerModule.class; } - @Override public ModuleConfig createConfigBeanIfAbsent() { + @Override + public ModuleConfig createConfigBeanIfAbsent() { return config; } - @Override public void prepare() { + @Override + public void prepare() { if (config.getRestPort() != 0) { - jettyServer = new JettyServer(Strings.isBlank(config.getRestHost()) ? "0.0.0.0" : config.getRestHost(), config.getRestPort(), config.getRestContextPath()); + jettyServer = new JettyServer(Strings.isBlank(config.getRestHost()) ? "0.0.0.0" : config.getRestHost(), config + .getRestPort(), config.getRestContextPath()); jettyServer.initialize(); this.registerServiceImplementation(JettyHandlerRegister.class, new JettyHandlerRegisterImpl(jettyServer)); @@ -76,7 +78,8 @@ public SharingServerModuleProvider() { } if (config.getGRPCPort() != 0) { - grpcServer = new GRPCServer(Strings.isBlank(config.getGRPCHost()) ? "0.0.0.0" : config.getGRPCHost(), config.getGRPCPort()); + grpcServer = new GRPCServer(Strings.isBlank(config.getGRPCHost()) ? "0.0.0.0" : config.getGRPCHost(), config + .getGRPCPort()); if (config.getMaxMessageSize() > 0) { grpcServer.setMaxMessageSize(config.getMaxMessageSize()); } @@ -101,20 +104,26 @@ public SharingServerModuleProvider() { } } - @Override public void start() { + @Override + public void start() { if (Objects.nonNull(grpcServer)) { grpcServer.addHandler(new HealthCheckServiceHandler()); } if (Objects.nonNull(receiverGRPCHandlerRegister)) { - receiverGRPCHandlerRegister.setGrpcHandlerRegister(getManager().find(CoreModule.NAME).provider().getService(GRPCHandlerRegister.class)); + receiverGRPCHandlerRegister.setGrpcHandlerRegister(getManager().find(CoreModule.NAME) + .provider() + .getService(GRPCHandlerRegister.class)); } if (Objects.nonNull(receiverJettyHandlerRegister)) { - receiverJettyHandlerRegister.setJettyHandlerRegister(getManager().find(CoreModule.NAME).provider().getService(JettyHandlerRegister.class)); + receiverJettyHandlerRegister.setJettyHandlerRegister(getManager().find(CoreModule.NAME) + .provider() + .getService(JettyHandlerRegister.class)); } } - @Override public void notifyAfterCompleted() throws ModuleStartException { + @Override + public void notifyAfterCompleted() throws ModuleStartException { try { if (Objects.nonNull(grpcServer)) { grpcServer.start(); @@ -127,7 +136,8 @@ public SharingServerModuleProvider() { } } - @Override public String[] requiredModules() { + @Override + public String[] requiredModules() { return new String[] {CoreModule.NAME}; } } diff --git a/oap-server/server-receiver-plugin/skywalking-so11y-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/skywalking-so11y-receiver-plugin/pom.xml index b11af897be40..8018098efcda 100644 --- a/oap-server/server-receiver-plugin/skywalking-so11y-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/skywalking-so11y-receiver-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + server-receiver-plugin org.apache.skywalking diff --git a/oap-server/server-receiver-plugin/skywalking-so11y-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/so11y/So11yReceiverModule.java b/oap-server/server-receiver-plugin/skywalking-so11y-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/so11y/So11yReceiverModule.java index 454e9d40784f..9a13b58b7987 100644 --- a/oap-server/server-receiver-plugin/skywalking-so11y-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/so11y/So11yReceiverModule.java +++ b/oap-server/server-receiver-plugin/skywalking-so11y-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/so11y/So11yReceiverModule.java @@ -22,8 +22,6 @@ /** * Self observability receiver module. - * - * @author gaohongtao */ public class So11yReceiverModule extends ModuleDefine { public static final String NAME = "receiver-so11y"; diff --git a/oap-server/server-receiver-plugin/skywalking-so11y-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/so11y/So11yReceiverModuleProvider.java b/oap-server/server-receiver-plugin/skywalking-so11y-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/so11y/So11yReceiverModuleProvider.java index 346a9623ca73..5671661aa8b7 100644 --- a/oap-server/server-receiver-plugin/skywalking-so11y-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/so11y/So11yReceiverModuleProvider.java +++ b/oap-server/server-receiver-plugin/skywalking-so11y-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/so11y/So11yReceiverModuleProvider.java @@ -21,6 +21,13 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.util.concurrent.ThreadFactoryBuilder; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; +import java.util.function.BiConsumer; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.RequiredArgsConstructor; @@ -30,8 +37,18 @@ import org.apache.skywalking.oap.server.core.analysis.TimeBucket; import org.apache.skywalking.oap.server.core.register.service.IServiceInstanceInventoryRegister; import org.apache.skywalking.oap.server.core.register.service.IServiceInventoryRegister; -import org.apache.skywalking.oap.server.core.source.*; -import org.apache.skywalking.oap.server.library.module.*; +import org.apache.skywalking.oap.server.core.source.GCPhrase; +import org.apache.skywalking.oap.server.core.source.MemoryPoolType; +import org.apache.skywalking.oap.server.core.source.ServiceInstanceJVMCPU; +import org.apache.skywalking.oap.server.core.source.ServiceInstanceJVMGC; +import org.apache.skywalking.oap.server.core.source.ServiceInstanceJVMMemory; +import org.apache.skywalking.oap.server.core.source.ServiceInstanceJVMMemoryPool; +import org.apache.skywalking.oap.server.core.source.SourceReceiver; +import org.apache.skywalking.oap.server.library.module.ModuleConfig; +import org.apache.skywalking.oap.server.library.module.ModuleDefine; +import org.apache.skywalking.oap.server.library.module.ModuleProvider; +import org.apache.skywalking.oap.server.library.module.ModuleStartException; +import org.apache.skywalking.oap.server.library.module.ServiceNotProvidedException; import org.apache.skywalking.oap.server.telemetry.TelemetryModule; import org.apache.skywalking.oap.server.telemetry.api.MetricFamily; import org.apache.skywalking.oap.server.telemetry.api.MetricsCollector; @@ -39,21 +56,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; -import java.util.function.BiConsumer; - import static java.util.stream.Collectors.groupingBy; import static java.util.stream.Collectors.summingDouble; /** * Self observability receiver provider. - * - * @author gaohongtao */ public class So11yReceiverModuleProvider extends ModuleProvider { @@ -63,9 +70,15 @@ public class So11yReceiverModuleProvider extends ModuleProvider { private static final int RUN_RATE_SECONDS = 5; - private final long[] lastNewGc = new long[]{0L, 0L}; + private final long[] lastNewGc = new long[] { + 0L, + 0L + }; - private final long[] lastOldGc = new long[]{0L, 0L}; + private final long[] lastOldGc = new long[] { + 0L, + 0L + }; private int serviceId; @@ -81,7 +94,6 @@ public class So11yReceiverModuleProvider extends ModuleProvider { private SourceReceiver sourceReceiver; - @Override public String name() { return "default"; @@ -103,34 +115,39 @@ public void prepare() throws ServiceNotProvidedException, ModuleStartException { @Override public void start() throws ServiceNotProvidedException, ModuleStartException { - serviceInventoryRegister = getManager().find(CoreModule.NAME).provider().getService(IServiceInventoryRegister.class); - serviceInstanceInventoryRegister = getManager().find(CoreModule.NAME).provider().getService(IServiceInstanceInventoryRegister.class); + serviceInventoryRegister = getManager().find(CoreModule.NAME) + .provider() + .getService(IServiceInventoryRegister.class); + serviceInstanceInventoryRegister = getManager().find(CoreModule.NAME) + .provider() + .getService(IServiceInstanceInventoryRegister.class); sourceReceiver = getManager().find(CoreModule.NAME).provider().getService(SourceReceiver.class); - MetricsCollector collector = getManager().find(TelemetryModule.NAME).provider().getService(MetricsCollector.class); - Executors.newSingleThreadScheduledExecutor(new ThreadFactoryBuilder() - .setDaemon(true).setNameFormat("So11y-receiver-%s").build()).scheduleAtFixedRate(() -> { - if (register()) { - heartbeat(); - } else { - return; - } - Iterable mfs = collector.collect(); - Map metricsIndex = new HashMap<>(); - for (MetricFamily each : mfs) { - if (each.samples.size() < 1) { - continue; - } - metricsIndex.put(each.name, each); - } - writeCpuUsage(metricsIndex); - writeJvmMemory(metricsIndex); - writeJvmMemoryPool(metricsIndex); - writeGC(metricsIndex); - }, RUN_RATE_SECONDS, RUN_RATE_SECONDS, TimeUnit.SECONDS); + MetricsCollector collector = getManager().find(TelemetryModule.NAME) + .provider() + .getService(MetricsCollector.class); + Executors.newSingleThreadScheduledExecutor(new ThreadFactoryBuilder().setDaemon(true) + .setNameFormat("So11y-receiver-%s") + .build()).scheduleAtFixedRate(() -> { + if (register()) { + heartbeat(); + } else { + return; + } + Iterable mfs = collector.collect(); + Map metricsIndex = new HashMap<>(); + for (MetricFamily each : mfs) { + if (each.samples.size() < 1) { + continue; + } + metricsIndex.put(each.name, each); + } + writeCpuUsage(metricsIndex); + writeJvmMemory(metricsIndex); + writeJvmMemoryPool(metricsIndex); + writeGC(metricsIndex); + }, RUN_RATE_SECONDS, RUN_RATE_SECONDS, TimeUnit.SECONDS); } - - @Override public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleStartException { @@ -138,7 +155,10 @@ public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleSta @Override public String[] requiredModules() { - return new String[] {TelemetryModule.NAME, CoreModule.NAME}; + return new String[] { + TelemetryModule.NAME, + CoreModule.NAME + }; } private void writeGC(Map metricsIndex) { @@ -147,141 +167,129 @@ private void writeGC(Map metricsIndex) { } List newGC = ImmutableList.of("PS Scavenge", "ParNew", "G1 Young Generation", "Copy"); List oldGC = ImmutableList.of("PS MarkSweep", "ConcurrentMarkSweep", "G1 Old Generation", "MarkSweepCompact"); - metricsIndex.get("jvm_gc_collection_seconds").samples.stream() - .map(sample -> { - int index = Iterables.indexOf(sample.labelNames, i -> Objects.equals(i, "gc")); - if (index < 0) { - return null; - } - String gcPhrase = sample.labelValues.get(index); - GCMetricType type = sample.name.contains("sum") ? GCMetricType.SUM : GCMetricType.COUNT; - double value = type == GCMetricType.SUM ? sample.value * 1000 : sample.value; - if (newGC.contains(gcPhrase)) { - return new GCMetric(GCPhrase.NEW, type, value); - } else if (oldGC.contains(gcPhrase)) { - return new GCMetric(GCPhrase.OLD, type, value); - } - throw new RuntimeException(String.format("Unsupported gc phrase %s", gcPhrase)); - }) - .filter(Objects::nonNull) - .collect(groupingBy(GCMetric::getPhrase)) - .forEach((gcPhrase, gcMetrics) -> { - ServiceInstanceJVMGC gc = new ServiceInstanceJVMGC(); - gc.setId(serviceInstanceId); - gc.setName(serviceInstanceName); - gc.setServiceId(serviceId); - gc.setServiceName(SERVICE_NAME); - gc.setPhrase(gcPhrase); - long[] lastGc = gcPhrase == GCPhrase.NEW ? lastNewGc : lastOldGc; - gcMetrics.stream().filter(m -> m.type.equals(GCMetricType.COUNT)).findFirst().ifPresent(m -> { - gc.setCount(m.getValue().longValue() - lastGc[0]); - lastGc[0] = m.getValue().longValue(); - }); - gcMetrics.stream().filter(m -> m.type.equals(GCMetricType.SUM)).findFirst().ifPresent(m -> { - gc.setTime(m.getValue().longValue() - lastGc[1]); - lastGc[1] = m.getValue().longValue(); - }); - gc.setTimeBucket(TimeBucket.getMinuteTimeBucket(System.currentTimeMillis())); - if (logger.isDebugEnabled()) { - logger.debug("Write {} {}counts {}ms to {}", gc.getPhrase(), gc.getCount(), gc.getTime(), gc.getName()); - } - sourceReceiver.receive(gc); - }); + metricsIndex.get("jvm_gc_collection_seconds").samples.stream().map(sample -> { + int index = Iterables.indexOf(sample.labelNames, i -> Objects.equals(i, "gc")); + if (index < 0) { + return null; + } + String gcPhrase = sample.labelValues.get(index); + GCMetricType type = sample.name.contains("sum") ? GCMetricType.SUM : GCMetricType.COUNT; + double value = type == GCMetricType.SUM ? sample.value * 1000 : sample.value; + if (newGC.contains(gcPhrase)) { + return new GCMetric(GCPhrase.NEW, type, value); + } else if (oldGC.contains(gcPhrase)) { + return new GCMetric(GCPhrase.OLD, type, value); + } + throw new RuntimeException(String.format("Unsupported gc phrase %s", gcPhrase)); + }).filter(Objects::nonNull).collect(groupingBy(GCMetric::getPhrase)).forEach((gcPhrase, gcMetrics) -> { + ServiceInstanceJVMGC gc = new ServiceInstanceJVMGC(); + gc.setId(serviceInstanceId); + gc.setName(serviceInstanceName); + gc.setServiceId(serviceId); + gc.setServiceName(SERVICE_NAME); + gc.setPhrase(gcPhrase); + long[] lastGc = gcPhrase == GCPhrase.NEW ? lastNewGc : lastOldGc; + gcMetrics.stream().filter(m -> m.type.equals(GCMetricType.COUNT)).findFirst().ifPresent(m -> { + gc.setCount(m.getValue().longValue() - lastGc[0]); + lastGc[0] = m.getValue().longValue(); + }); + gcMetrics.stream().filter(m -> m.type.equals(GCMetricType.SUM)).findFirst().ifPresent(m -> { + gc.setTime(m.getValue().longValue() - lastGc[1]); + lastGc[1] = m.getValue().longValue(); + }); + gc.setTimeBucket(TimeBucket.getMinuteTimeBucket(System.currentTimeMillis())); + if (logger.isDebugEnabled()) { + logger.debug("Write {} {}counts {}ms to {}", gc.getPhrase(), gc.getCount(), gc.getTime(), gc.getName()); + } + sourceReceiver.receive(gc); + }); } private void writeJvmMemoryPool(Map metricsIndex) { - List> setterList = ImmutableList.of( - new MetricSetter<>("jvm_memory_pool_bytes_used", (m, v) -> m.setUsed(v.longValue())), - new MetricSetter<>("jvm_memory_pool_bytes_committed", (m, v) -> m.setCommitted(v.longValue())), - new MetricSetter<>("jvm_memory_pool_bytes_max", (m, v) -> m.setMax(v.longValue())), - new MetricSetter<>("jvm_memory_pool_bytes_init", (m, v) -> m.setInit(v.longValue()))); + List> setterList = ImmutableList.of(new MetricSetter<>("jvm_memory_pool_bytes_used", (m, v) -> m + .setUsed(v.longValue())), new MetricSetter<>("jvm_memory_pool_bytes_committed", (m, v) -> m.setCommitted(v.longValue())), new MetricSetter<>("jvm_memory_pool_bytes_max", (m, v) -> m + .setMax(v.longValue())), new MetricSetter<>("jvm_memory_pool_bytes_init", (m, v) -> m.setInit(v.longValue()))); if (setterList.stream().anyMatch(i -> !metricsIndex.containsKey(i.name))) { return; } Map poolMap = new HashMap<>(); setterList.forEach(setter -> metricsIndex.get(setter.name).samples.stream() - .map(sample -> { - int index = Iterables.indexOf(sample.labelNames, i -> Objects.equals(i, "pool")); - if (index < 0) { - return null; - } - String poolType = sample.labelValues.get(index); - if (poolType.contains("Code")) { - return new PoolMetric(MemoryPoolType.CODE_CACHE_USAGE, sample.value); - } else if (poolType.contains("Eden")) { - return new PoolMetric(MemoryPoolType.NEWGEN_USAGE, sample.value); - } else if (poolType.contains("Survivor")) { - return new PoolMetric(MemoryPoolType.SURVIVOR_USAGE, sample.value); - } else if (poolType.contains("Old")) { - return new PoolMetric(MemoryPoolType.OLDGEN_USAGE, sample.value); - } else if (poolType.contains("Metaspace")) { - return new PoolMetric(MemoryPoolType.METASPACE_USAGE, sample.value); - } else if (poolType.contains("Perm") || poolType.contains("Compressed Class Space")) { - return new PoolMetric(MemoryPoolType.PERMGEN_USAGE, sample.value); - } - throw new RuntimeException(String.format("Unknown pool type %s", poolType)); - }) - .filter(Objects::nonNull) - .collect(groupingBy(PoolMetric::getType, summingDouble(PoolMetric::getValue))) - .forEach((memoryPoolType, value) -> { - if (!poolMap.containsKey(memoryPoolType)) { - ServiceInstanceJVMMemoryPool pool = new ServiceInstanceJVMMemoryPool(); - pool.setId(serviceInstanceId); - pool.setName(serviceInstanceName); - pool.setServiceId(serviceId); - pool.setServiceName(SERVICE_NAME); - pool.setPoolType(memoryPoolType); - pool.setTimeBucket(TimeBucket.getMinuteTimeBucket(System.currentTimeMillis())); - poolMap.put(memoryPoolType, pool); - } - ServiceInstanceJVMMemoryPool pool = poolMap.get(memoryPoolType); - setter.delegated.accept(pool, value); - })); + .map(sample -> { + int index = Iterables.indexOf(sample.labelNames, i -> Objects + .equals(i, "pool")); + if (index < 0) { + return null; + } + String poolType = sample.labelValues.get(index); + if (poolType.contains("Code")) { + return new PoolMetric(MemoryPoolType.CODE_CACHE_USAGE, sample.value); + } else if (poolType.contains("Eden")) { + return new PoolMetric(MemoryPoolType.NEWGEN_USAGE, sample.value); + } else if (poolType.contains("Survivor")) { + return new PoolMetric(MemoryPoolType.SURVIVOR_USAGE, sample.value); + } else if (poolType.contains("Old")) { + return new PoolMetric(MemoryPoolType.OLDGEN_USAGE, sample.value); + } else if (poolType.contains("Metaspace")) { + return new PoolMetric(MemoryPoolType.METASPACE_USAGE, sample.value); + } else if (poolType.contains("Perm") || poolType + .contains("Compressed Class Space")) { + return new PoolMetric(MemoryPoolType.PERMGEN_USAGE, sample.value); + } + throw new RuntimeException(String.format("Unknown pool type %s", poolType)); + }) + .filter(Objects::nonNull) + .collect(groupingBy(PoolMetric::getType, summingDouble(PoolMetric::getValue))) + .forEach((memoryPoolType, value) -> { + if (!poolMap.containsKey(memoryPoolType)) { + ServiceInstanceJVMMemoryPool pool = new ServiceInstanceJVMMemoryPool(); + pool.setId(serviceInstanceId); + pool.setName(serviceInstanceName); + pool.setServiceId(serviceId); + pool.setServiceName(SERVICE_NAME); + pool.setPoolType(memoryPoolType); + pool.setTimeBucket(TimeBucket.getMinuteTimeBucket(System + .currentTimeMillis())); + poolMap.put(memoryPoolType, pool); + } + ServiceInstanceJVMMemoryPool pool = poolMap + .get(memoryPoolType); + setter.delegated.accept(pool, value); + })); poolMap.values().forEach(p -> { if (logger.isDebugEnabled()) { - logger.debug("Write {} {}-{}-{}-{} to {}", p.getPoolType(), - humanReadableByteCount(p.getInit(), false), - humanReadableByteCount(p.getUsed(), false), - humanReadableByteCount(p.getCommitted(), false), - humanReadableByteCount(p.getMax(), false), p.getName()); + logger.debug("Write {} {}-{}-{}-{} to {}", p.getPoolType(), humanReadableByteCount(p.getInit(), false), humanReadableByteCount(p + .getUsed(), false), humanReadableByteCount(p.getCommitted(), false), humanReadableByteCount(p.getMax(), false), p + .getName()); } sourceReceiver.receive(p); }); } private void writeJvmMemory(final Map metricsIndex) { - List> setterList = ImmutableList.of( - new MetricSetter<>("jvm_memory_bytes_used", (m, v) -> m.setUsed(v.longValue())), - new MetricSetter<>("jvm_memory_bytes_committed", (m, v) -> m.setCommitted(v.longValue())), - new MetricSetter<>("jvm_memory_bytes_max", (m, v) -> m.setMax(v.longValue())), - new MetricSetter<>("jvm_memory_bytes_init", (m, v) -> m.setInit(v.longValue()))); + List> setterList = ImmutableList.of(new MetricSetter<>("jvm_memory_bytes_used", (m, v) -> m + .setUsed(v.longValue())), new MetricSetter<>("jvm_memory_bytes_committed", (m, v) -> m.setCommitted(v.longValue())), new MetricSetter<>("jvm_memory_bytes_max", (m, v) -> m + .setMax(v.longValue())), new MetricSetter<>("jvm_memory_bytes_init", (m, v) -> m.setInit(v.longValue()))); if (setterList.stream().anyMatch(i -> !metricsIndex.containsKey(i.name))) { return; } - ImmutableList.of(createJVMMemory(true), createJVMMemory(false)) - .forEach(memory -> { - String area = memory.isHeapStatus() ? "heap" : "nonheap"; - setterList.forEach(setter -> { - metricsIndex.get(setter.name).samples.stream() - .filter(input -> { - int index = Iterables.indexOf(input.labelNames, i -> Objects.equals(i, "area")); - if (index < 0) { - return false; - } - return Objects.equals(input.labelValues.get(index), area); - }) - .findFirst() - .ifPresent(sample -> setter.delegated.accept(memory, sample.value)); - }); - if (logger.isDebugEnabled()) { - logger.debug("Write {} {}-{}-{}-{} to {}", area, - humanReadableByteCount(memory.getInit(), false), - humanReadableByteCount(memory.getUsed(), false), - humanReadableByteCount(memory.getCommitted(), false), - humanReadableByteCount(memory.getMax(), false), memory.getName()); + ImmutableList.of(createJVMMemory(true), createJVMMemory(false)).forEach(memory -> { + String area = memory.isHeapStatus() ? "heap" : "nonheap"; + setterList.forEach(setter -> { + metricsIndex.get(setter.name).samples.stream().filter(input -> { + int index = Iterables.indexOf(input.labelNames, i -> Objects.equals(i, "area")); + if (index < 0) { + return false; } - sourceReceiver.receive(memory); - }); + return Objects.equals(input.labelValues.get(index), area); + }).findFirst().ifPresent(sample -> setter.delegated.accept(memory, sample.value)); + }); + if (logger.isDebugEnabled()) { + logger.debug("Write {} {}-{}-{}-{} to {}", area, humanReadableByteCount(memory.getInit(), false), humanReadableByteCount(memory + .getUsed(), false), humanReadableByteCount(memory.getCommitted(), false), humanReadableByteCount(memory + .getMax(), false), memory.getName()); + } + sourceReceiver.receive(memory); + }); } private ServiceInstanceJVMMemory createJVMMemory(boolean isHeap) { @@ -304,7 +312,8 @@ private void writeCpuUsage(Map metricsIndex) { lastCpuSeconds = value; return; } - double percentage = (value - lastCpuSeconds) * 100 / (RUN_RATE_SECONDS * Runtime.getRuntime().availableProcessors()); + double percentage = (value - lastCpuSeconds) * 100 / (RUN_RATE_SECONDS * Runtime.getRuntime() + .availableProcessors()); lastCpuSeconds = value; ServiceInstanceJVMCPU serviceInstanceJVMCPU = new ServiceInstanceJVMCPU(); serviceInstanceJVMCPU.setId(serviceInstanceId); @@ -317,7 +326,6 @@ private void writeCpuUsage(Map metricsIndex) { sourceReceiver.receive(serviceInstanceJVMCPU); } - private void heartbeat() { long now = System.currentTimeMillis(); serviceInventoryRegister.heartbeat(serviceId, now); @@ -332,8 +340,8 @@ private boolean register() { if (serviceId != Const.NONE && serviceInstanceId == Const.NONE) { serviceInstanceName = TelemetryRelatedContext.INSTANCE.getId(); logger.debug("Register so11y service instance [{}].", serviceInstanceName); - serviceInstanceId = serviceInstanceInventoryRegister.getOrCreate(serviceId, serviceInstanceName, serviceInstanceName, - System.currentTimeMillis(), null); + serviceInstanceId = serviceInstanceInventoryRegister.getOrCreate(serviceId, serviceInstanceName, serviceInstanceName, System + .currentTimeMillis(), null); } return serviceInstanceId != Const.NONE; } @@ -349,7 +357,8 @@ private class MetricSetter { private static String humanReadableByteCount(long bytes, boolean si) { int unit = si ? 1000 : 1024; - if (bytes < unit) return bytes + " B"; + if (bytes < unit) + return bytes + " B"; int exp = (int) (Math.log(bytes) / Math.log(unit)); String pre = (si ? "kMGTPE" : "KMGTPE").charAt(exp - 1) + (si ? "" : "i"); return String.format("%.1f %sB", bytes / Math.pow(unit, exp), pre); diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/pom.xml index 47c15dff0040..fe1eb2788b21 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + server-receiver-plugin org.apache.skywalking diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/module/TraceModule.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/module/TraceModule.java index aab042864c99..c03652b0145a 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/module/TraceModule.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/module/TraceModule.java @@ -21,9 +21,6 @@ import org.apache.skywalking.oap.server.library.module.ModuleDefine; import org.apache.skywalking.oap.server.receiver.trace.provider.parser.ISegmentParserService; -/** - * @author peng-yongsheng - */ public class TraceModule extends ModuleDefine { public static final String NAME = "receiver-trace"; @@ -31,7 +28,8 @@ public TraceModule() { super(NAME); } - @Override public Class[] services() { + @Override + public Class[] services() { return new Class[] {ISegmentParserService.class}; } } diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/DBLatencyThresholdsAndWatcher.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/DBLatencyThresholdsAndWatcher.java index 458af2c08a63..2c25d0992cd6 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/DBLatencyThresholdsAndWatcher.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/DBLatencyThresholdsAndWatcher.java @@ -18,15 +18,13 @@ package org.apache.skywalking.oap.server.receiver.trace.provider; -import java.util.*; +import java.util.HashMap; +import java.util.Map; import java.util.concurrent.atomic.AtomicReference; import org.apache.skywalking.oap.server.configuration.api.ConfigChangeWatcher; import org.apache.skywalking.oap.server.core.Const; import org.apache.skywalking.oap.server.receiver.trace.module.TraceModule; -/** - * @author wusheng - */ public class DBLatencyThresholdsAndWatcher extends ConfigChangeWatcher { private AtomicReference> thresholds; private AtomicReference settingsString; @@ -65,7 +63,8 @@ public int getThreshold(String type) { } } - @Override public void notify(ConfigChangeEvent value) { + @Override + public void notify(ConfigChangeEvent value) { if (EventType.DELETE.equals(value.getEventType())) { activeSetting(""); } else { @@ -73,7 +72,8 @@ public int getThreshold(String type) { } } - @Override public String value() { + @Override + public String value() { return settingsString.get(); } } diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/TraceModuleProvider.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/TraceModuleProvider.java index 7b1ab2ca62de..3eb3d5f1ff57 100755 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/TraceModuleProvider.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/TraceModuleProvider.java @@ -43,9 +43,6 @@ import java.io.IOException; -/** - * @author peng-yongsheng - */ public class TraceModuleProvider extends ModuleProvider { private final TraceServiceModuleConfig moduleConfig; @@ -57,19 +54,23 @@ public TraceModuleProvider() { this.moduleConfig = new TraceServiceModuleConfig(); } - @Override public String name() { + @Override + public String name() { return "default"; } - @Override public Class module() { + @Override + public Class module() { return TraceModule.class; } - @Override public ModuleConfig createConfigBeanIfAbsent() { + @Override + public ModuleConfig createConfigBeanIfAbsent() { return moduleConfig; } - @Override public void prepare() throws ServiceNotProvidedException { + @Override + public void prepare() throws ServiceNotProvidedException { thresholds = new DBLatencyThresholdsAndWatcher(moduleConfig.getSlowDBAccessThreshold(), this); uninstrumentedGatewaysConfig = new UninstrumentedGatewaysConfig(this); @@ -94,27 +95,41 @@ public SegmentParserListenerManager listenerManager() { return listenerManager; } - @Override public void start() throws ModuleStartException { - DynamicConfigurationService dynamicConfigurationService = getManager().find(ConfigurationModule.NAME).provider().getService(DynamicConfigurationService.class); - GRPCHandlerRegister grpcHandlerRegister = getManager().find(SharingServerModule.NAME).provider().getService(GRPCHandlerRegister.class); + @Override + public void start() throws ModuleStartException { + DynamicConfigurationService dynamicConfigurationService = getManager().find(ConfigurationModule.NAME) + .provider() + .getService(DynamicConfigurationService.class); + GRPCHandlerRegister grpcHandlerRegister = getManager().find(SharingServerModule.NAME) + .provider() + .getService(GRPCHandlerRegister.class); try { dynamicConfigurationService.registerConfigChangeWatcher(thresholds); dynamicConfigurationService.registerConfigChangeWatcher(uninstrumentedGatewaysConfig); grpcHandlerRegister.addHandler(new TraceSegmentReportServiceHandler(segmentProducerV2, getManager())); - SegmentStandardizationWorker standardizationWorkerV2 = new SegmentStandardizationWorker(getManager(), segmentProducerV2, moduleConfig.getBufferPath(), moduleConfig.getBufferOffsetMaxFileSize(), moduleConfig.getBufferDataMaxFileSize(), moduleConfig.isBufferFileCleanWhenRestart()); + SegmentStandardizationWorker standardizationWorkerV2 = new SegmentStandardizationWorker(getManager(), segmentProducerV2, moduleConfig + .getBufferPath(), moduleConfig.getBufferOffsetMaxFileSize(), moduleConfig.getBufferDataMaxFileSize(), moduleConfig + .isBufferFileCleanWhenRestart()); segmentProducerV2.setStandardizationWorker(standardizationWorkerV2); } catch (IOException e) { throw new ModuleStartException(e.getMessage(), e); } } - @Override public void notifyAfterCompleted() { + @Override + public void notifyAfterCompleted() { } - @Override public String[] requiredModules() { - return new String[] {TelemetryModule.NAME, CoreModule.NAME, SharingServerModule.NAME, ConfigurationModule.NAME}; + @Override + public String[] requiredModules() { + return new String[] { + TelemetryModule.NAME, + CoreModule.NAME, + SharingServerModule.NAME, + ConfigurationModule.NAME + }; } } diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/TraceServiceModuleConfig.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/TraceServiceModuleConfig.java index 49d3c1bb1860..a82abc68888c 100755 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/TraceServiceModuleConfig.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/TraceServiceModuleConfig.java @@ -18,38 +18,56 @@ package org.apache.skywalking.oap.server.receiver.trace.provider; -import lombok.*; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.oap.server.library.module.ModuleConfig; -/** - * @author peng-yongsheng - */ public class TraceServiceModuleConfig extends ModuleConfig { - @Setter @Getter private String bufferPath; - @Setter @Getter private int bufferOffsetMaxFileSize; - @Setter @Getter private int bufferDataMaxFileSize; - @Setter @Getter private boolean bufferFileCleanWhenRestart; + @Setter + @Getter + private String bufferPath; + @Setter + @Getter + private int bufferOffsetMaxFileSize; + @Setter + @Getter + private int bufferDataMaxFileSize; + @Setter + @Getter + private boolean bufferFileCleanWhenRestart; /** * The sample rate precision is 1/10000. 10000 means 100% sample in default. */ - @Setter @Getter private int sampleRate = 10000; + @Setter + @Getter + private int sampleRate = 10000; /** * The threshold used to check the slow database access. Unit, millisecond. */ - @Setter @Getter private String slowDBAccessThreshold = "default:200"; - @Setter @Getter private DBLatencyThresholdsAndWatcher dbLatencyThresholdsAndWatcher; - @Setter @Getter private UninstrumentedGatewaysConfig uninstrumentedGatewaysConfig; + @Setter + @Getter + private String slowDBAccessThreshold = "default:200"; + @Setter + @Getter + private DBLatencyThresholdsAndWatcher dbLatencyThresholdsAndWatcher; + @Setter + @Getter + private UninstrumentedGatewaysConfig uninstrumentedGatewaysConfig; /** * Analysis trace status. - * + *

* 1. Default(YES) means analysis all metrics from trace. - * + *

* 2. NO means, only save trace, but metrics come other places, such as service mesh. */ - @Setter @Getter private boolean traceAnalysis = true; + @Setter + @Getter + private boolean traceAnalysis = true; /** * Slow Sql string length can't beyond this limit */ - @Setter @Getter private int maxSlowSQLLength = 2000; + @Setter + @Getter + private int maxSlowSQLLength = 2000; } diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/UninstrumentedGatewaysConfig.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/UninstrumentedGatewaysConfig.java index 5ed2b56b1746..f1c13ee2cb85 100755 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/UninstrumentedGatewaysConfig.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/UninstrumentedGatewaysConfig.java @@ -42,9 +42,6 @@ import static java.util.Objects.isNull; -/** - * @author kezhenxu94 - */ @Slf4j public class UninstrumentedGatewaysConfig extends ConfigChangeWatcher { private final AtomicReference settingsString; @@ -85,10 +82,10 @@ private void onGatewaysUpdated(final GatewayInfos gateways) { if (isNull(gateways)) { gatewayInstanceKeyedByAddress = Collections.emptyMap(); } else { - gatewayInstanceKeyedByAddress = - StreamSupport.stream(gateways.spliterator(), false) - .flatMap(instance -> instance.getInstances().stream()) - .collect(Collectors.toMap(GatewayInstanceInfo::getAddress, Function.identity())); + gatewayInstanceKeyedByAddress = StreamSupport.stream(gateways.spliterator(), false) + .flatMap(instance -> instance.getInstances().stream()) + .collect(Collectors.toMap(GatewayInstanceInfo::getAddress, Function + .identity())); } } diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/handler/v6/grpc/TraceSegmentReportServiceHandler.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/handler/v6/grpc/TraceSegmentReportServiceHandler.java index 2be3a1f2e644..94cde7e7778d 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/handler/v6/grpc/TraceSegmentReportServiceHandler.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/handler/v6/grpc/TraceSegmentReportServiceHandler.java @@ -27,7 +27,9 @@ import org.apache.skywalking.oap.server.receiver.trace.provider.parser.SegmentParseV2; import org.apache.skywalking.oap.server.receiver.trace.provider.parser.SegmentSource; import org.apache.skywalking.oap.server.telemetry.TelemetryModule; -import org.apache.skywalking.oap.server.telemetry.api.*; +import org.apache.skywalking.oap.server.telemetry.api.HistogramMetrics; +import org.apache.skywalking.oap.server.telemetry.api.MetricsCreator; +import org.apache.skywalking.oap.server.telemetry.api.MetricsTag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,14 +42,17 @@ public class TraceSegmentReportServiceHandler extends TraceSegmentReportServiceG public TraceSegmentReportServiceHandler(SegmentParseV2.Producer segmentProducer, ModuleManager moduleManager) { this.segmentProducer = segmentProducer; - MetricsCreator metricsCreator = moduleManager.find(TelemetryModule.NAME).provider().getService(MetricsCreator.class); - histogram = metricsCreator.createHistogramMetric("trace_grpc_v6_in_latency", "The process latency of service mesh telemetry", - MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); + MetricsCreator metricsCreator = moduleManager.find(TelemetryModule.NAME) + .provider() + .getService(MetricsCreator.class); + histogram = metricsCreator.createHistogramMetric("trace_grpc_v6_in_latency", "The process latency of service mesh telemetry", MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); } - @Override public StreamObserver collect(StreamObserver responseObserver) { + @Override + public StreamObserver collect(StreamObserver responseObserver) { return new StreamObserver() { - @Override public void onNext(UpstreamSegment segment) { + @Override + public void onNext(UpstreamSegment segment) { if (logger.isDebugEnabled()) { logger.debug("receive segment"); } @@ -60,12 +65,14 @@ public TraceSegmentReportServiceHandler(SegmentParseV2.Producer segmentProducer, } } - @Override public void onError(Throwable throwable) { + @Override + public void onError(Throwable throwable) { logger.error(throwable.getMessage(), throwable); responseObserver.onCompleted(); } - @Override public void onCompleted() { + @Override + public void onCompleted() { responseObserver.onNext(Commands.newBuilder().build()); responseObserver.onCompleted(); } diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/ISegmentParserListenerManager.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/ISegmentParserListenerManager.java index 91b05aeef3ce..a15138623343 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/ISegmentParserListenerManager.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/ISegmentParserListenerManager.java @@ -20,9 +20,6 @@ import org.apache.skywalking.oap.server.receiver.trace.provider.parser.listener.SpanListenerFactory; -/** - * @author wusheng - */ public interface ISegmentParserListenerManager { void add(SpanListenerFactory spanListenerFactory); } diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/ISegmentParserService.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/ISegmentParserService.java index 4579d4829641..4e199d5d5fd3 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/ISegmentParserService.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/ISegmentParserService.java @@ -21,9 +21,6 @@ import org.apache.skywalking.apm.network.language.agent.UpstreamSegment; import org.apache.skywalking.oap.server.library.module.Service; -/** - * @author wusheng - */ public interface ISegmentParserService extends Service { void send(UpstreamSegment segment); } diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/SegmentParseV2.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/SegmentParseV2.java index 097efaa5762d..af335803a486 100755 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/SegmentParseV2.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/SegmentParseV2.java @@ -58,8 +58,6 @@ /** * SegmentParseV2 is a replication of SegmentParse, but be compatible with v2 trace protocol. - * - * @author wusheng */ public class SegmentParseV2 { @@ -71,12 +69,14 @@ public class SegmentParseV2 { private final SegmentCoreInfo segmentCoreInfo; private final TraceServiceModuleConfig config; private final ServiceInstanceInventoryCache serviceInstanceInventoryCache; - @Setter private SegmentStandardizationWorker standardizationWorker; + @Setter + private SegmentStandardizationWorker standardizationWorker; private volatile static CounterMetrics TRACE_BUFFER_FILE_RETRY; private volatile static CounterMetrics TRACE_BUFFER_FILE_OUT; private volatile static CounterMetrics TRACE_PARSE_ERROR; - private SegmentParseV2(ModuleManager moduleManager, SegmentParserListenerManager listenerManager, TraceServiceModuleConfig config) { + private SegmentParseV2(ModuleManager moduleManager, SegmentParserListenerManager listenerManager, + TraceServiceModuleConfig config) { this.moduleManager = moduleManager; this.listenerManager = listenerManager; this.spanListeners = new LinkedList<>(); @@ -87,16 +87,17 @@ private SegmentParseV2(ModuleManager moduleManager, SegmentParserListenerManager this.config = config; if (TRACE_BUFFER_FILE_RETRY == null) { - MetricsCreator metricsCreator = moduleManager.find(TelemetryModule.NAME).provider().getService(MetricsCreator.class); - TRACE_BUFFER_FILE_RETRY = metricsCreator.createCounter("v6_trace_buffer_file_retry", "The number of retry trace segment from the buffer file, but haven't registered successfully.", - MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); - TRACE_BUFFER_FILE_OUT = metricsCreator.createCounter("v6_trace_buffer_file_out", "The number of trace segment out of the buffer file", - MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); - TRACE_PARSE_ERROR = metricsCreator.createCounter("v6_trace_parse_error", "The number of trace segment out of the buffer file", - MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); + MetricsCreator metricsCreator = moduleManager.find(TelemetryModule.NAME) + .provider() + .getService(MetricsCreator.class); + TRACE_BUFFER_FILE_RETRY = metricsCreator.createCounter("v6_trace_buffer_file_retry", "The number of retry trace segment from the buffer file, but haven't registered successfully.", MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); + TRACE_BUFFER_FILE_OUT = metricsCreator.createCounter("v6_trace_buffer_file_out", "The number of trace segment out of the buffer file", MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); + TRACE_PARSE_ERROR = metricsCreator.createCounter("v6_trace_parse_error", "The number of trace segment out of the buffer file", MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); } - this.serviceInstanceInventoryCache = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInstanceInventoryCache.class); + this.serviceInstanceInventoryCache = moduleManager.find(CoreModule.NAME) + .provider() + .getService(ServiceInstanceInventoryCache.class); } public boolean parse(BufferData bufferData, SegmentSource source) { @@ -157,7 +158,11 @@ private boolean preBuild(List traceIds, SegmentDecorator segmentDecora notifyGlobalsListener(uniqueId); } - final String segmentId = segmentDecorator.getTraceSegmentId().getIdPartsList().stream().map(String::valueOf).collect(Collectors.joining(".")); + final String segmentId = segmentDecorator.getTraceSegmentId() + .getIdPartsList() + .stream() + .map(String::valueOf) + .collect(Collectors.joining(".")); segmentCoreInfo.setSegmentId(segmentId); segmentCoreInfo.setServiceId(segmentDecorator.getServiceId()); segmentCoreInfo.setServiceInstanceId(segmentDecorator.getServiceInstanceId()); @@ -174,7 +179,8 @@ private boolean preBuild(List traceIds, SegmentDecorator segmentDecora } else { for (int j = 0; j < spanDecorator.getRefsCount(); j++) { ReferenceDecorator referenceDecorator = spanDecorator.getRefs(j); - if (!ReferenceIdExchanger.getInstance(moduleManager).exchange(referenceDecorator, segmentCoreInfo.getServiceId())) { + if (!ReferenceIdExchanger.getInstance(moduleManager) + .exchange(referenceDecorator, segmentCoreInfo.getServiceId())) { exchanged = false; } } @@ -207,7 +213,8 @@ private boolean preBuild(List traceIds, SegmentDecorator segmentDecora } else if (SpanType.Local.equals(spanDecorator.getSpanType())) { notifyLocalListener(spanDecorator); } else { - logger.error("span type value was unexpected, span type name: {}", spanDecorator.getSpanType().name()); + logger.error("span type value was unexpected, span type name: {}", spanDecorator.getSpanType() + .name()); } } } @@ -233,7 +240,7 @@ private void notifyListenerToBuild() { private void notifyExitListener(SpanDecorator spanDecorator) { spanListeners.forEach(listener -> { if (listener.containsPoint(SpanListener.Point.Exit)) { - ((ExitSpanListener)listener).parseExit(spanDecorator, segmentCoreInfo); + ((ExitSpanListener) listener).parseExit(spanDecorator, segmentCoreInfo); } }); } @@ -241,7 +248,7 @@ private void notifyExitListener(SpanDecorator spanDecorator) { private void notifyEntryListener(SpanDecorator spanDecorator) { spanListeners.forEach(listener -> { if (listener.containsPoint(SpanListener.Point.Entry)) { - ((EntrySpanListener)listener).parseEntry(spanDecorator, segmentCoreInfo); + ((EntrySpanListener) listener).parseEntry(spanDecorator, segmentCoreInfo); } }); } @@ -249,7 +256,7 @@ private void notifyEntryListener(SpanDecorator spanDecorator) { private void notifyLocalListener(SpanDecorator spanDecorator) { spanListeners.forEach(listener -> { if (listener.containsPoint(SpanListener.Point.Local)) { - ((LocalSpanListener)listener).parseLocal(spanDecorator, segmentCoreInfo); + ((LocalSpanListener) listener).parseLocal(spanDecorator, segmentCoreInfo); } }); } @@ -257,7 +264,7 @@ private void notifyLocalListener(SpanDecorator spanDecorator) { private void notifyFirstListener(SpanDecorator spanDecorator) { spanListeners.forEach(listener -> { if (listener.containsPoint(SpanListener.Point.First)) { - ((FirstSpanListener)listener).parseFirst(spanDecorator, segmentCoreInfo); + ((FirstSpanListener) listener).parseFirst(spanDecorator, segmentCoreInfo); } }); } @@ -265,23 +272,26 @@ private void notifyFirstListener(SpanDecorator spanDecorator) { private void notifyGlobalsListener(UniqueId uniqueId) { spanListeners.forEach(listener -> { if (listener.containsPoint(SpanListener.Point.TraceIds)) { - ((GlobalTraceIdsListener)listener).parseGlobalTraceId(uniqueId, segmentCoreInfo); + ((GlobalTraceIdsListener) listener).parseGlobalTraceId(uniqueId, segmentCoreInfo); } }); } private void createSpanListeners() { - listenerManager.getSpanListenerFactories().forEach(spanListenerFactory -> spanListeners.add(spanListenerFactory.create(moduleManager, config))); + listenerManager.getSpanListenerFactories() + .forEach(spanListenerFactory -> spanListeners.add(spanListenerFactory.create(moduleManager, config))); } public static class Producer implements DataStreamReader.CallBack { - @Setter private SegmentStandardizationWorker standardizationWorker; + @Setter + private SegmentStandardizationWorker standardizationWorker; private final ModuleManager moduleManager; private final SegmentParserListenerManager listenerManager; private final TraceServiceModuleConfig config; - public Producer(ModuleManager moduleManager, SegmentParserListenerManager listenerManager, TraceServiceModuleConfig config) { + public Producer(ModuleManager moduleManager, SegmentParserListenerManager listenerManager, + TraceServiceModuleConfig config) { this.moduleManager = moduleManager; this.listenerManager = listenerManager; this.config = config; @@ -293,7 +303,8 @@ public void send(UpstreamSegment segment, SegmentSource source) { segmentParse.parse(new BufferData<>(segment), source); } - @Override public boolean call(BufferData bufferData) { + @Override + public boolean call(BufferData bufferData) { SegmentParseV2 segmentParse = new SegmentParseV2(moduleManager, listenerManager, config); segmentParse.setStandardizationWorker(standardizationWorker); boolean parseResult = segmentParse.parse(bufferData, SegmentSource.Buffer); diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/SegmentParserListenerManager.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/SegmentParserListenerManager.java index 24dc6d62e6a3..2b04c701fa15 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/SegmentParserListenerManager.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/SegmentParserListenerManager.java @@ -22,9 +22,6 @@ import java.util.List; import org.apache.skywalking.oap.server.receiver.trace.provider.parser.listener.SpanListenerFactory; -/** - * @author peng-yongsheng - */ public class SegmentParserListenerManager implements ISegmentParserListenerManager { private final List spanListenerFactories; diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/SegmentParserServiceImpl.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/SegmentParserServiceImpl.java index 5392e627c1b8..35a54dd5c8cb 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/SegmentParserServiceImpl.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/SegmentParserServiceImpl.java @@ -20,19 +20,15 @@ import org.apache.skywalking.apm.network.language.agent.UpstreamSegment; -/** - * @author wusheng - */ public class SegmentParserServiceImpl implements ISegmentParserService { private final SegmentParseV2.Producer segmentProducer; - public SegmentParserServiceImpl( - SegmentParseV2.Producer segmentProducer) { + public SegmentParserServiceImpl(SegmentParseV2.Producer segmentProducer) { this.segmentProducer = segmentProducer; } @Override public void send(UpstreamSegment segment) { - segmentProducer.send(segment,SegmentSource.Agent); + segmentProducer.send(segment, SegmentSource.Agent); } } diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/SegmentSource.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/SegmentSource.java index 7bbf3f9d266e..0b5b87becb3a 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/SegmentSource.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/SegmentSource.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.receiver.trace.provider.parser; -/** - * @author wusheng - */ public enum SegmentSource { Agent, Buffer } diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/decorator/ReferenceDecorator.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/decorator/ReferenceDecorator.java index 81ea5d445938..8ebfa21ab33a 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/decorator/ReferenceDecorator.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/decorator/ReferenceDecorator.java @@ -20,9 +20,6 @@ import org.apache.skywalking.apm.network.language.agent.v2.SegmentReference; -/** - * @author peng-yongsheng - */ public class ReferenceDecorator implements StandardBuilder { private boolean isOrigin = true; @@ -147,7 +144,8 @@ public void setNetworkAddress(String value) { referenceBuilderV2.setNetworkAddress(value); } - @Override public void toBuilder() { + @Override + public void toBuilder() { if (this.isOrigin) { this.isOrigin = false; referenceBuilderV2 = referenceObjectV2.toBuilder(); diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/decorator/SegmentCoreInfo.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/decorator/SegmentCoreInfo.java index fcb960f76c62..c77b0f8074dd 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/decorator/SegmentCoreInfo.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/decorator/SegmentCoreInfo.java @@ -18,12 +18,10 @@ package org.apache.skywalking.oap.server.receiver.trace.provider.parser.decorator; -import lombok.*; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.apm.network.ProtocolVersion; -/** - * @author peng-yongsheng - */ @Getter @Setter public class SegmentCoreInfo { diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/decorator/SegmentDecorator.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/decorator/SegmentDecorator.java index 7cd7ea4221d1..7d314dd2fa58 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/decorator/SegmentDecorator.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/decorator/SegmentDecorator.java @@ -23,9 +23,6 @@ import static java.util.Objects.isNull; -/** - * @author peng-yongsheng - */ public class SegmentDecorator implements StandardBuilder { private boolean isOrigin = true; private final SegmentObject segmentObjectV2; @@ -68,7 +65,8 @@ public byte[] toByteArray() { return segmentObjectV2.toByteArray(); } - @Override public void toBuilder() { + @Override + public void toBuilder() { if (isOrigin) { this.isOrigin = false; this.segmentBuilderV2 = segmentObjectV2.toBuilder(); diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/decorator/SpanDecorator.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/decorator/SpanDecorator.java index 7c291dd5145a..dc07d24526eb 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/decorator/SpanDecorator.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/decorator/SpanDecorator.java @@ -26,9 +26,6 @@ import static java.util.Objects.isNull; -/** - * @author peng-yongsheng - */ public class SpanDecorator implements StandardBuilder { private boolean isOrigin = true; private final StandardBuilder standardBuilder; @@ -222,7 +219,8 @@ public List getAllTags() { } } - @Override public void toBuilder() { + @Override + public void toBuilder() { if (this.isOrigin) { this.isOrigin = false; spanBuilderV2 = spanObjectV2.toBuilder(); diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/decorator/StandardBuilder.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/decorator/StandardBuilder.java index fbe9006f5e5d..1dc6932f1dad 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/decorator/StandardBuilder.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/decorator/StandardBuilder.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.receiver.trace.provider.parser.decorator; -/** - * @author peng-yongsheng - */ public interface StandardBuilder { void toBuilder(); } diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/EntrySpanListener.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/EntrySpanListener.java index 1c9e2f22a612..8d1c9ee2ea60 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/EntrySpanListener.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/EntrySpanListener.java @@ -18,11 +18,9 @@ package org.apache.skywalking.oap.server.receiver.trace.provider.parser.listener; -import org.apache.skywalking.oap.server.receiver.trace.provider.parser.decorator.*; +import org.apache.skywalking.oap.server.receiver.trace.provider.parser.decorator.SegmentCoreInfo; +import org.apache.skywalking.oap.server.receiver.trace.provider.parser.decorator.SpanDecorator; -/** - * @author peng-yongsheng - */ public interface EntrySpanListener extends SpanListener { void parseEntry(SpanDecorator spanDecorator, SegmentCoreInfo segmentCoreInfo); } \ No newline at end of file diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/ExitSpanListener.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/ExitSpanListener.java index 3c960487748a..da3aea4bd34b 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/ExitSpanListener.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/ExitSpanListener.java @@ -18,11 +18,9 @@ package org.apache.skywalking.oap.server.receiver.trace.provider.parser.listener; -import org.apache.skywalking.oap.server.receiver.trace.provider.parser.decorator.*; +import org.apache.skywalking.oap.server.receiver.trace.provider.parser.decorator.SegmentCoreInfo; +import org.apache.skywalking.oap.server.receiver.trace.provider.parser.decorator.SpanDecorator; -/** - * @author peng-yongsheng - */ public interface ExitSpanListener extends SpanListener { void parseExit(SpanDecorator spanDecorator, SegmentCoreInfo segmentCoreInfo); } diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/FirstSpanListener.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/FirstSpanListener.java index 1e6026dead3a..8d7a289cb6e4 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/FirstSpanListener.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/FirstSpanListener.java @@ -18,11 +18,9 @@ package org.apache.skywalking.oap.server.receiver.trace.provider.parser.listener; -import org.apache.skywalking.oap.server.receiver.trace.provider.parser.decorator.*; +import org.apache.skywalking.oap.server.receiver.trace.provider.parser.decorator.SegmentCoreInfo; +import org.apache.skywalking.oap.server.receiver.trace.provider.parser.decorator.SpanDecorator; -/** - * @author peng-yongsheng - */ public interface FirstSpanListener extends SpanListener { void parseFirst(SpanDecorator spanDecorator, SegmentCoreInfo segmentCoreInfo); } diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/GlobalTraceIdsListener.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/GlobalTraceIdsListener.java index 948ba2a7320c..8a62852611eb 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/GlobalTraceIdsListener.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/GlobalTraceIdsListener.java @@ -21,9 +21,6 @@ import org.apache.skywalking.apm.network.language.agent.UniqueId; import org.apache.skywalking.oap.server.receiver.trace.provider.parser.decorator.SegmentCoreInfo; -/** - * @author peng-yongsheng - */ public interface GlobalTraceIdsListener extends SpanListener { void parseGlobalTraceId(UniqueId uniqueId, SegmentCoreInfo segmentCoreInfo); } diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/LocalSpanListener.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/LocalSpanListener.java index f4bf171fa869..6aa2f1eb01cc 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/LocalSpanListener.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/LocalSpanListener.java @@ -18,11 +18,9 @@ package org.apache.skywalking.oap.server.receiver.trace.provider.parser.listener; -import org.apache.skywalking.oap.server.receiver.trace.provider.parser.decorator.*; +import org.apache.skywalking.oap.server.receiver.trace.provider.parser.decorator.SegmentCoreInfo; +import org.apache.skywalking.oap.server.receiver.trace.provider.parser.decorator.SpanDecorator; -/** - * @author peng-yongsheng - */ public interface LocalSpanListener extends SpanListener { void parseLocal(SpanDecorator spanDecorator, SegmentCoreInfo segmentCoreInfo); } diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/SpanListener.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/SpanListener.java index 08e3b808b113..5614d6a771f5 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/SpanListener.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/SpanListener.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.receiver.trace.provider.parser.listener; -/** - * @author peng-yongsheng - */ public interface SpanListener { void build(); diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/SpanListenerFactory.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/SpanListenerFactory.java index 9b4afd6aa277..03a69cabb0d5 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/SpanListenerFactory.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/SpanListenerFactory.java @@ -21,9 +21,6 @@ import org.apache.skywalking.oap.server.library.module.ModuleManager; import org.apache.skywalking.oap.server.receiver.trace.provider.TraceServiceModuleConfig; -/** - * @author peng-yongsheng - */ public interface SpanListenerFactory { SpanListener create(ModuleManager moduleManager, TraceServiceModuleConfig config); } diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/endpoint/MultiScopesSpanListener.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/endpoint/MultiScopesSpanListener.java index 8b15c4a2e24c..41f1b02f78c1 100755 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/endpoint/MultiScopesSpanListener.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/endpoint/MultiScopesSpanListener.java @@ -55,8 +55,6 @@ /** * Notice, in here, there are following concepts match - * - * @author peng-yongsheng, wusheng */ public class MultiScopesSpanListener implements EntrySpanListener, ExitSpanListener, GlobalTraceIdsListener { @@ -79,15 +77,24 @@ private MultiScopesSpanListener(ModuleManager moduleManager, TraceServiceModuleC this.entrySourceBuilders = new LinkedList<>(); this.exitSourceBuilders = new LinkedList<>(); this.slowDatabaseAccesses = new ArrayList<>(10); - this.instanceInventoryCache = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInstanceInventoryCache.class); - this.serviceInventoryCache = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInventoryCache.class); - this.endpointInventoryCache = moduleManager.find(CoreModule.NAME).provider().getService(EndpointInventoryCache.class); - this.networkAddressInventoryCache = moduleManager.find(CoreModule.NAME).provider().getService(NetworkAddressInventoryCache.class); + this.instanceInventoryCache = moduleManager.find(CoreModule.NAME) + .provider() + .getService(ServiceInstanceInventoryCache.class); + this.serviceInventoryCache = moduleManager.find(CoreModule.NAME) + .provider() + .getService(ServiceInventoryCache.class); + this.endpointInventoryCache = moduleManager.find(CoreModule.NAME) + .provider() + .getService(EndpointInventoryCache.class); + this.networkAddressInventoryCache = moduleManager.find(CoreModule.NAME) + .provider() + .getService(NetworkAddressInventoryCache.class); this.config = config; this.traceId = null; } - @Override public boolean containsPoint(Point point) { + @Override + public boolean containsPoint(Point point) { return Point.Entry.equals(point) || Point.Exit.equals(point) || Point.TraceIds.equals(point); } @@ -109,13 +116,15 @@ public void parseEntry(SpanDecorator spanDecorator, SegmentCoreInfo segmentCoreI final int serviceIdByPeerId = serviceInventoryCache.getServiceId(networkAddressId); final String address = networkAddressInventoryCache.get(networkAddressId).getName(); - if (spanDecorator.getSpanLayer().equals(SpanLayer.MQ) || config.getUninstrumentedGatewaysConfig().isAddressConfiguredAsGateway(address)) { + if (spanDecorator.getSpanLayer().equals(SpanLayer.MQ) || config.getUninstrumentedGatewaysConfig() + .isAddressConfiguredAsGateway(address)) { int instanceIdByPeerId = instanceInventoryCache.getServiceInstanceId(serviceIdByPeerId, networkAddressId); sourceBuilder.setSourceServiceInstanceId(instanceIdByPeerId); sourceBuilder.setSourceServiceId(serviceIdByPeerId); } else { sourceBuilder.setSourceServiceInstanceId(reference.getParentServiceInstanceId()); - sourceBuilder.setSourceServiceId(instanceInventoryCache.get(reference.getParentServiceInstanceId()).getServiceId()); + sourceBuilder.setSourceServiceId(instanceInventoryCache.get(reference.getParentServiceInstanceId()) + .getServiceId()); } sourceBuilder.setDestEndpointId(spanDecorator.getOperationNameId()); sourceBuilder.setDestServiceInstanceId(segmentCoreInfo.getServiceInstanceId()); @@ -142,7 +151,8 @@ public void parseEntry(SpanDecorator spanDecorator, SegmentCoreInfo segmentCoreI this.entrySpanDecorator = spanDecorator; } - @Override public void parseExit(SpanDecorator spanDecorator, SegmentCoreInfo segmentCoreInfo) { + @Override + public void parseExit(SpanDecorator spanDecorator, SegmentCoreInfo segmentCoreInfo) { if (this.minuteTimeBucket == 0) { this.minuteTimeBucket = segmentCoreInfo.getMinuteTimeBucket(); } @@ -212,7 +222,7 @@ public void parseEntry(SpanDecorator spanDecorator, SegmentCoreInfo segmentCoreI private void setPublicAttrs(SourceBuilder sourceBuilder, SpanDecorator spanDecorator) { long latency = spanDecorator.getEndTime() - spanDecorator.getStartTime(); - sourceBuilder.setLatency((int)latency); + sourceBuilder.setLatency((int) latency); sourceBuilder.setResponseCode(Const.NONE); sourceBuilder.setStatus(!spanDecorator.getIsError()); @@ -229,18 +239,22 @@ private void setPublicAttrs(SourceBuilder sourceBuilder, SpanDecorator spanDecor } sourceBuilder.setSourceServiceName(serviceInventoryCache.get(sourceBuilder.getSourceServiceId()).getName()); - sourceBuilder.setSourceServiceInstanceName(instanceInventoryCache.get(sourceBuilder.getSourceServiceInstanceId()).getName()); + sourceBuilder.setSourceServiceInstanceName(instanceInventoryCache.get(sourceBuilder.getSourceServiceInstanceId()) + .getName()); if (sourceBuilder.getSourceEndpointId() != Const.NONE) { - sourceBuilder.setSourceEndpointName(endpointInventoryCache.get(sourceBuilder.getSourceEndpointId()).getName()); + sourceBuilder.setSourceEndpointName(endpointInventoryCache.get(sourceBuilder.getSourceEndpointId()) + .getName()); } sourceBuilder.setDestServiceName(serviceInventoryCache.get(sourceBuilder.getDestServiceId()).getName()); - sourceBuilder.setDestServiceInstanceName(instanceInventoryCache.get(sourceBuilder.getDestServiceInstanceId()).getName()); + sourceBuilder.setDestServiceInstanceName(instanceInventoryCache.get(sourceBuilder.getDestServiceInstanceId()) + .getName()); if (sourceBuilder.getDestEndpointId() != Const.NONE) { sourceBuilder.setDestEndpointName(endpointInventoryCache.get(sourceBuilder.getDestEndpointId()).getName()); } } - @Override public void build() { + @Override + public void build() { entrySourceBuilders.forEach(entrySourceBuilder -> { entrySourceBuilder.setTimeBucket(minuteTimeBucket); sourceReceiver.receive(entrySourceBuilder.toAll()); @@ -269,7 +283,8 @@ private void setPublicAttrs(SourceBuilder sourceBuilder, SpanDecorator spanDecor } else { exitSourceBuilder.setSourceEndpointId(Const.USER_ENDPOINT_ID); } - exitSourceBuilder.setSourceEndpointName(endpointInventoryCache.get(exitSourceBuilder.getSourceEndpointId()).getName()); + exitSourceBuilder.setSourceEndpointName(endpointInventoryCache.get(exitSourceBuilder.getSourceEndpointId()) + .getName()); exitSourceBuilder.setTimeBucket(minuteTimeBucket); sourceReceiver.receive(exitSourceBuilder.toServiceRelation()); @@ -282,7 +297,8 @@ private void setPublicAttrs(SourceBuilder sourceBuilder, SpanDecorator spanDecor slowDatabaseAccesses.forEach(sourceReceiver::receive); } - @Override public void parseGlobalTraceId(UniqueId uniqueId, SegmentCoreInfo segmentCoreInfo) { + @Override + public void parseGlobalTraceId(UniqueId uniqueId, SegmentCoreInfo segmentCoreInfo) { if (traceId == null) { traceId = uniqueId.getIdPartsList().stream().map(String::valueOf).collect(Collectors.joining(".")); } diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/endpoint/SourceBuilder.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/endpoint/SourceBuilder.java index 5ec98dcd4ed7..f6483bea97f6 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/endpoint/SourceBuilder.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/endpoint/SourceBuilder.java @@ -18,34 +18,79 @@ package org.apache.skywalking.oap.server.receiver.trace.provider.parser.listener.endpoint; -import lombok.*; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.apm.util.StringUtil; -import org.apache.skywalking.oap.server.core.source.*; +import org.apache.skywalking.oap.server.core.source.All; +import org.apache.skywalking.oap.server.core.source.DatabaseAccess; +import org.apache.skywalking.oap.server.core.source.DetectPoint; +import org.apache.skywalking.oap.server.core.source.Endpoint; +import org.apache.skywalking.oap.server.core.source.EndpointRelation; +import org.apache.skywalking.oap.server.core.source.RequestType; +import org.apache.skywalking.oap.server.core.source.Service; +import org.apache.skywalking.oap.server.core.source.ServiceInstance; +import org.apache.skywalking.oap.server.core.source.ServiceInstanceRelation; +import org.apache.skywalking.oap.server.core.source.ServiceRelation; -/** - * @author peng-yongsheng - */ class SourceBuilder { - @Getter @Setter private int sourceServiceId; - @Getter @Setter private String sourceServiceName; - @Getter @Setter private int sourceServiceInstanceId; - @Getter @Setter private String sourceServiceInstanceName; - @Getter @Setter private int sourceEndpointId; - @Getter @Setter private String sourceEndpointName; - @Getter @Setter private int destServiceId; - @Getter @Setter private String destServiceName; - @Getter @Setter private int destServiceInstanceId; - @Getter @Setter private String destServiceInstanceName; - @Getter @Setter private int destEndpointId; - @Getter @Setter private String destEndpointName; - @Getter @Setter private int componentId; - @Getter @Setter private int latency; - @Getter @Setter private boolean status; - @Getter @Setter private int responseCode; - @Getter @Setter private RequestType type; - @Getter @Setter private DetectPoint detectPoint; - @Getter @Setter private long timeBucket; + @Getter + @Setter + private int sourceServiceId; + @Getter + @Setter + private String sourceServiceName; + @Getter + @Setter + private int sourceServiceInstanceId; + @Getter + @Setter + private String sourceServiceInstanceName; + @Getter + @Setter + private int sourceEndpointId; + @Getter + @Setter + private String sourceEndpointName; + @Getter + @Setter + private int destServiceId; + @Getter + @Setter + private String destServiceName; + @Getter + @Setter + private int destServiceInstanceId; + @Getter + @Setter + private String destServiceInstanceName; + @Getter + @Setter + private int destEndpointId; + @Getter + @Setter + private String destEndpointName; + @Getter + @Setter + private int componentId; + @Getter + @Setter + private int latency; + @Getter + @Setter + private boolean status; + @Getter + @Setter + private int responseCode; + @Getter + @Setter + private RequestType type; + @Getter + @Setter + private DetectPoint detectPoint; + @Getter + @Setter + private long timeBucket; All toAll() { All all = new All(); diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/segment/SegmentSpanListener.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/segment/SegmentSpanListener.java index 36f4c9a9a1c6..6c9c01ad72d6 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/segment/SegmentSpanListener.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/segment/SegmentSpanListener.java @@ -39,9 +39,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng - */ public class SegmentSpanListener implements FirstSpanListener, EntrySpanListener, GlobalTraceIdsListener { private static final Logger logger = LoggerFactory.getLogger(SegmentSpanListener.class); @@ -58,10 +55,13 @@ public class SegmentSpanListener implements FirstSpanListener, EntrySpanListener private SegmentSpanListener(ModuleManager moduleManager, TraceSegmentSampler sampler) { this.sampler = sampler; this.sourceReceiver = moduleManager.find(CoreModule.NAME).provider().getService(SourceReceiver.class); - this.serviceNameCacheService = moduleManager.find(CoreModule.NAME).provider().getService(EndpointInventoryCache.class); + this.serviceNameCacheService = moduleManager.find(CoreModule.NAME) + .provider() + .getService(EndpointInventoryCache.class); } - @Override public boolean containsPoint(Point point) { + @Override + public boolean containsPoint(Point point) { return Point.First.equals(point) || Point.Entry.equals(point) || Point.TraceIds.equals(point); } @@ -76,7 +76,7 @@ public void parseFirst(SpanDecorator spanDecorator, SegmentCoreInfo segmentCoreI segment.setSegmentId(segmentCoreInfo.getSegmentId()); segment.setServiceId(segmentCoreInfo.getServiceId()); segment.setServiceInstanceId(segmentCoreInfo.getServiceInstanceId()); - segment.setLatency((int)(segmentCoreInfo.getEndTime() - segmentCoreInfo.getStartTime())); + segment.setLatency((int) (segmentCoreInfo.getEndTime() - segmentCoreInfo.getStartTime())); segment.setStartTime(segmentCoreInfo.getStartTime()); segment.setEndTime(segmentCoreInfo.getEndTime()); segment.setIsError(BooleanUtils.booleanToValue(segmentCoreInfo.isError())); @@ -88,11 +88,13 @@ public void parseFirst(SpanDecorator spanDecorator, SegmentCoreInfo segmentCoreI firstEndpointName = spanDecorator.getOperationName(); } - @Override public void parseEntry(SpanDecorator spanDecorator, SegmentCoreInfo segmentCoreInfo) { + @Override + public void parseEntry(SpanDecorator spanDecorator, SegmentCoreInfo segmentCoreInfo) { entryEndpointId = spanDecorator.getOperationNameId(); } - @Override public void parseGlobalTraceId(UniqueId uniqueId, SegmentCoreInfo segmentCoreInfo) { + @Override + public void parseGlobalTraceId(UniqueId uniqueId, SegmentCoreInfo segmentCoreInfo) { if (sampleStatus.equals(SAMPLE_STATUS.UNKNOWN) || sampleStatus.equals(SAMPLE_STATUS.IGNORE)) { if (sampler.shouldSample(uniqueId)) { sampleStatus = SAMPLE_STATUS.SAMPLED; @@ -109,7 +111,8 @@ public void parseFirst(SpanDecorator spanDecorator, SegmentCoreInfo segmentCoreI segment.setTraceId(traceId); } - @Override public void build() { + @Override + public void build() { if (logger.isDebugEnabled()) { logger.debug("segment listener build, segment id: {}", segment.getSegmentId()); } @@ -150,7 +153,8 @@ public Factory(int segmentSamplingRate) { this.sampler = new TraceSegmentSampler(segmentSamplingRate); } - @Override public SpanListener create(ModuleManager moduleManager, TraceServiceModuleConfig config) { + @Override + public SpanListener create(ModuleManager moduleManager, TraceServiceModuleConfig config) { return new SegmentSpanListener(moduleManager, sampler); } } diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/segment/TraceSegmentSampler.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/segment/TraceSegmentSampler.java index bfafc28bd33b..cc805e172831 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/segment/TraceSegmentSampler.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/segment/TraceSegmentSampler.java @@ -23,18 +23,16 @@ /** * The sampler makes the sampling mechanism works at backend side. - * + *

* The sample check mechanism is very easy and effective when backend run in cluster mode. Based on traceId, which is * constituted by 3 Long, and according to GlobalIdGenerator, the last four number of the last Long is a sequence, so it * is suitable for sampling. - * + *

* Set rate = x - * + *

* Then divide last Long in TraceId by 10000, y = x % 10000 - * + *

* Sample result: [0,y) sampled, (y,~) ignored - * - * @author wusheng */ public class TraceSegmentSampler { private int sampleRate = 10000; diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/service/ServiceInstanceMappingSpanListener.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/service/ServiceInstanceMappingSpanListener.java index c7bef92e41c5..4201747e7f4d 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/service/ServiceInstanceMappingSpanListener.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/service/ServiceInstanceMappingSpanListener.java @@ -41,9 +41,6 @@ import java.util.ArrayList; import java.util.List; -/** - * @author zhangwei - */ public class ServiceInstanceMappingSpanListener implements EntrySpanListener { private static final Logger logger = LoggerFactory.getLogger(ServiceInstanceMappingSpanListener.class); @@ -57,10 +54,18 @@ public class ServiceInstanceMappingSpanListener implements EntrySpanListener { private final List serviceInstancesToResetMapping = new ArrayList<>(); public ServiceInstanceMappingSpanListener(ModuleManager moduleManager, TraceServiceModuleConfig config) { - this.serviceInstanceInventoryCache = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInstanceInventoryCache.class); - this.serviceInventoryCache = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInventoryCache.class); - this.serviceInstanceInventoryRegister = moduleManager.find(CoreModule.NAME).provider().getService(IServiceInstanceInventoryRegister.class); - this.networkAddressInventoryCache = moduleManager.find(CoreModule.NAME).provider().getService(NetworkAddressInventoryCache.class); + this.serviceInstanceInventoryCache = moduleManager.find(CoreModule.NAME) + .provider() + .getService(ServiceInstanceInventoryCache.class); + this.serviceInventoryCache = moduleManager.find(CoreModule.NAME) + .provider() + .getService(ServiceInventoryCache.class); + this.serviceInstanceInventoryRegister = moduleManager.find(CoreModule.NAME) + .provider() + .getService(IServiceInstanceInventoryRegister.class); + this.networkAddressInventoryCache = moduleManager.find(CoreModule.NAME) + .provider() + .getService(NetworkAddressInventoryCache.class); this.config = config; } @@ -81,7 +86,8 @@ public void parseEntry(SpanDecorator spanDecorator, SegmentCoreInfo segmentCoreI logger.debug("{} is configured as gateway, will reset its mapping service instance id", serviceInstanceId); } ServiceInstanceInventory instanceInventory = serviceInstanceInventoryCache.get(serviceInstanceId); - if (instanceInventory.getMappingServiceInstanceId() != Const.NONE && !serviceInstancesToResetMapping.contains(serviceInstanceId)) { + if (instanceInventory.getMappingServiceInstanceId() != Const.NONE && !serviceInstancesToResetMapping + .contains(serviceInstanceId)) { serviceInstancesToResetMapping.add(serviceInstanceId); } } else { @@ -99,7 +105,8 @@ public void parseEntry(SpanDecorator spanDecorator, SegmentCoreInfo segmentCoreI public void build() { serviceInstanceMappings.forEach(instanceMapping -> { if (logger.isDebugEnabled()) { - logger.debug("service instance mapping listener build, service id: {}, mapping service id: {}", instanceMapping.getServiceInstanceId(), instanceMapping.getMappingServiceInstanceId()); + logger.debug("service instance mapping listener build, service id: {}, mapping service id: {}", instanceMapping + .getServiceInstanceId(), instanceMapping.getMappingServiceInstanceId()); } serviceInstanceInventoryRegister.updateMapping(instanceMapping.getServiceInstanceId(), instanceMapping.getMappingServiceInstanceId()); }); diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/service/ServiceMappingSpanListener.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/service/ServiceMappingSpanListener.java index 0604754bd76f..df42c5c4289c 100755 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/service/ServiceMappingSpanListener.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/service/ServiceMappingSpanListener.java @@ -40,9 +40,6 @@ import java.util.ArrayList; import java.util.List; -/** - * @author peng-yongsheng - */ public class ServiceMappingSpanListener implements EntrySpanListener { private static final Logger logger = LoggerFactory.getLogger(ServiceMappingSpanListener.class); @@ -55,17 +52,25 @@ public class ServiceMappingSpanListener implements EntrySpanListener { private final List servicesToResetMapping = new ArrayList<>(); private ServiceMappingSpanListener(ModuleManager moduleManager, TraceServiceModuleConfig config) { - this.serviceInventoryCache = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInventoryCache.class); - this.networkAddressInventoryCache = moduleManager.find(CoreModule.NAME).provider().getService(NetworkAddressInventoryCache.class); - this.serviceInventoryRegister = moduleManager.find(CoreModule.NAME).provider().getService(IServiceInventoryRegister.class); + this.serviceInventoryCache = moduleManager.find(CoreModule.NAME) + .provider() + .getService(ServiceInventoryCache.class); + this.networkAddressInventoryCache = moduleManager.find(CoreModule.NAME) + .provider() + .getService(NetworkAddressInventoryCache.class); + this.serviceInventoryRegister = moduleManager.find(CoreModule.NAME) + .provider() + .getService(IServiceInventoryRegister.class); this.config = config; } - @Override public boolean containsPoint(Point point) { + @Override + public boolean containsPoint(Point point) { return Point.Entry.equals(point); } - @Override public void parseEntry(SpanDecorator spanDecorator, SegmentCoreInfo segmentCoreInfo) { + @Override + public void parseEntry(SpanDecorator spanDecorator, SegmentCoreInfo segmentCoreInfo) { if (logger.isDebugEnabled()) { logger.debug("service mapping listener parse reference"); } @@ -96,10 +101,12 @@ private ServiceMappingSpanListener(ModuleManager moduleManager, TraceServiceModu } } - @Override public void build() { + @Override + public void build() { serviceMappings.forEach(serviceMapping -> { if (logger.isDebugEnabled()) { - logger.debug("service mapping listener build, service id: {}, mapping service id: {}", serviceMapping.getServiceId(), serviceMapping.getMappingServiceId()); + logger.debug("service mapping listener build, service id: {}, mapping service id: {}", serviceMapping.getServiceId(), serviceMapping + .getMappingServiceId()); } serviceInventoryRegister.updateMapping(serviceMapping.getServiceId(), serviceMapping.getMappingServiceId()); }); @@ -113,7 +120,8 @@ private ServiceMappingSpanListener(ModuleManager moduleManager, TraceServiceModu public static class Factory implements SpanListenerFactory { - @Override public SpanListener create(ModuleManager moduleManager, TraceServiceModuleConfig config) { + @Override + public SpanListener create(ModuleManager moduleManager, TraceServiceModuleConfig config) { return new ServiceMappingSpanListener(moduleManager, config); } } diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/IdExchanger.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/IdExchanger.java index 0505983bfaa0..59963da376ab 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/IdExchanger.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/IdExchanger.java @@ -20,9 +20,6 @@ import org.apache.skywalking.oap.server.receiver.trace.provider.parser.decorator.StandardBuilder; -/** - * @author peng-yongsheng - */ public interface IdExchanger { boolean exchange(T standardBuilder, int serviceId); } diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/ReferenceIdExchanger.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/ReferenceIdExchanger.java index 0fcff21bf4ab..d3730391619c 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/ReferenceIdExchanger.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/ReferenceIdExchanger.java @@ -19,17 +19,17 @@ package org.apache.skywalking.oap.server.receiver.trace.provider.parser.standardization; import com.google.common.base.Strings; -import org.apache.skywalking.oap.server.core.*; +import org.apache.skywalking.oap.server.core.Const; +import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.cache.ServiceInstanceInventoryCache; -import org.apache.skywalking.oap.server.core.register.service.*; +import org.apache.skywalking.oap.server.core.register.service.IEndpointInventoryRegister; +import org.apache.skywalking.oap.server.core.register.service.INetworkAddressInventoryRegister; import org.apache.skywalking.oap.server.core.source.DetectPoint; import org.apache.skywalking.oap.server.library.module.ModuleManager; import org.apache.skywalking.oap.server.receiver.trace.provider.parser.decorator.ReferenceDecorator; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng - */ public class ReferenceIdExchanger implements IdExchanger { private static final Logger logger = LoggerFactory.getLogger(ReferenceIdExchanger.class); @@ -47,17 +47,26 @@ public static ReferenceIdExchanger getInstance(ModuleManager moduleManager) { } private ReferenceIdExchanger(ModuleManager moduleManager) { - this.endpointInventoryRegister = moduleManager.find(CoreModule.NAME).provider().getService(IEndpointInventoryRegister.class); - this.networkAddressInventoryRegister = moduleManager.find(CoreModule.NAME).provider().getService(INetworkAddressInventoryRegister.class); - this.serviceInstanceInventoryCache = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInstanceInventoryCache.class); + this.endpointInventoryRegister = moduleManager.find(CoreModule.NAME) + .provider() + .getService(IEndpointInventoryRegister.class); + this.networkAddressInventoryRegister = moduleManager.find(CoreModule.NAME) + .provider() + .getService(INetworkAddressInventoryRegister.class); + this.serviceInstanceInventoryCache = moduleManager.find(CoreModule.NAME) + .provider() + .getService(ServiceInstanceInventoryCache.class); } - @Override public boolean exchange(ReferenceDecorator standardBuilder, int serviceId) { + @Override + public boolean exchange(ReferenceDecorator standardBuilder, int serviceId) { boolean exchanged = true; if (standardBuilder.getEntryEndpointId() == 0) { - String entryEndpointName = Strings.isNullOrEmpty(standardBuilder.getEntryEndpointName()) ? Const.DOMAIN_OPERATION_NAME : standardBuilder.getEntryEndpointName(); - int entryServiceId = serviceInstanceInventoryCache.get(standardBuilder.getEntryServiceInstanceId()).getServiceId(); + String entryEndpointName = Strings.isNullOrEmpty(standardBuilder.getEntryEndpointName()) ? Const.DOMAIN_OPERATION_NAME : standardBuilder + .getEntryEndpointName(); + int entryServiceId = serviceInstanceInventoryCache.get(standardBuilder.getEntryServiceInstanceId()) + .getServiceId(); int entryEndpointId = getEndpointId(entryServiceId, entryEndpointName); if (entryEndpointId == 0) { if (logger.isDebugEnabled()) { @@ -77,8 +86,10 @@ private ReferenceIdExchanger(ModuleManager moduleManager) { } if (standardBuilder.getParentEndpointId() == 0) { - String parentEndpointName = Strings.isNullOrEmpty(standardBuilder.getParentEndpointName()) ? Const.DOMAIN_OPERATION_NAME : standardBuilder.getParentEndpointName(); - int parentServiceId = serviceInstanceInventoryCache.get(standardBuilder.getParentServiceInstanceId()).getServiceId(); + String parentEndpointName = Strings.isNullOrEmpty(standardBuilder.getParentEndpointName()) ? Const.DOMAIN_OPERATION_NAME : standardBuilder + .getParentEndpointName(); + int parentServiceId = serviceInstanceInventoryCache.get(standardBuilder.getParentServiceInstanceId()) + .getServiceId(); int parentEndpointId = getEndpointId(parentServiceId, parentEndpointName); if (parentEndpointId == 0) { @@ -124,7 +135,7 @@ private ReferenceIdExchanger(ModuleManager moduleManager) { * Endpoint in ref could be local or exit span's operation name. Especially if it is local span operation name, * exchange may not happen at agent, such as Java agent, then put literal endpoint string in the header, Need to try * to get the id by assuming the endpoint name is detected at server, local or client. - * + *

* If agent does the exchange, then always use endpoint id. */ private int getEndpointId(int serviceId, String endpointName) { diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/SegmentStandardization.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/SegmentStandardization.java index d1e308432c14..0e2f6ca1e8aa 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/SegmentStandardization.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/SegmentStandardization.java @@ -21,9 +21,6 @@ import org.apache.skywalking.apm.network.language.agent.UpstreamSegment; import org.apache.skywalking.oap.server.core.analysis.data.QueueData; -/** - * @author peng-yongsheng - */ public class SegmentStandardization implements QueueData { private final String id; @@ -38,15 +35,18 @@ public String getId() { private boolean endOfBatch = false; - @Override public void resetEndOfBatch() { + @Override + public void resetEndOfBatch() { this.endOfBatch = false; } - @Override public void asEndOfBatch() { + @Override + public void asEndOfBatch() { this.endOfBatch = true; } - @Override public boolean isEndOfBatch() { + @Override + public boolean isEndOfBatch() { return this.endOfBatch; } diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/SegmentStandardizationWorker.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/SegmentStandardizationWorker.java index 8464e0669ace..3fd4cc96f839 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/SegmentStandardizationWorker.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/SegmentStandardizationWorker.java @@ -24,15 +24,16 @@ import org.apache.skywalking.apm.commons.datacarrier.consumer.IConsumer; import org.apache.skywalking.apm.network.language.agent.UpstreamSegment; import org.apache.skywalking.oap.server.core.worker.AbstractWorker; -import org.apache.skywalking.oap.server.library.buffer.*; +import org.apache.skywalking.oap.server.library.buffer.BufferStream; +import org.apache.skywalking.oap.server.library.buffer.DataStreamReader; import org.apache.skywalking.oap.server.library.module.ModuleDefineHolder; import org.apache.skywalking.oap.server.telemetry.TelemetryModule; -import org.apache.skywalking.oap.server.telemetry.api.*; -import org.slf4j.*; +import org.apache.skywalking.oap.server.telemetry.api.CounterMetrics; +import org.apache.skywalking.oap.server.telemetry.api.MetricsCreator; +import org.apache.skywalking.oap.server.telemetry.api.MetricsTag; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng - */ public class SegmentStandardizationWorker extends AbstractWorker { private static final Logger logger = LoggerFactory.getLogger(SegmentStandardizationWorker.class); @@ -58,10 +59,11 @@ public SegmentStandardizationWorker(ModuleDefineHolder moduleDefineHolder, dataCarrier = new DataCarrier<>("SegmentStandardizationWorker", 1, 1024); dataCarrier.consume(new Consumer(stream), 1, 200); - MetricsCreator metricsCreator = moduleDefineHolder.find(TelemetryModule.NAME).provider().getService(MetricsCreator.class); - String metricNamePrefix = "v6_"; - traceBufferFileIn = metricsCreator.createCounter(metricNamePrefix + "trace_buffer_file_in", "The number of trace segment into the buffer file", - MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); + MetricsCreator metricsCreator = moduleDefineHolder.find(TelemetryModule.NAME) + .provider() + .getService(MetricsCreator.class); + String metricNamePrefix = "v6_"; + traceBufferFileIn = metricsCreator.createCounter(metricNamePrefix + "trace_buffer_file_in", "The number of trace segment into the buffer file", MetricsTag.EMPTY_KEY, MetricsTag.EMPTY_VALUE); } @Override diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/SpanExchanger.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/SpanExchanger.java index b3518834e7a4..9d6f534ef789 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/SpanExchanger.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/SpanExchanger.java @@ -43,9 +43,6 @@ import java.util.List; -/** - * @author peng-yongsheng - */ public class SpanExchanger implements IdExchanger { private static final Logger logger = LoggerFactory.getLogger(SpanExchanger.class); @@ -67,16 +64,31 @@ public static SpanExchanger getInstance(ModuleManager moduleManager) { } private SpanExchanger(ModuleManager moduleManager) { - this.serviceInventoryCacheDAO = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInventoryCache.class); - this.serviceInventoryRegister = moduleManager.find(CoreModule.NAME).provider().getService(IServiceInventoryRegister.class); - this.serviceInstanceInventoryCacheDAO = moduleManager.find(CoreModule.NAME).provider().getService(ServiceInstanceInventoryCache.class); - this.serviceInstanceInventoryRegister = moduleManager.find(CoreModule.NAME).provider().getService(IServiceInstanceInventoryRegister.class); - this.endpointInventoryRegister = moduleManager.find(CoreModule.NAME).provider().getService(IEndpointInventoryRegister.class); - this.networkAddressInventoryRegister = moduleManager.find(CoreModule.NAME).provider().getService(INetworkAddressInventoryRegister.class); - this.componentLibraryCatalogService = moduleManager.find(CoreModule.NAME).provider().getService(IComponentLibraryCatalogService.class); + this.serviceInventoryCacheDAO = moduleManager.find(CoreModule.NAME) + .provider() + .getService(ServiceInventoryCache.class); + this.serviceInventoryRegister = moduleManager.find(CoreModule.NAME) + .provider() + .getService(IServiceInventoryRegister.class); + this.serviceInstanceInventoryCacheDAO = moduleManager.find(CoreModule.NAME) + .provider() + .getService(ServiceInstanceInventoryCache.class); + this.serviceInstanceInventoryRegister = moduleManager.find(CoreModule.NAME) + .provider() + .getService(IServiceInstanceInventoryRegister.class); + this.endpointInventoryRegister = moduleManager.find(CoreModule.NAME) + .provider() + .getService(IEndpointInventoryRegister.class); + this.networkAddressInventoryRegister = moduleManager.find(CoreModule.NAME) + .provider() + .getService(INetworkAddressInventoryRegister.class); + this.componentLibraryCatalogService = moduleManager.find(CoreModule.NAME) + .provider() + .getService(IComponentLibraryCatalogService.class); } - @Override public boolean exchange(SpanDecorator standardBuilder, int serviceId) { + @Override + public boolean exchange(SpanDecorator standardBuilder, int serviceId) { boolean exchanged = true; if (standardBuilder.getComponentId() == 0 && !Strings.isNullOrEmpty(standardBuilder.getComponent())) { @@ -131,7 +143,8 @@ private SpanExchanger(ModuleManager moduleManager) { } serviceInventoryRegister.update(newServiceInventory.getSequence(), nodeType, properties); - ServiceInstanceInventory newServiceInstanceInventory = serviceInstanceInventoryCacheDAO.get(serviceInstanceInventoryCacheDAO.getServiceInstanceId(newServiceInventory.getSequence(), peerId)); + ServiceInstanceInventory newServiceInstanceInventory = serviceInstanceInventoryCacheDAO.get(serviceInstanceInventoryCacheDAO + .getServiceInstanceId(newServiceInventory.getSequence(), peerId)); serviceInstanceInventoryRegister.update(newServiceInstanceInventory.getSequence(), nodeType, properties); } @@ -141,8 +154,10 @@ private SpanExchanger(ModuleManager moduleManager) { * so, since 6.6.0, only it triggers register. */ if (SpanType.Entry.equals(standardBuilder.getSpanType())) { - String endpointName = Strings.isNullOrEmpty(standardBuilder.getOperationName()) ? Const.DOMAIN_OPERATION_NAME : standardBuilder.getOperationName(); - int endpointId = endpointInventoryRegister.getOrCreate(serviceId, endpointName, DetectPoint.fromSpanType(standardBuilder.getSpanType())); + String endpointName = Strings.isNullOrEmpty(standardBuilder.getOperationName()) ? Const.DOMAIN_OPERATION_NAME : standardBuilder + .getOperationName(); + int endpointId = endpointInventoryRegister.getOrCreate(serviceId, endpointName, DetectPoint.fromSpanType(standardBuilder + .getSpanType())); if (endpointId == 0) { if (logger.isDebugEnabled()) { diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/segment/TraceSegmentSamplerTest.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/segment/TraceSegmentSamplerTest.java index d55cd71afb5a..6df268c107aa 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/segment/TraceSegmentSamplerTest.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/segment/TraceSegmentSamplerTest.java @@ -26,14 +26,46 @@ public class TraceSegmentSamplerTest { @Test public void sample() { TraceSegmentSampler sampler = new TraceSegmentSampler(100); - Assert.assertTrue(sampler.shouldSample(UniqueId.newBuilder().addIdParts(123).addIdParts(2).addIdParts(0).build())); - Assert.assertTrue(sampler.shouldSample(UniqueId.newBuilder().addIdParts(123).addIdParts(2).addIdParts(50).build())); - Assert.assertTrue(sampler.shouldSample(UniqueId.newBuilder().addIdParts(123).addIdParts(2).addIdParts(99).build())); - Assert.assertFalse(sampler.shouldSample(UniqueId.newBuilder().addIdParts(123).addIdParts(2).addIdParts(100).build())); - Assert.assertFalse(sampler.shouldSample(UniqueId.newBuilder().addIdParts(123).addIdParts(2).addIdParts(101).build())); - Assert.assertTrue(sampler.shouldSample(UniqueId.newBuilder().addIdParts(123).addIdParts(2).addIdParts(10000).build())); - Assert.assertTrue(sampler.shouldSample(UniqueId.newBuilder().addIdParts(123).addIdParts(2).addIdParts(10001).build())); - Assert.assertFalse(sampler.shouldSample(UniqueId.newBuilder().addIdParts(123).addIdParts(2).addIdParts(1019903).build())); + Assert.assertTrue(sampler.shouldSample(UniqueId.newBuilder() + .addIdParts(123) + .addIdParts(2) + .addIdParts(0) + .build())); + Assert.assertTrue(sampler.shouldSample(UniqueId.newBuilder() + .addIdParts(123) + .addIdParts(2) + .addIdParts(50) + .build())); + Assert.assertTrue(sampler.shouldSample(UniqueId.newBuilder() + .addIdParts(123) + .addIdParts(2) + .addIdParts(99) + .build())); + Assert.assertFalse(sampler.shouldSample(UniqueId.newBuilder() + .addIdParts(123) + .addIdParts(2) + .addIdParts(100) + .build())); + Assert.assertFalse(sampler.shouldSample(UniqueId.newBuilder() + .addIdParts(123) + .addIdParts(2) + .addIdParts(101) + .build())); + Assert.assertTrue(sampler.shouldSample(UniqueId.newBuilder() + .addIdParts(123) + .addIdParts(2) + .addIdParts(10000) + .build())); + Assert.assertTrue(sampler.shouldSample(UniqueId.newBuilder() + .addIdParts(123) + .addIdParts(2) + .addIdParts(10001) + .build())); + Assert.assertFalse(sampler.shouldSample(UniqueId.newBuilder() + .addIdParts(123) + .addIdParts(2) + .addIdParts(1019903) + .build())); } @Test @@ -41,7 +73,11 @@ public void IllegalTraceIDSample() { TraceSegmentSampler sampler = new TraceSegmentSampler(100); Assert.assertFalse(sampler.shouldSample(UniqueId.newBuilder().addIdParts(123).addIdParts(2).build())); - Assert.assertFalse( - sampler.shouldSample(UniqueId.newBuilder().addIdParts(123).addIdParts(2).addIdParts(23).addIdParts(3).build())); + Assert.assertFalse(sampler.shouldSample(UniqueId.newBuilder() + .addIdParts(123) + .addIdParts(2) + .addIdParts(23) + .addIdParts(3) + .build())); } } diff --git a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/pom.xml index c44b11b225cb..5a57ff313de8 100644 --- a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + server-receiver-plugin org.apache.skywalking diff --git a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/ZipkinReceiverConfig.java b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/ZipkinReceiverConfig.java index cf9ff22ff555..1b49e550d3a7 100644 --- a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/ZipkinReceiverConfig.java +++ b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/ZipkinReceiverConfig.java @@ -18,12 +18,10 @@ package org.apache.skywalking.oap.server.receiver.zipkin; -import lombok.*; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.oap.server.library.module.ModuleConfig; -/** - * @author wusheng - */ @Setter @Getter public class ZipkinReceiverConfig extends ModuleConfig { diff --git a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/ZipkinReceiverModule.java b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/ZipkinReceiverModule.java index abf1f094e283..69c0e311e0b4 100644 --- a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/ZipkinReceiverModule.java +++ b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/ZipkinReceiverModule.java @@ -22,12 +22,10 @@ /** * Zipkin receiver module provides the HTTP, protoc serve for any SDK or agent by following Zipkin format. - * + *

* At this moment, Zipkin format is not compatible with SkyWalking, especially HEADERs. Please don't consider this as a * Zipkin-SkyWalking integration, it is provided for adding analysis, aggregation and visualization capabilities to * zipkin backend. - * - * @author wusheng */ public class ZipkinReceiverModule extends ModuleDefine { public static final String NAME = "receiver_zipkin"; @@ -36,7 +34,8 @@ public ZipkinReceiverModule() { super(NAME); } - @Override public Class[] services() { + @Override + public Class[] services() { return new Class[0]; } } diff --git a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/ZipkinReceiverProvider.java b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/ZipkinReceiverProvider.java index 0306d43ad098..f2b14c4a00ad 100644 --- a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/ZipkinReceiverProvider.java +++ b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/ZipkinReceiverProvider.java @@ -29,14 +29,11 @@ import org.apache.skywalking.oap.server.receiver.sharing.server.CoreRegisterLinker; import org.apache.skywalking.oap.server.receiver.trace.module.TraceModule; import org.apache.skywalking.oap.server.receiver.trace.provider.parser.ISegmentParserService; -import org.apache.skywalking.oap.server.receiver.zipkin.analysis.*; +import org.apache.skywalking.oap.server.receiver.zipkin.analysis.Receiver2AnalysisBridge; +import org.apache.skywalking.oap.server.receiver.zipkin.analysis.transform.Zipkin2SkyWalkingTransfer; import org.apache.skywalking.oap.server.receiver.zipkin.handler.SpanV1JettyHandler; import org.apache.skywalking.oap.server.receiver.zipkin.handler.SpanV2JettyHandler; -import org.apache.skywalking.oap.server.receiver.zipkin.analysis.transform.Zipkin2SkyWalkingTransfer; -/** - * @author wusheng - */ public class ZipkinReceiverProvider extends ModuleProvider { public static final String NAME = "default"; private ZipkinReceiverConfig config; @@ -46,23 +43,28 @@ public ZipkinReceiverProvider() { config = new ZipkinReceiverConfig(); } - @Override public String name() { + @Override + public String name() { return NAME; } - @Override public Class module() { + @Override + public Class module() { return ZipkinReceiverModule.class; } - @Override public ModuleConfig createConfigBeanIfAbsent() { + @Override + public ModuleConfig createConfigBeanIfAbsent() { return config; } - @Override public void prepare() throws ServiceNotProvidedException { + @Override + public void prepare() throws ServiceNotProvidedException { } - @Override public void start() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void start() throws ServiceNotProvidedException, ModuleStartException { CoreRegisterLinker.setModuleManager(getManager()); jettyServer = new JettyServer(config.getHost(), config.getPort(), config.getContextPath()); @@ -72,13 +74,16 @@ public ZipkinReceiverProvider() { jettyServer.addHandler(new SpanV2JettyHandler(config, getManager())); if (config.isNeedAnalysis()) { - ISegmentParserService segmentParseService = getManager().find(TraceModule.NAME).provider().getService(ISegmentParserService.class); + ISegmentParserService segmentParseService = getManager().find(TraceModule.NAME) + .provider() + .getService(ISegmentParserService.class); Receiver2AnalysisBridge bridge = new Receiver2AnalysisBridge(segmentParseService); Zipkin2SkyWalkingTransfer.INSTANCE.addListener(bridge); } } - @Override public void notifyAfterCompleted() throws ModuleStartException { + @Override + public void notifyAfterCompleted() throws ModuleStartException { try { jettyServer.start(); } catch (ServerException e) { @@ -86,7 +91,8 @@ public ZipkinReceiverProvider() { } } - @Override public String[] requiredModules() { + @Override + public String[] requiredModules() { if (config.isNeedAnalysis()) { return new String[] {TraceModule.NAME}; } else { diff --git a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/ZipkinSkyWalkingTransfer.java b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/ZipkinSkyWalkingTransfer.java index 5bcbcf42b84c..e5a7c32c8233 100644 --- a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/ZipkinSkyWalkingTransfer.java +++ b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/ZipkinSkyWalkingTransfer.java @@ -20,7 +20,7 @@ import java.util.List; import org.apache.skywalking.oap.server.receiver.sharing.server.CoreRegisterLinker; -import org.apache.skywalking.oap.server.receiver.zipkin.*; +import org.apache.skywalking.oap.server.receiver.zipkin.ZipkinReceiverConfig; import org.apache.skywalking.oap.server.receiver.zipkin.analysis.cache.CacheFactory; import zipkin2.Span; @@ -32,9 +32,9 @@ public void doTransfer(ZipkinReceiverConfig config, List spanList) { if (applicationCode != null) { int applicationId = CoreRegisterLinker.getServiceInventoryRegister().getOrCreate(applicationCode, null); if (applicationId != 0) { - CoreRegisterLinker.getServiceInstanceInventoryRegister().getOrCreate(applicationId, applicationCode, applicationCode, - span.timestampAsLong(), - ZipkinTraceOSInfoBuilder.getOSInfoForZipkin(applicationCode)); + CoreRegisterLinker.getServiceInstanceInventoryRegister() + .getOrCreate(applicationId, applicationCode, applicationCode, span.timestampAsLong(), ZipkinTraceOSInfoBuilder + .getOSInfoForZipkin(applicationCode)); } } diff --git a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/ZipkinTraceOSInfoBuilder.java b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/ZipkinTraceOSInfoBuilder.java index 7d286f84bb17..4e5bf3148b28 100644 --- a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/ZipkinTraceOSInfoBuilder.java +++ b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/ZipkinTraceOSInfoBuilder.java @@ -21,9 +21,6 @@ import com.google.gson.JsonObject; import org.apache.skywalking.oap.server.core.register.ServiceInstanceInventory; -/** - * @author wusheng - */ public class ZipkinTraceOSInfoBuilder { public static JsonObject getOSInfoForZipkin(String instanceName) { diff --git a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/cache/CacheFactory.java b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/cache/CacheFactory.java index 88930012426a..bffa458075f4 100644 --- a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/cache/CacheFactory.java +++ b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/cache/CacheFactory.java @@ -21,9 +21,6 @@ import org.apache.skywalking.oap.server.receiver.zipkin.ZipkinReceiverConfig; import org.apache.skywalking.oap.server.receiver.zipkin.analysis.cache.caffeine.CaffeineSpanCache; -/** - * @author wusheng - */ public class CacheFactory { public static final CacheFactory INSTANCE = new CacheFactory(); diff --git a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/cache/ISpanCache.java b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/cache/ISpanCache.java index 0f9f3e433780..b4f9d4fdb329 100644 --- a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/cache/ISpanCache.java +++ b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/cache/ISpanCache.java @@ -20,9 +20,6 @@ import zipkin2.Span; -/** - * @author wusheng - */ public interface ISpanCache { void addSpan(Span span); } diff --git a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/cache/caffeine/CaffeineSpanCache.java b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/cache/caffeine/CaffeineSpanCache.java index d8dc260263a4..41d15745ae17 100644 --- a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/cache/caffeine/CaffeineSpanCache.java +++ b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/cache/caffeine/CaffeineSpanCache.java @@ -36,10 +36,8 @@ import zipkin2.Span; /** - * NOTICE: FROM my test, Caffeine cache triggers/checks expire only face write/read op. - * In order to make trace finish in time, I have to set a timer to write a meaningless trace, for active expire. - * - * @author wusheng + * NOTICE: FROM my test, Caffeine cache triggers/checks expire only face write/read op. In order to make trace finish in + * time, I have to set a timer to write a meaningless trace, for active expire. */ public class CaffeineSpanCache implements ISpanCache, RemovalListener { private static final Logger logger = LoggerFactory.getLogger(CaffeineSpanCache.class); @@ -49,10 +47,10 @@ public class CaffeineSpanCache implements ISpanCache, RemovalListener { inProcessSpanCache.put("ACTIVE", new ZipkinTrace.TriggerTrace()); }, 2, 3, TimeUnit.SECONDS); @@ -60,10 +58,6 @@ public CaffeineSpanCache(ZipkinReceiverConfig config) { /** * Zipkin trace finished by the expired rule. - * - * @param key - * @param trace - * @param cause */ @Override public void onRemoval(@Nullable String key, @Nullable ZipkinTrace trace, @Nonnull RemovalCause cause) { diff --git a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/data/ZipkinTrace.java b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/data/ZipkinTrace.java index e54a6139cf20..89df070e3020 100644 --- a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/data/ZipkinTrace.java +++ b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/data/ZipkinTrace.java @@ -23,9 +23,6 @@ import java.util.concurrent.locks.ReentrantLock; import zipkin2.Span; -/** - * @author wusheng - */ public class ZipkinTrace { private List spans; private ReentrantLock spanWriteLock; @@ -50,13 +47,10 @@ public List getSpans() { @Override public String toString() { - return "ZipkinTrace{" + - "spans=" + spans + - '}'; + return "ZipkinTrace{" + "spans=" + spans + '}'; } public static class TriggerTrace extends ZipkinTrace { - } } diff --git a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/transform/SegmentBuilder.java b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/transform/SegmentBuilder.java index 9296bf26f624..269cad03015b 100644 --- a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/transform/SegmentBuilder.java +++ b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/transform/SegmentBuilder.java @@ -19,21 +19,29 @@ package org.apache.skywalking.oap.server.receiver.zipkin.analysis.transform; import com.google.common.base.Strings; -import java.util.*; -import java.util.concurrent.*; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.Callable; +import java.util.concurrent.ThreadLocalRandom; +import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicReference; import org.apache.skywalking.apm.network.common.KeyStringValuePair; -import org.apache.skywalking.apm.network.language.agent.*; -import org.apache.skywalking.apm.network.language.agent.v2.*; +import org.apache.skywalking.apm.network.language.agent.RefType; +import org.apache.skywalking.apm.network.language.agent.SpanType; +import org.apache.skywalking.apm.network.language.agent.UniqueId; +import org.apache.skywalking.apm.network.language.agent.v2.Log; +import org.apache.skywalking.apm.network.language.agent.v2.SegmentObject; +import org.apache.skywalking.apm.network.language.agent.v2.SegmentReference; +import org.apache.skywalking.apm.network.language.agent.v2.SpanObjectV2; import org.apache.skywalking.oap.server.receiver.sharing.server.CoreRegisterLinker; -import org.apache.skywalking.oap.server.receiver.zipkin.analysis.*; +import org.apache.skywalking.oap.server.receiver.zipkin.analysis.ZipkinTraceOSInfoBuilder; import org.apache.skywalking.oap.server.receiver.zipkin.analysis.data.SkyWalkingTrace; import org.eclipse.jetty.util.StringUtil; -import zipkin2.*; +import zipkin2.Endpoint; +import zipkin2.Span; -/** - * @author wusheng - */ public class SegmentBuilder { private Context context; private LinkedList segments; @@ -93,8 +101,10 @@ public static SkyWalkingTrace build(List traceSpans) throws Exception { builder.segments.forEach(segment -> { SegmentObject.Builder traceSegmentBuilder = segment.freeze(); segmentBuilders.add(traceSegmentBuilder); - CoreRegisterLinker.getServiceInventoryRegister().heartbeat(traceSegmentBuilder.getServiceId(), finalTimestamp); - CoreRegisterLinker.getServiceInstanceInventoryRegister().heartbeat(traceSegmentBuilder.getServiceInstanceId(), finalTimestamp); + CoreRegisterLinker.getServiceInventoryRegister() + .heartbeat(traceSegmentBuilder.getServiceId(), finalTimestamp); + CoreRegisterLinker.getServiceInstanceInventoryRegister() + .heartbeat(traceSegmentBuilder.getServiceInstanceId(), finalTimestamp); }); return new SkyWalkingTrace(builder.generateTraceOrSegmentId(), segmentBuilders); } @@ -188,15 +198,19 @@ private SpanObjectV2.Builder initSpan(SpanObjectV2.Builder parentSegmentSpan, Sp spanBuilder.setStartTime(startTime); spanBuilder.setEndTime(startTime + duration); - span.tags().forEach((tagKey, tagValue) -> spanBuilder.addTags( - KeyStringValuePair.newBuilder().setKey(tagKey).setValue(tagValue).build()) - ); + span.tags() + .forEach((tagKey, tagValue) -> spanBuilder.addTags(KeyStringValuePair.newBuilder() + .setKey(tagKey) + .setValue(tagValue) + .build())); - span.annotations().forEach(annotation -> - spanBuilder.addLogs(Log.newBuilder().setTime(annotation.timestamp() / 1000).addData( - KeyStringValuePair.newBuilder().setKey("zipkin.annotation").setValue(annotation.value()).build() - )) - ); + span.annotations() + .forEach(annotation -> spanBuilder.addLogs(Log.newBuilder() + .setTime(annotation.timestamp() / 1000) + .addData(KeyStringValuePair.newBuilder() + .setKey("zipkin.annotation") + .setValue(annotation.value()) + .build()))); return spanBuilder; } @@ -301,16 +315,12 @@ private boolean isAppChanged(String applicationCode) { } private Segment addApp(String serviceCode, long registerTime) throws Exception { - int serviceId = waitForExchange(() -> - CoreRegisterLinker.getServiceInventoryRegister().getOrCreate(serviceCode, null), - 10 - ); + int serviceId = waitForExchange(() -> CoreRegisterLinker.getServiceInventoryRegister() + .getOrCreate(serviceCode, null), 10); - int serviceInstanceId = waitForExchange(() -> - CoreRegisterLinker.getServiceInstanceInventoryRegister().getOrCreate(serviceId, serviceCode, serviceCode, - registerTime, ZipkinTraceOSInfoBuilder.getOSInfoForZipkin(serviceCode)), - 10 - ); + int serviceInstanceId = waitForExchange(() -> CoreRegisterLinker.getServiceInstanceInventoryRegister() + .getOrCreate(serviceId, serviceCode, serviceCode, registerTime, ZipkinTraceOSInfoBuilder + .getOSInfoForZipkin(serviceCode)), 10); Segment segment = new Segment(serviceCode, serviceId, serviceInstanceId); segmentsStack.add(segment); @@ -451,10 +461,10 @@ private int nextSpanId() { private UniqueId generateTraceOrSegmentId() { return UniqueId.newBuilder() - .addIdParts(ThreadLocalRandom.current().nextLong()) - .addIdParts(ThreadLocalRandom.current().nextLong()) - .addIdParts(ThreadLocalRandom.current().nextLong()) - .build(); + .addIdParts(ThreadLocalRandom.current().nextLong()) + .addIdParts(ThreadLocalRandom.current().nextLong()) + .addIdParts(ThreadLocalRandom.current().nextLong()) + .build(); } private class ClientSideSpan { diff --git a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/transform/Zipkin2SkyWalkingTransfer.java b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/transform/Zipkin2SkyWalkingTransfer.java index 25a59ab33df6..9a677c1e10ac 100644 --- a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/transform/Zipkin2SkyWalkingTransfer.java +++ b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/transform/Zipkin2SkyWalkingTransfer.java @@ -24,9 +24,6 @@ import org.apache.skywalking.oap.server.receiver.zipkin.analysis.data.ZipkinTrace; import zipkin2.Span; -/** - * @author wusheng - */ public class Zipkin2SkyWalkingTransfer { public static Zipkin2SkyWalkingTransfer INSTANCE = new Zipkin2SkyWalkingTransfer(); private List listeners = new LinkedList<>(); @@ -44,9 +41,7 @@ public void transfer(ZipkinTrace trace) throws Exception { if (traceSpans.size() > 0) { SkyWalkingTrace skyWalkingTrace = SegmentBuilder.build(traceSpans); - listeners.forEach(listener -> - listener.notify(skyWalkingTrace) - ); + listeners.forEach(listener -> listener.notify(skyWalkingTrace)); } } diff --git a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/handler/SpanEncode.java b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/handler/SpanEncode.java index ee5a91cd4a60..d33de7a79c4d 100644 --- a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/handler/SpanEncode.java +++ b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/handler/SpanEncode.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.receiver.zipkin.handler; -/** - * @author wusheng - */ public class SpanEncode { public static final int PROTO3 = 1; public static final int JSON_V2 = 2; diff --git a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/handler/SpanProcessor.java b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/handler/SpanProcessor.java index 30a713fa2f5d..f27c2a427c56 100644 --- a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/handler/SpanProcessor.java +++ b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/handler/SpanProcessor.java @@ -18,11 +18,14 @@ package org.apache.skywalking.oap.server.receiver.zipkin.handler; -import java.io.*; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; import java.util.List; import java.util.zip.GZIPInputStream; import javax.servlet.http.HttpServletRequest; -import org.apache.skywalking.oap.server.core.cache.*; +import org.apache.skywalking.oap.server.core.cache.EndpointInventoryCache; +import org.apache.skywalking.oap.server.core.cache.ServiceInventoryCache; import org.apache.skywalking.oap.server.core.source.SourceReceiver; import org.apache.skywalking.oap.server.receiver.zipkin.ZipkinReceiverConfig; import org.apache.skywalking.oap.server.receiver.zipkin.analysis.ZipkinSkyWalkingTransfer; @@ -36,8 +39,7 @@ public class SpanProcessor { private EndpointInventoryCache endpointInventoryCache; private int encode; - public SpanProcessor(SourceReceiver receiver, - ServiceInventoryCache serviceInventoryCache, + public SpanProcessor(SourceReceiver receiver, ServiceInventoryCache serviceInventoryCache, EndpointInventoryCache endpointInventoryCache, int encode) { this.receiver = receiver; this.serviceInventoryCache = serviceInventoryCache; diff --git a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/handler/SpanV1JettyHandler.java b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/handler/SpanV1JettyHandler.java index 09d57940aaaa..2301102dce34 100644 --- a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/handler/SpanV1JettyHandler.java +++ b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/handler/SpanV1JettyHandler.java @@ -18,14 +18,17 @@ package org.apache.skywalking.oap.server.receiver.zipkin.handler; -import javax.servlet.http.*; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.apache.skywalking.oap.server.core.CoreModule; -import org.apache.skywalking.oap.server.core.cache.*; +import org.apache.skywalking.oap.server.core.cache.EndpointInventoryCache; +import org.apache.skywalking.oap.server.core.cache.ServiceInventoryCache; import org.apache.skywalking.oap.server.core.source.SourceReceiver; import org.apache.skywalking.oap.server.library.module.ModuleManager; import org.apache.skywalking.oap.server.library.server.jetty.JettyHandler; import org.apache.skywalking.oap.server.receiver.zipkin.ZipkinReceiverConfig; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import zipkin2.codec.SpanBytesDecoder; public class SpanV1JettyHandler extends JettyHandler { @@ -36,8 +39,7 @@ public class SpanV1JettyHandler extends JettyHandler { private ServiceInventoryCache serviceInventoryCache; private EndpointInventoryCache endpointInventoryCache; - public SpanV1JettyHandler(ZipkinReceiverConfig config, - ModuleManager manager) { + public SpanV1JettyHandler(ZipkinReceiverConfig config, ModuleManager manager) { sourceReceiver = manager.find(CoreModule.NAME).provider().getService(SourceReceiver.class); serviceInventoryCache = manager.find(CoreModule.NAME).provider().getService(ServiceInventoryCache.class); endpointInventoryCache = manager.find(CoreModule.NAME).provider().getService(EndpointInventoryCache.class); @@ -59,9 +61,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response) int encode = type != null && type.contains("/x-thrift") ? SpanEncode.THRIFT : SpanEncode.JSON_V1; - SpanBytesDecoder decoder = SpanEncode.isThrift(encode) - ? SpanBytesDecoder.THRIFT - : SpanBytesDecoder.JSON_V1; + SpanBytesDecoder decoder = SpanEncode.isThrift(encode) ? SpanBytesDecoder.THRIFT : SpanBytesDecoder.JSON_V1; SpanProcessor processor = new SpanProcessor(sourceReceiver, serviceInventoryCache, endpointInventoryCache, encode); processor.convert(config, decoder, request); diff --git a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/handler/SpanV2JettyHandler.java b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/handler/SpanV2JettyHandler.java index a904c62987eb..09cf07a4371e 100644 --- a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/handler/SpanV2JettyHandler.java +++ b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/handler/SpanV2JettyHandler.java @@ -18,19 +18,19 @@ package org.apache.skywalking.oap.server.receiver.zipkin.handler; -import javax.servlet.http.*; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.apache.skywalking.oap.server.core.CoreModule; -import org.apache.skywalking.oap.server.core.cache.*; +import org.apache.skywalking.oap.server.core.cache.EndpointInventoryCache; +import org.apache.skywalking.oap.server.core.cache.ServiceInventoryCache; import org.apache.skywalking.oap.server.core.source.SourceReceiver; import org.apache.skywalking.oap.server.library.module.ModuleManager; import org.apache.skywalking.oap.server.library.server.jetty.JettyHandler; import org.apache.skywalking.oap.server.receiver.zipkin.ZipkinReceiverConfig; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import zipkin2.codec.SpanBytesDecoder; -/** - * @author wusheng - */ public class SpanV2JettyHandler extends JettyHandler { private static final Logger logger = LoggerFactory.getLogger(SpanV2JettyHandler.class); @@ -39,8 +39,7 @@ public class SpanV2JettyHandler extends JettyHandler { private ServiceInventoryCache serviceInventoryCache; private EndpointInventoryCache endpointInventoryCache; - public SpanV2JettyHandler(ZipkinReceiverConfig config, - ModuleManager manager) { + public SpanV2JettyHandler(ZipkinReceiverConfig config, ModuleManager manager) { sourceReceiver = manager.find(CoreModule.NAME).provider().getService(SourceReceiver.class); serviceInventoryCache = manager.find(CoreModule.NAME).provider().getService(ServiceInventoryCache.class); endpointInventoryCache = manager.find(CoreModule.NAME).provider().getService(EndpointInventoryCache.class); @@ -62,9 +61,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response) int encode = type != null && type.contains("/x-protobuf") ? SpanEncode.PROTO3 : SpanEncode.JSON_V2; - SpanBytesDecoder decoder = SpanEncode.isProto3(encode) - ? SpanBytesDecoder.PROTO3 - : SpanBytesDecoder.JSON_V2; + SpanBytesDecoder decoder = SpanEncode.isProto3(encode) ? SpanBytesDecoder.PROTO3 : SpanBytesDecoder.JSON_V2; SpanProcessor processor = new SpanProcessor(sourceReceiver, serviceInventoryCache, endpointInventoryCache, encode); processor.convert(config, decoder, request); diff --git a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/trace/SpanForward.java b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/trace/SpanForward.java index 84353e8c6a94..5d39bf9f618e 100644 --- a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/trace/SpanForward.java +++ b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/trace/SpanForward.java @@ -22,19 +22,18 @@ import org.apache.skywalking.apm.util.StringUtil; import org.apache.skywalking.oap.server.core.Const; import org.apache.skywalking.oap.server.core.analysis.TimeBucket; -import org.apache.skywalking.oap.server.core.cache.*; -import org.apache.skywalking.oap.server.core.source.*; -import org.apache.skywalking.oap.server.library.util.*; +import org.apache.skywalking.oap.server.core.cache.EndpointInventoryCache; +import org.apache.skywalking.oap.server.core.cache.ServiceInventoryCache; +import org.apache.skywalking.oap.server.core.source.DetectPoint; +import org.apache.skywalking.oap.server.core.source.SourceReceiver; +import org.apache.skywalking.oap.server.library.util.BooleanUtils; import org.apache.skywalking.oap.server.receiver.sharing.server.CoreRegisterLinker; -import org.apache.skywalking.oap.server.receiver.zipkin.*; +import org.apache.skywalking.oap.server.receiver.zipkin.ZipkinReceiverConfig; import org.apache.skywalking.oap.server.receiver.zipkin.handler.SpanEncode; import org.apache.skywalking.oap.server.storage.plugin.zipkin.ZipkinSpan; import zipkin2.Span; import zipkin2.codec.SpanBytesEncoder; -/** - * @author wusheng - */ public class SpanForward { private ZipkinReceiverConfig config; private SourceReceiver receiver; @@ -43,8 +42,7 @@ public class SpanForward { private int encode; public SpanForward(ZipkinReceiverConfig config, SourceReceiver receiver, - ServiceInventoryCache serviceInventoryCache, - EndpointInventoryCache endpointInventoryCache, int encode) { + ServiceInventoryCache serviceInventoryCache, EndpointInventoryCache endpointInventoryCache, int encode) { this.config = config; this.receiver = receiver; this.serviceInventoryCache = serviceInventoryCache; @@ -78,12 +76,12 @@ public void send(List spanList) { case SERVER: case CONSUMER: if (!StringUtil.isEmpty(spanName) && serviceId != Const.NONE) { - int endpointId = endpointInventoryCache.getEndpointId(serviceId, spanName, - DetectPoint.SERVER.ordinal()); + int endpointId = endpointInventoryCache.getEndpointId(serviceId, spanName, DetectPoint.SERVER.ordinal()); if (endpointId != Const.NONE) { zipkinSpan.setEndpointId(endpointId); } else if (config.isRegisterZipkinEndpoint()) { - CoreRegisterLinker.getEndpointInventoryRegister().getOrCreate(serviceId, spanName, DetectPoint.SERVER); + CoreRegisterLinker.getEndpointInventoryRegister() + .getOrCreate(serviceId, spanName, DetectPoint.SERVER); } } } @@ -102,7 +100,7 @@ public void send(List spanList) { zipkinSpan.setEndTime(startTime + latency); zipkinSpan.setIsError(BooleanUtils.booleanToValue(false)); zipkinSpan.setEncode(SpanEncode.PROTO3); - zipkinSpan.setLatency((int)latency); + zipkinSpan.setLatency((int) latency); zipkinSpan.setDataBinary(SpanBytesEncoder.PROTO3.encode(span)); receiver.receive(zipkinSpan); diff --git a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/transform/SpringSleuthSegmentBuilderTest.java b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/transform/SpringSleuthSegmentBuilderTest.java index 905f0f732fcc..0cc0b6c4ec45 100644 --- a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/transform/SpringSleuthSegmentBuilderTest.java +++ b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/zipkin/analysis/transform/SpringSleuthSegmentBuilderTest.java @@ -20,21 +20,26 @@ import com.google.gson.JsonObject; import java.io.UnsupportedEncodingException; -import java.util.*; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import org.apache.skywalking.apm.network.language.agent.SpanType; -import org.apache.skywalking.apm.network.language.agent.v2.*; +import org.apache.skywalking.apm.network.language.agent.v2.SegmentObject; +import org.apache.skywalking.apm.network.language.agent.v2.SegmentReference; +import org.apache.skywalking.apm.network.language.agent.v2.SpanObjectV2; import org.apache.skywalking.oap.server.core.register.NodeType; -import org.apache.skywalking.oap.server.core.register.service.*; +import org.apache.skywalking.oap.server.core.register.service.IServiceInstanceInventoryRegister; +import org.apache.skywalking.oap.server.core.register.service.IServiceInventoryRegister; import org.apache.skywalking.oap.server.receiver.sharing.server.CoreRegisterLinker; -import org.apache.skywalking.oap.server.receiver.zipkin.analysis.data.*; -import org.junit.*; +import org.apache.skywalking.oap.server.receiver.zipkin.analysis.data.SkyWalkingTrace; +import org.apache.skywalking.oap.server.receiver.zipkin.analysis.data.ZipkinTrace; +import org.junit.Assert; +import org.junit.Test; import org.powermock.reflect.Whitebox; import zipkin2.Span; import zipkin2.codec.SpanBytesDecoder; -/** - * @author wusheng - */ public class SpringSleuthSegmentBuilderTest implements SegmentListener { private Map applicationInstRegister = new HashMap<>(); private Map applicationRegister = new HashMap<>(); @@ -45,7 +50,8 @@ public class SpringSleuthSegmentBuilderTest implements SegmentListener { public void testTransform() throws Exception { IServiceInventoryRegister applicationIDService = new IServiceInventoryRegister() { - @Override public int getOrCreate(String serviceName, JsonObject properties) { + @Override + public int getOrCreate(String serviceName, JsonObject properties) { String key = "AppCode:" + serviceName; if (applicationRegister.containsKey(key)) { return applicationRegister.get(key); @@ -56,11 +62,13 @@ public void testTransform() throws Exception { } } - @Override public int getOrCreate(String serviceName, NodeType nodeType, JsonObject properties) { + @Override + public int getOrCreate(String serviceName, NodeType nodeType, JsonObject properties) { return getOrCreate(serviceName, properties); } - @Override public int getOrCreate(int addressId, String serviceName, JsonObject properties) { + @Override + public int getOrCreate(int addressId, String serviceName, JsonObject properties) { String key = "Address:" + serviceName; if (applicationRegister.containsKey(key)) { return applicationRegister.get(key); @@ -71,24 +79,29 @@ public void testTransform() throws Exception { } } - @Override public void update(int serviceId, NodeType nodeType, JsonObject properties) { + @Override + public void update(int serviceId, NodeType nodeType, JsonObject properties) { } - @Override public void heartbeat(int serviceId, long heartBeatTime) { + @Override + public void heartbeat(int serviceId, long heartBeatTime) { } - @Override public void updateMapping(int serviceId, int mappingServiceId) { + @Override + public void updateMapping(int serviceId, int mappingServiceId) { } - @Override public void resetMapping(final int serviceId) { + @Override + public void resetMapping(final int serviceId) { } }; IServiceInstanceInventoryRegister instanceIDService = new IServiceInstanceInventoryRegister() { - @Override public int getOrCreate(int serviceId, String serviceInstanceName, String uuid, long registerTime, + @Override + public int getOrCreate(int serviceId, String serviceInstanceName, String uuid, long registerTime, JsonObject osInfo) { String key = "AppCode:" + serviceId + ",UUID:" + uuid; if (applicationInstRegister.containsKey(key)) { @@ -100,7 +113,8 @@ public void testTransform() throws Exception { } } - @Override public int getOrCreate(int serviceId, String serviceInstanceName, int addressId, long registerTime) { + @Override + public int getOrCreate(int serviceId, String serviceInstanceName, int addressId, long registerTime) { String key = "VitualAppCode:" + serviceId + ",getAddress:" + addressId; if (applicationInstRegister.containsKey(key)) { return applicationInstRegister.get(key); @@ -116,7 +130,8 @@ public void update(int serviceInstanceId, NodeType nodeType, JsonObject properti } - @Override public void heartbeat(int serviceInstanceId, long heartBeatTime) { + @Override + public void heartbeat(int serviceInstanceId, long heartBeatTime) { } diff --git a/oap-server/server-starter-es7/pom.xml b/oap-server/server-starter-es7/pom.xml index 37513e9d7480..a8873743f6b3 100644 --- a/oap-server/server-starter-es7/pom.xml +++ b/oap-server/server-starter-es7/pom.xml @@ -17,7 +17,8 @@ ~ --> - + oap-server org.apache.skywalking diff --git a/oap-server/server-starter-es7/src/main/java/org/apache/skywalking/oap/server/starter/OAPServerStartUp.java b/oap-server/server-starter-es7/src/main/java/org/apache/skywalking/oap/server/starter/OAPServerStartUp.java index 003dd09b8d28..6dd180afdbf8 100644 --- a/oap-server/server-starter-es7/src/main/java/org/apache/skywalking/oap/server/starter/OAPServerStartUp.java +++ b/oap-server/server-starter-es7/src/main/java/org/apache/skywalking/oap/server/starter/OAPServerStartUp.java @@ -18,10 +18,6 @@ package org.apache.skywalking.oap.server.starter; -/** - * @author peng-yongsheng - * @author kezhenxu94 - */ public class OAPServerStartUp { public static void main(String[] args) { diff --git a/oap-server/server-starter/pom.xml b/oap-server/server-starter/pom.xml index 47a18070174a..824ea37a6d82 100644 --- a/oap-server/server-starter/pom.xml +++ b/oap-server/server-starter/pom.xml @@ -17,7 +17,8 @@ ~ --> - + oap-server org.apache.skywalking diff --git a/oap-server/server-starter/src/main/java/org/apache/skywalking/oap/server/starter/OAPServerStartUp.java b/oap-server/server-starter/src/main/java/org/apache/skywalking/oap/server/starter/OAPServerStartUp.java index 003dd09b8d28..6dd180afdbf8 100644 --- a/oap-server/server-starter/src/main/java/org/apache/skywalking/oap/server/starter/OAPServerStartUp.java +++ b/oap-server/server-starter/src/main/java/org/apache/skywalking/oap/server/starter/OAPServerStartUp.java @@ -18,10 +18,6 @@ package org.apache.skywalking.oap.server.starter; -/** - * @author peng-yongsheng - * @author kezhenxu94 - */ public class OAPServerStartUp { public static void main(String[] args) { diff --git a/oap-server/server-storage-plugin/pom.xml b/oap-server/server-storage-plugin/pom.xml index c5a64f178ce9..5826106469e6 100644 --- a/oap-server/server-storage-plugin/pom.xml +++ b/oap-server/server-storage-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + oap-server org.apache.skywalking diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/pom.xml b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/pom.xml index e2fb690c15d4..ed6c661f08fd 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/pom.xml +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + server-storage-plugin org.apache.skywalking diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchConfig.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchConfig.java index 46db72dbca7a..dd7de6a9c10a 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchConfig.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchConfig.java @@ -22,36 +22,60 @@ import lombok.Setter; import org.apache.skywalking.oap.server.library.module.ModuleConfig; -/** - * @author peng-yongsheng, jian.tan - */ @Getter public class StorageModuleElasticsearchConfig extends ModuleConfig { - @Setter private String nameSpace; - @Setter private String clusterNodes; - @Getter @Setter String protocol = "http"; - @Setter private int indexShardsNumber = 2; - @Setter private int indexReplicasNumber = 0; - @Setter private int indexRefreshInterval = 2; - @Setter private int bulkActions = 2000; - @Setter private int flushInterval = 10; - @Setter private int concurrentRequests = 2; - @Setter private int syncBulkActions = 3; - @Setter private String user; - @Setter private String password; - @Getter @Setter String trustStorePath; - @Getter @Setter String trustStorePass; - @Setter private int resultWindowMaxSize = 10000; - @Setter private int metadataQueryMaxSize = 5000; - @Setter private int segmentQueryMaxSize = 200; - @Setter private int profileTaskQueryMaxSize = 200; - @Setter private int recordDataTTL = 7; - @Setter private int minuteMetricsDataTTL = 2; - @Setter private int hourMetricsDataTTL = 2; - @Setter private int dayMetricsDataTTL = 2; + @Setter + private String nameSpace; + @Setter + private String clusterNodes; + @Getter + @Setter + String protocol = "http"; + @Setter + private int indexShardsNumber = 2; + @Setter + private int indexReplicasNumber = 0; + @Setter + private int indexRefreshInterval = 2; + @Setter + private int bulkActions = 2000; + @Setter + private int flushInterval = 10; + @Setter + private int concurrentRequests = 2; + @Setter + private int syncBulkActions = 3; + @Setter + private String user; + @Setter + private String password; + @Getter + @Setter + String trustStorePath; + @Getter + @Setter + String trustStorePass; + @Setter + private int resultWindowMaxSize = 10000; + @Setter + private int metadataQueryMaxSize = 5000; + @Setter + private int segmentQueryMaxSize = 200; + @Setter + private int profileTaskQueryMaxSize = 200; + @Setter + private int recordDataTTL = 7; + @Setter + private int minuteMetricsDataTTL = 2; + @Setter + private int hourMetricsDataTTL = 2; + @Setter + private int dayMetricsDataTTL = 2; private int otherMetricsDataTTL = 0; - @Setter private int monthMetricsDataTTL = 18; - @Setter private String advanced; + @Setter + private int monthMetricsDataTTL = 18; + @Setter + private String advanced; public int getMinuteMetricsDataTTL() { if (otherMetricsDataTTL > 0) { diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchProvider.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchProvider.java index c01679f0d243..eaf115eed8c2 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchProvider.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchProvider.java @@ -63,12 +63,19 @@ import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.cache.ServiceInventoryCacheEsDAO; import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.lock.RegisterLockDAOImpl; import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.lock.RegisterLockInstaller; -import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.query.*; +import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.query.AggregationQueryEsDAO; +import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.query.AlarmQueryEsDAO; +import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.query.LogQueryEsDAO; +import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.query.MetadataQueryEsDAO; +import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.query.MetricsQueryEsDAO; +import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.query.ProfileTaskLogEsDAO; +import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.query.ProfileTaskQueryEsDAO; +import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.query.ProfileThreadSnapshotQueryEsDAO; +import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.query.TopNRecordsQueryEsDAO; +import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.query.TopologyQueryEsDAO; +import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.query.TraceQueryEsDAO; import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.ttl.ElasticsearchStorageTTL; -/** - * @author peng-yongsheng, jian.tan - */ public class StorageModuleElasticsearchProvider extends ModuleProvider { protected final StorageModuleElasticsearchConfig config; @@ -99,17 +106,22 @@ public void prepare() throws ServiceNotProvidedException { if (!StringUtil.isEmpty(config.getNameSpace())) { config.setNameSpace(config.getNameSpace().toLowerCase()); } - elasticSearchClient = new ElasticSearchClient(config.getClusterNodes(), config.getProtocol(), config.getTrustStorePath(), config.getTrustStorePass(), config.getNameSpace(), config.getUser(), config.getPassword()); + elasticSearchClient = new ElasticSearchClient(config.getClusterNodes(), config.getProtocol(), config.getTrustStorePath(), config + .getTrustStorePass(), config.getNameSpace(), config.getUser(), config.getPassword()); - this.registerServiceImplementation(IBatchDAO.class, new BatchProcessEsDAO(elasticSearchClient, config.getBulkActions(), config.getFlushInterval(), config.getConcurrentRequests())); + this.registerServiceImplementation(IBatchDAO.class, new BatchProcessEsDAO(elasticSearchClient, config.getBulkActions(), config + .getFlushInterval(), config.getConcurrentRequests())); this.registerServiceImplementation(StorageDAO.class, new StorageEsDAO(elasticSearchClient)); this.registerServiceImplementation(IRegisterLockDAO.class, new RegisterLockDAOImpl(elasticSearchClient)); this.registerServiceImplementation(IHistoryDeleteDAO.class, new HistoryDeleteEsDAO(getManager(), elasticSearchClient, new ElasticsearchStorageTTL())); - this.registerServiceImplementation(IServiceInventoryCacheDAO.class, new ServiceInventoryCacheEsDAO(elasticSearchClient, config.getResultWindowMaxSize())); - this.registerServiceImplementation(IServiceInstanceInventoryCacheDAO.class, new ServiceInstanceInventoryCacheDAO(elasticSearchClient, config.getResultWindowMaxSize())); + this.registerServiceImplementation(IServiceInventoryCacheDAO.class, new ServiceInventoryCacheEsDAO(elasticSearchClient, config + .getResultWindowMaxSize())); + this.registerServiceImplementation(IServiceInstanceInventoryCacheDAO.class, new ServiceInstanceInventoryCacheDAO(elasticSearchClient, config + .getResultWindowMaxSize())); this.registerServiceImplementation(IEndpointInventoryCacheDAO.class, new EndpointInventoryCacheEsDAO(elasticSearchClient)); - this.registerServiceImplementation(INetworkAddressInventoryCacheDAO.class, new NetworkAddressInventoryCacheEsDAO(elasticSearchClient, config.getResultWindowMaxSize())); + this.registerServiceImplementation(INetworkAddressInventoryCacheDAO.class, new NetworkAddressInventoryCacheEsDAO(elasticSearchClient, config + .getResultWindowMaxSize())); this.registerServiceImplementation(ITopologyQueryDAO.class, new TopologyQueryEsDAO(elasticSearchClient)); this.registerServiceImplementation(IMetricsQueryDAO.class, new MetricsQueryEsDAO(elasticSearchClient)); @@ -120,9 +132,12 @@ public void prepare() throws ServiceNotProvidedException { this.registerServiceImplementation(ITopNRecordsQueryDAO.class, new TopNRecordsQueryEsDAO(elasticSearchClient)); this.registerServiceImplementation(ILogQueryDAO.class, new LogQueryEsDAO(elasticSearchClient)); - this.registerServiceImplementation(IProfileTaskQueryDAO.class, new ProfileTaskQueryEsDAO(elasticSearchClient, config.getProfileTaskQueryMaxSize())); - this.registerServiceImplementation(IProfileTaskLogQueryDAO.class, new ProfileTaskLogEsDAO(elasticSearchClient, config.getProfileTaskQueryMaxSize())); - this.registerServiceImplementation(IProfileThreadSnapshotQueryDAO.class, new ProfileThreadSnapshotQueryEsDAO(elasticSearchClient, config.getProfileTaskQueryMaxSize())); + this.registerServiceImplementation(IProfileTaskQueryDAO.class, new ProfileTaskQueryEsDAO(elasticSearchClient, config + .getProfileTaskQueryMaxSize())); + this.registerServiceImplementation(IProfileTaskLogQueryDAO.class, new ProfileTaskLogEsDAO(elasticSearchClient, config + .getProfileTaskQueryMaxSize())); + this.registerServiceImplementation(IProfileThreadSnapshotQueryDAO.class, new ProfileThreadSnapshotQueryEsDAO(elasticSearchClient, config + .getProfileTaskQueryMaxSize())); } @Override diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/BatchProcessEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/BatchProcessEsDAO.java index da8f4e4f8b22..842ef6fb6f16 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/BatchProcessEsDAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/BatchProcessEsDAO.java @@ -21,16 +21,16 @@ import java.util.List; import org.apache.skywalking.oap.server.core.storage.IBatchDAO; import org.apache.skywalking.oap.server.library.client.elasticsearch.ElasticSearchClient; -import org.apache.skywalking.oap.server.library.client.request.*; +import org.apache.skywalking.oap.server.library.client.request.InsertRequest; +import org.apache.skywalking.oap.server.library.client.request.PrepareRequest; import org.apache.skywalking.oap.server.library.util.CollectionUtils; -import org.elasticsearch.action.bulk.*; +import org.elasticsearch.action.bulk.BulkProcessor; +import org.elasticsearch.action.bulk.BulkRequest; import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.action.update.UpdateRequest; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng - */ public class BatchProcessEsDAO extends EsDAO implements IBatchDAO { private static final Logger logger = LoggerFactory.getLogger(BatchProcessEsDAO.class); @@ -40,31 +40,32 @@ public class BatchProcessEsDAO extends EsDAO implements IBatchDAO { private final int flushInterval; private final int concurrentRequests; - public BatchProcessEsDAO(ElasticSearchClient client, int bulkActions, int flushInterval, - int concurrentRequests) { + public BatchProcessEsDAO(ElasticSearchClient client, int bulkActions, int flushInterval, int concurrentRequests) { super(client); this.bulkActions = bulkActions; this.flushInterval = flushInterval; this.concurrentRequests = concurrentRequests; } - @Override public void asynchronous(InsertRequest insertRequest) { + @Override + public void asynchronous(InsertRequest insertRequest) { if (bulkProcessor == null) { this.bulkProcessor = getClient().createBulkProcessor(bulkActions, flushInterval, concurrentRequests); } - this.bulkProcessor.add((IndexRequest)insertRequest); + this.bulkProcessor.add((IndexRequest) insertRequest); } - @Override public void synchronous(List prepareRequests) { + @Override + public void synchronous(List prepareRequests) { if (CollectionUtils.isNotEmpty(prepareRequests)) { BulkRequest request = new BulkRequest(); for (PrepareRequest prepareRequest : prepareRequests) { if (prepareRequest instanceof InsertRequest) { - request.add((IndexRequest)prepareRequest); + request.add((IndexRequest) prepareRequest); } else { - request.add((UpdateRequest)prepareRequest); + request.add((UpdateRequest) prepareRequest); } } getClient().synchronousBulk(request); diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/ColumnTypeEsMapping.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/ColumnTypeEsMapping.java index 958fcada087c..6d20a9a2659f 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/ColumnTypeEsMapping.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/ColumnTypeEsMapping.java @@ -21,12 +21,10 @@ import org.apache.skywalking.oap.server.core.analysis.metrics.IntKeyLongValueHashMap; import org.apache.skywalking.oap.server.core.storage.model.DataTypeMapping; -/** - * @author peng-yongsheng - */ public class ColumnTypeEsMapping implements DataTypeMapping { - @Override public String transform(Class type) { + @Override + public String transform(Class type) { if (Integer.class.equals(type) || int.class.equals(type)) { return "integer"; } else if (Long.class.equals(type) || long.class.equals(type)) { diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/EsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/EsDAO.java index 38225eee5039..d98184f92a47 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/EsDAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/EsDAO.java @@ -25,13 +25,13 @@ import org.apache.skywalking.oap.server.core.storage.AbstractDAO; import org.apache.skywalking.oap.server.core.storage.type.StorageDataType; import org.apache.skywalking.oap.server.library.client.elasticsearch.ElasticSearchClient; -import org.elasticsearch.common.xcontent.*; -import org.elasticsearch.index.query.*; +import org.elasticsearch.common.xcontent.XContentBuilder; +import org.elasticsearch.common.xcontent.XContentFactory; +import org.elasticsearch.index.query.BoolQueryBuilder; +import org.elasticsearch.index.query.QueryBuilders; +import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.search.builder.SearchSourceBuilder; -/** - * @author peng-yongsheng - */ public abstract class EsDAO extends AbstractDAO { public EsDAO(ElasticSearchClient client) { @@ -63,7 +63,7 @@ protected XContentBuilder map2builder(Map objectMap) throws IOEx for (String key : objectMap.keySet()) { Object value = objectMap.get(key); if (value instanceof StorageDataType) { - builder.field(key, ((StorageDataType)value).toStorageData()); + builder.field(key, ((StorageDataType) value).toStorageData()); } else { builder.field(key, value); } diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/HistoryDeleteEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/HistoryDeleteEsDAO.java index e780e1fe1c06..250857e51b55 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/HistoryDeleteEsDAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/HistoryDeleteEsDAO.java @@ -19,7 +19,8 @@ package org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.config.ConfigService; import org.apache.skywalking.oap.server.core.storage.IHistoryDeleteDAO; @@ -29,11 +30,9 @@ import org.apache.skywalking.oap.server.library.client.elasticsearch.ElasticSearchClient; import org.apache.skywalking.oap.server.library.module.ModuleDefineHolder; import org.joda.time.DateTime; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng - */ public class HistoryDeleteEsDAO extends EsDAO implements IHistoryDeleteDAO { private static final Logger logger = LoggerFactory.getLogger(HistoryDeleteEsDAO.class); @@ -41,7 +40,8 @@ public class HistoryDeleteEsDAO extends EsDAO implements IHistoryDeleteDAO { private final StorageTTL storageTTL; private final ModuleDefineHolder moduleDefineHolder; - public HistoryDeleteEsDAO(ModuleDefineHolder moduleDefineHolder, ElasticSearchClient client, StorageTTL storageTTL) { + public HistoryDeleteEsDAO(ModuleDefineHolder moduleDefineHolder, ElasticSearchClient client, + StorageTTL storageTTL) { super(client); this.moduleDefineHolder = moduleDefineHolder; this.storageTTL = storageTTL; @@ -49,7 +49,9 @@ public HistoryDeleteEsDAO(ModuleDefineHolder moduleDefineHolder, ElasticSearchCl @Override public void deleteHistory(Model model, String timeBucketColumnName) throws IOException { - ConfigService configService = moduleDefineHolder.find(CoreModule.NAME).provider().getService(ConfigService.class); + ConfigService configService = moduleDefineHolder.find(CoreModule.NAME) + .provider() + .getService(ConfigService.class); ElasticSearchClient client = getClient(); TTLCalculator ttlCalculator; diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/MatchCNameBuilder.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/MatchCNameBuilder.java index d650bf934d57..32048777352a 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/MatchCNameBuilder.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/MatchCNameBuilder.java @@ -20,9 +20,6 @@ import org.apache.skywalking.oap.server.core.Const; -/** - * @author peng-yongsheng - */ public enum MatchCNameBuilder { INSTANCE; diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/MetricsEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/MetricsEsDAO.java index 01d32ce47648..f40a44d1d044 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/MetricsEsDAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/MetricsEsDAO.java @@ -19,19 +19,18 @@ package org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import org.apache.skywalking.oap.server.core.analysis.metrics.Metrics; -import org.apache.skywalking.oap.server.core.storage.*; +import org.apache.skywalking.oap.server.core.storage.IMetricsDAO; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.model.Model; -import org.apache.skywalking.oap.server.library.client.elasticsearch.*; +import org.apache.skywalking.oap.server.library.client.elasticsearch.ElasticSearchClient; import org.apache.skywalking.oap.server.library.client.request.InsertRequest; import org.apache.skywalking.oap.server.library.client.request.UpdateRequest; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.xcontent.XContentBuilder; -/** - * @author peng-yongsheng - */ public class MetricsEsDAO extends EsDAO implements IMetricsDAO { protected final StorageBuilder storageBuilder; @@ -41,10 +40,11 @@ protected MetricsEsDAO(ElasticSearchClient client, StorageBuilder stora this.storageBuilder = storageBuilder; } - @Override public List multiGet(Model model, List ids) throws IOException { + @Override + public List multiGet(Model model, List ids) throws IOException { SearchResponse response = getClient().ids(model.getName(), ids.toArray(new String[0])); - List result = new ArrayList<>((int)response.getHits().totalHits); + List result = new ArrayList<>((int) response.getHits().totalHits); for (int i = 0; i < response.getHits().totalHits; i++) { Metrics source = storageBuilder.map2Data(response.getHits().getAt(i).getSourceAsMap()); result.add(source); @@ -52,13 +52,15 @@ protected MetricsEsDAO(ElasticSearchClient client, StorageBuilder stora return result; } - @Override public InsertRequest prepareBatchInsert(Model model, Metrics metrics) throws IOException { + @Override + public InsertRequest prepareBatchInsert(Model model, Metrics metrics) throws IOException { XContentBuilder builder = map2builder(storageBuilder.data2Map(metrics)); String modelName = TimeSeriesUtils.timeSeries(model, metrics.getTimeBucket()); return getClient().prepareInsert(modelName, metrics.id(), builder); } - @Override public UpdateRequest prepareBatchUpdate(Model model, Metrics metrics) throws IOException { + @Override + public UpdateRequest prepareBatchUpdate(Model model, Metrics metrics) throws IOException { XContentBuilder builder = map2builder(storageBuilder.data2Map(metrics)); String modelName = TimeSeriesUtils.timeSeries(model, metrics.getTimeBucket()); return getClient().prepareUpdate(modelName, metrics.id(), builder); diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/NoneStreamEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/NoneStreamEsDAO.java index 1608d2583cea..28593239a28c 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/NoneStreamEsDAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/NoneStreamEsDAO.java @@ -18,6 +18,7 @@ package org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base; +import java.io.IOException; import org.apache.skywalking.oap.server.core.analysis.config.NoneStream; import org.apache.skywalking.oap.server.core.storage.INoneStreamDAO; import org.apache.skywalking.oap.server.core.storage.StorageBuilder; @@ -25,12 +26,8 @@ import org.apache.skywalking.oap.server.library.client.elasticsearch.ElasticSearchClient; import org.elasticsearch.common.xcontent.XContentBuilder; -import java.io.IOException; - /** * Synchronize storage Elasticsearch implements - * - * @author MrPro */ public class NoneStreamEsDAO extends EsDAO implements INoneStreamDAO { diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/RecordEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/RecordEsDAO.java index bf90163c044b..afd11f00ad22 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/RecordEsDAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/RecordEsDAO.java @@ -20,15 +20,13 @@ import java.io.IOException; import org.apache.skywalking.oap.server.core.analysis.record.Record; -import org.apache.skywalking.oap.server.core.storage.*; +import org.apache.skywalking.oap.server.core.storage.IRecordDAO; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.model.Model; import org.apache.skywalking.oap.server.library.client.elasticsearch.ElasticSearchClient; import org.apache.skywalking.oap.server.library.client.request.InsertRequest; import org.elasticsearch.common.xcontent.XContentBuilder; -/** - * @author peng-yongsheng - */ public class RecordEsDAO extends EsDAO implements IRecordDAO { private final StorageBuilder storageBuilder; @@ -38,7 +36,8 @@ public RecordEsDAO(ElasticSearchClient client, StorageBuilder storageBui this.storageBuilder = storageBuilder; } - @Override public InsertRequest prepareBatchInsert(Model model, Record record) throws IOException { + @Override + public InsertRequest prepareBatchInsert(Model model, Record record) throws IOException { XContentBuilder builder = map2builder(storageBuilder.data2Map(record)); String modelName = TimeSeriesUtils.timeSeries(model, record.getTimeBucket()); return getClient().prepareInsert(modelName, record.id(), builder); diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/RegisterEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/RegisterEsDAO.java index 6eeceb6a8325..6134c24374c7 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/RegisterEsDAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/RegisterEsDAO.java @@ -20,14 +20,12 @@ import java.io.IOException; import org.apache.skywalking.oap.server.core.register.RegisterSource; -import org.apache.skywalking.oap.server.core.storage.*; +import org.apache.skywalking.oap.server.core.storage.IRegisterDAO; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.library.client.elasticsearch.ElasticSearchClient; import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.common.xcontent.XContentBuilder; -/** - * @author peng-yongsheng - */ public class RegisterEsDAO extends EsDAO implements IRegisterDAO { private final StorageBuilder storageBuilder; @@ -37,7 +35,8 @@ public RegisterEsDAO(ElasticSearchClient client, StorageBuilder this.storageBuilder = storageBuilder; } - @Override public RegisterSource get(String modelName, String id) throws IOException { + @Override + public RegisterSource get(String modelName, String id) throws IOException { GetResponse response = getClient().get(modelName, id); if (response.isExists()) { return storageBuilder.map2Data(response.getSource()); @@ -46,12 +45,14 @@ public RegisterEsDAO(ElasticSearchClient client, StorageBuilder } } - @Override public void forceInsert(String modelName, RegisterSource source) throws IOException { + @Override + public void forceInsert(String modelName, RegisterSource source) throws IOException { XContentBuilder builder = map2builder(storageBuilder.data2Map(source)); getClient().forceInsert(modelName, source.id(), builder); } - @Override public void forceUpdate(String modelName, RegisterSource source) throws IOException { + @Override + public void forceUpdate(String modelName, RegisterSource source) throws IOException { XContentBuilder builder = map2builder(storageBuilder.data2Map(source)); getClient().forceUpdate(modelName, source.id(), builder); } diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/StorageEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/StorageEsDAO.java index 851f984817a4..685fd0cd2951 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/StorageEsDAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/StorageEsDAO.java @@ -22,27 +22,32 @@ import org.apache.skywalking.oap.server.core.analysis.metrics.Metrics; import org.apache.skywalking.oap.server.core.analysis.record.Record; import org.apache.skywalking.oap.server.core.register.RegisterSource; -import org.apache.skywalking.oap.server.core.storage.*; +import org.apache.skywalking.oap.server.core.storage.IMetricsDAO; +import org.apache.skywalking.oap.server.core.storage.INoneStreamDAO; +import org.apache.skywalking.oap.server.core.storage.IRecordDAO; +import org.apache.skywalking.oap.server.core.storage.IRegisterDAO; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.StorageDAO; import org.apache.skywalking.oap.server.library.client.elasticsearch.ElasticSearchClient; -/** - * @author peng-yongsheng - */ public class StorageEsDAO extends EsDAO implements StorageDAO { public StorageEsDAO(ElasticSearchClient client) { super(client); } - @Override public IMetricsDAO newMetricsDao(StorageBuilder storageBuilder) { + @Override + public IMetricsDAO newMetricsDao(StorageBuilder storageBuilder) { return new MetricsEsDAO(getClient(), storageBuilder); } - @Override public IRegisterDAO newRegisterDao(StorageBuilder storageBuilder) { + @Override + public IRegisterDAO newRegisterDao(StorageBuilder storageBuilder) { return new RegisterEsDAO(getClient(), storageBuilder); } - @Override public IRecordDAO newRecordDao(StorageBuilder storageBuilder) { + @Override + public IRecordDAO newRecordDao(StorageBuilder storageBuilder) { return new RecordEsDAO(getClient(), storageBuilder); } diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/StorageEsInstaller.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/StorageEsInstaller.java index 7a173010b1fb..c1b08ac7d15d 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/StorageEsInstaller.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/StorageEsInstaller.java @@ -35,9 +35,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng, jian.tan - */ public class StorageEsInstaller extends ModelInstaller { private static final Logger logger = LoggerFactory.getLogger(StorageEsInstaller.class); @@ -52,8 +49,9 @@ public StorageEsInstaller(ModuleManager moduleManager, final StorageModuleElasti this.config = config; } - @Override protected boolean isExists(Client client, Model model) throws StorageException { - ElasticSearchClient esClient = (ElasticSearchClient)client; + @Override + protected boolean isExists(Client client, Model model) throws StorageException { + ElasticSearchClient esClient = (ElasticSearchClient) client; try { if (model.isCapableOfTimeSeries()) { return esClient.isExistsTemplate(model.getName()) && esClient.isExistsIndex(model.getName()); @@ -65,12 +63,14 @@ public StorageEsInstaller(ModuleManager moduleManager, final StorageModuleElasti } } - @Override protected void createTable(Client client, Model model) throws StorageException { - ElasticSearchClient esClient = (ElasticSearchClient)client; + @Override + protected void createTable(Client client, Model model) throws StorageException { + ElasticSearchClient esClient = (ElasticSearchClient) client; Map settings = createSetting(model.isRecord()); Map mapping = createMapping(model); - logger.info("index {}'s columnTypeEsMapping builder str: {}", esClient.formatIndexName(model.getName()), mapping.toString()); + logger.info("index {}'s columnTypeEsMapping builder str: {}", esClient.formatIndexName(model.getName()), mapping + .toString()); try { if (model.isCapableOfTimeSeries()) { @@ -105,7 +105,9 @@ protected Map createSetting(boolean record) { Map setting = new HashMap<>(); setting.put("index.number_of_shards", config.getIndexShardsNumber()); setting.put("index.number_of_replicas", config.getIndexReplicasNumber()); - setting.put("index.refresh_interval", record ? TimeValue.timeValueSeconds(10).toString() : TimeValue.timeValueSeconds(config.getFlushInterval()).toString()); + setting.put("index.refresh_interval", record ? TimeValue.timeValueSeconds(10) + .toString() : TimeValue.timeValueSeconds(config.getFlushInterval()) + .toString()); setting.put("analysis.analyzer.oap_analyzer.type", "stop"); if (!StringUtil.isEmpty(config.getAdvanced())) { Map advancedSettings = gson.fromJson(config.getAdvanced(), Map.class); diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/TimeSeriesUtils.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/TimeSeriesUtils.java index 01bb8b07dacb..79d113a01c6a 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/TimeSeriesUtils.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/TimeSeriesUtils.java @@ -18,12 +18,10 @@ package org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.analysis.*; +import org.apache.skywalking.oap.server.core.analysis.Downsampling; +import org.apache.skywalking.oap.server.core.analysis.TimeBucket; import org.apache.skywalking.oap.server.core.storage.model.Model; -/** - * @author peng-yongsheng - */ public class TimeSeriesUtils { public static String timeSeries(Model model) { diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/EndpointInventoryCacheEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/EndpointInventoryCacheEsDAO.java index f1ed56a24ed4..c41a623528a3 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/EndpointInventoryCacheEsDAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/EndpointInventoryCacheEsDAO.java @@ -19,7 +19,8 @@ package org.apache.skywalking.oap.server.storage.plugin.elasticsearch.cache; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.register.*; +import org.apache.skywalking.oap.server.core.register.EndpointInventory; +import org.apache.skywalking.oap.server.core.register.RegisterSource; import org.apache.skywalking.oap.server.core.storage.cache.IEndpointInventoryCacheDAO; import org.apache.skywalking.oap.server.library.client.elasticsearch.ElasticSearchClient; import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base.EsDAO; @@ -28,11 +29,9 @@ import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.builder.SearchSourceBuilder; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng - */ public class EndpointInventoryCacheEsDAO extends EsDAO implements IEndpointInventoryCacheDAO { private static final Logger logger = LoggerFactory.getLogger(EndpointInventoryCacheEsDAO.class); @@ -43,12 +42,13 @@ public EndpointInventoryCacheEsDAO(ElasticSearchClient client) { super(client); } - @Override public int getEndpointId(int serviceId, String endpointName, int detectPoint) { + @Override + public int getEndpointId(int serviceId, String endpointName, int detectPoint) { try { String id = EndpointInventory.buildId(serviceId, endpointName, detectPoint); GetResponse response = getClient().get(EndpointInventory.INDEX_NAME, id); if (response.isExists()) { - return (int)response.getSource().getOrDefault(RegisterSource.SEQUENCE, 0); + return (int) response.getSource().getOrDefault(RegisterSource.SEQUENCE, 0); } else { return Const.NONE; } @@ -58,7 +58,8 @@ public EndpointInventoryCacheEsDAO(ElasticSearchClient client) { } } - @Override public EndpointInventory get(int endpointId) { + @Override + public EndpointInventory get(int endpointId) { try { SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder(); searchSourceBuilder.query(QueryBuilders.termQuery(EndpointInventory.SEQUENCE, endpointId)); diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/NetworkAddressInventoryCacheEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/NetworkAddressInventoryCacheEsDAO.java index e823a42dfc18..932ddfecadf0 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/NetworkAddressInventoryCacheEsDAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/NetworkAddressInventoryCacheEsDAO.java @@ -18,7 +18,8 @@ package org.apache.skywalking.oap.server.storage.plugin.elasticsearch.cache; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import org.apache.skywalking.oap.server.core.Const; import org.apache.skywalking.oap.server.core.register.NetworkAddressInventory; import org.apache.skywalking.oap.server.core.storage.cache.INetworkAddressInventoryCacheDAO; @@ -29,11 +30,9 @@ import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.builder.SearchSourceBuilder; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng, jian.tan - */ public class NetworkAddressInventoryCacheEsDAO extends EsDAO implements INetworkAddressInventoryCacheDAO { private static final Logger logger = LoggerFactory.getLogger(NetworkAddressInventoryCacheEsDAO.class); @@ -46,12 +45,13 @@ public NetworkAddressInventoryCacheEsDAO(ElasticSearchClient client, int resultW this.resultWindowMaxSize = resultWindowMaxSize; } - @Override public int getAddressId(String networkAddress) { + @Override + public int getAddressId(String networkAddress) { try { String id = NetworkAddressInventory.buildId(networkAddress); GetResponse response = getClient().get(NetworkAddressInventory.INDEX_NAME, id); if (response.isExists()) { - return (int)response.getSource().getOrDefault(NetworkAddressInventory.SEQUENCE, 0); + return (int) response.getSource().getOrDefault(NetworkAddressInventory.SEQUENCE, 0); } else { return Const.NONE; } @@ -61,7 +61,8 @@ public NetworkAddressInventoryCacheEsDAO(ElasticSearchClient client, int resultW } } - @Override public NetworkAddressInventory get(int addressId) { + @Override + public NetworkAddressInventory get(int addressId) { try { SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder(); searchSourceBuilder.query(QueryBuilders.termQuery(NetworkAddressInventory.SEQUENCE, addressId)); @@ -80,12 +81,14 @@ public NetworkAddressInventoryCacheEsDAO(ElasticSearchClient client, int resultW } } - @Override public List loadLastUpdate(long lastUpdateTime) { + @Override + public List loadLastUpdate(long lastUpdateTime) { List addressInventories = new ArrayList<>(); try { SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder(); - searchSourceBuilder.query(QueryBuilders.rangeQuery(NetworkAddressInventory.LAST_UPDATE_TIME).gte(lastUpdateTime)); + searchSourceBuilder.query(QueryBuilders.rangeQuery(NetworkAddressInventory.LAST_UPDATE_TIME) + .gte(lastUpdateTime)); searchSourceBuilder.size(resultWindowMaxSize); SearchResponse response = getClient().search(NetworkAddressInventory.INDEX_NAME, searchSourceBuilder); diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/ServiceInstanceInventoryCacheDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/ServiceInstanceInventoryCacheDAO.java index 80d5ce22b923..57feaa4fa0c8 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/ServiceInstanceInventoryCacheDAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/ServiceInstanceInventoryCacheDAO.java @@ -37,9 +37,6 @@ import java.util.ArrayList; import java.util.List; -/** - * @author peng-yongsheng - */ public class ServiceInstanceInventoryCacheDAO extends EsDAO implements IServiceInstanceInventoryCacheDAO { private static final Logger logger = LoggerFactory.getLogger(ServiceInstanceInventoryCacheDAO.class); @@ -52,7 +49,8 @@ public ServiceInstanceInventoryCacheDAO(ElasticSearchClient client, int resultWi this.resultWindowMaxSize = resultWindowMaxSize; } - @Override public ServiceInstanceInventory get(int serviceInstanceId) { + @Override + public ServiceInstanceInventory get(int serviceInstanceId) { try { SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder(); searchSourceBuilder.query(QueryBuilders.termQuery(ServiceInstanceInventory.SEQUENCE, serviceInstanceId)); @@ -71,17 +69,20 @@ public ServiceInstanceInventoryCacheDAO(ElasticSearchClient client, int resultWi } } - @Override public int getServiceInstanceId(int serviceId, String uuid) { + @Override + public int getServiceInstanceId(int serviceId, String uuid) { String id = ServiceInstanceInventory.buildId(serviceId, uuid); return get(id); } - @Override public int getServiceInstanceId(int serviceId, int addressId) { + @Override + public int getServiceInstanceId(int serviceId, int addressId) { String id = ServiceInstanceInventory.buildId(serviceId, addressId); return get(id); } - @Override public List loadLastUpdate(long lastUpdateTime) { + @Override + public List loadLastUpdate(long lastUpdateTime) { List instanceInventories = new ArrayList<>(); try { @@ -89,7 +90,8 @@ public ServiceInstanceInventoryCacheDAO(ElasticSearchClient client, int resultWi BoolQueryBuilder boolQuery = QueryBuilders.boolQuery(); boolQuery.must().add(QueryBuilders.termQuery(ServiceInstanceInventory.IS_ADDRESS, BooleanUtils.TRUE)); - boolQuery.must().add(QueryBuilders.rangeQuery(ServiceInstanceInventory.LAST_UPDATE_TIME).gte(lastUpdateTime)); + boolQuery.must() + .add(QueryBuilders.rangeQuery(ServiceInstanceInventory.LAST_UPDATE_TIME).gte(lastUpdateTime)); searchSourceBuilder.query(boolQuery); searchSourceBuilder.size(resultWindowMaxSize); @@ -109,7 +111,7 @@ private int get(String id) { try { GetResponse response = getClient().get(ServiceInstanceInventory.INDEX_NAME, id); if (response.isExists()) { - return (int)response.getSource().getOrDefault(RegisterSource.SEQUENCE, 0); + return (int) response.getSource().getOrDefault(RegisterSource.SEQUENCE, 0); } else { return Const.NONE; } diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/ServiceInventoryCacheEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/ServiceInventoryCacheEsDAO.java index a7ec6fcfc03a..0f3f66776216 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/ServiceInventoryCacheEsDAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/ServiceInventoryCacheEsDAO.java @@ -18,23 +18,24 @@ package org.apache.skywalking.oap.server.storage.plugin.elasticsearch.cache; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import org.apache.skywalking.oap.server.core.Const; -import org.apache.skywalking.oap.server.core.register.*; +import org.apache.skywalking.oap.server.core.register.RegisterSource; +import org.apache.skywalking.oap.server.core.register.ServiceInventory; import org.apache.skywalking.oap.server.core.storage.cache.IServiceInventoryCacheDAO; import org.apache.skywalking.oap.server.library.client.elasticsearch.ElasticSearchClient; import org.apache.skywalking.oap.server.library.util.BooleanUtils; import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base.EsDAO; import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.index.query.*; +import org.elasticsearch.index.query.BoolQueryBuilder; +import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.builder.SearchSourceBuilder; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng, jian.tan - */ public class ServiceInventoryCacheEsDAO extends EsDAO implements IServiceInventoryCacheDAO { private static final Logger logger = LoggerFactory.getLogger(ServiceInventoryCacheEsDAO.class); @@ -47,12 +48,14 @@ public ServiceInventoryCacheEsDAO(ElasticSearchClient client, int resultWindowMa this.resultWindowMaxSize = resultWindowMaxSize; } - @Override public int getServiceId(String serviceName) { + @Override + public int getServiceId(String serviceName) { String id = ServiceInventory.buildId(serviceName); return get(id); } - @Override public int getServiceId(int addressId) { + @Override + public int getServiceId(int addressId) { String id = ServiceInventory.buildId(addressId); return get(id); } @@ -61,7 +64,7 @@ private int get(String id) { try { GetResponse response = getClient().get(ServiceInventory.INDEX_NAME, id); if (response.isExists()) { - return (int)response.getSource().getOrDefault(RegisterSource.SEQUENCE, 0); + return (int) response.getSource().getOrDefault(RegisterSource.SEQUENCE, 0); } else { return Const.NONE; } @@ -71,7 +74,8 @@ private int get(String id) { } } - @Override public ServiceInventory get(int serviceId) { + @Override + public ServiceInventory get(int serviceId) { try { SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder(); searchSourceBuilder.query(QueryBuilders.termQuery(ServiceInventory.SEQUENCE, serviceId)); @@ -90,7 +94,8 @@ private int get(String id) { } } - @Override public List loadLastUpdate(long lastUpdateTime) { + @Override + public List loadLastUpdate(long lastUpdateTime) { List serviceInventories = new ArrayList<>(); try { diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/lock/RegisterLockDAOImpl.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/lock/RegisterLockDAOImpl.java index a7b383073bf3..88814675717f 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/lock/RegisterLockDAOImpl.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/lock/RegisterLockDAOImpl.java @@ -26,12 +26,11 @@ import org.apache.skywalking.oap.server.library.client.elasticsearch.ElasticSearchClient; import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base.EsDAO; import org.elasticsearch.action.get.GetResponse; -import org.elasticsearch.common.xcontent.*; -import org.slf4j.*; +import org.elasticsearch.common.xcontent.XContentBuilder; +import org.elasticsearch.common.xcontent.XContentFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng - */ public class RegisterLockDAOImpl extends EsDAO implements IRegisterLockDAO { private static final Logger logger = LoggerFactory.getLogger(RegisterLockDAOImpl.class); @@ -40,7 +39,8 @@ public RegisterLockDAOImpl(ElasticSearchClient client) { super(client); } - @Override public int getId(int scopeId, RegisterSource registerSource) { + @Override + public int getId(int scopeId, RegisterSource registerSource) { String id = scopeId + ""; int sequence = Const.NONE; @@ -49,7 +49,7 @@ public RegisterLockDAOImpl(ElasticSearchClient client) { if (response.isExists()) { Map source = response.getSource(); - sequence = ((Number)source.get(RegisterLockIndex.COLUMN_SEQUENCE)).intValue(); + sequence = ((Number) source.get(RegisterLockIndex.COLUMN_SEQUENCE)).intValue(); long version = response.getVersion(); sequence++; @@ -72,4 +72,3 @@ private void lock(String id, int sequence, long version) throws IOException { } } - diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/lock/RegisterLockIndex.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/lock/RegisterLockIndex.java index fd972a587bb9..71ce21c83cc7 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/lock/RegisterLockIndex.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/lock/RegisterLockIndex.java @@ -18,9 +18,6 @@ package org.apache.skywalking.oap.server.storage.plugin.elasticsearch.lock; -/** - * @author peng-yongsheng - */ public class RegisterLockIndex { public static final String NAME = "register_lock"; diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/lock/RegisterLockInstaller.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/lock/RegisterLockInstaller.java index 96d91ba51502..55d228685bd2 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/lock/RegisterLockInstaller.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/lock/RegisterLockInstaller.java @@ -32,9 +32,6 @@ import java.util.HashMap; import java.util.Map; -/** - * @author peng-yongsheng - */ public class RegisterLockInstaller { private static final Logger logger = LoggerFactory.getLogger(RegisterLockInstaller.class); @@ -59,7 +56,7 @@ public void install() throws StorageException { } for (Class registerSource : InventoryStreamProcessor.getInstance().getAllRegisterSources()) { - int scopeId = ((Stream)registerSource.getAnnotation(Stream.class)).scopeId(); + int scopeId = ((Stream) registerSource.getAnnotation(Stream.class)).scopeId(); putIfAbsent(scopeId); } } catch (IOException e) { diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/AggregationQueryEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/AggregationQueryEsDAO.java index 2c53a8b41c80..e03c9bd55524 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/AggregationQueryEsDAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/AggregationQueryEsDAO.java @@ -19,25 +19,28 @@ package org.apache.skywalking.oap.server.storage.plugin.elasticsearch.query; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import org.apache.skywalking.oap.server.core.analysis.Downsampling; import org.apache.skywalking.oap.server.core.analysis.metrics.Metrics; -import org.apache.skywalking.oap.server.core.query.entity.*; -import org.apache.skywalking.oap.server.core.register.*; +import org.apache.skywalking.oap.server.core.query.entity.Order; +import org.apache.skywalking.oap.server.core.query.entity.TopNEntity; +import org.apache.skywalking.oap.server.core.register.EndpointInventory; +import org.apache.skywalking.oap.server.core.register.ServiceInstanceInventory; import org.apache.skywalking.oap.server.core.storage.model.ModelName; import org.apache.skywalking.oap.server.core.storage.query.IAggregationQueryDAO; import org.apache.skywalking.oap.server.library.client.elasticsearch.ElasticSearchClient; import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base.EsDAO; import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.index.query.*; -import org.elasticsearch.search.aggregations.*; -import org.elasticsearch.search.aggregations.bucket.terms.*; +import org.elasticsearch.index.query.BoolQueryBuilder; +import org.elasticsearch.index.query.QueryBuilders; +import org.elasticsearch.search.aggregations.AggregationBuilders; +import org.elasticsearch.search.aggregations.BucketOrder; +import org.elasticsearch.search.aggregations.bucket.terms.Terms; +import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder; import org.elasticsearch.search.aggregations.metrics.avg.Avg; import org.elasticsearch.search.builder.SearchSourceBuilder; -/** - * @author peng-yongsheng - */ public class AggregationQueryEsDAO extends EsDAO implements IAggregationQueryDAO { public AggregationQueryEsDAO(ElasticSearchClient client) { @@ -45,8 +48,8 @@ public AggregationQueryEsDAO(ElasticSearchClient client) { } @Override - public List getServiceTopN(String indName, String valueCName, int topN, Downsampling downsampling, long startTB, - long endTB, Order order) throws IOException { + public List getServiceTopN(String indName, String valueCName, int topN, Downsampling downsampling, + long startTB, long endTB, Order order) throws IOException { String indexName = ModelName.build(downsampling, indName); SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource(); @@ -54,8 +57,9 @@ public List getServiceTopN(String indName, String valueCName, int to return aggregation(indexName, valueCName, sourceBuilder, topN, order); } - @Override public List getAllServiceInstanceTopN(String indName, String valueCName, int topN, Downsampling downsampling, - long startTB, long endTB, Order order) throws IOException { + @Override + public List getAllServiceInstanceTopN(String indName, String valueCName, int topN, + Downsampling downsampling, long startTB, long endTB, Order order) throws IOException { String indexName = ModelName.build(downsampling, indName); SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource(); @@ -63,7 +67,8 @@ public List getServiceTopN(String indName, String valueCName, int to return aggregation(indexName, valueCName, sourceBuilder, topN, order); } - @Override public List getServiceInstanceTopN(int serviceId, String indName, String valueCName, int topN, + @Override + public List getServiceInstanceTopN(int serviceId, String indName, String valueCName, int topN, Downsampling downsampling, long startTB, long endTB, Order order) throws IOException { String indexName = ModelName.build(downsampling, indName); @@ -79,8 +84,8 @@ public List getServiceTopN(String indName, String valueCName, int to } @Override - public List getAllEndpointTopN(String indName, String valueCName, int topN, Downsampling downsampling, long startTB, - long endTB, Order order) throws IOException { + public List getAllEndpointTopN(String indName, String valueCName, int topN, Downsampling downsampling, + long startTB, long endTB, Order order) throws IOException { String indexName = ModelName.build(downsampling, indName); SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource(); @@ -89,8 +94,8 @@ public List getAllEndpointTopN(String indName, String valueCName, in } @Override - public List getEndpointTopN(int serviceId, String indName, String valueCName, int topN, Downsampling downsampling, - long startTB, long endTB, Order order) throws IOException { + public List getEndpointTopN(int serviceId, String indName, String valueCName, int topN, + Downsampling downsampling, long startTB, long endTB, Order order) throws IOException { String indexName = ModelName.build(downsampling, indName); SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource(); @@ -123,7 +128,7 @@ protected List aggregation(String indexName, String valueCName, Sear TopNEntity topNEntity = new TopNEntity(); topNEntity.setId(termsBucket.getKeyAsString()); Avg value = termsBucket.getAggregations().get(valueCName); - topNEntity.setValue((long)value.getValue()); + topNEntity.setValue((long) value.getValue()); topNEntities.add(topNEntity); } @@ -131,13 +136,10 @@ protected List aggregation(String indexName, String valueCName, Sear } protected TermsAggregationBuilder aggregationBuilder(final String valueCName, final int topN, final boolean asc) { - return AggregationBuilders - .terms(Metrics.ENTITY_ID) - .field(Metrics.ENTITY_ID) - .order(BucketOrder.aggregation(valueCName, asc)) - .size(topN) - .subAggregation( - AggregationBuilders.avg(valueCName).field(valueCName) - ); + return AggregationBuilders.terms(Metrics.ENTITY_ID) + .field(Metrics.ENTITY_ID) + .order(BucketOrder.aggregation(valueCName, asc)) + .size(topN) + .subAggregation(AggregationBuilders.avg(valueCName).field(valueCName)); } } diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/AlarmQueryEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/AlarmQueryEsDAO.java index 4a3f525e06c9..4cf4c6c0d609 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/AlarmQueryEsDAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/AlarmQueryEsDAO.java @@ -22,19 +22,20 @@ import java.io.IOException; import java.util.Objects; import org.apache.skywalking.oap.server.core.alarm.AlarmRecord; -import org.apache.skywalking.oap.server.core.query.entity.*; +import org.apache.skywalking.oap.server.core.query.entity.AlarmMessage; +import org.apache.skywalking.oap.server.core.query.entity.Alarms; +import org.apache.skywalking.oap.server.core.query.entity.Scope; import org.apache.skywalking.oap.server.core.storage.query.IAlarmQueryDAO; import org.apache.skywalking.oap.server.library.client.elasticsearch.ElasticSearchClient; -import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base.*; +import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base.EsDAO; +import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base.MatchCNameBuilder; import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.index.query.*; +import org.elasticsearch.index.query.BoolQueryBuilder; +import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.sort.SortOrder; -/** - * @author peng-yongsheng - */ public class AlarmQueryEsDAO extends EsDAO implements IAlarmQueryDAO { public AlarmQueryEsDAO(ElasticSearchClient client) { @@ -42,8 +43,7 @@ public AlarmQueryEsDAO(ElasticSearchClient client) { } public Alarms getAlarm(final Integer scopeId, final String keyword, final int limit, final int from, - final long startTB, - final long endTB) throws IOException { + final long startTB, final long endTB) throws IOException { SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource(); BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery(); @@ -65,7 +65,7 @@ public Alarms getAlarm(final Integer scopeId, final String keyword, final int li SearchResponse response = getClient().search(AlarmRecord.INDEX_NAME, sourceBuilder); Alarms alarms = new Alarms(); - alarms.setTotal((int)response.getHits().totalHits); + alarms.setTotal((int) response.getHits().totalHits); for (SearchHit searchHit : response.getHits().getHits()) { AlarmRecord.Builder builder = new AlarmRecord.Builder(); diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/LogQueryEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/LogQueryEsDAO.java index 83dd3ca7ba72..a76ed67d8248 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/LogQueryEsDAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/LogQueryEsDAO.java @@ -24,29 +24,32 @@ import org.apache.skywalking.oap.server.core.Const; import org.apache.skywalking.oap.server.core.analysis.manual.log.AbstractLogRecord; import org.apache.skywalking.oap.server.core.analysis.record.Record; -import org.apache.skywalking.oap.server.core.query.entity.*; +import org.apache.skywalking.oap.server.core.query.entity.ContentType; +import org.apache.skywalking.oap.server.core.query.entity.Log; +import org.apache.skywalking.oap.server.core.query.entity.LogState; +import org.apache.skywalking.oap.server.core.query.entity.Logs; +import org.apache.skywalking.oap.server.core.query.entity.Pagination; import org.apache.skywalking.oap.server.core.storage.query.ILogQueryDAO; import org.apache.skywalking.oap.server.library.client.elasticsearch.ElasticSearchClient; import org.apache.skywalking.oap.server.library.util.BooleanUtils; import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base.EsDAO; import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.index.query.*; +import org.elasticsearch.index.query.BoolQueryBuilder; +import org.elasticsearch.index.query.QueryBuilder; +import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.builder.SearchSourceBuilder; import static org.apache.skywalking.oap.server.core.analysis.manual.log.AbstractLogRecord.TRACE_ID; -/** - * @author wusheng - */ public class LogQueryEsDAO extends EsDAO implements ILogQueryDAO { public LogQueryEsDAO(ElasticSearchClient client) { super(client); } @Override - public Logs queryLogs(String metricName, int serviceId, int serviceInstanceId, int endpointId, - String traceId, LogState state, String stateCode, Pagination paging, int from, int limit, long startSecondTB, + public Logs queryLogs(String metricName, int serviceId, int serviceInstanceId, int endpointId, String traceId, + LogState state, String stateCode, Pagination paging, int from, int limit, long startSecondTB, long endSecondTB) throws IOException { SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource(); @@ -62,7 +65,8 @@ public Logs queryLogs(String metricName, int serviceId, int serviceInstanceId, i boolQueryBuilder.must().add(QueryBuilders.termQuery(AbstractLogRecord.SERVICE_ID, serviceId)); } if (serviceInstanceId != Const.NONE) { - boolQueryBuilder.must().add(QueryBuilders.termQuery(AbstractLogRecord.SERVICE_INSTANCE_ID, serviceInstanceId)); + boolQueryBuilder.must() + .add(QueryBuilders.termQuery(AbstractLogRecord.SERVICE_INSTANCE_ID, serviceInstanceId)); } if (endpointId != Const.NONE) { boolQueryBuilder.must().add(QueryBuilders.termQuery(AbstractLogRecord.ENDPOINT_ID, endpointId)); @@ -74,9 +78,11 @@ public Logs queryLogs(String metricName, int serviceId, int serviceInstanceId, i boolQueryBuilder.must().add(QueryBuilders.termQuery(TRACE_ID, traceId)); } if (LogState.ERROR.equals(state)) { - boolQueryBuilder.must().add(QueryBuilders.termQuery(AbstractLogRecord.IS_ERROR, BooleanUtils.booleanToValue(true))); + boolQueryBuilder.must() + .add(QueryBuilders.termQuery(AbstractLogRecord.IS_ERROR, BooleanUtils.booleanToValue(true))); } else if (LogState.SUCCESS.equals(state)) { - boolQueryBuilder.must().add(QueryBuilders.termQuery(AbstractLogRecord.IS_ERROR, BooleanUtils.booleanToValue(false))); + boolQueryBuilder.must() + .add(QueryBuilders.termQuery(AbstractLogRecord.IS_ERROR, BooleanUtils.booleanToValue(false))); } sourceBuilder.size(limit); @@ -85,17 +91,20 @@ public Logs queryLogs(String metricName, int serviceId, int serviceInstanceId, i SearchResponse response = getClient().search(metricName, sourceBuilder); Logs logs = new Logs(); - logs.setTotal((int)response.getHits().totalHits); + logs.setTotal((int) response.getHits().totalHits); for (SearchHit searchHit : response.getHits().getHits()) { Log log = new Log(); - log.setServiceId(((Number)searchHit.getSourceAsMap().get(AbstractLogRecord.SERVICE_ID)).intValue()); - log.setServiceInstanceId(((Number)searchHit.getSourceAsMap().get(AbstractLogRecord.SERVICE_INSTANCE_ID)).intValue()); - log.setEndpointId(((Number)searchHit.getSourceAsMap().get(AbstractLogRecord.ENDPOINT_ID)).intValue()); - log.setError(BooleanUtils.valueToBoolean(((Number)searchHit.getSourceAsMap().get(AbstractLogRecord.IS_ERROR)).intValue())); - log.setStatusCode((String)searchHit.getSourceAsMap().get(AbstractLogRecord.STATUS_CODE)); - log.setContentType(ContentType.instanceOf(((Number)searchHit.getSourceAsMap().get(AbstractLogRecord.CONTENT_TYPE)).intValue())); - log.setContent((String)searchHit.getSourceAsMap().get(AbstractLogRecord.CONTENT)); + log.setServiceId(((Number) searchHit.getSourceAsMap().get(AbstractLogRecord.SERVICE_ID)).intValue()); + log.setServiceInstanceId(((Number) searchHit.getSourceAsMap() + .get(AbstractLogRecord.SERVICE_INSTANCE_ID)).intValue()); + log.setEndpointId(((Number) searchHit.getSourceAsMap().get(AbstractLogRecord.ENDPOINT_ID)).intValue()); + log.setError(BooleanUtils.valueToBoolean(((Number) searchHit.getSourceAsMap() + .get(AbstractLogRecord.IS_ERROR)).intValue())); + log.setStatusCode((String) searchHit.getSourceAsMap().get(AbstractLogRecord.STATUS_CODE)); + log.setContentType(ContentType.instanceOf(((Number) searchHit.getSourceAsMap() + .get(AbstractLogRecord.CONTENT_TYPE)).intValue())); + log.setContent((String) searchHit.getSourceAsMap().get(AbstractLogRecord.CONTENT)); logs.getLogs().add(log); } diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java index 9140959f9a7f..8e2369423a45 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java @@ -56,9 +56,6 @@ import static org.apache.skywalking.oap.server.core.register.ServiceInstanceInventory.PropertyUtil.OS_NAME; import static org.apache.skywalking.oap.server.core.register.ServiceInstanceInventory.PropertyUtil.PROCESS_NO; -/** - * @author peng-yongsheng - */ public class MetadataQueryEsDAO extends EsDAO implements IMetadataQueryDAO { private static final Gson GSON = new Gson(); @@ -69,7 +66,8 @@ public MetadataQueryEsDAO(ElasticSearchClient client, int queryMaxSize) { this.queryMaxSize = queryMaxSize; } - @Override public int numOfService(long startTimestamp, long endTimestamp) throws IOException { + @Override + public int numOfService(long startTimestamp, long endTimestamp) throws IOException { SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource(); BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery(); @@ -82,21 +80,23 @@ public MetadataQueryEsDAO(ElasticSearchClient client, int queryMaxSize) { sourceBuilder.size(0); SearchResponse response = getClient().search(ServiceInventory.INDEX_NAME, sourceBuilder); - return (int)response.getHits().getTotalHits(); + return (int) response.getHits().getTotalHits(); } - @Override public int numOfEndpoint() throws IOException { + @Override + public int numOfEndpoint() throws IOException { SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource(); BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery(); - boolQueryBuilder.must().add(QueryBuilders.termQuery(EndpointInventory.DETECT_POINT, DetectPoint.SERVER.ordinal())); + boolQueryBuilder.must() + .add(QueryBuilders.termQuery(EndpointInventory.DETECT_POINT, DetectPoint.SERVER.ordinal())); sourceBuilder.query(boolQueryBuilder); sourceBuilder.size(0); SearchResponse response = getClient().search(EndpointInventory.INDEX_NAME, sourceBuilder); - return (int)response.getHits().getTotalHits(); + return (int) response.getHits().getTotalHits(); } @Override @@ -108,7 +108,7 @@ public int numOfConjectural(int nodeTypeValue) throws IOException { SearchResponse response = getClient().search(ServiceInventory.INDEX_NAME, sourceBuilder); - return (int)response.getHits().getTotalHits(); + return (int) response.getHits().getTotalHits(); } @Override @@ -163,9 +163,9 @@ public List getAllDatabases() throws IOException { for (SearchHit searchHit : response.getHits()) { Map sourceAsMap = searchHit.getSourceAsMap(); Database database = new Database(); - database.setId(((Number)sourceAsMap.get(ServiceInventory.SEQUENCE)).intValue()); - database.setName((String)sourceAsMap.get(ServiceInventory.NAME)); - String propertiesString = (String)sourceAsMap.get(ServiceInstanceInventory.PROPERTIES); + database.setId(((Number) sourceAsMap.get(ServiceInventory.SEQUENCE)).intValue()); + database.setName((String) sourceAsMap.get(ServiceInventory.NAME)); + String propertiesString = (String) sourceAsMap.get(ServiceInstanceInventory.PROPERTIES); if (!Strings.isNullOrEmpty(propertiesString)) { JsonObject properties = GSON.fromJson(propertiesString, JsonObject.class); if (properties.has(ServiceInventory.PropertyUtil.DATABASE)) { @@ -179,8 +179,8 @@ public List getAllDatabases() throws IOException { return databases; } - @Override public List searchServices(long startTimestamp, long endTimestamp, - String keyword) throws IOException { + @Override + public List searchServices(long startTimestamp, long endTimestamp, String keyword) throws IOException { SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource(); BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery(); @@ -205,16 +205,16 @@ public Service searchService(String serviceCode) throws IOException { GetResponse response = getClient().get(ServiceInventory.INDEX_NAME, ServiceInventory.buildId(serviceCode)); if (response.isExists()) { Service service = new Service(); - service.setId(((Number)response.getSource().get(ServiceInventory.SEQUENCE)).intValue()); - service.setName((String)response.getSource().get(ServiceInventory.NAME)); + service.setId(((Number) response.getSource().get(ServiceInventory.SEQUENCE)).intValue()); + service.setName((String) response.getSource().get(ServiceInventory.NAME)); return service; } else { return null; } } - @Override public List searchEndpoint(String keyword, String serviceId, - int limit) throws IOException { + @Override + public List searchEndpoint(String keyword, String serviceId, int limit) throws IOException { SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource(); BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery(); @@ -225,7 +225,8 @@ public Service searchService(String serviceCode) throws IOException { boolQueryBuilder.must().add(QueryBuilders.matchQuery(matchCName, keyword)); } - boolQueryBuilder.must().add(QueryBuilders.termQuery(EndpointInventory.DETECT_POINT, DetectPoint.SERVER.ordinal())); + boolQueryBuilder.must() + .add(QueryBuilders.termQuery(EndpointInventory.DETECT_POINT, DetectPoint.SERVER.ordinal())); sourceBuilder.query(boolQueryBuilder); sourceBuilder.size(limit); @@ -237,15 +238,16 @@ public Service searchService(String serviceCode) throws IOException { Map sourceAsMap = searchHit.getSourceAsMap(); Endpoint endpoint = new Endpoint(); - endpoint.setId(((Number)sourceAsMap.get(EndpointInventory.SEQUENCE)).intValue()); - endpoint.setName((String)sourceAsMap.get(EndpointInventory.NAME)); + endpoint.setId(((Number) sourceAsMap.get(EndpointInventory.SEQUENCE)).intValue()); + endpoint.setName((String) sourceAsMap.get(EndpointInventory.NAME)); endpoints.add(endpoint); } return endpoints; } - @Override public List getServiceInstances(long startTimestamp, long endTimestamp, + @Override + public List getServiceInstances(long startTimestamp, long endTimestamp, String serviceId) throws IOException { SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource(); @@ -265,10 +267,10 @@ public Service searchService(String serviceCode) throws IOException { ServiceInstance serviceInstance = new ServiceInstance(); serviceInstance.setId(String.valueOf(sourceAsMap.get(ServiceInstanceInventory.SEQUENCE))); - serviceInstance.setName((String)sourceAsMap.get(ServiceInstanceInventory.NAME)); - serviceInstance.setInstanceUUID((String)sourceAsMap.get(ServiceInstanceInventory.INSTANCE_UUID)); + serviceInstance.setName((String) sourceAsMap.get(ServiceInstanceInventory.NAME)); + serviceInstance.setInstanceUUID((String) sourceAsMap.get(ServiceInstanceInventory.INSTANCE_UUID)); - String propertiesString = (String)sourceAsMap.get(ServiceInstanceInventory.PROPERTIES); + String propertiesString = (String) sourceAsMap.get(ServiceInstanceInventory.PROPERTIES); if (!Strings.isNullOrEmpty(propertiesString)) { JsonObject properties = GSON.fromJson(propertiesString, JsonObject.class); for (Map.Entry property : properties.entrySet()) { @@ -283,9 +285,11 @@ public Service searchService(String serviceCode) throws IOException { } else if (key.equals(PROCESS_NO)) { serviceInstance.getAttributes().add(new Attribute(PROCESS_NO, value)); } else if (key.equals(IPV4S)) { - List ipv4s = ServiceInstanceInventory.PropertyUtil.ipv4sDeserialize(properties.get(IPV4S).getAsString()); + List ipv4s = ServiceInstanceInventory.PropertyUtil.ipv4sDeserialize(properties.get(IPV4S) + .getAsString()); for (String ipv4 : ipv4s) { - serviceInstance.getAttributes().add(new Attribute(ServiceInstanceInventory.PropertyUtil.IPV4S, ipv4)); + serviceInstance.getAttributes() + .add(new Attribute(ServiceInstanceInventory.PropertyUtil.IPV4S, ipv4)); } } else { serviceInstance.getAttributes().add(new Attribute(key, value)); @@ -305,8 +309,8 @@ private List buildServices(SearchResponse response) { Map sourceAsMap = searchHit.getSourceAsMap(); Service service = new Service(); - service.setId(((Number)sourceAsMap.get(ServiceInventory.SEQUENCE)).intValue()); - service.setName((String)sourceAsMap.get(ServiceInventory.NAME)); + service.setId(((Number) sourceAsMap.get(ServiceInventory.SEQUENCE)).intValue()); + service.setName((String) sourceAsMap.get(ServiceInventory.NAME)); services.add(service); } diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetricsQueryEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetricsQueryEsDAO.java index 5ce7df7d43d3..a28babac46b2 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetricsQueryEsDAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetricsQueryEsDAO.java @@ -46,9 +46,6 @@ import org.elasticsearch.search.aggregations.metrics.sum.Sum; import org.elasticsearch.search.builder.SearchSourceBuilder; -/** - * @author peng-yongsheng - */ public class MetricsQueryEsDAO extends EsDAO implements IMetricsQueryDAO { public MetricsQueryEsDAO(ElasticSearchClient client) { @@ -57,14 +54,15 @@ public MetricsQueryEsDAO(ElasticSearchClient client) { @Override public IntValues getValues(String indName, Downsampling downsampling, long startTB, long endTB, Where where, - String valueCName, - Function function) throws IOException { + String valueCName, Function function) throws IOException { String indexName = ModelName.build(downsampling, indName); SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource(); queryBuild(sourceBuilder, where, startTB, endTB); - TermsAggregationBuilder entityIdAggregation = AggregationBuilders.terms(Metrics.ENTITY_ID).field(Metrics.ENTITY_ID).size(1000); + TermsAggregationBuilder entityIdAggregation = AggregationBuilders.terms(Metrics.ENTITY_ID) + .field(Metrics.ENTITY_ID) + .size(1000); functionAggregation(function, entityIdAggregation, valueCName); sourceBuilder.aggregation(entityIdAggregation); @@ -78,15 +76,15 @@ public IntValues getValues(String indName, Downsampling downsampling, long start switch (function) { case Sum: Sum sum = idBucket.getAggregations().get(valueCName); - value = (long)sum.getValue(); + value = (long) sum.getValue(); break; case Avg: Avg avg = idBucket.getAggregations().get(valueCName); - value = (long)avg.getValue(); + value = (long) avg.getValue(); break; default: avg = idBucket.getAggregations().get(valueCName); - value = (long)avg.getValue(); + value = (long) avg.getValue(); break; } @@ -112,7 +110,8 @@ protected void functionAggregation(Function function, TermsAggregationBuilder pa } } - @Override public IntValues getLinearIntValues(String indName, Downsampling downsampling, List ids, + @Override + public IntValues getLinearIntValues(String indName, Downsampling downsampling, List ids, String valueCName) throws IOException { String indexName = ModelName.build(downsampling, indName); @@ -126,7 +125,7 @@ protected void functionAggregation(Function function, TermsAggregationBuilder pa kvInt.setValue(0); if (idMap.containsKey(id)) { Map source = idMap.get(id); - kvInt.setValue(((Number)source.getOrDefault(valueCName, 0)).longValue()); + kvInt.setValue(((Number) source.getOrDefault(valueCName, 0)).longValue()); } intValues.addKVInt(kvInt); } @@ -134,8 +133,9 @@ protected void functionAggregation(Function function, TermsAggregationBuilder pa return intValues; } - @Override public IntValues[] getMultipleLinearIntValues(String indName, Downsampling downsampling, - List ids, List linearIndex, String valueCName) throws IOException { + @Override + public IntValues[] getMultipleLinearIntValues(String indName, Downsampling downsampling, List ids, + List linearIndex, String valueCName) throws IOException { String indexName = ModelName.build(downsampling, indName); SearchResponse response = getClient().ids(indexName, ids.toArray(new String[0])); @@ -157,7 +157,7 @@ protected void functionAggregation(Function function, TermsAggregationBuilder pa if (idMap.containsKey(id)) { Map source = idMap.get(id); IntKeyLongValueHashMap multipleValues = new IntKeyLongValueHashMap(5); - multipleValues.toObject((String)source.getOrDefault(valueCName, "")); + multipleValues.toObject((String) source.getOrDefault(valueCName, "")); for (int i = 0; i < linearIndex.size(); i++) { Integer index = linearIndex.get(i); @@ -170,7 +170,8 @@ protected void functionAggregation(Function function, TermsAggregationBuilder pa return intValuesArray; } - @Override public Thermodynamic getThermodynamic(String indName, Downsampling downsampling, List ids, + @Override + public Thermodynamic getThermodynamic(String indName, Downsampling downsampling, List ids, String valueCName) throws IOException { String indexName = ModelName.build(downsampling, indName); @@ -187,11 +188,11 @@ protected void functionAggregation(Function function, TermsAggregationBuilder pa // add empty list to represent no data exist for this time bucket thermodynamicValueMatrix.add(new ArrayList<>()); } else { - int axisYStep = ((Number)source.get(ThermodynamicMetrics.STEP)).intValue(); + int axisYStep = ((Number) source.get(ThermodynamicMetrics.STEP)).intValue(); thermodynamic.setAxisYStep(axisYStep); - numOfSteps = ((Number)source.get(ThermodynamicMetrics.NUM_OF_STEPS)).intValue() + 1; + numOfSteps = ((Number) source.get(ThermodynamicMetrics.NUM_OF_STEPS)).intValue() + 1; - String value = (String)source.get(ThermodynamicMetrics.DETAIL_GROUP); + String value = (String) source.get(ThermodynamicMetrics.DETAIL_GROUP); IntKeyLongValueHashMap intKeyLongValues = new IntKeyLongValueHashMap(5); intKeyLongValues.toObject(value); diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ProfileTaskLogEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ProfileTaskLogEsDAO.java index 0f0a23059d14..52d7992210c6 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ProfileTaskLogEsDAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ProfileTaskLogEsDAO.java @@ -35,9 +35,6 @@ import java.util.LinkedList; import java.util.List; -/** - * @author MrPro - */ public class ProfileTaskLogEsDAO extends EsDAO implements IProfileTaskLogQueryDAO { private final int queryMaxSize; @@ -73,10 +70,15 @@ public List getTaskLogList(String taskId) throws IOException { private ProfileTaskLog parseTaskLog(SearchHit data) { return ProfileTaskLog.builder() - .id(data.getId()) - .taskId((String) data.getSourceAsMap().get(ProfileTaskLogRecord.TASK_ID)) - .instanceId(((Number) data.getSourceAsMap().get(ProfileTaskLogRecord.INSTANCE_ID)).intValue()) - .operationType(ProfileTaskLogOperationType.parse(((Number) data.getSourceAsMap().get(ProfileTaskLogRecord.OPERATION_TYPE)).intValue())) - .operationTime(((Number) data.getSourceAsMap().get(ProfileTaskLogRecord.OPERATION_TIME)).longValue()).build(); + .id(data.getId()) + .taskId((String) data.getSourceAsMap().get(ProfileTaskLogRecord.TASK_ID)) + .instanceId(((Number) data.getSourceAsMap() + .get(ProfileTaskLogRecord.INSTANCE_ID)).intValue()) + .operationType(ProfileTaskLogOperationType.parse(((Number) data.getSourceAsMap() + .get(ProfileTaskLogRecord.OPERATION_TYPE)) + .intValue())) + .operationTime(((Number) data.getSourceAsMap() + .get(ProfileTaskLogRecord.OPERATION_TIME)).longValue()) + .build(); } } diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ProfileTaskQueryEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ProfileTaskQueryEsDAO.java index dbd2dee7fd74..93c7aaddc839 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ProfileTaskQueryEsDAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ProfileTaskQueryEsDAO.java @@ -35,9 +35,6 @@ import java.util.LinkedList; import java.util.List; -/** - * @author MrPro - */ public class ProfileTaskQueryEsDAO extends EsDAO implements IProfileTaskQueryDAO { private final int queryMaxSize; @@ -48,7 +45,8 @@ public ProfileTaskQueryEsDAO(ElasticSearchClient client, int queryMaxSize) { } @Override - public List getTaskList(Integer serviceId, String endpointName, Long startTimeBucket, Long endTimeBucket, Integer limit) throws IOException { + public List getTaskList(Integer serviceId, String endpointName, Long startTimeBucket, + Long endTimeBucket, Integer limit) throws IOException { SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource(); final BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery(); @@ -63,7 +61,8 @@ public List getTaskList(Integer serviceId, String endpointName, Lon } if (startTimeBucket != null) { - boolQueryBuilder.must().add(QueryBuilders.rangeQuery(ProfileTaskNoneStream.TIME_BUCKET).gte(startTimeBucket)); + boolQueryBuilder.must() + .add(QueryBuilders.rangeQuery(ProfileTaskNoneStream.TIME_BUCKET).gte(startTimeBucket)); } if (endTimeBucket != null) { @@ -109,14 +108,19 @@ public ProfileTask getById(String id) throws IOException { private ProfileTask parseTask(SearchHit data) { return ProfileTask.builder() - .id(data.getId()) - .serviceId(((Number) data.getSourceAsMap().get(ProfileTaskNoneStream.SERVICE_ID)).intValue()) - .endpointName((String) data.getSourceAsMap().get(ProfileTaskNoneStream.ENDPOINT_NAME)) - .startTime(((Number) data.getSourceAsMap().get(ProfileTaskNoneStream.START_TIME)).longValue()) - .createTime(((Number) data.getSourceAsMap().get(ProfileTaskNoneStream.CREATE_TIME)).longValue()) - .duration(((Number) data.getSourceAsMap().get(ProfileTaskNoneStream.DURATION)).intValue()) - .minDurationThreshold(((Number) data.getSourceAsMap().get(ProfileTaskNoneStream.MIN_DURATION_THRESHOLD)).intValue()) - .dumpPeriod(((Number) data.getSourceAsMap().get(ProfileTaskNoneStream.DUMP_PERIOD)).intValue()) - .maxSamplingCount(((Number) data.getSourceAsMap().get(ProfileTaskNoneStream.MAX_SAMPLING_COUNT)).intValue()).build(); + .id(data.getId()) + .serviceId(((Number) data.getSourceAsMap().get(ProfileTaskNoneStream.SERVICE_ID)).intValue()) + .endpointName((String) data.getSourceAsMap().get(ProfileTaskNoneStream.ENDPOINT_NAME)) + .startTime(((Number) data.getSourceAsMap().get(ProfileTaskNoneStream.START_TIME)).longValue()) + .createTime(((Number) data.getSourceAsMap() + .get(ProfileTaskNoneStream.CREATE_TIME)).longValue()) + .duration(((Number) data.getSourceAsMap().get(ProfileTaskNoneStream.DURATION)).intValue()) + .minDurationThreshold(((Number) data.getSourceAsMap() + .get(ProfileTaskNoneStream.MIN_DURATION_THRESHOLD)).intValue()) + .dumpPeriod(((Number) data.getSourceAsMap() + .get(ProfileTaskNoneStream.DUMP_PERIOD)).intValue()) + .maxSamplingCount(((Number) data.getSourceAsMap() + .get(ProfileTaskNoneStream.MAX_SAMPLING_COUNT)).intValue()) + .build(); } } diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ProfileThreadSnapshotQueryEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ProfileThreadSnapshotQueryEsDAO.java index add808708376..fc352503cf34 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ProfileThreadSnapshotQueryEsDAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ProfileThreadSnapshotQueryEsDAO.java @@ -98,12 +98,13 @@ public List queryProfiledSegments(String taskId) throws IOException for (SearchHit searchHit : response.getHits().getHits()) { BasicTrace basicTrace = new BasicTrace(); - basicTrace.setSegmentId((String)searchHit.getSourceAsMap().get(SegmentRecord.SEGMENT_ID)); + basicTrace.setSegmentId((String) searchHit.getSourceAsMap().get(SegmentRecord.SEGMENT_ID)); basicTrace.setStart(String.valueOf(searchHit.getSourceAsMap().get(SegmentRecord.START_TIME))); - basicTrace.getEndpointNames().add((String)searchHit.getSourceAsMap().get(SegmentRecord.ENDPOINT_NAME)); - basicTrace.setDuration(((Number)searchHit.getSourceAsMap().get(SegmentRecord.LATENCY)).intValue()); - basicTrace.setError(BooleanUtils.valueToBoolean(((Number)searchHit.getSourceAsMap().get(SegmentRecord.IS_ERROR)).intValue())); - basicTrace.getTraceIds().add((String)searchHit.getSourceAsMap().get(SegmentRecord.TRACE_ID)); + basicTrace.getEndpointNames().add((String) searchHit.getSourceAsMap().get(SegmentRecord.ENDPOINT_NAME)); + basicTrace.setDuration(((Number) searchHit.getSourceAsMap().get(SegmentRecord.LATENCY)).intValue()); + basicTrace.setError(BooleanUtils.valueToBoolean(((Number) searchHit.getSourceAsMap() + .get(SegmentRecord.IS_ERROR)).intValue())); + basicTrace.getTraceIds().add((String) searchHit.getSourceAsMap().get(SegmentRecord.TRACE_ID)); result.add(basicTrace); } diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TopNRecordsQueryEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TopNRecordsQueryEsDAO.java index d5f23d5d6e03..1b4bbad982b8 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TopNRecordsQueryEsDAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TopNRecordsQueryEsDAO.java @@ -19,21 +19,21 @@ package org.apache.skywalking.oap.server.storage.plugin.elasticsearch.query; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import org.apache.skywalking.oap.server.core.analysis.topn.TopN; -import org.apache.skywalking.oap.server.core.query.entity.*; +import org.apache.skywalking.oap.server.core.query.entity.Order; +import org.apache.skywalking.oap.server.core.query.entity.TopNRecord; import org.apache.skywalking.oap.server.core.storage.query.ITopNRecordsQueryDAO; import org.apache.skywalking.oap.server.library.client.elasticsearch.ElasticSearchClient; import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base.EsDAO; import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.index.query.*; +import org.elasticsearch.index.query.BoolQueryBuilder; +import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.sort.SortOrder; -/** - * @author wusheng - */ public class TopNRecordsQueryEsDAO extends EsDAO implements ITopNRecordsQueryDAO { public TopNRecordsQueryEsDAO(ElasticSearchClient client) { super(client); @@ -55,9 +55,9 @@ public List getTopNRecords(long startSecondTB, long endSecondTB, Str for (SearchHit searchHit : response.getHits().getHits()) { TopNRecord record = new TopNRecord(); - record.setStatement((String)searchHit.getSourceAsMap().get(TopN.STATEMENT)); - record.setTraceId((String)searchHit.getSourceAsMap().get(TopN.TRACE_ID)); - record.setLatency(((Number)searchHit.getSourceAsMap().get(TopN.LATENCY)).longValue()); + record.setStatement((String) searchHit.getSourceAsMap().get(TopN.STATEMENT)); + record.setTraceId((String) searchHit.getSourceAsMap().get(TopN.TRACE_ID)); + record.setLatency(((Number) searchHit.getSourceAsMap().get(TopN.LATENCY)).longValue()); results.add(record); } diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TopologyQueryEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TopologyQueryEsDAO.java index 5f31c32f0097..27b66bbe998d 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TopologyQueryEsDAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TopologyQueryEsDAO.java @@ -45,9 +45,6 @@ import java.util.ArrayList; import java.util.List; -/** - * @author peng-yongsheng - */ public class TopologyQueryEsDAO extends EsDAO implements ITopologyQueryDAO { public TopologyQueryEsDAO(ElasticSearchClient client) { @@ -55,7 +52,8 @@ public TopologyQueryEsDAO(ElasticSearchClient client) { } @Override - public List loadSpecifiedServerSideServiceRelations(Downsampling downsampling, long startTB, long endTB, List serviceIds) throws IOException { + public List loadSpecifiedServerSideServiceRelations(Downsampling downsampling, long startTB, + long endTB, List serviceIds) throws IOException { if (CollectionUtils.isEmpty(serviceIds)) { throw new UnexpectedException("Service id is empty"); } @@ -69,7 +67,8 @@ public List loadSpecifiedServerSideServiceRelations(Downsamplin } @Override - public List loadSpecifiedClientSideServiceRelations(Downsampling downsampling, long startTB, long endTB, List serviceIds) throws IOException { + public List loadSpecifiedClientSideServiceRelations(Downsampling downsampling, long startTB, + long endTB, List serviceIds) throws IOException { if (CollectionUtils.isEmpty(serviceIds)) { throw new UnexpectedException("Service id is empty"); } @@ -82,43 +81,59 @@ public List loadSpecifiedClientSideServiceRelations(Downsamplin return load(sourceBuilder, indexName, DetectPoint.CLIENT); } - private void setQueryCondition(SearchSourceBuilder sourceBuilder, long startTB, long endTB, List serviceIds) { + private void setQueryCondition(SearchSourceBuilder sourceBuilder, long startTB, long endTB, + List serviceIds) { BoolQueryBuilder boolQuery = QueryBuilders.boolQuery(); - boolQuery.must().add(QueryBuilders.rangeQuery(ServiceRelationServerSideMetrics.TIME_BUCKET).gte(startTB).lte(endTB)); + boolQuery.must() + .add(QueryBuilders.rangeQuery(ServiceRelationServerSideMetrics.TIME_BUCKET).gte(startTB).lte(endTB)); BoolQueryBuilder serviceIdBoolQuery = QueryBuilders.boolQuery(); boolQuery.must().add(serviceIdBoolQuery); if (serviceIds.size() == 1) { - serviceIdBoolQuery.should().add(QueryBuilders.termQuery(ServiceRelationServerSideMetrics.SOURCE_SERVICE_ID, serviceIds.get(0))); - serviceIdBoolQuery.should().add(QueryBuilders.termQuery(ServiceRelationServerSideMetrics.DEST_SERVICE_ID, serviceIds.get(0))); + serviceIdBoolQuery.should() + .add(QueryBuilders.termQuery(ServiceRelationServerSideMetrics.SOURCE_SERVICE_ID, serviceIds + .get(0))); + serviceIdBoolQuery.should() + .add(QueryBuilders.termQuery(ServiceRelationServerSideMetrics.DEST_SERVICE_ID, serviceIds.get(0))); } else { - serviceIdBoolQuery.should().add(QueryBuilders.termsQuery(ServiceRelationServerSideMetrics.SOURCE_SERVICE_ID, serviceIds)); - serviceIdBoolQuery.should().add(QueryBuilders.termsQuery(ServiceRelationServerSideMetrics.DEST_SERVICE_ID, serviceIds)); + serviceIdBoolQuery.should() + .add(QueryBuilders.termsQuery(ServiceRelationServerSideMetrics.SOURCE_SERVICE_ID, serviceIds)); + serviceIdBoolQuery.should() + .add(QueryBuilders.termsQuery(ServiceRelationServerSideMetrics.DEST_SERVICE_ID, serviceIds)); } sourceBuilder.query(boolQuery); } - @Override public List loadServerSideServiceRelations(Downsampling downsampling, long startTB, long endTB) throws IOException { + @Override + public List loadServerSideServiceRelations(Downsampling downsampling, long startTB, + long endTB) throws IOException { String indexName = ModelName.build(downsampling, ServiceRelationServerSideMetrics.INDEX_NAME); SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource(); - sourceBuilder.query(QueryBuilders.rangeQuery(ServiceRelationServerSideMetrics.TIME_BUCKET).gte(startTB).lte(endTB)); + sourceBuilder.query(QueryBuilders.rangeQuery(ServiceRelationServerSideMetrics.TIME_BUCKET) + .gte(startTB) + .lte(endTB)); sourceBuilder.size(0); return load(sourceBuilder, indexName, DetectPoint.SERVER); } - @Override public List loadClientSideServiceRelations(Downsampling downsampling, long startTB, long endTB) throws IOException { + @Override + public List loadClientSideServiceRelations(Downsampling downsampling, long startTB, + long endTB) throws IOException { String indexName = ModelName.build(downsampling, ServiceRelationClientSideMetrics.INDEX_NAME); SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource(); - sourceBuilder.query(QueryBuilders.rangeQuery(ServiceRelationServerSideMetrics.TIME_BUCKET).gte(startTB).lte(endTB)); + sourceBuilder.query(QueryBuilders.rangeQuery(ServiceRelationServerSideMetrics.TIME_BUCKET) + .gte(startTB) + .lte(endTB)); sourceBuilder.size(0); return load(sourceBuilder, indexName, DetectPoint.CLIENT); } @Override - public List loadServerSideServiceInstanceRelations(int clientServiceId, int serverServiceId, Downsampling downsampling, long startTB, long endTB) throws IOException { + public List loadServerSideServiceInstanceRelations(int clientServiceId, int serverServiceId, + Downsampling downsampling, long startTB, long endTB) throws IOException { String indexName = ModelName.build(downsampling, ServiceInstanceRelationServerSideMetrics.INDEX_NAME); SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource(); sourceBuilder.size(0); @@ -128,7 +143,8 @@ public List loadServerSideServiceInstanceRelations(int clientSe } @Override - public List loadClientSideServiceInstanceRelations(int clientServiceId, int serverServiceId, Downsampling downsampling, long startTB, long endTB) throws IOException { + public List loadClientSideServiceInstanceRelations(int clientServiceId, int serverServiceId, + Downsampling downsampling, long startTB, long endTB) throws IOException { String indexName = ModelName.build(downsampling, ServiceInstanceRelationClientSideMetrics.INDEX_NAME); SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource(); sourceBuilder.size(0); @@ -137,9 +153,11 @@ public List loadClientSideServiceInstanceRelations(int clientSe return load(sourceBuilder, indexName, DetectPoint.CLIENT); } - private void setInstanceQueryCondition(SearchSourceBuilder sourceBuilder, long startTB, long endTB, int clientServiceId, int serverServiceId) { + private void setInstanceQueryCondition(SearchSourceBuilder sourceBuilder, long startTB, long endTB, + int clientServiceId, int serverServiceId) { BoolQueryBuilder boolQuery = QueryBuilders.boolQuery(); - boolQuery.must().add(QueryBuilders.rangeQuery(EndpointRelationServerSideMetrics.TIME_BUCKET).gte(startTB).lte(endTB)); + boolQuery.must() + .add(QueryBuilders.rangeQuery(EndpointRelationServerSideMetrics.TIME_BUCKET).gte(startTB).lte(endTB)); BoolQueryBuilder serviceIdBoolQuery = new BoolQueryBuilder(); boolQuery.must(serviceIdBoolQuery); @@ -160,19 +178,23 @@ private void setInstanceQueryCondition(SearchSourceBuilder sourceBuilder, long s } @Override - public List loadSpecifiedDestOfServerSideEndpointRelations(Downsampling downsampling, long startTB, long endTB, int destEndpointId) throws IOException { + public List loadSpecifiedDestOfServerSideEndpointRelations(Downsampling downsampling, long startTB, + long endTB, int destEndpointId) throws IOException { String indexName = ModelName.build(downsampling, EndpointRelationServerSideMetrics.INDEX_NAME); SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource(); sourceBuilder.size(0); BoolQueryBuilder boolQuery = QueryBuilders.boolQuery(); - boolQuery.must().add(QueryBuilders.rangeQuery(EndpointRelationServerSideMetrics.TIME_BUCKET).gte(startTB).lte(endTB)); + boolQuery.must() + .add(QueryBuilders.rangeQuery(EndpointRelationServerSideMetrics.TIME_BUCKET).gte(startTB).lte(endTB)); BoolQueryBuilder serviceIdBoolQuery = QueryBuilders.boolQuery(); boolQuery.must().add(serviceIdBoolQuery); - serviceIdBoolQuery.should().add(QueryBuilders.termQuery(EndpointRelationServerSideMetrics.SOURCE_ENDPOINT_ID, destEndpointId)); - serviceIdBoolQuery.should().add(QueryBuilders.termQuery(EndpointRelationServerSideMetrics.DEST_ENDPOINT_ID, destEndpointId)); + serviceIdBoolQuery.should() + .add(QueryBuilders.termQuery(EndpointRelationServerSideMetrics.SOURCE_ENDPOINT_ID, destEndpointId)); + serviceIdBoolQuery.should() + .add(QueryBuilders.termQuery(EndpointRelationServerSideMetrics.DEST_ENDPOINT_ID, destEndpointId)); sourceBuilder.query(boolQuery); diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TraceQueryEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TraceQueryEsDAO.java index 600eb4e58ab8..65ca71333d00 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TraceQueryEsDAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TraceQueryEsDAO.java @@ -20,22 +20,30 @@ import com.google.common.base.Strings; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Base64; +import java.util.Collections; +import java.util.List; import org.apache.skywalking.oap.server.core.analysis.manual.segment.SegmentRecord; -import org.apache.skywalking.oap.server.core.query.entity.*; +import org.apache.skywalking.oap.server.core.query.entity.BasicTrace; +import org.apache.skywalking.oap.server.core.query.entity.QueryOrder; +import org.apache.skywalking.oap.server.core.query.entity.Span; +import org.apache.skywalking.oap.server.core.query.entity.TraceBrief; +import org.apache.skywalking.oap.server.core.query.entity.TraceState; import org.apache.skywalking.oap.server.core.storage.query.ITraceQueryDAO; import org.apache.skywalking.oap.server.library.client.elasticsearch.ElasticSearchClient; import org.apache.skywalking.oap.server.library.util.BooleanUtils; -import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base.*; +import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base.EsDAO; +import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base.MatchCNameBuilder; import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.index.query.*; +import org.elasticsearch.index.query.BoolQueryBuilder; +import org.elasticsearch.index.query.QueryBuilder; +import org.elasticsearch.index.query.QueryBuilders; +import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.sort.SortOrder; -/** - * @author peng-yongsheng - */ public class TraceQueryEsDAO extends EsDAO implements ITraceQueryDAO { private int segmentQueryMaxSize; @@ -46,9 +54,9 @@ public TraceQueryEsDAO(ElasticSearchClient client, int segmentQueryMaxSize) { } @Override - public TraceBrief queryBasicTraces(long startSecondTB, long endSecondTB, long minDuration, - long maxDuration, String endpointName, int serviceId, int serviceInstanceId, int endpointId, String traceId, - int limit, int from, TraceState traceState, QueryOrder queryOrder) throws IOException { + public TraceBrief queryBasicTraces(long startSecondTB, long endSecondTB, long minDuration, long maxDuration, + String endpointName, int serviceId, int serviceInstanceId, int endpointId, String traceId, int limit, int from, + TraceState traceState, QueryOrder queryOrder) throws IOException { SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource(); BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery(); @@ -107,24 +115,26 @@ public TraceBrief queryBasicTraces(long startSecondTB, long endSecondTB, long mi SearchResponse response = getClient().search(SegmentRecord.INDEX_NAME, sourceBuilder); TraceBrief traceBrief = new TraceBrief(); - traceBrief.setTotal((int)response.getHits().totalHits); + traceBrief.setTotal((int) response.getHits().totalHits); for (SearchHit searchHit : response.getHits().getHits()) { BasicTrace basicTrace = new BasicTrace(); - basicTrace.setSegmentId((String)searchHit.getSourceAsMap().get(SegmentRecord.SEGMENT_ID)); + basicTrace.setSegmentId((String) searchHit.getSourceAsMap().get(SegmentRecord.SEGMENT_ID)); basicTrace.setStart(String.valueOf(searchHit.getSourceAsMap().get(SegmentRecord.START_TIME))); - basicTrace.getEndpointNames().add((String)searchHit.getSourceAsMap().get(SegmentRecord.ENDPOINT_NAME)); - basicTrace.setDuration(((Number)searchHit.getSourceAsMap().get(SegmentRecord.LATENCY)).intValue()); - basicTrace.setError(BooleanUtils.valueToBoolean(((Number)searchHit.getSourceAsMap().get(SegmentRecord.IS_ERROR)).intValue())); - basicTrace.getTraceIds().add((String)searchHit.getSourceAsMap().get(SegmentRecord.TRACE_ID)); + basicTrace.getEndpointNames().add((String) searchHit.getSourceAsMap().get(SegmentRecord.ENDPOINT_NAME)); + basicTrace.setDuration(((Number) searchHit.getSourceAsMap().get(SegmentRecord.LATENCY)).intValue()); + basicTrace.setError(BooleanUtils.valueToBoolean(((Number) searchHit.getSourceAsMap() + .get(SegmentRecord.IS_ERROR)).intValue())); + basicTrace.getTraceIds().add((String) searchHit.getSourceAsMap().get(SegmentRecord.TRACE_ID)); traceBrief.getTraces().add(basicTrace); } return traceBrief; } - @Override public List queryByTraceId(String traceId) throws IOException { + @Override + public List queryByTraceId(String traceId) throws IOException { SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource(); sourceBuilder.query(QueryBuilders.termQuery(SegmentRecord.TRACE_ID, traceId)); sourceBuilder.size(segmentQueryMaxSize); @@ -134,25 +144,26 @@ public TraceBrief queryBasicTraces(long startSecondTB, long endSecondTB, long mi List segmentRecords = new ArrayList<>(); for (SearchHit searchHit : response.getHits().getHits()) { SegmentRecord segmentRecord = new SegmentRecord(); - segmentRecord.setSegmentId((String)searchHit.getSourceAsMap().get(SegmentRecord.SEGMENT_ID)); - segmentRecord.setTraceId((String)searchHit.getSourceAsMap().get(SegmentRecord.TRACE_ID)); - segmentRecord.setServiceId(((Number)searchHit.getSourceAsMap().get(SegmentRecord.SERVICE_ID)).intValue()); - segmentRecord.setEndpointName((String)searchHit.getSourceAsMap().get(SegmentRecord.ENDPOINT_NAME)); - segmentRecord.setStartTime(((Number)searchHit.getSourceAsMap().get(SegmentRecord.START_TIME)).longValue()); - segmentRecord.setEndTime(((Number)searchHit.getSourceAsMap().get(SegmentRecord.END_TIME)).longValue()); - segmentRecord.setLatency(((Number)searchHit.getSourceAsMap().get(SegmentRecord.LATENCY)).intValue()); - segmentRecord.setIsError(((Number)searchHit.getSourceAsMap().get(SegmentRecord.IS_ERROR)).intValue()); - String dataBinaryBase64 = (String)searchHit.getSourceAsMap().get(SegmentRecord.DATA_BINARY); + segmentRecord.setSegmentId((String) searchHit.getSourceAsMap().get(SegmentRecord.SEGMENT_ID)); + segmentRecord.setTraceId((String) searchHit.getSourceAsMap().get(SegmentRecord.TRACE_ID)); + segmentRecord.setServiceId(((Number) searchHit.getSourceAsMap().get(SegmentRecord.SERVICE_ID)).intValue()); + segmentRecord.setEndpointName((String) searchHit.getSourceAsMap().get(SegmentRecord.ENDPOINT_NAME)); + segmentRecord.setStartTime(((Number) searchHit.getSourceAsMap().get(SegmentRecord.START_TIME)).longValue()); + segmentRecord.setEndTime(((Number) searchHit.getSourceAsMap().get(SegmentRecord.END_TIME)).longValue()); + segmentRecord.setLatency(((Number) searchHit.getSourceAsMap().get(SegmentRecord.LATENCY)).intValue()); + segmentRecord.setIsError(((Number) searchHit.getSourceAsMap().get(SegmentRecord.IS_ERROR)).intValue()); + String dataBinaryBase64 = (String) searchHit.getSourceAsMap().get(SegmentRecord.DATA_BINARY); if (!Strings.isNullOrEmpty(dataBinaryBase64)) { segmentRecord.setDataBinary(Base64.getDecoder().decode(dataBinaryBase64)); } - segmentRecord.setVersion(((Number)searchHit.getSourceAsMap().get(SegmentRecord.VERSION)).intValue()); + segmentRecord.setVersion(((Number) searchHit.getSourceAsMap().get(SegmentRecord.VERSION)).intValue()); segmentRecords.add(segmentRecord); } return segmentRecords; } - @Override public List doFlexibleTraceQuery(String traceId) throws IOException { + @Override + public List doFlexibleTraceQuery(String traceId) throws IOException { return Collections.emptyList(); } } diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/ttl/ElasticsearchStorageTTL.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/ttl/ElasticsearchStorageTTL.java index 46af52d8dd56..001797a6a793 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/ttl/ElasticsearchStorageTTL.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/ttl/ElasticsearchStorageTTL.java @@ -18,14 +18,15 @@ package org.apache.skywalking.oap.server.storage.plugin.elasticsearch.ttl; import org.apache.skywalking.oap.server.core.analysis.Downsampling; -import org.apache.skywalking.oap.server.core.storage.ttl.*; +import org.apache.skywalking.oap.server.core.storage.ttl.DayTTLCalculator; +import org.apache.skywalking.oap.server.core.storage.ttl.MonthTTLCalculator; +import org.apache.skywalking.oap.server.core.storage.ttl.StorageTTL; +import org.apache.skywalking.oap.server.core.storage.ttl.TTLCalculator; -/** - * @author peng-yongsheng - */ public class ElasticsearchStorageTTL implements StorageTTL { - @Override public TTLCalculator metricsCalculator(Downsampling downsampling) { + @Override + public TTLCalculator metricsCalculator(Downsampling downsampling) { switch (downsampling) { case Month: return new MonthTTLCalculator(); @@ -38,7 +39,8 @@ public class ElasticsearchStorageTTL implements StorageTTL { } } - @Override public TTLCalculator recordCalculator() { + @Override + public TTLCalculator recordCalculator() { return new EsRecordTTLCalculator(); } } diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/ttl/EsHourTTLCalculator.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/ttl/EsHourTTLCalculator.java index a36a16e304b0..267a65aaf119 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/ttl/EsHourTTLCalculator.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/ttl/EsHourTTLCalculator.java @@ -21,12 +21,10 @@ import org.apache.skywalking.oap.server.core.storage.ttl.TTLCalculator; import org.joda.time.DateTime; -/** - * @author peng-yongsheng - */ public class EsHourTTLCalculator implements TTLCalculator { - @Override public long timeBefore(DateTime currentTime, DataTTLConfig dataTTLConfig) { + @Override + public long timeBefore(DateTime currentTime, DataTTLConfig dataTTLConfig) { return Long.valueOf(currentTime.plusDays(0 - dataTTLConfig.getHourMetricsDataTTL()).toString("yyyyMMdd")); } } diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/ttl/EsMinuteTTLCalculator.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/ttl/EsMinuteTTLCalculator.java index 825b8ce665fa..f8d8c858c038 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/ttl/EsMinuteTTLCalculator.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/ttl/EsMinuteTTLCalculator.java @@ -21,12 +21,10 @@ import org.apache.skywalking.oap.server.core.storage.ttl.TTLCalculator; import org.joda.time.DateTime; -/** - * @author peng-yongsheng - */ public class EsMinuteTTLCalculator implements TTLCalculator { - @Override public long timeBefore(DateTime currentTime, DataTTLConfig dataTTLConfig) { + @Override + public long timeBefore(DateTime currentTime, DataTTLConfig dataTTLConfig) { return Long.valueOf(currentTime.plusDays(0 - dataTTLConfig.getMinuteMetricsDataTTL()).toString("yyyyMMdd")); } } diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/ttl/EsRecordTTLCalculator.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/ttl/EsRecordTTLCalculator.java index 19ce59d8362e..ef4ca277fb2c 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/ttl/EsRecordTTLCalculator.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/ttl/EsRecordTTLCalculator.java @@ -24,12 +24,11 @@ /** * Calculate TTL for record. - * - * @author wusheng */ public class EsRecordTTLCalculator implements TTLCalculator { - @Override public long timeBefore(DateTime currentTime, DataTTLConfig dataTTLConfig) { + @Override + public long timeBefore(DateTime currentTime, DataTTLConfig dataTTLConfig) { return Long.valueOf(currentTime.plusDays(0 - dataTTLConfig.getRecordDataTTL()).toString("yyyyMMdd")); } } \ No newline at end of file diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/test/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/ElasticSearchColumnTypeMappingTestCase.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/test/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/ElasticSearchColumnTypeMappingTestCase.java index 24d78f01c7c2..807a7b832a89 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/test/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/ElasticSearchColumnTypeMappingTestCase.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/test/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/ElasticSearchColumnTypeMappingTestCase.java @@ -18,11 +18,9 @@ package org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -/** - * @author peng-yongsheng - */ public class ElasticSearchColumnTypeMappingTestCase { @Test diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/test/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/TimeSeriesUtilsTestCase.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/test/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/TimeSeriesUtilsTestCase.java index a4bec731f402..e3f6f359c245 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/test/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/TimeSeriesUtilsTestCase.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/test/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/TimeSeriesUtilsTestCase.java @@ -17,11 +17,9 @@ package org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -/** - * @author peng-yongsheng - */ public class TimeSeriesUtilsTestCase { @Test diff --git a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/pom.xml b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/pom.xml index 84834c0bbab9..380cabd41a77 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/pom.xml +++ b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + apm org.apache.skywalking diff --git a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/Es7DAO.java b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/Es7DAO.java index d9b0e7fe3ca0..778731182d68 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/Es7DAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/Es7DAO.java @@ -21,9 +21,6 @@ import org.apache.skywalking.oap.server.core.storage.AbstractDAO; import org.apache.skywalking.oap.server.storage.plugin.elasticsearch7.client.ElasticSearch7Client; -/** - * @author kezhenxu94 - */ public class Es7DAO extends AbstractDAO { public Es7DAO(final ElasticSearch7Client client) { super(client); diff --git a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/StorageModuleElasticsearch7Config.java b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/StorageModuleElasticsearch7Config.java index 40fbf4dce36e..2b3ba513553c 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/StorageModuleElasticsearch7Config.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/StorageModuleElasticsearch7Config.java @@ -20,8 +20,5 @@ import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.StorageModuleElasticsearchConfig; -/** - * @author kezhenxu94 - */ public class StorageModuleElasticsearch7Config extends StorageModuleElasticsearchConfig { } diff --git a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/StorageModuleElasticsearch7Provider.java b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/StorageModuleElasticsearch7Provider.java index 02811fea0fc4..377ab262a63f 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/StorageModuleElasticsearch7Provider.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/StorageModuleElasticsearch7Provider.java @@ -18,6 +18,11 @@ package org.apache.skywalking.oap.server.storage.plugin.elasticsearch7; +import java.io.IOException; +import java.security.KeyManagementException; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; +import java.security.cert.CertificateException; import org.apache.skywalking.apm.util.StringUtil; import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.config.ConfigService; @@ -49,29 +54,28 @@ import org.apache.skywalking.oap.server.library.module.ServiceNotProvidedException; import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base.BatchProcessEsDAO; import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base.HistoryDeleteEsDAO; -import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.query.*; +import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.query.ProfileTaskLogEsDAO; +import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.query.ProfileTaskQueryEsDAO; +import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.query.TopNRecordsQueryEsDAO; +import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.query.TopologyQueryEsDAO; import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.ttl.ElasticsearchStorageTTL; +import org.apache.skywalking.oap.server.storage.plugin.elasticsearch7.base.StorageEs7Installer; import org.apache.skywalking.oap.server.storage.plugin.elasticsearch7.cache.EndpointInventoryCacheEs7DAO; import org.apache.skywalking.oap.server.storage.plugin.elasticsearch7.cache.NetworkAddressInventoryCacheEs7DAO; import org.apache.skywalking.oap.server.storage.plugin.elasticsearch7.cache.ServiceInstanceInventoryCacheEs7DAO; import org.apache.skywalking.oap.server.storage.plugin.elasticsearch7.cache.ServiceInventoryCacheEs7DAO; import org.apache.skywalking.oap.server.storage.plugin.elasticsearch7.client.ElasticSearch7Client; import org.apache.skywalking.oap.server.storage.plugin.elasticsearch7.dao.StorageEs7DAO; -import org.apache.skywalking.oap.server.storage.plugin.elasticsearch7.base.StorageEs7Installer; import org.apache.skywalking.oap.server.storage.plugin.elasticsearch7.lock.RegisterLockEs77DAOImpl; import org.apache.skywalking.oap.server.storage.plugin.elasticsearch7.lock.RegisterLockEs7Installer; -import org.apache.skywalking.oap.server.storage.plugin.elasticsearch7.query.*; +import org.apache.skywalking.oap.server.storage.plugin.elasticsearch7.query.AggregationQueryEs7DAO; +import org.apache.skywalking.oap.server.storage.plugin.elasticsearch7.query.AlarmQueryEs7DAO; +import org.apache.skywalking.oap.server.storage.plugin.elasticsearch7.query.LogQueryEs7DAO; +import org.apache.skywalking.oap.server.storage.plugin.elasticsearch7.query.MetadataQueryEs7DAO; +import org.apache.skywalking.oap.server.storage.plugin.elasticsearch7.query.MetricsQueryEs7DAO; +import org.apache.skywalking.oap.server.storage.plugin.elasticsearch7.query.ProfileThreadSnapshotQueryEs7DAO; +import org.apache.skywalking.oap.server.storage.plugin.elasticsearch7.query.TraceQueryEs7DAO; -import java.io.IOException; -import java.security.KeyManagementException; -import java.security.KeyStoreException; -import java.security.NoSuchAlgorithmException; -import java.security.cert.CertificateException; - -/** - * @author peng-yongsheng, jian.tan - * @author kezhenxu94 - */ public class StorageModuleElasticsearch7Provider extends ModuleProvider { protected final StorageModuleElasticsearch7Config config; @@ -102,7 +106,8 @@ public void prepare() throws ServiceNotProvidedException { if (!StringUtil.isEmpty(config.getNameSpace())) { config.setNameSpace(config.getNameSpace().toLowerCase()); } - elasticSearch7Client = new ElasticSearch7Client(config.getClusterNodes(), config.getProtocol(), config.getTrustStorePath(), config.getTrustStorePass(), config.getNameSpace(), config.getUser(), config.getPassword()); + elasticSearch7Client = new ElasticSearch7Client(config.getClusterNodes(), config.getProtocol(), config.getTrustStorePath(), config + .getTrustStorePass(), config.getNameSpace(), config.getUser(), config.getPassword()); this.registerServiceImplementation(IBatchDAO.class, new BatchProcessEsDAO(elasticSearch7Client, config.getBulkActions(), config.getFlushInterval(), config.getConcurrentRequests())); this.registerServiceImplementation(StorageDAO.class, new StorageEs7DAO(elasticSearch7Client)); @@ -151,7 +156,7 @@ public void notifyAfterCompleted() { @Override public String[] requiredModules() { - return new String[]{CoreModule.NAME}; + return new String[] {CoreModule.NAME}; } private void overrideCoreModuleTTLConfig() { diff --git a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/base/StorageEs7Installer.java b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/base/StorageEs7Installer.java index beda8a0e2bb9..2e7d286203a9 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/base/StorageEs7Installer.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/base/StorageEs7Installer.java @@ -27,15 +27,11 @@ import java.util.Map; -/** - * @author kezhenxu94, jian.tan - */ public class StorageEs7Installer extends StorageEsInstaller { private static final Logger logger = LoggerFactory.getLogger(StorageEs7Installer.class); - public StorageEs7Installer(final ModuleManager moduleManager, - final StorageModuleElasticsearch7Config config) { + public StorageEs7Installer(final ModuleManager moduleManager, final StorageModuleElasticsearch7Config config) { super(moduleManager, config); } diff --git a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/cache/EndpointInventoryCacheEs7DAO.java b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/cache/EndpointInventoryCacheEs7DAO.java index 908f05f36a88..ea6b65196242 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/cache/EndpointInventoryCacheEs7DAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/cache/EndpointInventoryCacheEs7DAO.java @@ -28,10 +28,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng - * @author kezhenxu94 - */ public class EndpointInventoryCacheEs7DAO extends EndpointInventoryCacheEsDAO { private static final Logger logger = LoggerFactory.getLogger(EndpointInventoryCacheEs7DAO.class); diff --git a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/cache/NetworkAddressInventoryCacheEs7DAO.java b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/cache/NetworkAddressInventoryCacheEs7DAO.java index 447c7e12594e..ff81b482d527 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/cache/NetworkAddressInventoryCacheEs7DAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/cache/NetworkAddressInventoryCacheEs7DAO.java @@ -28,10 +28,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng, jian.tan - * @author kezhenxu94 - */ public class NetworkAddressInventoryCacheEs7DAO extends NetworkAddressInventoryCacheEsDAO { private static final Logger logger = LoggerFactory.getLogger(NetworkAddressInventoryCacheEs7DAO.class); @@ -40,7 +36,8 @@ public NetworkAddressInventoryCacheEs7DAO(ElasticSearchClient client, int result super(client, resultWindowMaxSize); } - @Override public NetworkAddressInventory get(int addressId) { + @Override + public NetworkAddressInventory get(int addressId) { try { SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder(); searchSourceBuilder.query(QueryBuilders.termQuery(NetworkAddressInventory.SEQUENCE, addressId)); diff --git a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/cache/ServiceInstanceInventoryCacheEs7DAO.java b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/cache/ServiceInstanceInventoryCacheEs7DAO.java index 9559e6398d5f..08349f3b692f 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/cache/ServiceInstanceInventoryCacheEs7DAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/cache/ServiceInstanceInventoryCacheEs7DAO.java @@ -28,10 +28,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng - * @author kezhenxu94 - */ public class ServiceInstanceInventoryCacheEs7DAO extends ServiceInstanceInventoryCacheDAO { private static final Logger logger = LoggerFactory.getLogger(ServiceInstanceInventoryCacheEs7DAO.class); diff --git a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/cache/ServiceInventoryCacheEs7DAO.java b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/cache/ServiceInventoryCacheEs7DAO.java index 4a828ed33e8c..d0ba2a210a9a 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/cache/ServiceInventoryCacheEs7DAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/cache/ServiceInventoryCacheEs7DAO.java @@ -28,10 +28,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng, jian.tan - * @author kezhenxu94 - */ public class ServiceInventoryCacheEs7DAO extends ServiceInventoryCacheEsDAO { private static final Logger logger = LoggerFactory.getLogger(ServiceInventoryCacheEs7DAO.class); @@ -40,7 +36,8 @@ public ServiceInventoryCacheEs7DAO(final ElasticSearchClient client, final int r super(client, resultWindowMaxSize); } - @Override public ServiceInventory get(int serviceId) { + @Override + public ServiceInventory get(int serviceId) { try { SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder(); searchSourceBuilder.query(QueryBuilders.termQuery(ServiceInventory.SEQUENCE, serviceId)); diff --git a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/client/ElasticSearch7Client.java b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/client/ElasticSearch7Client.java index ea3c49d647c1..cd2003b4131c 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/client/ElasticSearch7Client.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/client/ElasticSearch7Client.java @@ -65,19 +65,12 @@ import java.util.List; import java.util.Map; -/** - * @author peng-yongsheng - * @author kezhenxu94 - */ public class ElasticSearch7Client extends ElasticSearchClient { private static final Logger logger = LoggerFactory.getLogger(ElasticSearch7Client.class); - public ElasticSearch7Client(final String clusterNodes, - final String protocol, - final String trustStorePath, - final String trustStorePass, - final String namespace, final String user, final String password) { + public ElasticSearch7Client(final String clusterNodes, final String protocol, final String trustStorePath, + final String trustStorePass, final String namespace, final String user, final String password) { super(clusterNodes, protocol, trustStorePath, trustStorePass, namespace, user, password); } @@ -97,9 +90,8 @@ public boolean createIndex(String indexName) throws IOException { return response.isAcknowledged(); } - public boolean createIndex(String indexName, - Map settings, - Map mapping) throws IOException { + public boolean createIndex(String indexName, Map settings, + Map mapping) throws IOException { indexName = formatIndexName(indexName); CreateIndexRequest request = new CreateIndexRequest(indexName); request.settings(settings); @@ -145,20 +137,17 @@ public boolean isExistsTemplate(String indexName) throws IOException { return client.indices().existsTemplate(indexTemplatesExistRequest, RequestOptions.DEFAULT); } - public boolean createTemplate(String indexName, - Map settings, - Map mapping) throws IOException { + public boolean createTemplate(String indexName, Map settings, + Map mapping) throws IOException { indexName = formatIndexName(indexName); - PutIndexTemplateRequest putIndexTemplateRequest = - new PutIndexTemplateRequest(indexName) - .patterns(Collections.singletonList(indexName + "-*")) - .alias(new Alias(indexName)) - .settings(settings) - .mapping(mapping); + PutIndexTemplateRequest putIndexTemplateRequest = new PutIndexTemplateRequest(indexName).patterns(Collections.singletonList(indexName + "-*")) + .alias(new Alias(indexName)) + .settings(settings) + .mapping(mapping); - AcknowledgedResponse acknowledgedResponse = - client.indices().putTemplate(putIndexTemplateRequest, RequestOptions.DEFAULT); + AcknowledgedResponse acknowledgedResponse = client.indices() + .putTemplate(putIndexTemplateRequest, RequestOptions.DEFAULT); return acknowledgedResponse.isAcknowledged(); } @@ -167,14 +156,13 @@ public boolean deleteTemplate(String indexName) throws IOException { indexName = formatIndexName(indexName); DeleteIndexTemplateRequest deleteIndexTemplateRequest = new DeleteIndexTemplateRequest(indexName); - AcknowledgedResponse acknowledgedResponse = client.indices().deleteTemplate(deleteIndexTemplateRequest, RequestOptions.DEFAULT); + AcknowledgedResponse acknowledgedResponse = client.indices() + .deleteTemplate(deleteIndexTemplateRequest, RequestOptions.DEFAULT); return acknowledgedResponse.isAcknowledged(); } - public SearchResponse search( - String indexName, - SearchSourceBuilder searchSourceBuilder) throws IOException { + public SearchResponse search(String indexName, SearchSourceBuilder searchSourceBuilder) throws IOException { indexName = formatIndexName(indexName); SearchRequest searchRequest = new SearchRequest(indexName); searchRequest.source(searchSourceBuilder); @@ -187,9 +175,7 @@ public GetResponse get(String indexName, String id) throws IOException { return client.get(request, RequestOptions.DEFAULT); } - public SearchResponse ids( - String indexName, - String[] ids) throws IOException { + public SearchResponse ids(String indexName, String[] ids) throws IOException { indexName = formatIndexName(indexName); SearchRequest searchRequest = new SearchRequest(indexName); @@ -203,11 +189,8 @@ public void forceInsert(String indexName, String id, XContentBuilder source) thr client.index(request, RequestOptions.DEFAULT); } - public void forceUpdate(String indexName, - String id, - XContentBuilder source, - long seqNo, - long primaryTerm) throws IOException { + public void forceUpdate(String indexName, String id, XContentBuilder source, long seqNo, + long primaryTerm) throws IOException { org.elasticsearch.action.update.UpdateRequest request = (org.elasticsearch.action.update.UpdateRequest) prepareUpdate(indexName, id, source); request.setIfSeqNo(seqNo); request.setIfPrimaryTerm(primaryTerm); @@ -231,22 +214,14 @@ public UpdateRequest prepareUpdate(String indexName, String id, XContentBuilder return new ElasticSearch7UpdateRequest(indexName, id).doc(source); } - public int delete( - String indexName, - String timeBucketColumnName, - long endTimeBucket) throws IOException { + public int delete(String indexName, String timeBucketColumnName, long endTimeBucket) throws IOException { indexName = formatIndexName(indexName); DeleteByQueryRequest deleteByQueryRequest = new DeleteByQueryRequest(indexName); deleteByQueryRequest.setAbortOnVersionConflict(false); - deleteByQueryRequest.setQuery( - QueryBuilders.rangeQuery(timeBucketColumnName).lte(endTimeBucket) - ); + deleteByQueryRequest.setQuery(QueryBuilders.rangeQuery(timeBucketColumnName).lte(endTimeBucket)); BulkByScrollResponse bulkByScrollResponse = client.deleteByQuery(deleteByQueryRequest, RequestOptions.DEFAULT); - logger.debug( - "delete indexName: {}, by query request: {}, response: {}", - indexName, deleteByQueryRequest, bulkByScrollResponse - ); + logger.debug("delete indexName: {}, by query request: {}, response: {}", indexName, deleteByQueryRequest, bulkByScrollResponse); return HttpStatus.SC_OK; } @@ -266,12 +241,11 @@ public void synchronousBulk(BulkRequest request) { public BulkProcessor createBulkProcessor(int bulkActions, int flushInterval, int concurrentRequests) { BulkProcessor.Listener listener = createBulkListener(); - return BulkProcessor.builder( - (bulkRequest, bulkResponseActionListener) -> client.bulkAsync(bulkRequest, RequestOptions.DEFAULT, bulkResponseActionListener), listener) - .setBulkActions(bulkActions) - .setFlushInterval(TimeValue.timeValueSeconds(flushInterval)) - .setConcurrentRequests(concurrentRequests) - .setBackoffPolicy(BackoffPolicy.exponentialBackoff(TimeValue.timeValueMillis(100), 3)) - .build(); + return BulkProcessor.builder((bulkRequest, bulkResponseActionListener) -> client.bulkAsync(bulkRequest, RequestOptions.DEFAULT, bulkResponseActionListener), listener) + .setBulkActions(bulkActions) + .setFlushInterval(TimeValue.timeValueSeconds(flushInterval)) + .setConcurrentRequests(concurrentRequests) + .setBackoffPolicy(BackoffPolicy.exponentialBackoff(TimeValue.timeValueMillis(100), 3)) + .build(); } } diff --git a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/client/ElasticSearch7InsertRequest.java b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/client/ElasticSearch7InsertRequest.java index 378cf16aca7b..720a33423b03 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/client/ElasticSearch7InsertRequest.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/client/ElasticSearch7InsertRequest.java @@ -21,10 +21,6 @@ import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.common.xcontent.XContentBuilder; -/** - * @author peng-yongsheng - * @author kezhenxu94 - */ public class ElasticSearch7InsertRequest extends IndexRequest implements InsertRequest { public ElasticSearch7InsertRequest(String index, String id) { diff --git a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/client/ElasticSearch7UpdateRequest.java b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/client/ElasticSearch7UpdateRequest.java index 8ddd6a795c83..f53c8bdb93d3 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/client/ElasticSearch7UpdateRequest.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/client/ElasticSearch7UpdateRequest.java @@ -20,10 +20,6 @@ import org.elasticsearch.action.update.UpdateRequest; import org.elasticsearch.common.xcontent.XContentBuilder; -/** - * @author peng-yongsheng - * @author kezhenxu94 - */ public class ElasticSearch7UpdateRequest extends UpdateRequest implements org.apache.skywalking.oap.server.library.client.request.UpdateRequest { public ElasticSearch7UpdateRequest(String index, String id) { diff --git a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/dao/MetricsEs7DAO.java b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/dao/MetricsEs7DAO.java index 6c41b001e9d3..6bf283630319 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/dao/MetricsEs7DAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/dao/MetricsEs7DAO.java @@ -29,14 +29,9 @@ import java.util.ArrayList; import java.util.List; -/** - * @author peng-yongsheng - * @author kezhenxu94 - */ public class MetricsEs7DAO extends MetricsEsDAO { - MetricsEs7DAO(final ElasticSearchClient client, - final StorageBuilder storageBuilder) { + MetricsEs7DAO(final ElasticSearchClient client, final StorageBuilder storageBuilder) { super(client, storageBuilder); } diff --git a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/dao/StorageEs7DAO.java b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/dao/StorageEs7DAO.java index 5b754936440d..10f1b7362084 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/dao/StorageEs7DAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/dao/StorageEs7DAO.java @@ -22,31 +22,36 @@ import org.apache.skywalking.oap.server.core.analysis.metrics.Metrics; import org.apache.skywalking.oap.server.core.analysis.record.Record; import org.apache.skywalking.oap.server.core.register.RegisterSource; -import org.apache.skywalking.oap.server.core.storage.*; +import org.apache.skywalking.oap.server.core.storage.IMetricsDAO; +import org.apache.skywalking.oap.server.core.storage.INoneStreamDAO; +import org.apache.skywalking.oap.server.core.storage.IRecordDAO; +import org.apache.skywalking.oap.server.core.storage.IRegisterDAO; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.StorageDAO; import org.apache.skywalking.oap.server.library.client.elasticsearch.ElasticSearchClient; -import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base.NoneStreamEsDAO; import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base.EsDAO; +import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base.NoneStreamEsDAO; import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base.RecordEsDAO; import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base.RegisterEsDAO; -/** - * @author peng-yongsheng - */ public class StorageEs7DAO extends EsDAO implements StorageDAO { public StorageEs7DAO(ElasticSearchClient client) { super(client); } - @Override public IMetricsDAO newMetricsDao(StorageBuilder storageBuilder) { + @Override + public IMetricsDAO newMetricsDao(StorageBuilder storageBuilder) { return new MetricsEs7DAO(getClient(), storageBuilder); } - @Override public IRegisterDAO newRegisterDao(StorageBuilder storageBuilder) { + @Override + public IRegisterDAO newRegisterDao(StorageBuilder storageBuilder) { return new RegisterEsDAO(getClient(), storageBuilder); } - @Override public IRecordDAO newRecordDao(StorageBuilder storageBuilder) { + @Override + public IRecordDAO newRecordDao(StorageBuilder storageBuilder) { return new RecordEsDAO(getClient(), storageBuilder); } diff --git a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/lock/RegisterLockEs77DAOImpl.java b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/lock/RegisterLockEs77DAOImpl.java index 6b47775ecc0e..5f4f334a92cf 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/lock/RegisterLockEs77DAOImpl.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/lock/RegisterLockEs77DAOImpl.java @@ -32,9 +32,6 @@ import java.io.IOException; import java.util.Map; -/** - * @author kezhenxu94 - */ public class RegisterLockEs77DAOImpl extends Es7DAO implements IRegisterLockDAO { private static final Logger logger = LoggerFactory.getLogger(RegisterLockEs77DAOImpl.class); @@ -76,4 +73,3 @@ private void lock(String id, int sequence, final long seqNo, long primaryTerm) t } } - diff --git a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/lock/RegisterLockEs7Installer.java b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/lock/RegisterLockEs7Installer.java index d741c08623d2..632140c6b253 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/lock/RegisterLockEs7Installer.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/lock/RegisterLockEs7Installer.java @@ -25,10 +25,6 @@ import java.util.HashMap; import java.util.Map; -/** - * @author peng-yongsheng - * @author kezhenxu94 - */ public class RegisterLockEs7Installer extends RegisterLockInstaller { public RegisterLockEs7Installer(final ElasticSearchClient client) { diff --git a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/AggregationQueryEs7DAO.java b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/AggregationQueryEs7DAO.java index 77158fd443b2..9b9e4e0b3ea7 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/AggregationQueryEs7DAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/AggregationQueryEs7DAO.java @@ -35,22 +35,14 @@ import java.util.ArrayList; import java.util.List; -/** - * @author peng-yongsheng - * @author kezhenxu94 - */ public class AggregationQueryEs7DAO extends AggregationQueryEsDAO { public AggregationQueryEs7DAO(ElasticSearchClient client) { super(client); } - protected List aggregation( - String indexName, - String valueCName, - SearchSourceBuilder sourceBuilder, - int topN, - Order order) throws IOException { + protected List aggregation(String indexName, String valueCName, SearchSourceBuilder sourceBuilder, + int topN, Order order) throws IOException { boolean asc = false; if (order.equals(Order.ASC)) { @@ -77,13 +69,10 @@ protected List aggregation( } protected TermsAggregationBuilder aggregationBuilder(final String valueCName, final int topN, final boolean asc) { - return AggregationBuilders - .terms(Metrics.ENTITY_ID) - .field(Metrics.ENTITY_ID) - .order(BucketOrder.aggregation(valueCName, asc)) - .size(topN) - .subAggregation( - AggregationBuilders.avg(valueCName).field(valueCName) - ); + return AggregationBuilders.terms(Metrics.ENTITY_ID) + .field(Metrics.ENTITY_ID) + .order(BucketOrder.aggregation(valueCName, asc)) + .size(topN) + .subAggregation(AggregationBuilders.avg(valueCName).field(valueCName)); } } diff --git a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/AlarmQueryEs7DAO.java b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/AlarmQueryEs7DAO.java index 350189854655..aa7fad2ab036 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/AlarmQueryEs7DAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/AlarmQueryEs7DAO.java @@ -37,22 +37,14 @@ import java.io.IOException; import java.util.Objects; -/** - * @author peng-yongsheng - * @author kezhenxu94 - */ public class AlarmQueryEs7DAO extends EsDAO implements IAlarmQueryDAO { public AlarmQueryEs7DAO(ElasticSearchClient client) { super(client); } - public Alarms getAlarm(final Integer scopeId, - final String keyword, - final int limit, - final int from, - final long startTB, - final long endTB) throws IOException { + public Alarms getAlarm(final Integer scopeId, final String keyword, final int limit, final int from, + final long startTB, final long endTB) throws IOException { SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource(); BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery(); diff --git a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/LogQueryEs7DAO.java b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/LogQueryEs7DAO.java index 7dca18eb2a9b..ff17d726e9b3 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/LogQueryEs7DAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/LogQueryEs7DAO.java @@ -43,28 +43,15 @@ import static org.apache.skywalking.oap.server.core.analysis.manual.log.AbstractLogRecord.TRACE_ID; -/** - * @author wusheng - * @author kezhenxu94 - */ public class LogQueryEs7DAO extends EsDAO implements ILogQueryDAO { public LogQueryEs7DAO(ElasticSearchClient client) { super(client); } @Override - public Logs queryLogs(String metricName, - int serviceId, - int serviceInstanceId, - int endpointId, - String traceId, - LogState state, - String stateCode, - Pagination paging, - int from, - int limit, - long startSecondTB, - long endSecondTB) throws IOException { + public Logs queryLogs(String metricName, int serviceId, int serviceInstanceId, int endpointId, String traceId, + LogState state, String stateCode, Pagination paging, int from, int limit, long startSecondTB, + long endSecondTB) throws IOException { SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource(); BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery(); @@ -79,7 +66,8 @@ public Logs queryLogs(String metricName, boolQueryBuilder.must().add(QueryBuilders.termQuery(AbstractLogRecord.SERVICE_ID, serviceId)); } if (serviceInstanceId != Const.NONE) { - boolQueryBuilder.must().add(QueryBuilders.termQuery(AbstractLogRecord.SERVICE_INSTANCE_ID, serviceInstanceId)); + boolQueryBuilder.must() + .add(QueryBuilders.termQuery(AbstractLogRecord.SERVICE_INSTANCE_ID, serviceInstanceId)); } if (endpointId != Const.NONE) { boolQueryBuilder.must().add(QueryBuilders.termQuery(AbstractLogRecord.ENDPOINT_ID, endpointId)); @@ -91,9 +79,11 @@ public Logs queryLogs(String metricName, boolQueryBuilder.must().add(QueryBuilders.termQuery(TRACE_ID, traceId)); } if (LogState.ERROR.equals(state)) { - boolQueryBuilder.must().add(QueryBuilders.termQuery(AbstractLogRecord.IS_ERROR, BooleanUtils.booleanToValue(true))); + boolQueryBuilder.must() + .add(QueryBuilders.termQuery(AbstractLogRecord.IS_ERROR, BooleanUtils.booleanToValue(true))); } else if (LogState.SUCCESS.equals(state)) { - boolQueryBuilder.must().add(QueryBuilders.termQuery(AbstractLogRecord.IS_ERROR, BooleanUtils.booleanToValue(false))); + boolQueryBuilder.must() + .add(QueryBuilders.termQuery(AbstractLogRecord.IS_ERROR, BooleanUtils.booleanToValue(false))); } sourceBuilder.size(limit); @@ -107,11 +97,14 @@ public Logs queryLogs(String metricName, for (SearchHit searchHit : response.getHits().getHits()) { Log log = new Log(); log.setServiceId(((Number) searchHit.getSourceAsMap().get(AbstractLogRecord.SERVICE_ID)).intValue()); - log.setServiceInstanceId(((Number) searchHit.getSourceAsMap().get(AbstractLogRecord.SERVICE_INSTANCE_ID)).intValue()); + log.setServiceInstanceId(((Number) searchHit.getSourceAsMap() + .get(AbstractLogRecord.SERVICE_INSTANCE_ID)).intValue()); log.setEndpointId(((Number) searchHit.getSourceAsMap().get(AbstractLogRecord.ENDPOINT_ID)).intValue()); - log.setError(BooleanUtils.valueToBoolean(((Number) searchHit.getSourceAsMap().get(AbstractLogRecord.IS_ERROR)).intValue())); + log.setError(BooleanUtils.valueToBoolean(((Number) searchHit.getSourceAsMap() + .get(AbstractLogRecord.IS_ERROR)).intValue())); log.setStatusCode((String) searchHit.getSourceAsMap().get(AbstractLogRecord.STATUS_CODE)); - log.setContentType(ContentType.instanceOf(((Number) searchHit.getSourceAsMap().get(AbstractLogRecord.CONTENT_TYPE)).intValue())); + log.setContentType(ContentType.instanceOf(((Number) searchHit.getSourceAsMap() + .get(AbstractLogRecord.CONTENT_TYPE)).intValue())); log.setContent((String) searchHit.getSourceAsMap().get(AbstractLogRecord.CONTENT)); logs.getLogs().add(log); diff --git a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/MetadataQueryEs7DAO.java b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/MetadataQueryEs7DAO.java index 01102fcb0331..d421b69b20b7 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/MetadataQueryEs7DAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/MetadataQueryEs7DAO.java @@ -31,9 +31,6 @@ import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.builder.SearchSourceBuilder; -/** - * @author peng-yongsheng - */ public class MetadataQueryEs7DAO extends MetadataQueryEsDAO { public MetadataQueryEs7DAO(final ElasticSearchClient client, final int queryMaxSize) { @@ -54,7 +51,7 @@ public int numOfService(long startTimestamp, long endTimestamp) throws IOExcepti sourceBuilder.size(0); SearchResponse response = getClient().search(ServiceInventory.INDEX_NAME, sourceBuilder); - return (int)response.getHits().getTotalHits().value; + return (int) response.getHits().getTotalHits().value; } @Override @@ -63,13 +60,14 @@ public int numOfEndpoint() throws IOException { BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery(); - boolQueryBuilder.must().add(QueryBuilders.termQuery(EndpointInventory.DETECT_POINT, DetectPoint.SERVER.ordinal())); + boolQueryBuilder.must() + .add(QueryBuilders.termQuery(EndpointInventory.DETECT_POINT, DetectPoint.SERVER.ordinal())); sourceBuilder.query(boolQueryBuilder); sourceBuilder.size(0); SearchResponse response = getClient().search(EndpointInventory.INDEX_NAME, sourceBuilder); - return (int)response.getHits().getTotalHits().value; + return (int) response.getHits().getTotalHits().value; } @Override @@ -81,7 +79,7 @@ public int numOfConjectural(int nodeTypeValue) throws IOException { SearchResponse response = getClient().search(ServiceInventory.INDEX_NAME, sourceBuilder); - return (int)response.getHits().getTotalHits().value; + return (int) response.getHits().getTotalHits().value; } } diff --git a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/MetricsQueryEs7DAO.java b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/MetricsQueryEs7DAO.java index 60c2b6bfac47..d3663b7e0393 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/MetricsQueryEs7DAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/MetricsQueryEs7DAO.java @@ -37,10 +37,6 @@ import java.io.IOException; -/** - * @author peng-yongsheng - * @author kezhenxu94 - */ public class MetricsQueryEs7DAO extends MetricsQueryEsDAO { public MetricsQueryEs7DAO(ElasticSearchClient client) { @@ -48,21 +44,17 @@ public MetricsQueryEs7DAO(ElasticSearchClient client) { } @Override - public IntValues getValues( - String indName, - Downsampling downsampling, - long startTB, - long endTB, - Where where, - String valueCName, - Function function) throws IOException { + public IntValues getValues(String indName, Downsampling downsampling, long startTB, long endTB, Where where, + String valueCName, Function function) throws IOException { String indexName = ModelName.build(downsampling, indName); SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource(); queryBuild(sourceBuilder, where, startTB, endTB); - TermsAggregationBuilder entityIdAggregation = AggregationBuilders.terms(Metrics.ENTITY_ID).field(Metrics.ENTITY_ID).size(1000); + TermsAggregationBuilder entityIdAggregation = AggregationBuilders.terms(Metrics.ENTITY_ID) + .field(Metrics.ENTITY_ID) + .size(1000); functionAggregation(function, entityIdAggregation, valueCName); sourceBuilder.aggregation(entityIdAggregation); diff --git a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/ProfileThreadSnapshotQueryEs7DAO.java b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/ProfileThreadSnapshotQueryEs7DAO.java index e0f7458af5c5..cd0964de4fcd 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/ProfileThreadSnapshotQueryEs7DAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/ProfileThreadSnapshotQueryEs7DAO.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.oap.server.storage.plugin.elasticsearch7.query; import org.apache.skywalking.oap.server.core.profile.ProfileThreadSnapshotRecord; diff --git a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/TraceQueryEs7DAO.java b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/TraceQueryEs7DAO.java index 3e0ba5389dba..ea89e6e3ff87 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/TraceQueryEs7DAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/TraceQueryEs7DAO.java @@ -40,9 +40,6 @@ import java.io.IOException; import java.util.List; -/** - * @author peng-yongsheng - */ public class TraceQueryEs7DAO extends TraceQueryEsDAO { public TraceQueryEs7DAO(ElasticSearchClient client, int segmentQueryMaxSize) { @@ -50,19 +47,9 @@ public TraceQueryEs7DAO(ElasticSearchClient client, int segmentQueryMaxSize) { } @Override - public TraceBrief queryBasicTraces(long startSecondTB, - long endSecondTB, - long minDuration, - long maxDuration, - String endpointName, - int serviceId, - int serviceInstanceId, - int endpointId, - String traceId, - int limit, - int from, - TraceState traceState, - QueryOrder queryOrder) throws IOException { + public TraceBrief queryBasicTraces(long startSecondTB, long endSecondTB, long minDuration, long maxDuration, + String endpointName, int serviceId, int serviceInstanceId, int endpointId, String traceId, int limit, int from, + TraceState traceState, QueryOrder queryOrder) throws IOException { SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource(); BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery(); @@ -130,7 +117,8 @@ public TraceBrief queryBasicTraces(long startSecondTB, basicTrace.setStart(String.valueOf(searchHit.getSourceAsMap().get(SegmentRecord.START_TIME))); basicTrace.getEndpointNames().add((String) searchHit.getSourceAsMap().get(SegmentRecord.ENDPOINT_NAME)); basicTrace.setDuration(((Number) searchHit.getSourceAsMap().get(SegmentRecord.LATENCY)).intValue()); - basicTrace.setError(BooleanUtils.valueToBoolean(((Number) searchHit.getSourceAsMap().get(SegmentRecord.IS_ERROR)).intValue())); + basicTrace.setError(BooleanUtils.valueToBoolean(((Number) searchHit.getSourceAsMap() + .get(SegmentRecord.IS_ERROR)).intValue())); basicTrace.getTraceIds().add((String) searchHit.getSourceAsMap().get(SegmentRecord.TRACE_ID)); traceBrief.getTraces().add(basicTrace); } diff --git a/oap-server/server-storage-plugin/storage-jaeger-plugin/pom.xml b/oap-server/server-storage-plugin/storage-jaeger-plugin/pom.xml index 16b5388896a1..f30164cafd97 100644 --- a/oap-server/server-storage-plugin/storage-jaeger-plugin/pom.xml +++ b/oap-server/server-storage-plugin/storage-jaeger-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + server-storage-plugin org.apache.skywalking diff --git a/oap-server/server-storage-plugin/storage-jaeger-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jaeger/JaegerSpan.java b/oap-server/server-storage-plugin/storage-jaeger-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jaeger/JaegerSpan.java index 46e62edf96fe..9fbae2485e81 100644 --- a/oap-server/server-storage-plugin/storage-jaeger-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jaeger/JaegerSpan.java +++ b/oap-server/server-storage-plugin/storage-jaeger-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jaeger/JaegerSpan.java @@ -18,35 +18,61 @@ package org.apache.skywalking.oap.server.storage.plugin.jaeger; -import lombok.*; -import org.apache.skywalking.oap.server.core.source.*; +import lombok.Getter; +import lombok.Setter; +import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine; +import org.apache.skywalking.oap.server.core.source.ScopeDeclaration; +import org.apache.skywalking.oap.server.core.source.Source; -import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.*; +import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.JAEGER_SPAN; -/** - * @author peng-yongsheng - */ @ScopeDeclaration(id = JAEGER_SPAN, name = "JaegerSpan") public class JaegerSpan extends Source { - @Override public int scope() { + @Override + public int scope() { return DefaultScopeDefine.JAEGER_SPAN; } - @Override public String getEntityId() { + @Override + public String getEntityId() { return traceId + spanId; } - @Setter @Getter private String traceId; - @Setter @Getter private String spanId; - @Setter @Getter private int serviceId; - @Setter @Getter private int serviceInstanceId; - @Setter @Getter private String endpointName; - @Setter @Getter private int endpointId; - @Setter @Getter private long startTime; - @Setter @Getter private long endTime; - @Setter @Getter private int latency; - @Setter @Getter private int isError; - @Setter @Getter private byte[] dataBinary; - @Setter @Getter private int encode; + @Setter + @Getter + private String traceId; + @Setter + @Getter + private String spanId; + @Setter + @Getter + private int serviceId; + @Setter + @Getter + private int serviceInstanceId; + @Setter + @Getter + private String endpointName; + @Setter + @Getter + private int endpointId; + @Setter + @Getter + private long startTime; + @Setter + @Getter + private long endTime; + @Setter + @Getter + private int latency; + @Setter + @Getter + private int isError; + @Setter + @Getter + private byte[] dataBinary; + @Setter + @Getter + private int encode; } diff --git a/oap-server/server-storage-plugin/storage-jaeger-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jaeger/JaegerSpanRecord.java b/oap-server/server-storage-plugin/storage-jaeger-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jaeger/JaegerSpanRecord.java index 0544227bd02a..28def8e82a28 100644 --- a/oap-server/server-storage-plugin/storage-jaeger-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jaeger/JaegerSpanRecord.java +++ b/oap-server/server-storage-plugin/storage-jaeger-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jaeger/JaegerSpanRecord.java @@ -18,8 +18,11 @@ package org.apache.skywalking.oap.server.storage.plugin.jaeger; -import java.util.*; -import lombok.*; +import java.util.Base64; +import java.util.HashMap; +import java.util.Map; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.apm.util.StringUtil; import org.apache.skywalking.oap.server.core.Const; import org.apache.skywalking.oap.server.core.analysis.Stream; @@ -27,7 +30,8 @@ import org.apache.skywalking.oap.server.core.analysis.worker.RecordStreamProcessor; import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine; import org.apache.skywalking.oap.server.core.storage.StorageBuilder; -import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.annotation.Column; +import org.apache.skywalking.oap.server.core.storage.annotation.IDColumn; import org.apache.skywalking.oap.server.library.util.CollectionUtils; @Stream(name = JaegerSpanRecord.INDEX_NAME, scopeId = DefaultScopeDefine.JAEGER_SPAN, builder = JaegerSpanRecord.Builder.class, processor = RecordStreamProcessor.class) @@ -46,26 +50,76 @@ public class JaegerSpanRecord extends Record { public static final String DATA_BINARY = "data_binary"; public static final String ENCODE = "encode"; - @Setter @Getter @Column(columnName = TRACE_ID) @IDColumn private String traceId; - @Setter @Getter @Column(columnName = SPAN_ID) @IDColumn private String spanId; - @Setter @Getter @Column(columnName = SERVICE_ID) @IDColumn private int serviceId; - @Setter @Getter @Column(columnName = SERVICE_INSTANCE_ID) @IDColumn private int serviceInstanceId; - @Setter @Getter @Column(columnName = ENDPOINT_NAME, matchQuery = true) @IDColumn private String endpointName; - @Setter @Getter @Column(columnName = ENDPOINT_ID) @IDColumn private int endpointId; - @Setter @Getter @Column(columnName = START_TIME) @IDColumn private long startTime; - @Setter @Getter @Column(columnName = END_TIME) @IDColumn private long endTime; - @Setter @Getter @Column(columnName = LATENCY) @IDColumn private int latency; - @Setter @Getter @Column(columnName = IS_ERROR) @IDColumn private int isError; - @Setter @Getter @Column(columnName = DATA_BINARY) @IDColumn private byte[] dataBinary; - @Setter @Getter @Column(columnName = ENCODE) @IDColumn private int encode; + @Setter + @Getter + @Column(columnName = TRACE_ID) + @IDColumn + private String traceId; + @Setter + @Getter + @Column(columnName = SPAN_ID) + @IDColumn + private String spanId; + @Setter + @Getter + @Column(columnName = SERVICE_ID) + @IDColumn + private int serviceId; + @Setter + @Getter + @Column(columnName = SERVICE_INSTANCE_ID) + @IDColumn + private int serviceInstanceId; + @Setter + @Getter + @Column(columnName = ENDPOINT_NAME, matchQuery = true) + @IDColumn + private String endpointName; + @Setter + @Getter + @Column(columnName = ENDPOINT_ID) + @IDColumn + private int endpointId; + @Setter + @Getter + @Column(columnName = START_TIME) + @IDColumn + private long startTime; + @Setter + @Getter + @Column(columnName = END_TIME) + @IDColumn + private long endTime; + @Setter + @Getter + @Column(columnName = LATENCY) + @IDColumn + private int latency; + @Setter + @Getter + @Column(columnName = IS_ERROR) + @IDColumn + private int isError; + @Setter + @Getter + @Column(columnName = DATA_BINARY) + @IDColumn + private byte[] dataBinary; + @Setter + @Getter + @Column(columnName = ENCODE) + @IDColumn + private int encode; - @Override public String id() { + @Override + public String id() { return traceId + "-" + spanId; } public static class Builder implements StorageBuilder { - @Override public Map data2Map(JaegerSpanRecord storageData) { + @Override + public Map data2Map(JaegerSpanRecord storageData) { Map map = new HashMap<>(); map.put(TRACE_ID, storageData.getTraceId()); map.put(SPAN_ID, storageData.getSpanId()); @@ -87,25 +141,26 @@ public static class Builder implements StorageBuilder { return map; } - @Override public JaegerSpanRecord map2Data(Map dbMap) { + @Override + public JaegerSpanRecord map2Data(Map dbMap) { JaegerSpanRecord record = new JaegerSpanRecord(); - record.setTraceId((String)dbMap.get(TRACE_ID)); - record.setSpanId((String)dbMap.get(SPAN_ID)); - record.setServiceId(((Number)dbMap.get(SERVICE_ID)).intValue()); - record.setServiceInstanceId(((Number)dbMap.get(SERVICE_INSTANCE_ID)).intValue()); - record.setEndpointName((String)dbMap.get(ENDPOINT_NAME)); - record.setEndpointId(((Number)dbMap.get(ENDPOINT_ID)).intValue()); - record.setStartTime(((Number)dbMap.get(START_TIME)).longValue()); - record.setEndTime(((Number)dbMap.get(END_TIME)).longValue()); - record.setLatency(((Number)dbMap.get(LATENCY)).intValue()); - record.setIsError(((Number)dbMap.get(IS_ERROR)).intValue()); - record.setTimeBucket(((Number)dbMap.get(TIME_BUCKET)).longValue()); - if (StringUtil.isEmpty((String)dbMap.get(DATA_BINARY))) { + record.setTraceId((String) dbMap.get(TRACE_ID)); + record.setSpanId((String) dbMap.get(SPAN_ID)); + record.setServiceId(((Number) dbMap.get(SERVICE_ID)).intValue()); + record.setServiceInstanceId(((Number) dbMap.get(SERVICE_INSTANCE_ID)).intValue()); + record.setEndpointName((String) dbMap.get(ENDPOINT_NAME)); + record.setEndpointId(((Number) dbMap.get(ENDPOINT_ID)).intValue()); + record.setStartTime(((Number) dbMap.get(START_TIME)).longValue()); + record.setEndTime(((Number) dbMap.get(END_TIME)).longValue()); + record.setLatency(((Number) dbMap.get(LATENCY)).intValue()); + record.setIsError(((Number) dbMap.get(IS_ERROR)).intValue()); + record.setTimeBucket(((Number) dbMap.get(TIME_BUCKET)).longValue()); + if (StringUtil.isEmpty((String) dbMap.get(DATA_BINARY))) { record.setDataBinary(new byte[] {}); } else { - record.setDataBinary(Base64.getDecoder().decode((String)dbMap.get(DATA_BINARY))); + record.setDataBinary(Base64.getDecoder().decode((String) dbMap.get(DATA_BINARY))); } - record.setEncode(((Number)dbMap.get(ENCODE)).intValue()); + record.setEncode(((Number) dbMap.get(ENCODE)).intValue()); return record; } } diff --git a/oap-server/server-storage-plugin/storage-jaeger-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jaeger/JaegerSpanRecordDispatcher.java b/oap-server/server-storage-plugin/storage-jaeger-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jaeger/JaegerSpanRecordDispatcher.java index f7509a81d414..fc95836cdd5c 100644 --- a/oap-server/server-storage-plugin/storage-jaeger-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jaeger/JaegerSpanRecordDispatcher.java +++ b/oap-server/server-storage-plugin/storage-jaeger-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jaeger/JaegerSpanRecordDispatcher.java @@ -23,12 +23,11 @@ /** * Dispatch for Zipkin native mode spans. - * - * @author wusheng */ public class JaegerSpanRecordDispatcher implements SourceDispatcher { - @Override public void dispatch(JaegerSpan source) { + @Override + public void dispatch(JaegerSpan source) { JaegerSpanRecord segment = new JaegerSpanRecord(); segment.setTraceId(source.getTraceId()); segment.setSpanId(source.getSpanId()); diff --git a/oap-server/server-storage-plugin/storage-jaeger-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jaeger/elasticsearch/JaegerStorageModuleElasticsearchProvider.java b/oap-server/server-storage-plugin/storage-jaeger-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jaeger/elasticsearch/JaegerStorageModuleElasticsearchProvider.java index 74519fa68382..ebdf859906a3 100644 --- a/oap-server/server-storage-plugin/storage-jaeger-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jaeger/elasticsearch/JaegerStorageModuleElasticsearchProvider.java +++ b/oap-server/server-storage-plugin/storage-jaeger-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jaeger/elasticsearch/JaegerStorageModuleElasticsearchProvider.java @@ -23,11 +23,9 @@ import org.apache.skywalking.oap.server.core.storage.query.ITraceQueryDAO; import org.apache.skywalking.oap.server.library.module.ServiceNotProvidedException; import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.StorageModuleElasticsearchProvider; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng - */ public class JaegerStorageModuleElasticsearchProvider extends StorageModuleElasticsearchProvider { private static final Logger logger = LoggerFactory.getLogger(JaegerStorageModuleElasticsearchProvider.class); @@ -45,9 +43,12 @@ public void prepare() throws ServiceNotProvidedException { this.registerServiceImplementation(ITraceQueryDAO.class, traceQueryEsDAO); } - @Override public void notifyAfterCompleted() { + @Override + public void notifyAfterCompleted() { super.notifyAfterCompleted(); - traceQueryEsDAO.setServiceInventoryCache(getManager().find(CoreModule.NAME).provider().getService(ServiceInventoryCache.class)); + traceQueryEsDAO.setServiceInventoryCache(getManager().find(CoreModule.NAME) + .provider() + .getService(ServiceInventoryCache.class)); } @Override diff --git a/oap-server/server-storage-plugin/storage-jaeger-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jaeger/elasticsearch/JaegerTraceQueryEsDAO.java b/oap-server/server-storage-plugin/storage-jaeger-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jaeger/elasticsearch/JaegerTraceQueryEsDAO.java index cf9a24471790..d29284334656 100644 --- a/oap-server/server-storage-plugin/storage-jaeger-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jaeger/elasticsearch/JaegerTraceQueryEsDAO.java +++ b/oap-server/server-storage-plugin/storage-jaeger-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jaeger/elasticsearch/JaegerTraceQueryEsDAO.java @@ -23,36 +23,59 @@ import io.jaegertracing.api_v2.Model; import java.io.IOException; import java.time.Instant; -import java.util.*; +import java.util.ArrayList; +import java.util.Base64; +import java.util.Collections; +import java.util.List; import lombok.Setter; import org.apache.skywalking.oap.server.core.Const; import org.apache.skywalking.oap.server.core.analysis.manual.segment.SegmentRecord; import org.apache.skywalking.oap.server.core.cache.ServiceInventoryCache; -import org.apache.skywalking.oap.server.core.query.entity.*; +import org.apache.skywalking.oap.server.core.query.entity.BasicTrace; +import org.apache.skywalking.oap.server.core.query.entity.KeyValue; +import org.apache.skywalking.oap.server.core.query.entity.LogEntity; +import org.apache.skywalking.oap.server.core.query.entity.QueryOrder; +import org.apache.skywalking.oap.server.core.query.entity.Ref; +import org.apache.skywalking.oap.server.core.query.entity.RefType; +import org.apache.skywalking.oap.server.core.query.entity.Span; +import org.apache.skywalking.oap.server.core.query.entity.TraceBrief; +import org.apache.skywalking.oap.server.core.query.entity.TraceState; import org.apache.skywalking.oap.server.core.storage.query.ITraceQueryDAO; import org.apache.skywalking.oap.server.library.client.elasticsearch.ElasticSearchClient; import org.apache.skywalking.oap.server.library.util.BooleanUtils; import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base.EsDAO; import org.apache.skywalking.oap.server.storage.plugin.jaeger.JaegerSpanRecord; import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.index.query.*; +import org.elasticsearch.index.query.BoolQueryBuilder; +import org.elasticsearch.index.query.QueryBuilder; +import org.elasticsearch.index.query.QueryBuilders; +import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.search.SearchHit; -import org.elasticsearch.search.aggregations.*; -import org.elasticsearch.search.aggregations.bucket.terms.*; +import org.elasticsearch.search.aggregations.AggregationBuilders; +import org.elasticsearch.search.aggregations.BucketOrder; +import org.elasticsearch.search.aggregations.bucket.terms.Terms; +import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder; import org.elasticsearch.search.aggregations.metrics.max.Max; import org.elasticsearch.search.aggregations.metrics.min.Min; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.sort.SortOrder; import static org.apache.skywalking.oap.server.core.analysis.record.Record.TIME_BUCKET; -import static org.apache.skywalking.oap.server.storage.plugin.jaeger.JaegerSpanRecord.*; +import static org.apache.skywalking.oap.server.storage.plugin.jaeger.JaegerSpanRecord.ENDPOINT_ID; +import static org.apache.skywalking.oap.server.storage.plugin.jaeger.JaegerSpanRecord.ENDPOINT_NAME; +import static org.apache.skywalking.oap.server.storage.plugin.jaeger.JaegerSpanRecord.END_TIME; +import static org.apache.skywalking.oap.server.storage.plugin.jaeger.JaegerSpanRecord.IS_ERROR; +import static org.apache.skywalking.oap.server.storage.plugin.jaeger.JaegerSpanRecord.LATENCY; +import static org.apache.skywalking.oap.server.storage.plugin.jaeger.JaegerSpanRecord.SERVICE_ID; +import static org.apache.skywalking.oap.server.storage.plugin.jaeger.JaegerSpanRecord.SERVICE_INSTANCE_ID; +import static org.apache.skywalking.oap.server.storage.plugin.jaeger.JaegerSpanRecord.START_TIME; +import static org.apache.skywalking.oap.server.storage.plugin.jaeger.JaegerSpanRecord.TRACE_ID; public class JaegerTraceQueryEsDAO extends EsDAO implements ITraceQueryDAO { @Setter private ServiceInventoryCache serviceInventoryCache; - public JaegerTraceQueryEsDAO( - ElasticSearchClient client) { + public JaegerTraceQueryEsDAO(ElasticSearchClient client) { super(client); } @@ -105,13 +128,13 @@ public TraceBrief queryBasicTraces(long startSecondTB, long endSecondTB, long mi break; } - TermsAggregationBuilder builder = AggregationBuilders.terms(TRACE_ID).field(TRACE_ID).size(limit) - .subAggregation( - AggregationBuilders.max(LATENCY).field(LATENCY) - ) - .subAggregation( - AggregationBuilders.min(START_TIME).field(START_TIME) - ); + TermsAggregationBuilder builder = AggregationBuilders.terms(TRACE_ID) + .field(TRACE_ID) + .size(limit) + .subAggregation(AggregationBuilders.max(LATENCY) + .field(LATENCY)) + .subAggregation(AggregationBuilders.min(START_TIME) + .field(START_TIME)); switch (queryOrder) { case BY_START_TIME: builder.order(BucketOrder.aggregation(START_TIME, false)); @@ -134,9 +157,9 @@ public TraceBrief queryBasicTraces(long startSecondTB, long endSecondTB, long mi basicTrace.setSegmentId(termsBucket.getKeyAsString()); Min startTime = termsBucket.getAggregations().get(START_TIME); Max latency = termsBucket.getAggregations().get(LATENCY); - basicTrace.setStart(String.valueOf((long)startTime.getValue())); + basicTrace.setStart(String.valueOf((long) startTime.getValue())); basicTrace.getEndpointNames().add(""); - basicTrace.setDuration((int)latency.getValue()); + basicTrace.setDuration((int) latency.getValue()); basicTrace.setError(false); basicTrace.getTraceIds().add(termsBucket.getKeyAsString()); traceBrief.getTraces().add(basicTrace); @@ -145,12 +168,13 @@ public TraceBrief queryBasicTraces(long startSecondTB, long endSecondTB, long mi return traceBrief; } - @Override public List queryByTraceId(String traceId) throws IOException { + @Override + public List queryByTraceId(String traceId) throws IOException { return Collections.emptyList(); } - @Override public List doFlexibleTraceQuery( - String traceId) throws IOException { + @Override + public List doFlexibleTraceQuery(String traceId) throws IOException { SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource(); sourceBuilder.query(QueryBuilders.termQuery(TRACE_ID, traceId)); sourceBuilder.sort(START_TIME, SortOrder.ASC); @@ -161,12 +185,14 @@ public TraceBrief queryBasicTraces(long startSecondTB, long endSecondTB, long mi List spanList = new ArrayList<>(); for (SearchHit searchHit : response.getHits().getHits()) { - int serviceId = ((Number)searchHit.getSourceAsMap().get(SERVICE_ID)).intValue(); - long startTime = ((Number)searchHit.getSourceAsMap().get(START_TIME)).longValue(); - long endTime = ((Number)searchHit.getSourceAsMap().get(END_TIME)).longValue(); - String dataBinaryBase64 = (String)searchHit.getSourceAsMap().get(SegmentRecord.DATA_BINARY); + int serviceId = ((Number) searchHit.getSourceAsMap().get(SERVICE_ID)).intValue(); + long startTime = ((Number) searchHit.getSourceAsMap().get(START_TIME)).longValue(); + long endTime = ((Number) searchHit.getSourceAsMap().get(END_TIME)).longValue(); + String dataBinaryBase64 = (String) searchHit.getSourceAsMap().get(SegmentRecord.DATA_BINARY); - Model.Span jaegerSpan = Model.Span.newBuilder().mergeFrom(Base64.getDecoder().decode(dataBinaryBase64)).build(); + Model.Span jaegerSpan = Model.Span.newBuilder() + .mergeFrom(Base64.getDecoder().decode(dataBinaryBase64)) + .build(); Span swSpan = new Span(); @@ -205,7 +231,8 @@ public TraceBrief queryBasicTraces(long startSecondTB, long endSecondTB, long mi LogEntity entity = new LogEntity(); boolean hasTimestamp = log.hasTimestamp(); if (hasTimestamp) { - long time = Instant.ofEpochSecond(log.getTimestamp().getSeconds(), log.getTimestamp().getNanos()).toEpochMilli(); + long time = Instant.ofEpochSecond(log.getTimestamp().getSeconds(), log.getTimestamp().getNanos()) + .toEpochMilli(); entity.setTime(time); } log.getFieldsList().forEach(field -> { diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/pom.xml b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/pom.xml index 269e222759b4..af7d4923220b 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/pom.xml +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + server-storage-plugin org.apache.skywalking @@ -44,9 +45,9 @@ h2 - - - + + + diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/ArrayParamBuilder.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/ArrayParamBuilder.java index 78da5fc89fee..1dd8a56ea875 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/ArrayParamBuilder.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/ArrayParamBuilder.java @@ -17,9 +17,6 @@ package org.apache.skywalking.oap.server.storage.plugin.jdbc; -/** - * @author peng-yongsheng - */ public class ArrayParamBuilder { public static String build(String[] values) { diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/SQLBuilder.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/SQLBuilder.java index f74b1b691e07..c3456805921d 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/SQLBuilder.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/SQLBuilder.java @@ -20,8 +20,6 @@ /** * SQLBuilder - * - * @author wusheng */ public class SQLBuilder { private static String LINE_END = System.lineSeparator(); @@ -51,7 +49,8 @@ public String toStringInNewLine() { return LINE_END + toString(); } - @Override public String toString() { + @Override + public String toString() { return text.toString(); } } diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/SQLExecutor.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/SQLExecutor.java index d2d7cc25afeb..90dc96352946 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/SQLExecutor.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/SQLExecutor.java @@ -18,15 +18,17 @@ package org.apache.skywalking.oap.server.storage.plugin.jdbc; -import java.sql.*; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; import java.util.List; -import org.apache.skywalking.oap.server.library.client.request.*; -import org.slf4j.*; +import org.apache.skywalking.oap.server.library.client.request.InsertRequest; +import org.apache.skywalking.oap.server.library.client.request.UpdateRequest; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A SQL executor. - * - * @author wusheng */ public class SQLExecutor implements InsertRequest, UpdateRequest { diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/TableMetaInfo.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/TableMetaInfo.java index 752728e114fe..01767eee8b3f 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/TableMetaInfo.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/TableMetaInfo.java @@ -22,9 +22,6 @@ import java.util.Map; import org.apache.skywalking.oap.server.core.storage.model.Model; -/** - * @author wusheng - */ public class TableMetaInfo { private static Map TABLES = new HashMap<>(); diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/H2StorageConfig.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/H2StorageConfig.java index 4b443428feaf..372af1299db9 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/H2StorageConfig.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/H2StorageConfig.java @@ -22,9 +22,6 @@ import lombok.Setter; import org.apache.skywalking.oap.server.library.module.ModuleConfig; -/** - * @author wusheng - */ @Setter @Getter public class H2StorageConfig extends ModuleConfig { diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/H2StorageProvider.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/H2StorageProvider.java index 11783a41ef53..5b468ced6c92 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/H2StorageProvider.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/H2StorageProvider.java @@ -20,25 +20,63 @@ import java.util.Properties; import org.apache.skywalking.oap.server.core.CoreModule; -import org.apache.skywalking.oap.server.core.storage.*; -import org.apache.skywalking.oap.server.core.storage.cache.*; +import org.apache.skywalking.oap.server.core.storage.IBatchDAO; +import org.apache.skywalking.oap.server.core.storage.IHistoryDeleteDAO; +import org.apache.skywalking.oap.server.core.storage.IRegisterLockDAO; +import org.apache.skywalking.oap.server.core.storage.StorageDAO; +import org.apache.skywalking.oap.server.core.storage.StorageException; +import org.apache.skywalking.oap.server.core.storage.StorageModule; +import org.apache.skywalking.oap.server.core.storage.cache.IEndpointInventoryCacheDAO; +import org.apache.skywalking.oap.server.core.storage.cache.INetworkAddressInventoryCacheDAO; +import org.apache.skywalking.oap.server.core.storage.cache.IServiceInstanceInventoryCacheDAO; +import org.apache.skywalking.oap.server.core.storage.cache.IServiceInventoryCacheDAO; import org.apache.skywalking.oap.server.core.storage.profile.IProfileTaskLogQueryDAO; import org.apache.skywalking.oap.server.core.storage.profile.IProfileTaskQueryDAO; import org.apache.skywalking.oap.server.core.storage.profile.IProfileThreadSnapshotQueryDAO; -import org.apache.skywalking.oap.server.core.storage.query.*; +import org.apache.skywalking.oap.server.core.storage.query.IAggregationQueryDAO; +import org.apache.skywalking.oap.server.core.storage.query.IAlarmQueryDAO; +import org.apache.skywalking.oap.server.core.storage.query.ILogQueryDAO; +import org.apache.skywalking.oap.server.core.storage.query.IMetadataQueryDAO; +import org.apache.skywalking.oap.server.core.storage.query.IMetricsQueryDAO; +import org.apache.skywalking.oap.server.core.storage.query.ITopNRecordsQueryDAO; +import org.apache.skywalking.oap.server.core.storage.query.ITopologyQueryDAO; +import org.apache.skywalking.oap.server.core.storage.query.ITraceQueryDAO; import org.apache.skywalking.oap.server.core.storage.ttl.GeneralStorageTTL; import org.apache.skywalking.oap.server.library.client.jdbc.hikaricp.JDBCHikariCPClient; -import org.apache.skywalking.oap.server.library.module.*; -import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.*; -import org.slf4j.*; +import org.apache.skywalking.oap.server.library.module.ModuleConfig; +import org.apache.skywalking.oap.server.library.module.ModuleDefine; +import org.apache.skywalking.oap.server.library.module.ModuleProvider; +import org.apache.skywalking.oap.server.library.module.ModuleStartException; +import org.apache.skywalking.oap.server.library.module.ServiceNotProvidedException; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2AggregationQueryDAO; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2AlarmQueryDAO; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2BatchDAO; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2EndpointInventoryCacheDAO; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2HistoryDeleteDAO; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2LogQueryDAO; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2MetadataQueryDAO; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2MetricsQueryDAO; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2NetworkAddressInventoryCacheDAO; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2ProfileTaskLogQueryDAO; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2ProfileTaskQueryDAO; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2ProfileThreadSnapshotQueryDAO; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2RegisterLockDAO; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2RegisterLockInstaller; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2ServiceInstanceInventoryCacheDAO; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2ServiceInventoryCacheDAO; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2StorageDAO; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2TableInstaller; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2TopNRecordsQueryDAO; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2TopologyQueryDAO; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2TraceQueryDAO; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * H2 Storage provider is for demonstration and preview only. I will find that haven't implemented several interfaces, * because not necessary, and don't consider about performance very much. - * + *

* If someone wants to implement SQL-style database as storage, please just refer the logic. - * - * @author wusheng, peng-yongsheng */ public class H2StorageProvider extends ModuleProvider { @@ -52,19 +90,23 @@ public H2StorageProvider() { config = new H2StorageConfig(); } - @Override public String name() { + @Override + public String name() { return "h2"; } - @Override public Class module() { + @Override + public Class module() { return StorageModule.class; } - @Override public ModuleConfig createConfigBeanIfAbsent() { + @Override + public ModuleConfig createConfigBeanIfAbsent() { return config; } - @Override public void prepare() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void prepare() throws ServiceNotProvidedException, ModuleStartException { Properties settings = new Properties(); settings.setProperty("dataSourceClassName", config.getDriver()); settings.setProperty("dataSource.url", config.getUrl()); @@ -98,7 +140,8 @@ public H2StorageProvider() { this.registerServiceImplementation(IProfileThreadSnapshotQueryDAO.class, new H2ProfileThreadSnapshotQueryDAO(h2Client)); } - @Override public void start() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void start() throws ServiceNotProvidedException, ModuleStartException { try { h2Client.connect(); @@ -111,11 +154,13 @@ public H2StorageProvider() { } } - @Override public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleStartException { } - @Override public String[] requiredModules() { + @Override + public String[] requiredModules() { return new String[] {CoreModule.NAME}; } } diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2AggregationQueryDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2AggregationQueryDAO.java index 2b19ce07781e..b75682e45bc9 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2AggregationQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2AggregationQueryDAO.java @@ -37,10 +37,6 @@ import java.util.ArrayList; import java.util.List; -/** - * @author wusheng - * @author panjuan - */ public class H2AggregationQueryDAO implements IAggregationQueryDAO { @Getter(AccessLevel.PROTECTED) @@ -56,14 +52,15 @@ public List getServiceTopN(String indName, String valueCName, int to return topNQuery(indName, valueCName, topN, downsampling, startTB, endTB, order, null); } - @Override public List getAllServiceInstanceTopN(String indName, String valueCName, int topN, + @Override + public List getAllServiceInstanceTopN(String indName, String valueCName, int topN, Downsampling downsampling, long startTB, long endTB, Order order) throws IOException { return topNQuery(indName, valueCName, topN, downsampling, startTB, endTB, order, null); } @Override - public List getServiceInstanceTopN(int serviceId, String indName, String valueCName, - int topN, Downsampling downsampling, long startTB, long endTB, Order order) throws IOException { + public List getServiceInstanceTopN(int serviceId, String indName, String valueCName, int topN, + Downsampling downsampling, long startTB, long endTB, Order order) throws IOException { return topNQuery(indName, valueCName, topN, downsampling, startTB, endTB, order, (sql, conditions) -> { sql.append(" and ").append(ServiceInstanceInventory.SERVICE_ID).append("=?"); conditions.add(serviceId); @@ -76,8 +73,9 @@ public List getAllEndpointTopN(String indName, String valueCName, in return topNQuery(indName, valueCName, topN, downsampling, startTB, endTB, order, null); } - @Override public List getEndpointTopN(int serviceId, String indName, String valueCName, - int topN, Downsampling downsampling, long startTB, long endTB, Order order) throws IOException { + @Override + public List getEndpointTopN(int serviceId, String indName, String valueCName, int topN, + Downsampling downsampling, long startTB, long endTB, Order order) throws IOException { return topNQuery(indName, valueCName, topN, downsampling, startTB, endTB, order, (sql, conditions) -> { sql.append(" and ").append(EndpointInventory.SERVICE_ID).append("=?"); conditions.add(serviceId); @@ -85,12 +83,17 @@ public List getAllEndpointTopN(String indName, String valueCName, in } public List topNQuery(String indName, String valueCName, int topN, Downsampling downsampling, - long startTB, long endTB, Order order, AppendCondition appender) throws IOException { + long startTB, long endTB, Order order, AppendCondition appender) throws IOException { String indexName = ModelName.build(downsampling, indName); StringBuilder sql = new StringBuilder(); List conditions = new ArrayList<>(10); - sql.append("select * from (select avg(").append(valueCName).append(") value,").append(Metrics.ENTITY_ID).append(" from ") - .append(indexName).append(" where "); + sql.append("select * from (select avg(") + .append(valueCName) + .append(") value,") + .append(Metrics.ENTITY_ID) + .append(" from ") + .append(indexName) + .append(" where "); this.setTimeRangeCondition(sql, conditions, startTB, endTB); if (appender != null) { appender.append(sql, conditions); @@ -100,7 +103,7 @@ public List topNQuery(String indName, String valueCName, int topN, D List topNEntities = new ArrayList<>(); try (Connection connection = h2Client.getConnection()) { try (ResultSet resultSet = h2Client.executeQuery(connection, sql.toString(), conditions.toArray(new Object[0]))) { - + try { while (resultSet.next()) { TopNEntity topNEntity = new TopNEntity(); diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2AlarmQueryDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2AlarmQueryDAO.java index c934bcaef77f..e5315cf4ee9e 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2AlarmQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2AlarmQueryDAO.java @@ -34,12 +34,8 @@ import java.util.List; import java.util.Objects; -/** - * @author wusheng - * @author panjuan - */ public class H2AlarmQueryDAO implements IAlarmQueryDAO { - + private JDBCHikariCPClient client; public H2AlarmQueryDAO(JDBCHikariCPClient client) { @@ -63,23 +59,24 @@ public Alarms getAlarm(Integer scopeId, String keyword, int limit, int from, lon sql.append(" and ").append(AlarmRecord.TIME_BUCKET).append(" <= ?"); parameters.add(endTB); } - + if (!Strings.isNullOrEmpty(keyword)) { sql.append(" and ").append(AlarmRecord.ALARM_MESSAGE).append(" like '%").append(keyword).append("%' "); } sql.append(" order by ").append(AlarmRecord.START_TIME).append(" desc "); - + Alarms alarms = new Alarms(); try (Connection connection = client.getConnection()) { - - try (ResultSet resultSet = client.executeQuery(connection, "select count(1) total from (select 1 " + sql.toString() + " )", parameters.toArray(new Object[0]))) { + + try (ResultSet resultSet = client.executeQuery(connection, "select count(1) total from (select 1 " + sql.toString() + " )", parameters + .toArray(new Object[0]))) { while (resultSet.next()) { alarms.setTotal(resultSet.getInt("total")); } } - + this.buildLimit(sql, from, limit); - + try (ResultSet resultSet = client.executeQuery(connection, "select * " + sql.toString(), parameters.toArray(new Object[0]))) { while (resultSet.next()) { AlarmMessage message = new AlarmMessage(); @@ -88,14 +85,14 @@ public Alarms getAlarm(Integer scopeId, String keyword, int limit, int from, lon message.setStartTime(resultSet.getLong(AlarmRecord.START_TIME)); message.setScope(Scope.Finder.valueOf(resultSet.getInt(AlarmRecord.SCOPE))); message.setScopeId(resultSet.getInt(AlarmRecord.SCOPE)); - + alarms.getMsgs().add(message); } } } catch (SQLException e) { throw new IOException(e); } - + return alarms; } diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2BatchDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2BatchDAO.java index 279a6a86ad70..ac29498e7637 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2BatchDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2BatchDAO.java @@ -18,22 +18,24 @@ package org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao; -import java.sql.*; +import java.sql.Connection; +import java.sql.SQLException; import java.util.List; import org.apache.skywalking.apm.commons.datacarrier.DataCarrier; -import org.apache.skywalking.apm.commons.datacarrier.consumer.*; +import org.apache.skywalking.apm.commons.datacarrier.consumer.BulkConsumePool; +import org.apache.skywalking.apm.commons.datacarrier.consumer.ConsumerPoolFactory; +import org.apache.skywalking.apm.commons.datacarrier.consumer.IConsumer; import org.apache.skywalking.oap.server.core.UnexpectedException; import org.apache.skywalking.oap.server.core.storage.IBatchDAO; import org.apache.skywalking.oap.server.library.client.jdbc.JDBCClientException; import org.apache.skywalking.oap.server.library.client.jdbc.hikaricp.JDBCHikariCPClient; -import org.apache.skywalking.oap.server.library.client.request.*; +import org.apache.skywalking.oap.server.library.client.request.InsertRequest; +import org.apache.skywalking.oap.server.library.client.request.PrepareRequest; import org.apache.skywalking.oap.server.library.util.CollectionUtils; import org.apache.skywalking.oap.server.storage.plugin.jdbc.SQLExecutor; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author wusheng, peng-yongsheng - */ public class H2BatchDAO implements IBatchDAO { private static final Logger logger = LoggerFactory.getLogger(H2BatchDAO.class); @@ -56,7 +58,8 @@ public H2BatchDAO(JDBCHikariCPClient h2Client) { this.dataCarrier.consume(ConsumerPoolFactory.INSTANCE.get(name), new H2BatchDAO.H2BatchConsumer(this)); } - @Override public void synchronous(List prepareRequests) { + @Override + public void synchronous(List prepareRequests) { if (CollectionUtils.isEmpty(prepareRequests)) { return; } @@ -68,7 +71,7 @@ public H2BatchDAO(JDBCHikariCPClient h2Client) { try (Connection connection = h2Client.getConnection()) { for (PrepareRequest prepareRequest : prepareRequests) { try { - SQLExecutor sqlExecutor = (SQLExecutor)prepareRequest; + SQLExecutor sqlExecutor = (SQLExecutor) prepareRequest; sqlExecutor.invoke(connection); } catch (SQLException e) { // Just avoid one execution failure makes the rest of batch failure. @@ -80,7 +83,8 @@ public H2BatchDAO(JDBCHikariCPClient h2Client) { } } - @Override public void asynchronous(InsertRequest insertRequest) { + @Override + public void asynchronous(InsertRequest insertRequest) { this.dataCarrier.produce(insertRequest); } @@ -92,19 +96,23 @@ private H2BatchConsumer(H2BatchDAO h2BatchDAO) { this.h2BatchDAO = h2BatchDAO; } - @Override public void init() { + @Override + public void init() { } - @Override public void consume(List prepareRequests) { + @Override + public void consume(List prepareRequests) { h2BatchDAO.synchronous(prepareRequests); } - @Override public void onError(List prepareRequests, Throwable t) { + @Override + public void onError(List prepareRequests, Throwable t) { logger.error(t.getMessage(), t); } - @Override public void onExit() { + @Override + public void onExit() { } } } diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2EndpointInventoryCacheDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2EndpointInventoryCacheDAO.java index 58bda31eb531..9d8650802080 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2EndpointInventoryCacheDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2EndpointInventoryCacheDAO.java @@ -22,11 +22,9 @@ import org.apache.skywalking.oap.server.core.register.EndpointInventory; import org.apache.skywalking.oap.server.core.storage.cache.IEndpointInventoryCacheDAO; import org.apache.skywalking.oap.server.library.client.jdbc.hikaricp.JDBCHikariCPClient; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author wusheng - */ public class H2EndpointInventoryCacheDAO extends H2SQLExecutor implements IEndpointInventoryCacheDAO { private static final Logger logger = LoggerFactory.getLogger(H2EndpointInventoryCacheDAO.class); private JDBCHikariCPClient h2Client; @@ -35,14 +33,16 @@ public H2EndpointInventoryCacheDAO(JDBCHikariCPClient h2Client) { this.h2Client = h2Client; } - @Override public int getEndpointId(int serviceId, String endpointName, int detectPoint) { + @Override + public int getEndpointId(int serviceId, String endpointName, int detectPoint) { String id = EndpointInventory.buildId(serviceId, endpointName, detectPoint); return getEntityIDByID(h2Client, EndpointInventory.SEQUENCE, EndpointInventory.INDEX_NAME, id); } - @Override public EndpointInventory get(int endpointId) { + @Override + public EndpointInventory get(int endpointId) { try { - return (EndpointInventory)getByColumn(h2Client, EndpointInventory.INDEX_NAME, EndpointInventory.SEQUENCE, endpointId, new EndpointInventory.Builder()); + return (EndpointInventory) getByColumn(h2Client, EndpointInventory.INDEX_NAME, EndpointInventory.SEQUENCE, endpointId, new EndpointInventory.Builder()); } catch (IOException e) { logger.error(e.getMessage(), e); return null; diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2HistoryDeleteDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2HistoryDeleteDAO.java index f709566dcc11..95e6104a9fcf 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2HistoryDeleteDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2HistoryDeleteDAO.java @@ -33,9 +33,6 @@ import org.apache.skywalking.oap.server.storage.plugin.jdbc.SQLBuilder; import org.joda.time.DateTime; -/** - * @author wusheng - */ public class H2HistoryDeleteDAO implements IHistoryDeleteDAO { private final JDBCHikariCPClient client; @@ -50,9 +47,12 @@ public H2HistoryDeleteDAO(ModuleDefineHolder moduleDefineHolder, JDBCHikariCPCli @Override public void deleteHistory(Model model, String timeBucketColumnName) throws IOException { - ConfigService configService = moduleDefineHolder.find(CoreModule.NAME).provider().getService(ConfigService.class); + ConfigService configService = moduleDefineHolder.find(CoreModule.NAME) + .provider() + .getService(ConfigService.class); - SQLBuilder dataDeleteSQL = new SQLBuilder("delete from " + model.getName() + " where ").append(timeBucketColumnName).append("<= ?"); + SQLBuilder dataDeleteSQL = new SQLBuilder("delete from " + model.getName() + " where ").append(timeBucketColumnName) + .append("<= ?"); try (Connection connection = client.getConnection()) { TTLCalculator ttlCalculator; diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2LogQueryDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2LogQueryDAO.java index 3d1f9718015a..80b90335f076 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2LogQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2LogQueryDAO.java @@ -46,10 +46,6 @@ import static org.apache.skywalking.oap.server.core.analysis.manual.log.AbstractLogRecord.TIMESTAMP; import static org.apache.skywalking.oap.server.core.analysis.manual.log.AbstractLogRecord.TRACE_ID; -/** - * @author wusheng - * @author panjuan - */ public class H2LogQueryDAO implements ILogQueryDAO { private JDBCHikariCPClient h2Client; @@ -58,9 +54,8 @@ public H2LogQueryDAO(JDBCHikariCPClient h2Client) { } @Override - public Logs queryLogs(String metricName, int serviceId, int serviceInstanceId, int endpointId, - String traceId, LogState state, - String stateCode, Pagination paging, int from, int limit, long startSecondTB, + public Logs queryLogs(String metricName, int serviceId, int serviceInstanceId, int endpointId, String traceId, + LogState state, String stateCode, Pagination paging, int from, int limit, long startSecondTB, long endSecondTB) throws IOException { StringBuilder sql = new StringBuilder(); List parameters = new ArrayList<>(10); @@ -105,7 +100,8 @@ public Logs queryLogs(String metricName, int serviceId, int serviceInstanceId, i Logs logs = new Logs(); try (Connection connection = h2Client.getConnection()) { - try (ResultSet resultSet = h2Client.executeQuery(connection, buildCountStatement(sql.toString()), parameters.toArray(new Object[0]))) { + try (ResultSet resultSet = h2Client.executeQuery(connection, buildCountStatement(sql.toString()), parameters + .toArray(new Object[0]))) { while (resultSet.next()) { logs.setTotal(resultSet.getInt("total")); } diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java index 739914281d61..8acb798d1d22 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java @@ -51,9 +51,6 @@ import static org.apache.skywalking.oap.server.core.register.ServiceInstanceInventory.PropertyUtil.OS_NAME; import static org.apache.skywalking.oap.server.core.register.ServiceInstanceInventory.PropertyUtil.PROCESS_NO; -/** - * @author wusheng - */ public class H2MetadataQueryDAO implements IMetadataQueryDAO { private static final Gson GSON = new Gson(); @@ -202,8 +199,7 @@ public List getAllDatabases() throws IOException { } @Override - public List searchServices(long startTimestamp, long endTimestamp, - String keyword) throws IOException { + public List searchServices(long startTimestamp, long endTimestamp, String keyword) throws IOException { StringBuilder sql = new StringBuilder(); List condition = new ArrayList<>(5); sql.append("select * from ").append(ServiceInventory.INDEX_NAME).append(" where "); @@ -254,8 +250,7 @@ public Service searchService(String serviceCode) throws IOException { } @Override - public List searchEndpoint(String keyword, String serviceId, - int limit) throws IOException { + public List searchEndpoint(String keyword, String serviceId, int limit) throws IOException { StringBuilder sql = new StringBuilder(); List condition = new ArrayList<>(5); sql.append("select * from ").append(EndpointInventory.INDEX_NAME).append(" where "); @@ -320,9 +315,11 @@ public List getServiceInstances(long startTimestamp, long endTi } else if (key.equals(PROCESS_NO)) { serviceInstance.getAttributes().add(new Attribute(PROCESS_NO, value)); } else if (key.equals(IPV4S)) { - List ipv4s = ServiceInstanceInventory.PropertyUtil.ipv4sDeserialize(properties.get(IPV4S).getAsString()); + List ipv4s = ServiceInstanceInventory.PropertyUtil.ipv4sDeserialize(properties.get(IPV4S) + .getAsString()); for (String ipv4 : ipv4s) { - serviceInstance.getAttributes().add(new Attribute(ServiceInstanceInventory.PropertyUtil.IPV4S, ipv4)); + serviceInstance.getAttributes() + .add(new Attribute(ServiceInstanceInventory.PropertyUtil.IPV4S, ipv4)); } } else { serviceInstance.getAttributes().add(new Attribute(key, value)); @@ -341,12 +338,18 @@ public List getServiceInstances(long startTimestamp, long endTi private void setTimeRangeCondition(StringBuilder sql, List conditions, long startTimestamp, long endTimestamp) { - sql.append(" ( (").append(RegisterSource.HEARTBEAT_TIME).append(" >= ? and ") - .append(RegisterSource.REGISTER_TIME).append(" <= ? )"); + sql.append(" ( (") + .append(RegisterSource.HEARTBEAT_TIME) + .append(" >= ? and ") + .append(RegisterSource.REGISTER_TIME) + .append(" <= ? )"); conditions.add(endTimestamp); conditions.add(endTimestamp); - sql.append(" or (").append(RegisterSource.REGISTER_TIME).append(" <= ? and ") - .append(RegisterSource.HEARTBEAT_TIME).append(" >= ? ) ) "); + sql.append(" or (") + .append(RegisterSource.REGISTER_TIME) + .append(" <= ? and ") + .append(RegisterSource.HEARTBEAT_TIME) + .append(" >= ? ) ) "); conditions.add(endTimestamp); conditions.add(startTimestamp); } diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetricsDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetricsDAO.java index e071c51dc73b..1435fc0bd6a6 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetricsDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetricsDAO.java @@ -19,16 +19,16 @@ package org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import org.apache.skywalking.oap.server.core.analysis.metrics.Metrics; -import org.apache.skywalking.oap.server.core.storage.*; +import org.apache.skywalking.oap.server.core.storage.IMetricsDAO; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.StorageData; import org.apache.skywalking.oap.server.core.storage.model.Model; import org.apache.skywalking.oap.server.library.client.jdbc.hikaricp.JDBCHikariCPClient; import org.apache.skywalking.oap.server.storage.plugin.jdbc.SQLExecutor; -/** - * @author wusheng - */ public class H2MetricsDAO extends H2SQLExecutor implements IMetricsDAO { private JDBCHikariCPClient h2Client; @@ -39,20 +39,23 @@ public H2MetricsDAO(JDBCHikariCPClient h2Client, StorageBuilder storage this.storageBuilder = storageBuilder; } - @Override public List multiGet(Model model, List ids) throws IOException { + @Override + public List multiGet(Model model, List ids) throws IOException { List storageDataList = getByIDs(h2Client, model.getName(), ids.toArray(new String[0]), storageBuilder); List result = new ArrayList<>(storageDataList.size()); for (StorageData storageData : storageDataList) { - result.add((Metrics)storageData); + result.add((Metrics) storageData); } return result; } - @Override public SQLExecutor prepareBatchInsert(Model model, Metrics metrics) throws IOException { + @Override + public SQLExecutor prepareBatchInsert(Model model, Metrics metrics) throws IOException { return getInsertExecutor(model.getName(), metrics, storageBuilder); } - @Override public SQLExecutor prepareBatchUpdate(Model model, Metrics metrics) throws IOException { + @Override + public SQLExecutor prepareBatchUpdate(Model model, Metrics metrics) throws IOException { return getUpdateExecutor(model.getName(), metrics, storageBuilder); } } diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetricsQueryDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetricsQueryDAO.java index 8b37015529b6..bbce536a65f5 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetricsQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetricsQueryDAO.java @@ -41,9 +41,6 @@ import org.apache.skywalking.oap.server.core.storage.query.IMetricsQueryDAO; import org.apache.skywalking.oap.server.library.client.jdbc.hikaricp.JDBCHikariCPClient; -/** - * @author wusheng - */ public class H2MetricsQueryDAO extends H2SQLExecutor implements IMetricsQueryDAO { private JDBCHikariCPClient h2Client; @@ -54,8 +51,7 @@ public H2MetricsQueryDAO(JDBCHikariCPClient h2Client) { @Override public IntValues getValues(String indName, Downsampling downsampling, long startTB, long endTB, Where where, - String valueCName, - Function function) throws IOException { + String valueCName, Function function) throws IOException { String tableName = ModelName.build(downsampling, indName); List whereKeyValues = where.getKeyValues(); @@ -94,11 +90,7 @@ public IntValues getValues(String indName, Downsampling downsampling, long start IntValues intValues = new IntValues(); try (Connection connection = h2Client.getConnection()) { - try (ResultSet resultSet = h2Client.executeQuery(connection, "select " + Metrics.ENTITY_ID + " id, " + op + "(" + valueCName + ") value from " + tableName - + " where " + whereSql - + Metrics.TIME_BUCKET + ">= ? and " + Metrics.TIME_BUCKET + "<=?" - + " group by " + Metrics.ENTITY_ID, - startTB, endTB)) { + try (ResultSet resultSet = h2Client.executeQuery(connection, "select " + Metrics.ENTITY_ID + " id, " + op + "(" + valueCName + ") value from " + tableName + " where " + whereSql + Metrics.TIME_BUCKET + ">= ? and " + Metrics.TIME_BUCKET + "<=?" + " group by " + Metrics.ENTITY_ID, startTB, endTB)) { while (resultSet.next()) { KVInt kv = new KVInt(); @@ -113,7 +105,8 @@ public IntValues getValues(String indName, Downsampling downsampling, long start return orderWithDefault0(intValues, ids); } - @Override public IntValues getLinearIntValues(String indName, Downsampling downsampling, List ids, + @Override + public IntValues getLinearIntValues(String indName, Downsampling downsampling, List ids, String valueCName) throws IOException { String tableName = ModelName.build(downsampling, indName); @@ -128,7 +121,8 @@ public IntValues getValues(String indName, Downsampling downsampling, long start IntValues intValues = new IntValues(); try (Connection connection = h2Client.getConnection()) { - try (ResultSet resultSet = h2Client.executeQuery(connection, "select id, " + valueCName + " from " + tableName + " where id in (" + idValues.toString() + ")")) { + try (ResultSet resultSet = h2Client.executeQuery(connection, "select id, " + valueCName + " from " + tableName + " where id in (" + idValues + .toString() + ")")) { while (resultSet.next()) { KVInt kv = new KVInt(); kv.setId(resultSet.getString("id")); @@ -143,10 +137,9 @@ public IntValues getValues(String indName, Downsampling downsampling, long start return orderWithDefault0(intValues, ids); } - @Override public IntValues[] getMultipleLinearIntValues(String indName, Downsampling downsampling, - List ids, - final List linearIndex, - String valueCName) throws IOException { + @Override + public IntValues[] getMultipleLinearIntValues(String indName, Downsampling downsampling, List ids, + final List linearIndex, String valueCName) throws IOException { String tableName = ModelName.build(downsampling, indName); StringBuilder idValues = new StringBuilder(); @@ -163,7 +156,8 @@ public IntValues getValues(String indName, Downsampling downsampling, long start } try (Connection connection = h2Client.getConnection()) { - try (ResultSet resultSet = h2Client.executeQuery(connection, "select id, " + valueCName + " from " + tableName + " where id in (" + idValues.toString() + ")")) { + try (ResultSet resultSet = h2Client.executeQuery(connection, "select id, " + valueCName + " from " + tableName + " where id in (" + idValues + .toString() + ")")) { while (resultSet.next()) { String id = resultSet.getString("id"); @@ -188,10 +182,6 @@ public IntValues getValues(String indName, Downsampling downsampling, long start /** * Make sure the order is same as the expected order, and keep default value as 0. - * - * @param origin - * @param expectedOrder - * @return */ private IntValues orderWithDefault0(IntValues origin, List expectedOrder) { IntValues intValues = new IntValues(); @@ -208,10 +198,6 @@ private IntValues orderWithDefault0(IntValues origin, List expectedOrder /** * Make sure the order is same as the expected order, and keep default value as 0. - * - * @param origin - * @param expectedOrder - * @return */ private IntValues[] orderWithDefault0(IntValues[] origin, List expectedOrder) { for (int i = 0; i < origin.length; i++) { @@ -220,7 +206,8 @@ private IntValues[] orderWithDefault0(IntValues[] origin, List expectedO return origin; } - @Override public Thermodynamic getThermodynamic(String indName, Downsampling downsampling, List ids, + @Override + public Thermodynamic getThermodynamic(String indName, Downsampling downsampling, List ids, String valueCName) throws IOException { String tableName = ModelName.build(downsampling, indName); @@ -239,11 +226,8 @@ private IntValues[] orderWithDefault0(IntValues[] origin, List expectedO Thermodynamic thermodynamic = new Thermodynamic(); int numOfSteps = 0; int axisYStep = 0; - try (ResultSet resultSet = h2Client.executeQuery(connection, "select " + ThermodynamicMetrics.STEP + " step, " - + ThermodynamicMetrics.NUM_OF_STEPS + " num_of_steps, " - + ThermodynamicMetrics.DETAIL_GROUP + " detail_group, " - + "id " - + " from " + tableName + " where id in (" + idValues.toString() + ")")) { + try (ResultSet resultSet = h2Client.executeQuery(connection, "select " + ThermodynamicMetrics.STEP + " step, " + ThermodynamicMetrics.NUM_OF_STEPS + " num_of_steps, " + ThermodynamicMetrics.DETAIL_GROUP + " detail_group, " + "id " + " from " + tableName + " where id in (" + idValues + .toString() + ")")) { while (resultSet.next()) { axisYStep = resultSet.getInt("step"); diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2NetworkAddressInventoryCacheDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2NetworkAddressInventoryCacheDAO.java index 4b68a300ad67..fce1fd3c5069 100755 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2NetworkAddressInventoryCacheDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2NetworkAddressInventoryCacheDAO.java @@ -19,16 +19,17 @@ package org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao; import java.io.IOException; -import java.sql.*; -import java.util.*; -import org.apache.skywalking.oap.server.core.register.*; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; +import org.apache.skywalking.oap.server.core.register.NetworkAddressInventory; import org.apache.skywalking.oap.server.core.storage.cache.INetworkAddressInventoryCacheDAO; import org.apache.skywalking.oap.server.library.client.jdbc.hikaricp.JDBCHikariCPClient; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author wusheng - */ public class H2NetworkAddressInventoryCacheDAO extends H2SQLExecutor implements INetworkAddressInventoryCacheDAO { private static final Logger logger = LoggerFactory.getLogger(H2NetworkAddressInventoryCacheDAO.class); private JDBCHikariCPClient h2Client; @@ -37,21 +38,24 @@ public H2NetworkAddressInventoryCacheDAO(JDBCHikariCPClient h2Client) { this.h2Client = h2Client; } - @Override public int getAddressId(String networkAddress) { + @Override + public int getAddressId(String networkAddress) { String id = NetworkAddressInventory.buildId(networkAddress); return getEntityIDByID(h2Client, NetworkAddressInventory.SEQUENCE, NetworkAddressInventory.INDEX_NAME, id); } - @Override public NetworkAddressInventory get(int addressId) { + @Override + public NetworkAddressInventory get(int addressId) { try { - return (NetworkAddressInventory)getByColumn(h2Client, NetworkAddressInventory.INDEX_NAME, NetworkAddressInventory.SEQUENCE, addressId, new NetworkAddressInventory.Builder()); + return (NetworkAddressInventory) getByColumn(h2Client, NetworkAddressInventory.INDEX_NAME, NetworkAddressInventory.SEQUENCE, addressId, new NetworkAddressInventory.Builder()); } catch (IOException e) { logger.error(e.getMessage(), e); return null; } } - @Override public List loadLastUpdate(long lastUpdateTime) { + @Override + public List loadLastUpdate(long lastUpdateTime) { List addressInventories = new ArrayList<>(); try { @@ -63,7 +67,7 @@ public H2NetworkAddressInventoryCacheDAO(JDBCHikariCPClient h2Client) { try (ResultSet resultSet = h2Client.executeQuery(connection, sql.toString(), lastUpdateTime)) { NetworkAddressInventory addressInventory; do { - addressInventory = (NetworkAddressInventory)toStorageData(resultSet, NetworkAddressInventory.INDEX_NAME, new NetworkAddressInventory.Builder()); + addressInventory = (NetworkAddressInventory) toStorageData(resultSet, NetworkAddressInventory.INDEX_NAME, new NetworkAddressInventory.Builder()); if (addressInventory != null) { addressInventories.add(addressInventory); } diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2NoneStreamDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2NoneStreamDAO.java index e52700555766..44a96d2c27d5 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2NoneStreamDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2NoneStreamDAO.java @@ -31,8 +31,6 @@ /** * Synchronize storage H2 implements - * - * @author MrPro */ public class H2NoneStreamDAO extends H2SQLExecutor implements INoneStreamDAO { diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2ProfileTaskLogQueryDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2ProfileTaskLogQueryDAO.java index 27d9d4e1f065..7adbc4cea3a7 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2ProfileTaskLogQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2ProfileTaskLogQueryDAO.java @@ -33,9 +33,6 @@ import java.util.LinkedList; import java.util.List; -/** - * @author MrPro - */ public class H2ProfileTaskLogQueryDAO implements IProfileTaskLogQueryDAO { private JDBCHikariCPClient h2Client; @@ -70,10 +67,11 @@ public List getTaskLogList(String taskId) throws IOException { private ProfileTaskLog parseLog(ResultSet data) throws SQLException { return ProfileTaskLog.builder() - .id(data.getString("id")) - .taskId(data.getString(ProfileTaskLogRecord.TASK_ID)) - .instanceId(data.getInt(ProfileTaskLogRecord.INSTANCE_ID)) - .operationType(ProfileTaskLogOperationType.parse(data.getInt(ProfileTaskLogRecord.OPERATION_TYPE))) - .operationTime(data.getLong(ProfileTaskLogRecord.OPERATION_TIME)).build(); + .id(data.getString("id")) + .taskId(data.getString(ProfileTaskLogRecord.TASK_ID)) + .instanceId(data.getInt(ProfileTaskLogRecord.INSTANCE_ID)) + .operationType(ProfileTaskLogOperationType.parse(data.getInt(ProfileTaskLogRecord.OPERATION_TYPE))) + .operationTime(data.getLong(ProfileTaskLogRecord.OPERATION_TIME)) + .build(); } } diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2ProfileTaskQueryDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2ProfileTaskQueryDAO.java index 248ca70c4f10..c8313c185a84 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2ProfileTaskQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2ProfileTaskQueryDAO.java @@ -33,9 +33,6 @@ import java.util.LinkedList; import java.util.List; -/** - * @author MrPro - */ public class H2ProfileTaskQueryDAO implements IProfileTaskQueryDAO { private JDBCHikariCPClient h2Client; @@ -44,7 +41,8 @@ public H2ProfileTaskQueryDAO(JDBCHikariCPClient h2Client) { } @Override - public List getTaskList(Integer serviceId, String endpointName, Long startTimeBucket, Long endTimeBucket, Integer limit) throws IOException { + public List getTaskList(Integer serviceId, String endpointName, Long startTimeBucket, + Long endTimeBucket, Integer limit) throws IOException { final StringBuilder sql = new StringBuilder(); final ArrayList condition = new ArrayList<>(4); sql.append("select * from ").append(ProfileTaskNoneStream.INDEX_NAME).append(" where 1=1 "); @@ -113,19 +111,18 @@ public ProfileTask getById(String id) throws IOException { /** * parse profile task data - * @param data - * @return */ private ProfileTask parseTask(ResultSet data) throws SQLException { return ProfileTask.builder() - .id(data.getString("id")) - .serviceId(data.getInt(ProfileTaskNoneStream.SERVICE_ID)) - .endpointName(data.getString(ProfileTaskNoneStream.ENDPOINT_NAME)) - .startTime(data.getLong(ProfileTaskNoneStream.START_TIME)) - .createTime(data.getLong(ProfileTaskNoneStream.CREATE_TIME)) - .duration(data.getInt(ProfileTaskNoneStream.DURATION)) - .minDurationThreshold(data.getInt(ProfileTaskNoneStream.MIN_DURATION_THRESHOLD)) - .dumpPeriod(data.getInt(ProfileTaskNoneStream.DUMP_PERIOD)) - .maxSamplingCount(data.getInt(ProfileTaskNoneStream.MAX_SAMPLING_COUNT)).build(); + .id(data.getString("id")) + .serviceId(data.getInt(ProfileTaskNoneStream.SERVICE_ID)) + .endpointName(data.getString(ProfileTaskNoneStream.ENDPOINT_NAME)) + .startTime(data.getLong(ProfileTaskNoneStream.START_TIME)) + .createTime(data.getLong(ProfileTaskNoneStream.CREATE_TIME)) + .duration(data.getInt(ProfileTaskNoneStream.DURATION)) + .minDurationThreshold(data.getInt(ProfileTaskNoneStream.MIN_DURATION_THRESHOLD)) + .dumpPeriod(data.getInt(ProfileTaskNoneStream.DUMP_PERIOD)) + .maxSamplingCount(data.getInt(ProfileTaskNoneStream.MAX_SAMPLING_COUNT)) + .build(); } } diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2ProfileThreadSnapshotQueryDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2ProfileThreadSnapshotQueryDAO.java index d0ddaeae20d4..53ceb932a29f 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2ProfileThreadSnapshotQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2ProfileThreadSnapshotQueryDAO.java @@ -18,6 +18,15 @@ package org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao; +import java.io.IOException; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Base64; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; import org.apache.skywalking.apm.util.StringUtil; import org.apache.skywalking.oap.server.core.analysis.manual.segment.SegmentRecord; import org.apache.skywalking.oap.server.core.profile.ProfileThreadSnapshotRecord; @@ -28,12 +37,6 @@ import org.apache.skywalking.oap.server.library.util.CollectionUtils; import org.elasticsearch.search.sort.SortOrder; -import java.io.IOException; -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.*; - public class H2ProfileThreadSnapshotQueryDAO implements IProfileThreadSnapshotQueryDAO { private JDBCHikariCPClient h2Client; @@ -45,9 +48,16 @@ public H2ProfileThreadSnapshotQueryDAO(JDBCHikariCPClient h2Client) { public List queryProfiledSegments(String taskId) throws IOException { // search segment id list StringBuilder sql = new StringBuilder(); - sql.append("select ").append(ProfileThreadSnapshotRecord.SEGMENT_ID).append(" from ").append(ProfileThreadSnapshotRecord.INDEX_NAME); + sql.append("select ") + .append(ProfileThreadSnapshotRecord.SEGMENT_ID) + .append(" from ") + .append(ProfileThreadSnapshotRecord.INDEX_NAME); - sql.append(" where ").append(ProfileThreadSnapshotRecord.TASK_ID).append(" = ? and ").append(ProfileThreadSnapshotRecord.SEQUENCE).append(" = 0"); + sql.append(" where ") + .append(ProfileThreadSnapshotRecord.TASK_ID) + .append(" = ? and ") + .append(ProfileThreadSnapshotRecord.SEQUENCE) + .append(" = 0"); final LinkedList segments = new LinkedList<>(); try (Connection connection = h2Client.getConnection()) { @@ -76,7 +86,8 @@ public List queryProfiledSegments(String taskId) throws IOException ArrayList result = new ArrayList<>(segments.size()); try (Connection connection = h2Client.getConnection()) { - try (ResultSet resultSet = h2Client.executeQuery(connection, sql.toString(), segments.toArray(new String[segments.size()]))) { + try (ResultSet resultSet = h2Client.executeQuery(connection, sql.toString(), segments.toArray(new String[segments + .size()]))) { while (resultSet.next()) { BasicTrace basicTrace = new BasicTrace(); diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2RecordDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2RecordDAO.java index 39158b4ca0a3..c0c08eb0a950 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2RecordDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2RecordDAO.java @@ -20,14 +20,12 @@ import java.io.IOException; import org.apache.skywalking.oap.server.core.analysis.record.Record; -import org.apache.skywalking.oap.server.core.storage.*; +import org.apache.skywalking.oap.server.core.storage.IRecordDAO; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.core.storage.model.Model; import org.apache.skywalking.oap.server.library.client.jdbc.hikaricp.JDBCHikariCPClient; import org.apache.skywalking.oap.server.library.client.request.InsertRequest; -/** - * @author wusheng - */ public class H2RecordDAO extends H2SQLExecutor implements IRecordDAO { private JDBCHikariCPClient h2Client; @@ -38,7 +36,8 @@ public H2RecordDAO(JDBCHikariCPClient h2Client, StorageBuilder storageBu this.storageBuilder = storageBuilder; } - @Override public InsertRequest prepareBatchInsert(Model model, Record record) throws IOException { + @Override + public InsertRequest prepareBatchInsert(Model model, Record record) throws IOException { return getInsertExecutor(model.getName(), record, storageBuilder); } } diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2RegisterDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2RegisterDAO.java index 9c24197fb13e..5052f825d9a5 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2RegisterDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2RegisterDAO.java @@ -19,16 +19,16 @@ package org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao; import java.io.IOException; -import java.sql.*; +import java.sql.Connection; +import java.sql.SQLException; import org.apache.skywalking.oap.server.core.register.RegisterSource; -import org.apache.skywalking.oap.server.core.storage.*; +import org.apache.skywalking.oap.server.core.storage.IRegisterDAO; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; import org.apache.skywalking.oap.server.library.client.jdbc.JDBCClientException; import org.apache.skywalking.oap.server.library.client.jdbc.hikaricp.JDBCHikariCPClient; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author wusheng - */ public class H2RegisterDAO extends H2SQLExecutor implements IRegisterDAO { private static final Logger logger = LoggerFactory.getLogger(H2RegisterDAO.class); @@ -41,11 +41,13 @@ public H2RegisterDAO(JDBCHikariCPClient h2Client, StorageBuilder this.storageBuilder = storageBuilder; } - @Override public RegisterSource get(String modelName, String id) throws IOException { - return (RegisterSource)getByID(h2Client, modelName, id, storageBuilder); + @Override + public RegisterSource get(String modelName, String id) throws IOException { + return (RegisterSource) getByID(h2Client, modelName, id, storageBuilder); } - @Override public void forceInsert(String modelName, RegisterSource source) throws IOException { + @Override + public void forceInsert(String modelName, RegisterSource source) throws IOException { try (Connection connection = h2Client.getConnection()) { getInsertExecutor(modelName, source, storageBuilder).invoke(connection); } catch (SQLException | JDBCClientException e) { @@ -53,7 +55,8 @@ public H2RegisterDAO(JDBCHikariCPClient h2Client, StorageBuilder } } - @Override public void forceUpdate(String modelName, RegisterSource source) throws IOException { + @Override + public void forceUpdate(String modelName, RegisterSource source) throws IOException { try (Connection connection = h2Client.getConnection()) { getUpdateExecutor(modelName, source, storageBuilder).invoke(connection); } catch (SQLException | JDBCClientException e) { diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2RegisterLockDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2RegisterLockDAO.java index 91b63dacdd6f..95f65dedc079 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2RegisterLockDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2RegisterLockDAO.java @@ -18,18 +18,19 @@ package org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao; -import java.sql.*; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; import org.apache.skywalking.oap.server.core.Const; import org.apache.skywalking.oap.server.core.register.RegisterSource; import org.apache.skywalking.oap.server.core.storage.IRegisterLockDAO; import org.apache.skywalking.oap.server.library.client.jdbc.JDBCClientException; import org.apache.skywalking.oap.server.library.client.jdbc.hikaricp.JDBCHikariCPClient; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * In MySQL, use a row lock of LOCK table. - * - * @author wusheng, peng-yongsheng */ public class H2RegisterLockDAO implements IRegisterLockDAO { @@ -41,7 +42,8 @@ public H2RegisterLockDAO(JDBCHikariCPClient h2Client) { this.h2Client = h2Client; } - @Override public int getId(int scopeId, RegisterSource registerSource) { + @Override + public int getId(int scopeId, RegisterSource registerSource) { try (Connection connection = h2Client.getTransactionConnection()) { ResultSet resultSet = h2Client.executeQuery(connection, "select sequence from " + H2RegisterLockInstaller.LOCK_TABLE_NAME + " where id = " + scopeId + " for update"); while (resultSet.next()) { diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2RegisterLockInstaller.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2RegisterLockInstaller.java index 1bbceae3b4cc..37a8ea999306 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2RegisterLockInstaller.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2RegisterLockInstaller.java @@ -18,7 +18,10 @@ package org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao; -import java.sql.*; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; import org.apache.skywalking.oap.server.core.analysis.Stream; import org.apache.skywalking.oap.server.core.register.worker.InventoryStreamProcessor; import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine; @@ -27,11 +30,9 @@ import org.apache.skywalking.oap.server.library.client.jdbc.JDBCClientException; import org.apache.skywalking.oap.server.library.client.jdbc.hikaricp.JDBCHikariCPClient; import org.apache.skywalking.oap.server.storage.plugin.jdbc.SQLBuilder; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author wusheng, peng-yongsheng - */ public class H2RegisterLockInstaller { private static final Logger logger = LoggerFactory.getLogger(H2RegisterLockInstaller.class); @@ -40,12 +41,9 @@ public class H2RegisterLockInstaller { /** * In MySQL lock storage, lock table created. The row lock is used in {@link H2RegisterLockDAO} - * - * @param client - * @throws StorageException */ public void install(Client client, H2RegisterLockDAO dao) throws StorageException { - JDBCHikariCPClient h2Client = (JDBCHikariCPClient)client; + JDBCHikariCPClient h2Client = (JDBCHikariCPClient) client; SQLBuilder tableCreateSQL = new SQLBuilder("CREATE TABLE IF NOT EXISTS " + LOCK_TABLE_NAME + " ("); tableCreateSQL.appendLine("id int PRIMARY KEY, "); tableCreateSQL.appendLine("sequence int, "); @@ -60,7 +58,7 @@ public void install(Client client, H2RegisterLockDAO dao) throws StorageExceptio h2Client.execute(connection, tableCreateSQL.toString()); for (Class registerSource : InventoryStreamProcessor.getInstance().getAllRegisterSources()) { - int scopeId = ((Stream)registerSource.getAnnotation(Stream.class)).scopeId(); + int scopeId = ((Stream) registerSource.getAnnotation(Stream.class)).scopeId(); putIfAbsent(h2Client, connection, scopeId, DefaultScopeDefine.nameOf(scopeId)); } } catch (JDBCClientException | SQLException e) { diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2SQLExecutor.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2SQLExecutor.java index ff86eb2e9d37..6b32a4079e39 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2SQLExecutor.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2SQLExecutor.java @@ -19,23 +19,30 @@ package org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao; import java.io.IOException; -import java.sql.*; -import java.util.*; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import org.apache.skywalking.oap.server.core.Const; import org.apache.skywalking.oap.server.core.register.ServiceInstanceInventory; -import org.apache.skywalking.oap.server.core.storage.*; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.StorageData; import org.apache.skywalking.oap.server.core.storage.model.ModelColumn; import org.apache.skywalking.oap.server.core.storage.type.StorageDataType; import org.apache.skywalking.oap.server.library.client.jdbc.JDBCClientException; import org.apache.skywalking.oap.server.library.client.jdbc.hikaricp.JDBCHikariCPClient; -import org.apache.skywalking.oap.server.storage.plugin.jdbc.*; -import org.slf4j.*; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.ArrayParamBuilder; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.SQLBuilder; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.SQLExecutor; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.TableMetaInfo; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author wusheng, peng-yongsheng - */ public class H2SQLExecutor { - + private static final Logger logger = LoggerFactory.getLogger(H2SQLExecutor.class); protected List getByIDs(JDBCHikariCPClient h2Client, String modelName, String[] ids, @@ -88,7 +95,8 @@ protected StorageData getByColumn(JDBCHikariCPClient h2Client, String modelName, } } - protected StorageData toStorageData(ResultSet rs, String modelName, StorageBuilder storageBuilder) throws SQLException { + protected StorageData toStorageData(ResultSet rs, String modelName, + StorageBuilder storageBuilder) throws SQLException { if (rs.next()) { Map data = new HashMap(); List columns = TableMetaInfo.get(modelName).getColumns(); @@ -113,7 +121,8 @@ protected int getEntityIDByID(JDBCHikariCPClient h2Client, String entityColumnNa return Const.NONE; } - protected SQLExecutor getInsertExecutor(String modelName, StorageData metrics, StorageBuilder storageBuilder) throws IOException { + protected SQLExecutor getInsertExecutor(String modelName, StorageData metrics, + StorageBuilder storageBuilder) throws IOException { Map objectMap = storageBuilder.data2Map(metrics); SQLBuilder sqlBuilder = new SQLBuilder("INSERT INTO " + modelName + " VALUES"); @@ -130,7 +139,7 @@ protected SQLExecutor getInsertExecutor(String modelName, StorageData metrics, S Object value = objectMap.get(column.getColumnName().getName()); if (value instanceof StorageDataType) { - param.add(((StorageDataType)value).toStorageData()); + param.add(((StorageDataType) value).toStorageData()); } else { param.add(value); } @@ -140,7 +149,8 @@ protected SQLExecutor getInsertExecutor(String modelName, StorageData metrics, S return new SQLExecutor(sqlBuilder.toString(), param); } - protected SQLExecutor getUpdateExecutor(String modelName, StorageData metrics, StorageBuilder storageBuilder) throws IOException { + protected SQLExecutor getUpdateExecutor(String modelName, StorageData metrics, + StorageBuilder storageBuilder) throws IOException { Map objectMap = storageBuilder.data2Map(metrics); SQLBuilder sqlBuilder = new SQLBuilder("UPDATE " + modelName + " SET "); @@ -155,7 +165,7 @@ protected SQLExecutor getUpdateExecutor(String modelName, StorageData metrics, S Object value = objectMap.get(column.getColumnName().getName()); if (value instanceof StorageDataType) { - param.add(((StorageDataType)value).toStorageData()); + param.add(((StorageDataType) value).toStorageData()); } else { param.add(value); } diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2ServiceInstanceInventoryCacheDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2ServiceInstanceInventoryCacheDAO.java index 8eeb234b5799..1f4c9f566031 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2ServiceInstanceInventoryCacheDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2ServiceInstanceInventoryCacheDAO.java @@ -32,9 +32,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * @author wusheng - */ public class H2ServiceInstanceInventoryCacheDAO extends H2SQLExecutor implements IServiceInstanceInventoryCacheDAO { private static final Logger logger = LoggerFactory.getLogger(H2ServiceInstanceInventoryCacheDAO.class); private JDBCHikariCPClient h2Client; @@ -43,21 +40,24 @@ public H2ServiceInstanceInventoryCacheDAO(JDBCHikariCPClient h2Client) { this.h2Client = h2Client; } - @Override public ServiceInstanceInventory get(int serviceInstanceId) { + @Override + public ServiceInstanceInventory get(int serviceInstanceId) { try { - return (ServiceInstanceInventory)getByColumn(h2Client, ServiceInstanceInventory.INDEX_NAME, ServiceInstanceInventory.SEQUENCE, serviceInstanceId, new ServiceInstanceInventory.Builder()); + return (ServiceInstanceInventory) getByColumn(h2Client, ServiceInstanceInventory.INDEX_NAME, ServiceInstanceInventory.SEQUENCE, serviceInstanceId, new ServiceInstanceInventory.Builder()); } catch (IOException e) { logger.error(e.getMessage(), e); return null; } } - @Override public int getServiceInstanceId(int serviceId, String uuid) { + @Override + public int getServiceInstanceId(int serviceId, String uuid) { String id = ServiceInstanceInventory.buildId(serviceId, uuid); return getByID(id); } - @Override public int getServiceInstanceId(int serviceId, int addressId) { + @Override + public int getServiceInstanceId(int serviceId, int addressId) { String id = ServiceInstanceInventory.buildId(serviceId, addressId); return getByID(id); } diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2ServiceInventoryCacheDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2ServiceInventoryCacheDAO.java index bf8bd5f56c74..d5f36105e6fc 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2ServiceInventoryCacheDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2ServiceInventoryCacheDAO.java @@ -19,17 +19,18 @@ package org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao; import java.io.IOException; -import java.sql.*; -import java.util.*; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; import org.apache.skywalking.oap.server.core.register.ServiceInventory; import org.apache.skywalking.oap.server.core.storage.cache.IServiceInventoryCacheDAO; import org.apache.skywalking.oap.server.library.client.jdbc.hikaricp.JDBCHikariCPClient; import org.apache.skywalking.oap.server.library.util.BooleanUtils; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author wusheng - */ public class H2ServiceInventoryCacheDAO extends H2SQLExecutor implements IServiceInventoryCacheDAO { private static final Logger logger = LoggerFactory.getLogger(H2ServiceInventoryCacheDAO.class); private JDBCHikariCPClient h2Client; @@ -38,26 +39,30 @@ public H2ServiceInventoryCacheDAO(JDBCHikariCPClient h2Client) { this.h2Client = h2Client; } - @Override public int getServiceId(String serviceName) { + @Override + public int getServiceId(String serviceName) { String id = ServiceInventory.buildId(serviceName); return getEntityIDByID(h2Client, ServiceInventory.SEQUENCE, ServiceInventory.INDEX_NAME, id); } - @Override public int getServiceId(int addressId) { + @Override + public int getServiceId(int addressId) { String id = ServiceInventory.buildId(addressId); return getEntityIDByID(h2Client, ServiceInventory.SEQUENCE, ServiceInventory.INDEX_NAME, id); } - @Override public ServiceInventory get(int serviceId) { + @Override + public ServiceInventory get(int serviceId) { try { - return (ServiceInventory)getByColumn(h2Client, ServiceInventory.INDEX_NAME, ServiceInventory.SEQUENCE, serviceId, new ServiceInventory.Builder()); + return (ServiceInventory) getByColumn(h2Client, ServiceInventory.INDEX_NAME, ServiceInventory.SEQUENCE, serviceId, new ServiceInventory.Builder()); } catch (IOException e) { logger.error(e.getMessage(), e); return null; } } - @Override public List loadLastUpdate(long lastUpdateTime) { + @Override + public List loadLastUpdate(long lastUpdateTime) { List serviceInventories = new ArrayList<>(); try { @@ -70,7 +75,7 @@ public H2ServiceInventoryCacheDAO(JDBCHikariCPClient h2Client) { try (ResultSet resultSet = h2Client.executeQuery(connection, sql.toString(), BooleanUtils.TRUE, lastUpdateTime)) { ServiceInventory serviceInventory; do { - serviceInventory = (ServiceInventory)toStorageData(resultSet, ServiceInventory.INDEX_NAME, new ServiceInventory.Builder()); + serviceInventory = (ServiceInventory) toStorageData(resultSet, ServiceInventory.INDEX_NAME, new ServiceInventory.Builder()); if (serviceInventory != null) { serviceInventories.add(serviceInventory); } diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2StorageDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2StorageDAO.java index 8cca0927074d..e2a8780d9290 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2StorageDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2StorageDAO.java @@ -22,12 +22,14 @@ import org.apache.skywalking.oap.server.core.analysis.metrics.Metrics; import org.apache.skywalking.oap.server.core.analysis.record.Record; import org.apache.skywalking.oap.server.core.register.RegisterSource; -import org.apache.skywalking.oap.server.core.storage.*; +import org.apache.skywalking.oap.server.core.storage.IMetricsDAO; +import org.apache.skywalking.oap.server.core.storage.INoneStreamDAO; +import org.apache.skywalking.oap.server.core.storage.IRecordDAO; +import org.apache.skywalking.oap.server.core.storage.IRegisterDAO; +import org.apache.skywalking.oap.server.core.storage.StorageBuilder; +import org.apache.skywalking.oap.server.core.storage.StorageDAO; import org.apache.skywalking.oap.server.library.client.jdbc.hikaricp.JDBCHikariCPClient; -/** - * @author wusheng, peng-yongsheng - */ public class H2StorageDAO implements StorageDAO { private JDBCHikariCPClient h2Client; @@ -36,15 +38,18 @@ public H2StorageDAO(JDBCHikariCPClient h2Client) { this.h2Client = h2Client; } - @Override public IMetricsDAO newMetricsDao(StorageBuilder storageBuilder) { + @Override + public IMetricsDAO newMetricsDao(StorageBuilder storageBuilder) { return new H2MetricsDAO(h2Client, storageBuilder); } - @Override public IRegisterDAO newRegisterDao(StorageBuilder storageBuilder) { + @Override + public IRegisterDAO newRegisterDao(StorageBuilder storageBuilder) { return new H2RegisterDAO(h2Client, storageBuilder); } - @Override public IRecordDAO newRecordDao(StorageBuilder storageBuilder) { + @Override + public IRecordDAO newRecordDao(StorageBuilder storageBuilder) { return new H2RecordDAO(h2Client, storageBuilder); } diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2TableInstaller.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2TableInstaller.java index ea3d7ead542d..1fa6eacfdb43 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2TableInstaller.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2TableInstaller.java @@ -18,19 +18,25 @@ package org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao; -import java.sql.*; - +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; import org.apache.skywalking.oap.server.core.analysis.manual.segment.SegmentRecord; import org.apache.skywalking.oap.server.core.analysis.metrics.IntKeyLongValueHashMap; import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine; import org.apache.skywalking.oap.server.core.storage.StorageException; -import org.apache.skywalking.oap.server.core.storage.model.*; +import org.apache.skywalking.oap.server.core.storage.model.ColumnName; +import org.apache.skywalking.oap.server.core.storage.model.Model; +import org.apache.skywalking.oap.server.core.storage.model.ModelColumn; +import org.apache.skywalking.oap.server.core.storage.model.ModelInstaller; import org.apache.skywalking.oap.server.library.client.Client; import org.apache.skywalking.oap.server.library.client.jdbc.JDBCClientException; import org.apache.skywalking.oap.server.library.client.jdbc.hikaricp.JDBCHikariCPClient; import org.apache.skywalking.oap.server.library.module.ModuleManager; -import org.apache.skywalking.oap.server.storage.plugin.jdbc.*; -import org.slf4j.*; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.SQLBuilder; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.TableMetaInfo; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class H2TableInstaller extends ModelInstaller { private static final Logger logger = LoggerFactory.getLogger(H2TableInstaller.class); @@ -39,9 +45,10 @@ public H2TableInstaller(ModuleManager moduleManager) { super(moduleManager); } - @Override protected boolean isExists(Client client, Model model) throws StorageException { + @Override + protected boolean isExists(Client client, Model model) throws StorageException { TableMetaInfo.addModel(model); - JDBCHikariCPClient h2Client = (JDBCHikariCPClient)client; + JDBCHikariCPClient h2Client = (JDBCHikariCPClient) client; try (Connection conn = h2Client.getConnection()) { try (ResultSet rset = conn.getMetaData().getTables(null, null, model.getName(), null)) { if (rset.next()) { @@ -56,14 +63,17 @@ public H2TableInstaller(ModuleManager moduleManager) { return false; } - @Override protected void createTable(Client client, Model model) throws StorageException { - JDBCHikariCPClient h2Client = (JDBCHikariCPClient)client; + @Override + protected void createTable(Client client, Model model) throws StorageException { + JDBCHikariCPClient h2Client = (JDBCHikariCPClient) client; SQLBuilder tableCreateSQL = new SQLBuilder("CREATE TABLE IF NOT EXISTS " + model.getName() + " ("); tableCreateSQL.appendLine("id VARCHAR(300) PRIMARY KEY, "); for (int i = 0; i < model.getColumns().size(); i++) { ModelColumn column = model.getColumns().get(i); ColumnName name = column.getColumnName(); - tableCreateSQL.appendLine(name.getStorageName() + " " + getColumnType(model, name, column.getType()) + (i != model.getColumns().size() - 1 ? "," : "")); + tableCreateSQL.appendLine(name.getStorageName() + " " + getColumnType(model, name, column.getType()) + (i != model + .getColumns() + .size() - 1 ? "," : "")); } tableCreateSQL.appendLine(")"); diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2TopNRecordsQueryDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2TopNRecordsQueryDAO.java index 2ab22317d315..03ac41de398f 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2TopNRecordsQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2TopNRecordsQueryDAO.java @@ -19,16 +19,17 @@ package org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao; import java.io.IOException; -import java.sql.*; -import java.util.*; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; import org.apache.skywalking.oap.server.core.analysis.topn.TopN; -import org.apache.skywalking.oap.server.core.query.entity.*; +import org.apache.skywalking.oap.server.core.query.entity.Order; +import org.apache.skywalking.oap.server.core.query.entity.TopNRecord; import org.apache.skywalking.oap.server.core.storage.query.ITopNRecordsQueryDAO; import org.apache.skywalking.oap.server.library.client.jdbc.hikaricp.JDBCHikariCPClient; -/** - * @author wusheng - */ public class H2TopNRecordsQueryDAO implements ITopNRecordsQueryDAO { private JDBCHikariCPClient h2Client; diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2TopologyQueryDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2TopologyQueryDAO.java index b2cf68c57b3b..02ed57f27180 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2TopologyQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2TopologyQueryDAO.java @@ -19,8 +19,11 @@ package org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao; import java.io.IOException; -import java.sql.*; -import java.util.*; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; import org.apache.skywalking.oap.server.core.analysis.Downsampling; import org.apache.skywalking.oap.server.core.analysis.manual.RelationDefineUtil; import org.apache.skywalking.oap.server.core.analysis.manual.endpointrelation.EndpointRelationServerSideMetrics; @@ -29,15 +32,12 @@ import org.apache.skywalking.oap.server.core.analysis.manual.relation.service.ServiceRelationClientSideMetrics; import org.apache.skywalking.oap.server.core.analysis.manual.relation.service.ServiceRelationServerSideMetrics; import org.apache.skywalking.oap.server.core.analysis.metrics.Metrics; -import org.apache.skywalking.oap.server.core.query.entity.*; +import org.apache.skywalking.oap.server.core.query.entity.Call; import org.apache.skywalking.oap.server.core.source.DetectPoint; import org.apache.skywalking.oap.server.core.storage.model.ModelName; import org.apache.skywalking.oap.server.core.storage.query.ITopologyQueryDAO; import org.apache.skywalking.oap.server.library.client.jdbc.hikaricp.JDBCHikariCPClient; -/** - * @author wusheng - */ public class H2TopologyQueryDAO implements ITopologyQueryDAO { private JDBCHikariCPClient h2Client; @@ -45,48 +45,51 @@ public H2TopologyQueryDAO(JDBCHikariCPClient h2Client) { this.h2Client = h2Client; } - @Override public List loadSpecifiedServerSideServiceRelations(Downsampling downsampling, long startTB, long endTB, - List serviceIds) throws IOException { + @Override + public List loadSpecifiedServerSideServiceRelations(Downsampling downsampling, long startTB, + long endTB, List serviceIds) throws IOException { String tableName = ModelName.build(downsampling, ServiceRelationServerSideMetrics.INDEX_NAME); return loadServiceCalls(tableName, startTB, endTB, ServiceRelationServerSideMetrics.SOURCE_SERVICE_ID, ServiceRelationServerSideMetrics.DEST_SERVICE_ID, serviceIds, false); } - @Override public List loadSpecifiedClientSideServiceRelations(Downsampling downsampling, long startTB, long endTB, - List serviceIds) throws IOException { + @Override + public List loadSpecifiedClientSideServiceRelations(Downsampling downsampling, long startTB, + long endTB, List serviceIds) throws IOException { String tableName = ModelName.build(downsampling, ServiceRelationClientSideMetrics.INDEX_NAME); return loadServiceCalls(tableName, startTB, endTB, ServiceRelationServerSideMetrics.SOURCE_SERVICE_ID, ServiceRelationServerSideMetrics.DEST_SERVICE_ID, serviceIds, true); } - @Override public List loadServerSideServiceRelations(Downsampling downsampling, long startTB, long endTB) throws IOException { + @Override + public List loadServerSideServiceRelations(Downsampling downsampling, long startTB, + long endTB) throws IOException { String tableName = ModelName.build(downsampling, ServiceRelationServerSideMetrics.INDEX_NAME); return loadServiceCalls(tableName, startTB, endTB, ServiceRelationServerSideMetrics.SOURCE_SERVICE_ID, ServiceRelationServerSideMetrics.DEST_SERVICE_ID, new ArrayList<>(0), false); } - @Override public List loadClientSideServiceRelations(Downsampling downsampling, long startTB, long endTB) throws IOException { + @Override + public List loadClientSideServiceRelations(Downsampling downsampling, long startTB, + long endTB) throws IOException { String tableName = ModelName.build(downsampling, ServiceRelationClientSideMetrics.INDEX_NAME); return loadServiceCalls(tableName, startTB, endTB, ServiceRelationServerSideMetrics.SOURCE_SERVICE_ID, ServiceRelationServerSideMetrics.DEST_SERVICE_ID, new ArrayList<>(0), true); } @Override - public List loadServerSideServiceInstanceRelations(int clientServiceId, int serverServiceId, Downsampling downsampling, long startTB, long endTB) throws IOException { + public List loadServerSideServiceInstanceRelations(int clientServiceId, int serverServiceId, + Downsampling downsampling, long startTB, long endTB) throws IOException { String tableName = ModelName.build(downsampling, ServiceInstanceRelationServerSideMetrics.INDEX_NAME); - return loadServiceInstanceCalls(tableName, startTB, endTB, - ServiceInstanceRelationServerSideMetrics.SOURCE_SERVICE_ID, - ServiceInstanceRelationServerSideMetrics.DEST_SERVICE_ID, - clientServiceId, serverServiceId, false); + return loadServiceInstanceCalls(tableName, startTB, endTB, ServiceInstanceRelationServerSideMetrics.SOURCE_SERVICE_ID, ServiceInstanceRelationServerSideMetrics.DEST_SERVICE_ID, clientServiceId, serverServiceId, false); } @Override - public List loadClientSideServiceInstanceRelations(int clientServiceId, int serverServiceId, Downsampling downsampling, long startTB, long endTB) throws IOException { + public List loadClientSideServiceInstanceRelations(int clientServiceId, int serverServiceId, + Downsampling downsampling, long startTB, long endTB) throws IOException { String tableName = ModelName.build(downsampling, ServiceInstanceRelationClientSideMetrics.INDEX_NAME); - return loadServiceInstanceCalls(tableName, startTB, endTB, - ServiceInstanceRelationClientSideMetrics.SOURCE_SERVICE_ID, - ServiceInstanceRelationClientSideMetrics.DEST_SERVICE_ID, - clientServiceId, serverServiceId, true); + return loadServiceInstanceCalls(tableName, startTB, endTB, ServiceInstanceRelationClientSideMetrics.SOURCE_SERVICE_ID, ServiceInstanceRelationClientSideMetrics.DEST_SERVICE_ID, clientServiceId, serverServiceId, true); } @Override - public List loadSpecifiedDestOfServerSideEndpointRelations(Downsampling downsampling, long startTB, long endTB, int destEndpointId) throws IOException { + public List loadSpecifiedDestOfServerSideEndpointRelations(Downsampling downsampling, long startTB, + long endTB, int destEndpointId) throws IOException { String tableName = ModelName.build(downsampling, EndpointRelationServerSideMetrics.INDEX_NAME); List calls = loadEndpointFromSide(tableName, startTB, endTB, EndpointRelationServerSideMetrics.SOURCE_ENDPOINT_ID, EndpointRelationServerSideMetrics.DEST_ENDPOINT_ID, destEndpointId, false); @@ -114,13 +117,8 @@ private List loadServiceCalls(String tableName, long startTB, l } List calls = new ArrayList<>(); try (Connection connection = h2Client.getConnection()) { - try (ResultSet resultSet = h2Client.executeQuery(connection, "select " - + Metrics.ENTITY_ID - + " from " + tableName + " where " - + Metrics.TIME_BUCKET + ">= ? and " + Metrics.TIME_BUCKET + "<=? " - + serviceIdMatchSql.toString() - + " group by " + Metrics.ENTITY_ID, - conditions)) { + try (ResultSet resultSet = h2Client.executeQuery(connection, "select " + Metrics.ENTITY_ID + " from " + tableName + " where " + Metrics.TIME_BUCKET + ">= ? and " + Metrics.TIME_BUCKET + "<=? " + serviceIdMatchSql + .toString() + " group by " + Metrics.ENTITY_ID, conditions)) { buildCalls(resultSet, calls, isClientSide); } } catch (SQLException e) { @@ -129,21 +127,31 @@ private List loadServiceCalls(String tableName, long startTB, l return calls; } - private List loadServiceInstanceCalls(String tableName, long startTB, long endTB, String sourceCName, - String descCName, int sourceServiceId, int destServiceId, boolean isClientSide) throws IOException { - Object[] conditions = new Object[]{startTB, endTB, sourceServiceId, destServiceId, destServiceId, sourceServiceId}; - StringBuilder serviceIdMatchSql = new StringBuilder("and ((") - .append(sourceCName).append("=? and ").append(descCName).append("=?").append(") or (") - .append(sourceCName).append("=? and ").append(descCName).append("=?").append("))"); + private List loadServiceInstanceCalls(String tableName, long startTB, long endTB, + String sourceCName, String descCName, int sourceServiceId, int destServiceId, + boolean isClientSide) throws IOException { + Object[] conditions = new Object[] { + startTB, + endTB, + sourceServiceId, + destServiceId, + destServiceId, + sourceServiceId + }; + StringBuilder serviceIdMatchSql = new StringBuilder("and ((").append(sourceCName) + .append("=? and ") + .append(descCName) + .append("=?") + .append(") or (") + .append(sourceCName) + .append("=? and ") + .append(descCName) + .append("=?") + .append("))"); List calls = new ArrayList<>(); try (Connection connection = h2Client.getConnection()) { - try (ResultSet resultSet = h2Client.executeQuery(connection, "select " - + Metrics.ENTITY_ID - + " from " + tableName + " where " - + Metrics.TIME_BUCKET + ">= ? and " + Metrics.TIME_BUCKET + "<=? " - + serviceIdMatchSql.toString() - + " group by " + Metrics.ENTITY_ID, - conditions)) { + try (ResultSet resultSet = h2Client.executeQuery(connection, "select " + Metrics.ENTITY_ID + " from " + tableName + " where " + Metrics.TIME_BUCKET + ">= ? and " + Metrics.TIME_BUCKET + "<=? " + serviceIdMatchSql + .toString() + " group by " + Metrics.ENTITY_ID, conditions)) { buildCalls(resultSet, calls, isClientSide); } } catch (SQLException e) { @@ -160,13 +168,7 @@ private List loadEndpointFromSide(String tableName, long startT conditions[2] = id; List calls = new ArrayList<>(); try (Connection connection = h2Client.getConnection()) { - try (ResultSet resultSet = h2Client.executeQuery(connection, "select " - + Metrics.ENTITY_ID - + " from " + tableName + " where " - + Metrics.TIME_BUCKET + ">= ? and " + Metrics.TIME_BUCKET + "<=? and " - + (isSourceId ? sourceCName : destCName) + "=?" - + " group by " + Metrics.ENTITY_ID, - conditions)) { + try (ResultSet resultSet = h2Client.executeQuery(connection, "select " + Metrics.ENTITY_ID + " from " + tableName + " where " + Metrics.TIME_BUCKET + ">= ? and " + Metrics.TIME_BUCKET + "<=? and " + (isSourceId ? sourceCName : destCName) + "=?" + " group by " + Metrics.ENTITY_ID, conditions)) { buildCalls(resultSet, calls, isSourceId); } } catch (SQLException e) { diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2TraceQueryDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2TraceQueryDAO.java index e3999f65099a..40f19325bc68 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2TraceQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2TraceQueryDAO.java @@ -39,10 +39,6 @@ import java.util.Collections; import java.util.List; -/** - * @author wusheng - * @author panjuan - */ public class H2TraceQueryDAO implements ITraceQueryDAO { private JDBCHikariCPClient h2Client; @@ -114,7 +110,8 @@ public TraceBrief queryBasicTraces(long startSecondTB, long endSecondTB, long mi TraceBrief traceBrief = new TraceBrief(); try (Connection connection = h2Client.getConnection()) { - try (ResultSet resultSet = h2Client.executeQuery(connection, buildCountStatement(sql.toString()), parameters.toArray(new Object[0]))) { + try (ResultSet resultSet = h2Client.executeQuery(connection, buildCountStatement(sql.toString()), parameters + .toArray(new Object[0]))) { while (resultSet.next()) { traceBrief.setTotal(resultSet.getInt("total")); } @@ -152,7 +149,8 @@ protected void buildLimit(StringBuilder sql, int from, int limit) { sql.append(" OFFSET ").append(from); } - @Override public List queryByTraceId(String traceId) throws IOException { + @Override + public List queryByTraceId(String traceId) throws IOException { List segmentRecords = new ArrayList<>(); try (Connection connection = h2Client.getConnection()) { @@ -181,7 +179,8 @@ protected void buildLimit(StringBuilder sql, int from, int limit) { return segmentRecords; } - @Override public List doFlexibleTraceQuery(String traceId) { + @Override + public List doFlexibleTraceQuery(String traceId) { return Collections.emptyList(); } } diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLAggregationQueryDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLAggregationQueryDAO.java index 3d87db4d6107..a636ac3cd395 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLAggregationQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLAggregationQueryDAO.java @@ -33,14 +33,9 @@ import java.util.ArrayList; import java.util.List; -/** - * @author wusheng - * @author panjuan - */ public class MySQLAggregationQueryDAO extends H2AggregationQueryDAO { - public MySQLAggregationQueryDAO( - JDBCHikariCPClient client) { + public MySQLAggregationQueryDAO(JDBCHikariCPClient client) { super(client); } @@ -50,15 +45,20 @@ public List topNQuery(String indName, String valueCName, int topN, D String tableName = ModelName.build(downsampling, indName); StringBuilder sql = new StringBuilder(); List conditions = new ArrayList<>(10); - sql.append("select avg(").append(valueCName).append(") value,").append(Metrics.ENTITY_ID).append(" from ") - .append(tableName).append(" where "); + sql.append("select avg(") + .append(valueCName) + .append(") value,") + .append(Metrics.ENTITY_ID) + .append(" from ") + .append(tableName) + .append(" where "); this.setTimeRangeCondition(sql, conditions, startTB, endTB); if (appender != null) { appender.append(sql, conditions); } sql.append(" group by ").append(Metrics.ENTITY_ID); sql.append(" order by value ").append(order.equals(Order.ASC) ? "asc" : "desc").append(" limit ").append(topN); - + List topNEntities = new ArrayList<>(); try (Connection connection = getH2Client().getConnection()) { try (ResultSet resultSet = getH2Client().executeQuery(connection, sql.toString(), conditions.toArray(new Object[0]))) { diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLAlarmQueryDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLAlarmQueryDAO.java index 524759617d2f..1f7f172aedff 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLAlarmQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLAlarmQueryDAO.java @@ -34,21 +34,17 @@ import java.util.List; import java.util.Objects; -/** - * @author wusheng - * @author panjuan - */ public class MySQLAlarmQueryDAO implements IAlarmQueryDAO { - + private JDBCHikariCPClient client; - + public MySQLAlarmQueryDAO(JDBCHikariCPClient client) { this.client = client; } - + @Override public Alarms getAlarm(Integer scopeId, String keyword, int limit, int from, long startTB, - long endTB) throws IOException { + long endTB) throws IOException { StringBuilder sql = new StringBuilder(); List parameters = new ArrayList<>(10); sql.append("from ").append(AlarmRecord.INDEX_NAME).append(" where "); @@ -63,23 +59,24 @@ public Alarms getAlarm(Integer scopeId, String keyword, int limit, int from, lon sql.append(" and ").append(AlarmRecord.TIME_BUCKET).append(" <= ?"); parameters.add(endTB); } - + if (!Strings.isNullOrEmpty(keyword)) { sql.append(" and ").append(AlarmRecord.ALARM_MESSAGE).append(" like '%").append(keyword).append("%' "); } sql.append(" order by ").append(AlarmRecord.START_TIME).append(" desc "); - + Alarms alarms = new Alarms(); try (Connection connection = client.getConnection()) { - - try (ResultSet resultSet = client.executeQuery(connection, "select count(1) total " + sql.toString(), parameters.toArray(new Object[0]))) { + + try (ResultSet resultSet = client.executeQuery(connection, "select count(1) total " + sql.toString(), parameters + .toArray(new Object[0]))) { while (resultSet.next()) { alarms.setTotal(resultSet.getInt("total")); } } - + this.buildLimit(sql, from, limit); - + try (ResultSet resultSet = client.executeQuery(connection, "select * " + sql.toString(), parameters.toArray(new Object[0]))) { while (resultSet.next()) { AlarmMessage message = new AlarmMessage(); @@ -88,17 +85,17 @@ public Alarms getAlarm(Integer scopeId, String keyword, int limit, int from, lon message.setStartTime(resultSet.getLong(AlarmRecord.START_TIME)); message.setScope(Scope.Finder.valueOf(resultSet.getInt(AlarmRecord.SCOPE))); message.setScopeId(resultSet.getInt(AlarmRecord.SCOPE)); - + alarms.getMsgs().add(message); } } } catch (SQLException e) { throw new IOException(e); } - + return alarms; } - + private void buildLimit(StringBuilder sql, int from, int limit) { sql.append(" LIMIT ").append(from).append(", ").append(limit); } diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLLogQueryDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLLogQueryDAO.java index 5744e6c3afed..27f1bf5b3674 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLLogQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLLogQueryDAO.java @@ -21,21 +21,17 @@ import org.apache.skywalking.oap.server.library.client.jdbc.hikaricp.JDBCHikariCPClient; import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2LogQueryDAO; -/** - * @author wusheng - * @author panjuan - */ public class MySQLLogQueryDAO extends H2LogQueryDAO { - + public MySQLLogQueryDAO(JDBCHikariCPClient h2Client) { super(h2Client); } - + @Override protected String buildCountStatement(String sql) { return "select count(1) total " + sql; } - + protected void buildLimit(StringBuilder sql, int from, int limit) { sql.append(" LIMIT ").append(from).append(", ").append(limit); } diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLStorageConfig.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLStorageConfig.java index 92ad903b9750..1b44b1de1e8b 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLStorageConfig.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLStorageConfig.java @@ -24,14 +24,10 @@ import java.util.Properties; -/** - * - * @author panjuan - */ @Setter @Getter public final class MySQLStorageConfig extends ModuleConfig { - + private int metadataQueryMaxSize = 5000; private Properties properties; } diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLStorageProvider.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLStorageProvider.java index 295417fe66b6..09d302ef5bba 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLStorageProvider.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLStorageProvider.java @@ -47,7 +47,22 @@ import org.apache.skywalking.oap.server.library.module.ModuleProvider; import org.apache.skywalking.oap.server.library.module.ModuleStartException; import org.apache.skywalking.oap.server.library.module.ServiceNotProvidedException; -import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.*; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2BatchDAO; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2EndpointInventoryCacheDAO; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2HistoryDeleteDAO; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2MetadataQueryDAO; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2MetricsQueryDAO; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2NetworkAddressInventoryCacheDAO; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2ProfileTaskLogQueryDAO; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2ProfileTaskQueryDAO; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2ProfileThreadSnapshotQueryDAO; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2RegisterLockDAO; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2RegisterLockInstaller; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2ServiceInstanceInventoryCacheDAO; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2ServiceInventoryCacheDAO; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2StorageDAO; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2TopNRecordsQueryDAO; +import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2TopologyQueryDAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -58,8 +73,6 @@ * Because this module is not really related to MySQL, instead, it is based on MySQL SQL style with JDBC, so, by having * this storage implementation, we could also use this in MySQL-compatible projects, such as, Apache ShardingSphere, * TiDB - * - * @author wusheng, peng-yongsheng, panjuan */ public class MySQLStorageProvider extends ModuleProvider { @@ -73,19 +86,23 @@ public MySQLStorageProvider() { config = new MySQLStorageConfig(); } - @Override public String name() { + @Override + public String name() { return "mysql"; } - @Override public Class module() { + @Override + public Class module() { return StorageModule.class; } - @Override public ModuleConfig createConfigBeanIfAbsent() { + @Override + public ModuleConfig createConfigBeanIfAbsent() { return config; } - @Override public void prepare() throws ServiceNotProvidedException { + @Override + public void prepare() throws ServiceNotProvidedException { mysqlClient = new JDBCHikariCPClient(config.getProperties()); this.registerServiceImplementation(IBatchDAO.class, new H2BatchDAO(mysqlClient)); @@ -112,8 +129,9 @@ public MySQLStorageProvider() { this.registerServiceImplementation(IProfileTaskLogQueryDAO.class, new H2ProfileTaskLogQueryDAO(mysqlClient)); this.registerServiceImplementation(IProfileThreadSnapshotQueryDAO.class, new H2ProfileThreadSnapshotQueryDAO(mysqlClient)); } - - @Override public void start() throws ServiceNotProvidedException, ModuleStartException { + + @Override + public void start() throws ServiceNotProvidedException, ModuleStartException { try { mysqlClient.connect(); @@ -126,11 +144,13 @@ public MySQLStorageProvider() { } } - @Override public void notifyAfterCompleted() throws ServiceNotProvidedException { + @Override + public void notifyAfterCompleted() throws ServiceNotProvidedException { } - @Override public String[] requiredModules() { + @Override + public String[] requiredModules() { return new String[] {CoreModule.NAME}; } } diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLTableInstaller.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLTableInstaller.java index af409bc131cb..55404d914ba2 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLTableInstaller.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLTableInstaller.java @@ -18,27 +18,33 @@ package org.apache.skywalking.oap.server.storage.plugin.jdbc.mysql; -import java.sql.*; +import java.sql.Connection; +import java.sql.SQLException; import org.apache.skywalking.oap.server.core.analysis.manual.segment.SegmentRecord; import org.apache.skywalking.oap.server.core.analysis.metrics.IntKeyLongValueHashMap; import org.apache.skywalking.oap.server.core.register.RegisterSource; import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine; import org.apache.skywalking.oap.server.core.storage.StorageException; -import org.apache.skywalking.oap.server.core.storage.model.*; +import org.apache.skywalking.oap.server.core.storage.model.ColumnName; +import org.apache.skywalking.oap.server.core.storage.model.Model; import org.apache.skywalking.oap.server.library.client.Client; import org.apache.skywalking.oap.server.library.client.jdbc.JDBCClientException; import org.apache.skywalking.oap.server.library.client.jdbc.hikaricp.JDBCHikariCPClient; import org.apache.skywalking.oap.server.library.module.ModuleManager; import org.apache.skywalking.oap.server.storage.plugin.jdbc.SQLBuilder; import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2TableInstaller; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.*; +import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.ALARM; +import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.ENDPOINT_INVENTORY; +import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.NETWORK_ADDRESS; +import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.SEGMENT; +import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.SERVICE_INSTANCE_INVENTORY; +import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.SERVICE_INVENTORY; /** * Extend H2TableInstaller but match MySQL SQL syntax. - * - * @author wusheng */ public class MySQLTableInstaller extends H2TableInstaller { @@ -53,9 +59,10 @@ public MySQLTableInstaller(ModuleManager moduleManager) { this.overrideColumnName("match", "match_num"); } - @Override protected void createTable(Client client, Model model) throws StorageException { + @Override + protected void createTable(Client client, Model model) throws StorageException { super.createTable(client, model); - JDBCHikariCPClient jdbcHikariCPClient = (JDBCHikariCPClient)client; + JDBCHikariCPClient jdbcHikariCPClient = (JDBCHikariCPClient) client; this.createIndexes(jdbcHikariCPClient, model); } @@ -108,7 +115,11 @@ private void createIndexesForAllMetrics(JDBCHikariCPClient client, Model model) try (Connection connection = client.getConnection()) { SQLBuilder tableIndexSQL = new SQLBuilder("CREATE INDEX "); tableIndexSQL.append(model.getName().toUpperCase()).append("_TIME_BUCKET "); - tableIndexSQL.append("ON ").append(model.getName()).append("(").append(SegmentRecord.TIME_BUCKET).append(")"); + tableIndexSQL.append("ON ") + .append(model.getName()) + .append("(") + .append(SegmentRecord.TIME_BUCKET) + .append(")"); createIndex(client, connection, model, tableIndexSQL); } catch (JDBCClientException | SQLException e) { throw new StorageException(e.getMessage(), e); @@ -119,7 +130,11 @@ private void createAlarmIndexes(JDBCHikariCPClient client, Model model) throws S try (Connection connection = client.getConnection()) { SQLBuilder tableIndexSQL = new SQLBuilder("CREATE INDEX "); tableIndexSQL.append(model.getName().toUpperCase()).append("_TIME_BUCKET "); - tableIndexSQL.append("ON ").append(model.getName()).append("(").append(SegmentRecord.TIME_BUCKET).append(")"); + tableIndexSQL.append("ON ") + .append(model.getName()) + .append("(") + .append(SegmentRecord.TIME_BUCKET) + .append(")"); createIndex(client, connection, model, tableIndexSQL); } catch (JDBCClientException | SQLException e) { throw new StorageException(e.getMessage(), e); @@ -135,7 +150,11 @@ private void createSegmentIndexes(JDBCHikariCPClient client, Model model) throws tableIndexSQL = new SQLBuilder("CREATE INDEX "); tableIndexSQL.append(model.getName().toUpperCase()).append("_ENDPOINT_ID "); - tableIndexSQL.append("ON ").append(model.getName()).append("(").append(SegmentRecord.ENDPOINT_ID).append(")"); + tableIndexSQL.append("ON ") + .append(model.getName()) + .append("(") + .append(SegmentRecord.ENDPOINT_ID) + .append(")"); createIndex(client, connection, model, tableIndexSQL); tableIndexSQL = new SQLBuilder("CREATE INDEX "); @@ -145,7 +164,11 @@ private void createSegmentIndexes(JDBCHikariCPClient client, Model model) throws tableIndexSQL = new SQLBuilder("CREATE INDEX "); tableIndexSQL.append(model.getName().toUpperCase()).append("_TIME_BUCKET "); - tableIndexSQL.append("ON ").append(model.getName()).append("(").append(SegmentRecord.TIME_BUCKET).append(")"); + tableIndexSQL.append("ON ") + .append(model.getName()) + .append("(") + .append(SegmentRecord.TIME_BUCKET) + .append(")"); createIndex(client, connection, model, tableIndexSQL); } catch (JDBCClientException | SQLException e) { throw new StorageException(e.getMessage(), e); @@ -161,7 +184,13 @@ private void createInventoryIndexes(JDBCHikariCPClient client, Model model) thro tableIndexSQL = new SQLBuilder("CREATE INDEX "); tableIndexSQL.append(model.getName().toUpperCase()).append("_TIME "); - tableIndexSQL.append("ON ").append(model.getName()).append("(").append(RegisterSource.HEARTBEAT_TIME).append(", ").append(RegisterSource.REGISTER_TIME).append(")"); + tableIndexSQL.append("ON ") + .append(model.getName()) + .append("(") + .append(RegisterSource.HEARTBEAT_TIME) + .append(", ") + .append(RegisterSource.REGISTER_TIME) + .append(")"); createIndex(client, connection, model, tableIndexSQL); } catch (JDBCClientException | SQLException e) { throw new StorageException(e.getMessage(), e); diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLTraceQueryDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLTraceQueryDAO.java index bcbf47fa36b0..7cb6a38b2aa2 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLTraceQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLTraceQueryDAO.java @@ -21,22 +21,19 @@ import org.apache.skywalking.oap.server.library.client.jdbc.hikaricp.JDBCHikariCPClient; import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2TraceQueryDAO; -/** - * @author wusheng - * @author panjuan - */ public class MySQLTraceQueryDAO extends H2TraceQueryDAO { - + public MySQLTraceQueryDAO(JDBCHikariCPClient mysqlClient) { super(mysqlClient); } - + @Override protected String buildCountStatement(String sql) { return "select count(1) total " + sql; } - - @Override protected void buildLimit(StringBuilder sql, int from, int limit) { + + @Override + protected void buildLimit(StringBuilder sql, int from, int limit) { sql.append(" LIMIT ").append(from).append(", ").append(limit); } } diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/test/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/ArrayParamBuilderTestCase.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/test/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/ArrayParamBuilderTestCase.java index 8d120a5f8d6a..2af41c040a25 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/test/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/ArrayParamBuilderTestCase.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/test/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/ArrayParamBuilderTestCase.java @@ -17,11 +17,9 @@ package org.apache.skywalking.oap.server.storage.plugin.jdbc; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -/** - * @author peng-yongsheng - */ public class ArrayParamBuilderTestCase { @Test @@ -29,10 +27,17 @@ public void testBuild() { String param = ArrayParamBuilder.build(new String[] {"1"}); Assert.assertEquals("'1'", param); - param = ArrayParamBuilder.build(new String[] {"1", "2"}); + param = ArrayParamBuilder.build(new String[] { + "1", + "2" + }); Assert.assertEquals("'1','2'", param); - param = ArrayParamBuilder.build(new String[] {"1", "2", "3"}); + param = ArrayParamBuilder.build(new String[] { + "1", + "2", + "3" + }); Assert.assertEquals("'1','2','3'", param); } } diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/test/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/PreventRedistributionMySQLDriverTest.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/test/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/PreventRedistributionMySQLDriverTest.java index dbc13db58791..41bf89b01474 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/test/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/PreventRedistributionMySQLDriverTest.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/test/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/PreventRedistributionMySQLDriverTest.java @@ -22,11 +22,9 @@ /** * This is a very special test case. It isn't for feature testing. - * - * In Apache, we can't redistribute MySQL Driver, because of GPL license, but we deliver MySQL solution sourceScopeId codes and - * distribution by using JDBC. - * - * @author wusheng + *

+ * In Apache, we can't redistribute MySQL Driver, because of GPL license, but we deliver MySQL solution sourceScopeId + * codes and distribution by using JDBC. */ public class PreventRedistributionMySQLDriverTest { @Test(expected = ClassNotFoundException.class) diff --git a/oap-server/server-storage-plugin/storage-zipkin-plugin/pom.xml b/oap-server/server-storage-plugin/storage-zipkin-plugin/pom.xml index a9cce6670ee8..07e2d3ba4ff5 100644 --- a/oap-server/server-storage-plugin/storage-zipkin-plugin/pom.xml +++ b/oap-server/server-storage-plugin/storage-zipkin-plugin/pom.xml @@ -17,7 +17,8 @@ ~ --> - + server-storage-plugin org.apache.skywalking diff --git a/oap-server/server-storage-plugin/storage-zipkin-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/ZipkinSpan.java b/oap-server/server-storage-plugin/storage-zipkin-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/ZipkinSpan.java index 3cf99f623cf9..ca657873857b 100644 --- a/oap-server/server-storage-plugin/storage-zipkin-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/ZipkinSpan.java +++ b/oap-server/server-storage-plugin/storage-zipkin-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/ZipkinSpan.java @@ -18,35 +18,61 @@ package org.apache.skywalking.oap.server.storage.plugin.zipkin; -import lombok.*; -import org.apache.skywalking.oap.server.core.source.*; +import lombok.Getter; +import lombok.Setter; +import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine; +import org.apache.skywalking.oap.server.core.source.ScopeDeclaration; +import org.apache.skywalking.oap.server.core.source.Source; -import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.*; +import static org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.ZIPKIN_SPAN; -/** - * @author peng-yongsheng - */ @ScopeDeclaration(id = ZIPKIN_SPAN, name = "ZipkinSpan") public class ZipkinSpan extends Source { - @Override public int scope() { + @Override + public int scope() { return DefaultScopeDefine.ZIPKIN_SPAN; } - @Override public String getEntityId() { + @Override + public String getEntityId() { return traceId + spanId; } - @Setter @Getter private String traceId; - @Setter @Getter private String spanId; - @Setter @Getter private int serviceId; - @Setter @Getter private int serviceInstanceId; - @Setter @Getter private String endpointName; - @Setter @Getter private int endpointId; - @Setter @Getter private long startTime; - @Setter @Getter private long endTime; - @Setter @Getter private int latency; - @Setter @Getter private int isError; - @Setter @Getter private byte[] dataBinary; - @Setter @Getter private int encode; + @Setter + @Getter + private String traceId; + @Setter + @Getter + private String spanId; + @Setter + @Getter + private int serviceId; + @Setter + @Getter + private int serviceInstanceId; + @Setter + @Getter + private String endpointName; + @Setter + @Getter + private int endpointId; + @Setter + @Getter + private long startTime; + @Setter + @Getter + private long endTime; + @Setter + @Getter + private int latency; + @Setter + @Getter + private int isError; + @Setter + @Getter + private byte[] dataBinary; + @Setter + @Getter + private int encode; } diff --git a/oap-server/server-storage-plugin/storage-zipkin-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/ZipkinSpanRecord.java b/oap-server/server-storage-plugin/storage-zipkin-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/ZipkinSpanRecord.java index b1333af390c8..8b067221e8b4 100644 --- a/oap-server/server-storage-plugin/storage-zipkin-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/ZipkinSpanRecord.java +++ b/oap-server/server-storage-plugin/storage-zipkin-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/ZipkinSpanRecord.java @@ -18,8 +18,11 @@ package org.apache.skywalking.oap.server.storage.plugin.zipkin; -import java.util.*; -import lombok.*; +import java.util.Base64; +import java.util.HashMap; +import java.util.Map; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.apm.util.StringUtil; import org.apache.skywalking.oap.server.core.Const; import org.apache.skywalking.oap.server.core.analysis.Stream; @@ -27,7 +30,8 @@ import org.apache.skywalking.oap.server.core.analysis.worker.RecordStreamProcessor; import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine; import org.apache.skywalking.oap.server.core.storage.StorageBuilder; -import org.apache.skywalking.oap.server.core.storage.annotation.*; +import org.apache.skywalking.oap.server.core.storage.annotation.Column; +import org.apache.skywalking.oap.server.core.storage.annotation.IDColumn; import org.apache.skywalking.oap.server.library.util.CollectionUtils; @Stream(name = ZipkinSpanRecord.INDEX_NAME, scopeId = DefaultScopeDefine.ZIPKIN_SPAN, builder = ZipkinSpanRecord.Builder.class, processor = RecordStreamProcessor.class) @@ -46,26 +50,76 @@ public class ZipkinSpanRecord extends Record { public static final String DATA_BINARY = "data_binary"; public static final String ENCODE = "encode"; - @Setter @Getter @Column(columnName = TRACE_ID) @IDColumn private String traceId; - @Setter @Getter @Column(columnName = SPAN_ID) @IDColumn private String spanId; - @Setter @Getter @Column(columnName = SERVICE_ID) @IDColumn private int serviceId; - @Setter @Getter @Column(columnName = SERVICE_INSTANCE_ID) @IDColumn private int serviceInstanceId; - @Setter @Getter @Column(columnName = ENDPOINT_NAME, matchQuery = true) @IDColumn private String endpointName; - @Setter @Getter @Column(columnName = ENDPOINT_ID) @IDColumn private int endpointId; - @Setter @Getter @Column(columnName = START_TIME) @IDColumn private long startTime; - @Setter @Getter @Column(columnName = END_TIME) @IDColumn private long endTime; - @Setter @Getter @Column(columnName = LATENCY) @IDColumn private int latency; - @Setter @Getter @Column(columnName = IS_ERROR) @IDColumn private int isError; - @Setter @Getter @Column(columnName = DATA_BINARY) @IDColumn private byte[] dataBinary; - @Setter @Getter @Column(columnName = ENCODE) @IDColumn private int encode; + @Setter + @Getter + @Column(columnName = TRACE_ID) + @IDColumn + private String traceId; + @Setter + @Getter + @Column(columnName = SPAN_ID) + @IDColumn + private String spanId; + @Setter + @Getter + @Column(columnName = SERVICE_ID) + @IDColumn + private int serviceId; + @Setter + @Getter + @Column(columnName = SERVICE_INSTANCE_ID) + @IDColumn + private int serviceInstanceId; + @Setter + @Getter + @Column(columnName = ENDPOINT_NAME, matchQuery = true) + @IDColumn + private String endpointName; + @Setter + @Getter + @Column(columnName = ENDPOINT_ID) + @IDColumn + private int endpointId; + @Setter + @Getter + @Column(columnName = START_TIME) + @IDColumn + private long startTime; + @Setter + @Getter + @Column(columnName = END_TIME) + @IDColumn + private long endTime; + @Setter + @Getter + @Column(columnName = LATENCY) + @IDColumn + private int latency; + @Setter + @Getter + @Column(columnName = IS_ERROR) + @IDColumn + private int isError; + @Setter + @Getter + @Column(columnName = DATA_BINARY) + @IDColumn + private byte[] dataBinary; + @Setter + @Getter + @Column(columnName = ENCODE) + @IDColumn + private int encode; - @Override public String id() { + @Override + public String id() { return traceId + "-" + spanId; } public static class Builder implements StorageBuilder { - @Override public Map data2Map(ZipkinSpanRecord storageData) { + @Override + public Map data2Map(ZipkinSpanRecord storageData) { Map map = new HashMap<>(); map.put(TRACE_ID, storageData.getTraceId()); map.put(SPAN_ID, storageData.getSpanId()); @@ -87,25 +141,26 @@ public static class Builder implements StorageBuilder { return map; } - @Override public ZipkinSpanRecord map2Data(Map dbMap) { + @Override + public ZipkinSpanRecord map2Data(Map dbMap) { ZipkinSpanRecord record = new ZipkinSpanRecord(); - record.setTraceId((String)dbMap.get(TRACE_ID)); - record.setSpanId((String)dbMap.get(SPAN_ID)); - record.setServiceId(((Number)dbMap.get(SERVICE_ID)).intValue()); - record.setServiceInstanceId(((Number)dbMap.get(SERVICE_INSTANCE_ID)).intValue()); - record.setEndpointName((String)dbMap.get(ENDPOINT_NAME)); - record.setEndpointId(((Number)dbMap.get(ENDPOINT_ID)).intValue()); - record.setStartTime(((Number)dbMap.get(START_TIME)).longValue()); - record.setEndTime(((Number)dbMap.get(END_TIME)).longValue()); - record.setLatency(((Number)dbMap.get(LATENCY)).intValue()); - record.setIsError(((Number)dbMap.get(IS_ERROR)).intValue()); - record.setTimeBucket(((Number)dbMap.get(TIME_BUCKET)).longValue()); - if (StringUtil.isEmpty((String)dbMap.get(DATA_BINARY))) { + record.setTraceId((String) dbMap.get(TRACE_ID)); + record.setSpanId((String) dbMap.get(SPAN_ID)); + record.setServiceId(((Number) dbMap.get(SERVICE_ID)).intValue()); + record.setServiceInstanceId(((Number) dbMap.get(SERVICE_INSTANCE_ID)).intValue()); + record.setEndpointName((String) dbMap.get(ENDPOINT_NAME)); + record.setEndpointId(((Number) dbMap.get(ENDPOINT_ID)).intValue()); + record.setStartTime(((Number) dbMap.get(START_TIME)).longValue()); + record.setEndTime(((Number) dbMap.get(END_TIME)).longValue()); + record.setLatency(((Number) dbMap.get(LATENCY)).intValue()); + record.setIsError(((Number) dbMap.get(IS_ERROR)).intValue()); + record.setTimeBucket(((Number) dbMap.get(TIME_BUCKET)).longValue()); + if (StringUtil.isEmpty((String) dbMap.get(DATA_BINARY))) { record.setDataBinary(new byte[] {}); } else { - record.setDataBinary(Base64.getDecoder().decode((String)dbMap.get(DATA_BINARY))); + record.setDataBinary(Base64.getDecoder().decode((String) dbMap.get(DATA_BINARY))); } - record.setEncode(((Number)dbMap.get(ENCODE)).intValue()); + record.setEncode(((Number) dbMap.get(ENCODE)).intValue()); return record; } } diff --git a/oap-server/server-storage-plugin/storage-zipkin-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/ZipkinSpanRecordDispatcher.java b/oap-server/server-storage-plugin/storage-zipkin-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/ZipkinSpanRecordDispatcher.java index a580c70de0b5..bd10c4353e0b 100644 --- a/oap-server/server-storage-plugin/storage-zipkin-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/ZipkinSpanRecordDispatcher.java +++ b/oap-server/server-storage-plugin/storage-zipkin-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/ZipkinSpanRecordDispatcher.java @@ -23,12 +23,11 @@ /** * Dispatch for Zipkin native mode spans. - * - * @author wusheng */ public class ZipkinSpanRecordDispatcher implements SourceDispatcher { - @Override public void dispatch(ZipkinSpan source) { + @Override + public void dispatch(ZipkinSpan source) { ZipkinSpanRecord segment = new ZipkinSpanRecord(); segment.setTraceId(source.getTraceId()); segment.setSpanId(source.getSpanId()); diff --git a/oap-server/server-storage-plugin/storage-zipkin-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/elasticsearch/ZipkinStorageModuleElasticsearchProvider.java b/oap-server/server-storage-plugin/storage-zipkin-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/elasticsearch/ZipkinStorageModuleElasticsearchProvider.java index e529fda25f33..219c0303d667 100644 --- a/oap-server/server-storage-plugin/storage-zipkin-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/elasticsearch/ZipkinStorageModuleElasticsearchProvider.java +++ b/oap-server/server-storage-plugin/storage-zipkin-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/elasticsearch/ZipkinStorageModuleElasticsearchProvider.java @@ -23,11 +23,9 @@ import org.apache.skywalking.oap.server.core.storage.query.ITraceQueryDAO; import org.apache.skywalking.oap.server.library.module.ServiceNotProvidedException; import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.StorageModuleElasticsearchProvider; -import org.slf4j.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * @author peng-yongsheng - */ public class ZipkinStorageModuleElasticsearchProvider extends StorageModuleElasticsearchProvider { private static final Logger logger = LoggerFactory.getLogger(ZipkinStorageModuleElasticsearchProvider.class); @@ -45,9 +43,12 @@ public void prepare() throws ServiceNotProvidedException { this.registerServiceImplementation(ITraceQueryDAO.class, traceQueryEsDAO); } - @Override public void notifyAfterCompleted() { + @Override + public void notifyAfterCompleted() { super.notifyAfterCompleted(); - traceQueryEsDAO.setServiceInventoryCache(getManager().find(CoreModule.NAME).provider().getService(ServiceInventoryCache.class)); + traceQueryEsDAO.setServiceInventoryCache(getManager().find(CoreModule.NAME) + .provider() + .getService(ServiceInventoryCache.class)); } @Override diff --git a/oap-server/server-storage-plugin/storage-zipkin-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/elasticsearch/ZipkinTraceQueryEsDAO.java b/oap-server/server-storage-plugin/storage-zipkin-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/elasticsearch/ZipkinTraceQueryEsDAO.java index d7ae20c57deb..94611429ba60 100644 --- a/oap-server/server-storage-plugin/storage-zipkin-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/elasticsearch/ZipkinTraceQueryEsDAO.java +++ b/oap-server/server-storage-plugin/storage-zipkin-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/zipkin/elasticsearch/ZipkinTraceQueryEsDAO.java @@ -20,23 +20,38 @@ import com.google.common.base.Strings; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Base64; +import java.util.Collections; +import java.util.List; import lombok.Setter; import org.apache.skywalking.apm.util.StringUtil; import org.apache.skywalking.oap.server.core.Const; import org.apache.skywalking.oap.server.core.analysis.manual.segment.SegmentRecord; import org.apache.skywalking.oap.server.core.cache.ServiceInventoryCache; -import org.apache.skywalking.oap.server.core.query.entity.*; +import org.apache.skywalking.oap.server.core.query.entity.BasicTrace; +import org.apache.skywalking.oap.server.core.query.entity.KeyValue; +import org.apache.skywalking.oap.server.core.query.entity.LogEntity; +import org.apache.skywalking.oap.server.core.query.entity.QueryOrder; +import org.apache.skywalking.oap.server.core.query.entity.Ref; +import org.apache.skywalking.oap.server.core.query.entity.RefType; +import org.apache.skywalking.oap.server.core.query.entity.TraceBrief; +import org.apache.skywalking.oap.server.core.query.entity.TraceState; import org.apache.skywalking.oap.server.core.storage.query.ITraceQueryDAO; import org.apache.skywalking.oap.server.library.client.elasticsearch.ElasticSearchClient; import org.apache.skywalking.oap.server.library.util.BooleanUtils; import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base.EsDAO; import org.apache.skywalking.oap.server.storage.plugin.zipkin.ZipkinSpanRecord; import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.index.query.*; +import org.elasticsearch.index.query.BoolQueryBuilder; +import org.elasticsearch.index.query.QueryBuilder; +import org.elasticsearch.index.query.QueryBuilders; +import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.search.SearchHit; -import org.elasticsearch.search.aggregations.*; -import org.elasticsearch.search.aggregations.bucket.terms.*; +import org.elasticsearch.search.aggregations.AggregationBuilders; +import org.elasticsearch.search.aggregations.BucketOrder; +import org.elasticsearch.search.aggregations.bucket.terms.Terms; +import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder; import org.elasticsearch.search.aggregations.metrics.max.Max; import org.elasticsearch.search.aggregations.metrics.min.Min; import org.elasticsearch.search.builder.SearchSourceBuilder; @@ -44,14 +59,21 @@ import zipkin2.Span; import zipkin2.codec.SpanBytesDecoder; -import static org.apache.skywalking.oap.server.storage.plugin.zipkin.ZipkinSpanRecord.*; +import static org.apache.skywalking.oap.server.storage.plugin.zipkin.ZipkinSpanRecord.ENDPOINT_ID; +import static org.apache.skywalking.oap.server.storage.plugin.zipkin.ZipkinSpanRecord.ENDPOINT_NAME; +import static org.apache.skywalking.oap.server.storage.plugin.zipkin.ZipkinSpanRecord.IS_ERROR; +import static org.apache.skywalking.oap.server.storage.plugin.zipkin.ZipkinSpanRecord.LATENCY; +import static org.apache.skywalking.oap.server.storage.plugin.zipkin.ZipkinSpanRecord.SERVICE_ID; +import static org.apache.skywalking.oap.server.storage.plugin.zipkin.ZipkinSpanRecord.SERVICE_INSTANCE_ID; +import static org.apache.skywalking.oap.server.storage.plugin.zipkin.ZipkinSpanRecord.START_TIME; +import static org.apache.skywalking.oap.server.storage.plugin.zipkin.ZipkinSpanRecord.TIME_BUCKET; +import static org.apache.skywalking.oap.server.storage.plugin.zipkin.ZipkinSpanRecord.TRACE_ID; public class ZipkinTraceQueryEsDAO extends EsDAO implements ITraceQueryDAO { @Setter private ServiceInventoryCache serviceInventoryCache; - public ZipkinTraceQueryEsDAO( - ElasticSearchClient client) { + public ZipkinTraceQueryEsDAO(ElasticSearchClient client) { super(client); } @@ -104,13 +126,13 @@ public TraceBrief queryBasicTraces(long startSecondTB, long endSecondTB, long mi break; } - TermsAggregationBuilder builder = AggregationBuilders.terms(TRACE_ID).field(TRACE_ID).size(limit) - .subAggregation( - AggregationBuilders.max(LATENCY).field(LATENCY) - ) - .subAggregation( - AggregationBuilders.min(START_TIME).field(START_TIME) - ); + TermsAggregationBuilder builder = AggregationBuilders.terms(TRACE_ID) + .field(TRACE_ID) + .size(limit) + .subAggregation(AggregationBuilders.max(LATENCY) + .field(LATENCY)) + .subAggregation(AggregationBuilders.min(START_TIME) + .field(START_TIME)); switch (queryOrder) { case BY_START_TIME: builder.order(BucketOrder.aggregation(START_TIME, false)); @@ -133,9 +155,9 @@ public TraceBrief queryBasicTraces(long startSecondTB, long endSecondTB, long mi basicTrace.setSegmentId(termsBucket.getKeyAsString()); Min startTime = termsBucket.getAggregations().get(START_TIME); Max latency = termsBucket.getAggregations().get(LATENCY); - basicTrace.setStart(String.valueOf((long)startTime.getValue())); + basicTrace.setStart(String.valueOf((long) startTime.getValue())); basicTrace.getEndpointNames().add(""); - basicTrace.setDuration((int)latency.getValue()); + basicTrace.setDuration((int) latency.getValue()); basicTrace.setError(false); basicTrace.getTraceIds().add(termsBucket.getKeyAsString()); traceBrief.getTraces().add(basicTrace); @@ -144,11 +166,13 @@ public TraceBrief queryBasicTraces(long startSecondTB, long endSecondTB, long mi return traceBrief; } - @Override public List queryByTraceId(String traceId) throws IOException { + @Override + public List queryByTraceId(String traceId) throws IOException { return Collections.emptyList(); } - @Override public List doFlexibleTraceQuery( + @Override + public List doFlexibleTraceQuery( String traceId) throws IOException { SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource(); sourceBuilder.query(QueryBuilders.termQuery(TRACE_ID, traceId)); @@ -160,8 +184,8 @@ public TraceBrief queryBasicTraces(long startSecondTB, long endSecondTB, long mi List spanList = new ArrayList<>(); for (SearchHit searchHit : response.getHits().getHits()) { - int serviceId = ((Number)searchHit.getSourceAsMap().get(SERVICE_ID)).intValue(); - String dataBinaryBase64 = (String)searchHit.getSourceAsMap().get(SegmentRecord.DATA_BINARY); + int serviceId = ((Number) searchHit.getSourceAsMap().get(SERVICE_ID)).intValue(); + String dataBinaryBase64 = (String) searchHit.getSourceAsMap().get(SegmentRecord.DATA_BINARY); Span span = SpanBytesDecoder.PROTO3.decodeOne(Base64.getDecoder().decode(dataBinaryBase64)); org.apache.skywalking.oap.server.core.query.entity.Span swSpan = new org.apache.skywalking.oap.server.core.query.entity.Span(); diff --git a/oap-server/server-telemetry/pom.xml b/oap-server/server-telemetry/pom.xml index ea4bd5bb2bc4..9dce0e899f6f 100644 --- a/oap-server/server-telemetry/pom.xml +++ b/oap-server/server-telemetry/pom.xml @@ -17,7 +17,8 @@ ~ --> - + oap-server org.apache.skywalking diff --git a/oap-server/server-telemetry/telemetry-api/pom.xml b/oap-server/server-telemetry/telemetry-api/pom.xml index 1655a7888b3f..c3fd74b593d4 100644 --- a/oap-server/server-telemetry/telemetry-api/pom.xml +++ b/oap-server/server-telemetry/telemetry-api/pom.xml @@ -17,7 +17,8 @@ ~ --> - + server-telemetry org.apache.skywalking diff --git a/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/TelemetryModule.java b/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/TelemetryModule.java index f9a9d13bf669..8e4a159eecc5 100644 --- a/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/TelemetryModule.java +++ b/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/TelemetryModule.java @@ -24,8 +24,6 @@ /** * Telemetry module definition - * - * @author wusheng */ public class TelemetryModule extends ModuleDefine { public static final String NAME = "telemetry"; @@ -34,7 +32,11 @@ public TelemetryModule() { super(NAME); } - @Override public Class[] services() { - return new Class[] {MetricsCreator.class, MetricsCollector.class}; + @Override + public Class[] services() { + return new Class[] { + MetricsCreator.class, + MetricsCollector.class + }; } } diff --git a/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/CounterMetrics.java b/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/CounterMetrics.java index 870c46f268a1..17ed47b20d73 100644 --- a/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/CounterMetrics.java +++ b/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/CounterMetrics.java @@ -22,8 +22,6 @@ * A counter is a cumulative metrics that represents a single monotonically increasing counter whose value can only * increase or be reset to zero on restart. For example, you can use a counter to represent the number of requests * served, tasks completed, or errors.z - * - * @author wusheng */ public interface CounterMetrics { /** @@ -33,8 +31,6 @@ public interface CounterMetrics { /** * Increase the given value to the counter - * - * @param value */ void inc(double value); } diff --git a/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/GaugeMetrics.java b/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/GaugeMetrics.java index ce070bb6f0f4..03dfa584696f 100644 --- a/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/GaugeMetrics.java +++ b/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/GaugeMetrics.java @@ -20,8 +20,6 @@ /** * A gauge is a metrics that represents a single numerical value that can arbitrarily go up and down. - * - * @author wusheng */ public interface GaugeMetrics { /** @@ -31,8 +29,6 @@ public interface GaugeMetrics { /** * Increase the given value to the gauge - * - * @param value */ void inc(double value); @@ -43,15 +39,11 @@ public interface GaugeMetrics { /** * Decrease the given value to the gauge - * - * @param value */ void dec(double value); /** * Set the given value to the gauge - * - * @param value */ void setValue(double value); } diff --git a/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/HistogramMetrics.java b/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/HistogramMetrics.java index dce0af3473a5..a3215a203508 100644 --- a/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/HistogramMetrics.java +++ b/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/HistogramMetrics.java @@ -18,13 +18,11 @@ package org.apache.skywalking.oap.server.telemetry.api; -import java.io.*; +import java.io.Closeable; /** * A histogram samples observations (usually things like request durations or response sizes) and counts them in * configurable buckets. It also provides a sum of all observed values. - * - * @author wusheng */ public abstract class HistogramMetrics { public Timer createTimer() { @@ -50,7 +48,7 @@ public Timer(HistogramMetrics metrics) { public void finish() { long endNanos = System.nanoTime(); - duration = (double)(endNanos - startNanos) / 1.0E9D; + duration = (double) (endNanos - startNanos) / 1.0E9D; metrics.observe(duration); } diff --git a/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/MetricFamily.java b/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/MetricFamily.java index eabb2c632a6d..62f314cb3ad0 100644 --- a/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/MetricFamily.java +++ b/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/MetricFamily.java @@ -18,16 +18,13 @@ package org.apache.skywalking.oap.server.telemetry.api; +import java.util.List; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.ToString; -import java.util.List; - /** * MetricFamily define a metric and all its samples. - * - * @author gaohongtao */ @AllArgsConstructor @EqualsAndHashCode @@ -40,11 +37,7 @@ public class MetricFamily { public final List samples; public enum Type { - COUNTER, - GAUGE, - SUMMARY, - HISTOGRAM, - UNTYPED, + COUNTER, GAUGE, SUMMARY, HISTOGRAM, UNTYPED, } /** diff --git a/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/MetricsCollector.java b/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/MetricsCollector.java index c0a988f64611..a966c381145e 100644 --- a/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/MetricsCollector.java +++ b/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/MetricsCollector.java @@ -22,8 +22,6 @@ /** * Collect all metrics from telemetry. - * - * @author gaohongtao */ public interface MetricsCollector extends Service { diff --git a/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/MetricsCreator.java b/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/MetricsCreator.java index 60c19f6fc579..6e7ff6941254 100644 --- a/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/MetricsCreator.java +++ b/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/MetricsCreator.java @@ -23,38 +23,23 @@ /** * Open API to telemetry module, allow to create metrics instance with different type. Types inherits from prometheus * project, and plan to move to openmetrics APIs after it is ready. - * - * @author wusheng */ public interface MetricsCreator extends Service { /** * Create a counter type metrics instance. - * - * @param name - * @param tips - * @param tagKeys - * @return */ CounterMetrics createCounter(String name, String tips, MetricsTag.Keys tagKeys, MetricsTag.Values tagValues); /** * Create a gauge type metrics instance. - * - * @param name - * @param tips - * @param tagKeys - * @return */ GaugeMetrics createGauge(String name, String tips, MetricsTag.Keys tagKeys, MetricsTag.Values tagValues); /** * Create a Histogram type metrics instance. * - * @param name - * @param tips - * @param tagKeys * @param buckets Time bucket for duration. - * @return */ - HistogramMetrics createHistogramMetric(String name, String tips, MetricsTag.Keys tagKeys, MetricsTag.Values tagValues, double... buckets); + HistogramMetrics createHistogramMetric(String name, String tips, MetricsTag.Keys tagKeys, + MetricsTag.Values tagValues, double... buckets); } diff --git a/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/MetricsTag.java b/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/MetricsTag.java index f9542ba62c92..067ab5b3be4c 100644 --- a/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/MetricsTag.java +++ b/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/MetricsTag.java @@ -20,7 +20,7 @@ /** * Tag for the target metrics. - * + *

* The tag values should be set in putting value phase. */ public class MetricsTag { diff --git a/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/TelemetryRelatedContext.java b/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/TelemetryRelatedContext.java index 3bceccab2970..09bfcbdf53bc 100644 --- a/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/TelemetryRelatedContext.java +++ b/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/TelemetryRelatedContext.java @@ -20,13 +20,14 @@ /** * The telemetry context which the metrics instances may need to know. - * @author wusheng */ public enum TelemetryRelatedContext { INSTANCE; private volatile String id = null; - TelemetryRelatedContext(){} + + TelemetryRelatedContext() { + } /** * Set a global ID to represent the current oap instance diff --git a/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/none/MetricsCollectorNoop.java b/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/none/MetricsCollectorNoop.java index 57eac8be99d2..d1068ddd5d4f 100644 --- a/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/none/MetricsCollectorNoop.java +++ b/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/none/MetricsCollectorNoop.java @@ -18,15 +18,12 @@ package org.apache.skywalking.oap.server.telemetry.none; +import java.util.Collections; import org.apache.skywalking.oap.server.telemetry.api.MetricFamily; import org.apache.skywalking.oap.server.telemetry.api.MetricsCollector; -import java.util.Collections; - /** * No-op MetricFamily Collector. - * - * @author gaohongtao */ public class MetricsCollectorNoop implements MetricsCollector { @Override diff --git a/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/none/MetricsCreatorNoop.java b/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/none/MetricsCreatorNoop.java index 90b022854f82..6f3efd471751 100644 --- a/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/none/MetricsCreatorNoop.java +++ b/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/none/MetricsCreatorNoop.java @@ -18,22 +18,27 @@ package org.apache.skywalking.oap.server.telemetry.none; -import org.apache.skywalking.oap.server.telemetry.api.*; +import org.apache.skywalking.oap.server.telemetry.api.CounterMetrics; +import org.apache.skywalking.oap.server.telemetry.api.GaugeMetrics; +import org.apache.skywalking.oap.server.telemetry.api.HistogramMetrics; +import org.apache.skywalking.oap.server.telemetry.api.MetricsCreator; +import org.apache.skywalking.oap.server.telemetry.api.MetricsTag; /** * A no-op metrics create, just create nut shell metrics instance. - * - * @author wusheng */ public class MetricsCreatorNoop implements MetricsCreator { @Override - public CounterMetrics createCounter(String name, String tips, MetricsTag.Keys tagKeys, MetricsTag.Values tagValues) { + public CounterMetrics createCounter(String name, String tips, MetricsTag.Keys tagKeys, + MetricsTag.Values tagValues) { return new CounterMetrics() { - @Override public void inc() { + @Override + public void inc() { } - @Override public void inc(double value) { + @Override + public void inc(double value) { } }; @@ -42,23 +47,28 @@ public CounterMetrics createCounter(String name, String tips, MetricsTag.Keys ta @Override public GaugeMetrics createGauge(String name, String tips, MetricsTag.Keys tagKeys, MetricsTag.Values tagValues) { return new GaugeMetrics() { - @Override public void inc() { + @Override + public void inc() { } - @Override public void inc(double value) { + @Override + public void inc(double value) { } - @Override public void dec() { + @Override + public void dec() { } - @Override public void dec(double value) { + @Override + public void dec(double value) { } - @Override public void setValue(double value) { + @Override + public void setValue(double value) { } }; @@ -68,7 +78,8 @@ public GaugeMetrics createGauge(String name, String tips, MetricsTag.Keys tagKey public HistogramMetrics createHistogramMetric(String name, String tips, MetricsTag.Keys tagKeys, MetricsTag.Values tagValues, double... buckets) { return new HistogramMetrics() { - @Override public void observe(double value) { + @Override + public void observe(double value) { } }; diff --git a/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/none/NoneTelemetryProvider.java b/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/none/NoneTelemetryProvider.java index 96975e2931eb..0c1165ecb4b6 100644 --- a/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/none/NoneTelemetryProvider.java +++ b/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/none/NoneTelemetryProvider.java @@ -18,44 +18,53 @@ package org.apache.skywalking.oap.server.telemetry.none; -import org.apache.skywalking.oap.server.library.module.*; +import org.apache.skywalking.oap.server.library.module.ModuleConfig; +import org.apache.skywalking.oap.server.library.module.ModuleDefine; +import org.apache.skywalking.oap.server.library.module.ModuleProvider; +import org.apache.skywalking.oap.server.library.module.ModuleStartException; +import org.apache.skywalking.oap.server.library.module.ServiceNotProvidedException; import org.apache.skywalking.oap.server.telemetry.TelemetryModule; import org.apache.skywalking.oap.server.telemetry.api.MetricsCollector; import org.apache.skywalking.oap.server.telemetry.api.MetricsCreator; /** * A nutshell telemetry implementor. - * - * @author wusheng */ public class NoneTelemetryProvider extends ModuleProvider { - @Override public String name() { + @Override + public String name() { return "none"; } - @Override public Class module() { + @Override + public Class module() { return TelemetryModule.class; } - @Override public ModuleConfig createConfigBeanIfAbsent() { + @Override + public ModuleConfig createConfigBeanIfAbsent() { return new ModuleConfig() { }; } - @Override public void prepare() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void prepare() throws ServiceNotProvidedException, ModuleStartException { this.registerServiceImplementation(MetricsCreator.class, new MetricsCreatorNoop()); this.registerServiceImplementation(MetricsCollector.class, new MetricsCollectorNoop()); } - @Override public void start() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void start() throws ServiceNotProvidedException, ModuleStartException { } - @Override public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleStartException { } - @Override public String[] requiredModules() { + @Override + public String[] requiredModules() { return new String[0]; } } diff --git a/oap-server/server-telemetry/telemetry-prometheus/pom.xml b/oap-server/server-telemetry/telemetry-prometheus/pom.xml index 8b8e37b015c6..f1e8503e1253 100644 --- a/oap-server/server-telemetry/telemetry-prometheus/pom.xml +++ b/oap-server/server-telemetry/telemetry-prometheus/pom.xml @@ -17,7 +17,8 @@ ~ --> - + server-telemetry org.apache.skywalking diff --git a/oap-server/server-telemetry/telemetry-prometheus/src/main/java/org/apache/skywalking/oap/server/telemetry/prometheus/BaseMetrics.java b/oap-server/server-telemetry/telemetry-prometheus/src/main/java/org/apache/skywalking/oap/server/telemetry/prometheus/BaseMetrics.java index 92435cfabd8a..cac808442e1a 100644 --- a/oap-server/server-telemetry/telemetry-prometheus/src/main/java/org/apache/skywalking/oap/server/telemetry/prometheus/BaseMetrics.java +++ b/oap-server/server-telemetry/telemetry-prometheus/src/main/java/org/apache/skywalking/oap/server/telemetry/prometheus/BaseMetrics.java @@ -19,14 +19,14 @@ package org.apache.skywalking.oap.server.telemetry.prometheus; import io.prometheus.client.SimpleCollector; -import java.util.*; +import java.util.HashMap; +import java.util.Map; import java.util.concurrent.locks.ReentrantLock; -import org.apache.skywalking.oap.server.telemetry.api.*; +import org.apache.skywalking.oap.server.telemetry.api.MetricsTag; +import org.apache.skywalking.oap.server.telemetry.api.TelemetryRelatedContext; /** * BaseMetrics parent class represents the me - * - * @author wusheng */ public abstract class BaseMetrics { private static Map ALL_METRICS = new HashMap<>(); @@ -38,8 +38,7 @@ public abstract class BaseMetrics { protected final MetricsTag.Values values; private ReentrantLock lock = new ReentrantLock(); - public BaseMetrics(String name, String tips, MetricsTag.Keys labels, - MetricsTag.Values values) { + public BaseMetrics(String name, String tips, MetricsTag.Keys labels, MetricsTag.Values values) { this.name = name; this.tips = tips; this.labels = labels; @@ -76,9 +75,9 @@ protected C getMetric() { } } - T metrics = (T)ALL_METRICS.get(name); + T metrics = (T) ALL_METRICS.get(name); - metricsInstance = (C)metrics.labels(labelValues); + metricsInstance = (C) metrics.labels(labelValues); } } finally { lock.unlock(); diff --git a/oap-server/server-telemetry/telemetry-prometheus/src/main/java/org/apache/skywalking/oap/server/telemetry/prometheus/PrometheusConfig.java b/oap-server/server-telemetry/telemetry-prometheus/src/main/java/org/apache/skywalking/oap/server/telemetry/prometheus/PrometheusConfig.java index 670fb6e98b94..08c8756a460b 100644 --- a/oap-server/server-telemetry/telemetry-prometheus/src/main/java/org/apache/skywalking/oap/server/telemetry/prometheus/PrometheusConfig.java +++ b/oap-server/server-telemetry/telemetry-prometheus/src/main/java/org/apache/skywalking/oap/server/telemetry/prometheus/PrometheusConfig.java @@ -18,13 +18,12 @@ package org.apache.skywalking.oap.server.telemetry.prometheus; -import lombok.*; +import lombok.Getter; +import lombok.Setter; import org.apache.skywalking.oap.server.library.module.ModuleConfig; /** * The Prometheus telemetry implementor settings. - * - * @author wusheng */ @Setter @Getter diff --git a/oap-server/server-telemetry/telemetry-prometheus/src/main/java/org/apache/skywalking/oap/server/telemetry/prometheus/PrometheusCounterMetrics.java b/oap-server/server-telemetry/telemetry-prometheus/src/main/java/org/apache/skywalking/oap/server/telemetry/prometheus/PrometheusCounterMetrics.java index 4b6284da4bde..d4ad81d18c93 100644 --- a/oap-server/server-telemetry/telemetry-prometheus/src/main/java/org/apache/skywalking/oap/server/telemetry/prometheus/PrometheusCounterMetrics.java +++ b/oap-server/server-telemetry/telemetry-prometheus/src/main/java/org/apache/skywalking/oap/server/telemetry/prometheus/PrometheusCounterMetrics.java @@ -19,36 +19,36 @@ package org.apache.skywalking.oap.server.telemetry.prometheus; import io.prometheus.client.Counter; -import org.apache.skywalking.oap.server.telemetry.api.*; +import org.apache.skywalking.oap.server.telemetry.api.CounterMetrics; +import org.apache.skywalking.oap.server.telemetry.api.MetricsTag; /** * Counter metrics in Prometheus implementor. - * - * @author wusheng */ public class PrometheusCounterMetrics extends BaseMetrics implements CounterMetrics { - public PrometheusCounterMetrics(String name, String tips, - MetricsTag.Keys labels, MetricsTag.Values values) { + public PrometheusCounterMetrics(String name, String tips, MetricsTag.Keys labels, MetricsTag.Values values) { super(name, tips, labels, values); } - @Override public void inc() { + @Override + public void inc() { Counter.Child metrics = this.getMetric(); if (metrics != null) { metrics.inc(); } } - @Override public void inc(double value) { + @Override + public void inc(double value) { Counter.Child metrics = this.getMetric(); if (metrics != null) { metrics.inc(value); } } - @Override protected Counter create(String[] labelNames) { - return Counter.build() - .name(name).help(tips).labelNames(labelNames).register(); + @Override + protected Counter create(String[] labelNames) { + return Counter.build().name(name).help(tips).labelNames(labelNames).register(); } } diff --git a/oap-server/server-telemetry/telemetry-prometheus/src/main/java/org/apache/skywalking/oap/server/telemetry/prometheus/PrometheusGaugeMetrics.java b/oap-server/server-telemetry/telemetry-prometheus/src/main/java/org/apache/skywalking/oap/server/telemetry/prometheus/PrometheusGaugeMetrics.java index 0f4aea36c4c0..bfb0f578b3c3 100644 --- a/oap-server/server-telemetry/telemetry-prometheus/src/main/java/org/apache/skywalking/oap/server/telemetry/prometheus/PrometheusGaugeMetrics.java +++ b/oap-server/server-telemetry/telemetry-prometheus/src/main/java/org/apache/skywalking/oap/server/telemetry/prometheus/PrometheusGaugeMetrics.java @@ -19,57 +19,59 @@ package org.apache.skywalking.oap.server.telemetry.prometheus; import io.prometheus.client.Gauge; -import org.apache.skywalking.oap.server.telemetry.api.*; +import org.apache.skywalking.oap.server.telemetry.api.GaugeMetrics; +import org.apache.skywalking.oap.server.telemetry.api.MetricsTag; /** * Gauge metrics in Prometheus implementor. - * - * @author wusheng */ public class PrometheusGaugeMetrics extends BaseMetrics implements GaugeMetrics { - public PrometheusGaugeMetrics(String name, String tips, - MetricsTag.Keys labels, - MetricsTag.Values values) { + public PrometheusGaugeMetrics(String name, String tips, MetricsTag.Keys labels, MetricsTag.Values values) { super(name, tips, labels, values); } - @Override public void inc() { + @Override + public void inc() { Gauge.Child metrics = this.getMetric(); if (metrics != null) { metrics.inc(); } } - @Override public void inc(double value) { + @Override + public void inc(double value) { Gauge.Child metrics = this.getMetric(); if (metrics != null) { metrics.inc(value); } } - @Override public void dec() { + @Override + public void dec() { Gauge.Child metrics = this.getMetric(); if (metrics != null) { metrics.dec(); } } - @Override public void dec(double value) { + @Override + public void dec(double value) { Gauge.Child metrics = this.getMetric(); if (metrics != null) { metrics.dec(value); } } - @Override public void setValue(double value) { + @Override + public void setValue(double value) { Gauge.Child metrics = this.getMetric(); if (metrics != null) { metrics.set(value); } } - @Override protected Gauge create(String[] labelNames) { - return Gauge.build() - .name(name).help(tips).labelNames(labelNames).register(); + @Override + protected Gauge create(String[] labelNames) { + return Gauge.build().name(name).help(tips).labelNames(labelNames).register(); } } diff --git a/oap-server/server-telemetry/telemetry-prometheus/src/main/java/org/apache/skywalking/oap/server/telemetry/prometheus/PrometheusHistogramMetrics.java b/oap-server/server-telemetry/telemetry-prometheus/src/main/java/org/apache/skywalking/oap/server/telemetry/prometheus/PrometheusHistogramMetrics.java index ea4294bb67ba..425dc521f724 100644 --- a/oap-server/server-telemetry/telemetry-prometheus/src/main/java/org/apache/skywalking/oap/server/telemetry/prometheus/PrometheusHistogramMetrics.java +++ b/oap-server/server-telemetry/telemetry-prometheus/src/main/java/org/apache/skywalking/oap/server/telemetry/prometheus/PrometheusHistogramMetrics.java @@ -19,24 +19,24 @@ package org.apache.skywalking.oap.server.telemetry.prometheus; import io.prometheus.client.Histogram; -import org.apache.skywalking.oap.server.telemetry.api.*; +import org.apache.skywalking.oap.server.telemetry.api.HistogramMetrics; +import org.apache.skywalking.oap.server.telemetry.api.MetricsTag; /** * HistogramMetrics metrics in Prometheus implementor. - * - * @author wusheng */ public class PrometheusHistogramMetrics extends HistogramMetrics { private InnerMetricObject inner; private final double[] buckets; - public PrometheusHistogramMetrics(String name, String tips, MetricsTag.Keys labels, - MetricsTag.Values values, double... buckets) { + public PrometheusHistogramMetrics(String name, String tips, MetricsTag.Keys labels, MetricsTag.Values values, + double... buckets) { inner = new InnerMetricObject(name, tips, labels, values); this.buckets = buckets; } - @Override public void observe(double value) { + @Override + public void observe(double value) { Histogram.Child metrics = inner.getMetric(); if (metrics != null) { metrics.observe(value); @@ -44,14 +44,13 @@ public PrometheusHistogramMetrics(String name, String tips, MetricsTag.Keys labe } class InnerMetricObject extends BaseMetrics { - public InnerMetricObject(String name, String tips, MetricsTag.Keys labels, - MetricsTag.Values values) { + public InnerMetricObject(String name, String tips, MetricsTag.Keys labels, MetricsTag.Values values) { super(name, tips, labels, values); } - @Override protected Histogram create(String[] labelNames) { - Histogram.Builder builder = Histogram.build() - .name(name).help(tips); + @Override + protected Histogram create(String[] labelNames) { + Histogram.Builder builder = Histogram.build().name(name).help(tips); if (builder != null && buckets.length > 0) { builder = builder.buckets(buckets); } diff --git a/oap-server/server-telemetry/telemetry-prometheus/src/main/java/org/apache/skywalking/oap/server/telemetry/prometheus/PrometheusMetricsCreator.java b/oap-server/server-telemetry/telemetry-prometheus/src/main/java/org/apache/skywalking/oap/server/telemetry/prometheus/PrometheusMetricsCreator.java index 592103c2be2b..c127a81aad71 100644 --- a/oap-server/server-telemetry/telemetry-prometheus/src/main/java/org/apache/skywalking/oap/server/telemetry/prometheus/PrometheusMetricsCreator.java +++ b/oap-server/server-telemetry/telemetry-prometheus/src/main/java/org/apache/skywalking/oap/server/telemetry/prometheus/PrometheusMetricsCreator.java @@ -18,16 +18,19 @@ package org.apache.skywalking.oap.server.telemetry.prometheus; -import org.apache.skywalking.oap.server.telemetry.api.*; +import org.apache.skywalking.oap.server.telemetry.api.CounterMetrics; +import org.apache.skywalking.oap.server.telemetry.api.GaugeMetrics; +import org.apache.skywalking.oap.server.telemetry.api.HistogramMetrics; +import org.apache.skywalking.oap.server.telemetry.api.MetricsCreator; +import org.apache.skywalking.oap.server.telemetry.api.MetricsTag; /** * Create metrics instance for Prometheus exporter. - * - * @author wusheng */ public class PrometheusMetricsCreator implements MetricsCreator { @Override - public CounterMetrics createCounter(String name, String tips, MetricsTag.Keys tagKeys, MetricsTag.Values tagValues) { + public CounterMetrics createCounter(String name, String tips, MetricsTag.Keys tagKeys, + MetricsTag.Values tagValues) { return new PrometheusCounterMetrics(name, tips, tagKeys, tagValues); } diff --git a/oap-server/server-telemetry/telemetry-prometheus/src/main/java/org/apache/skywalking/oap/server/telemetry/prometheus/PrometheusTelemetryProvider.java b/oap-server/server-telemetry/telemetry-prometheus/src/main/java/org/apache/skywalking/oap/server/telemetry/prometheus/PrometheusTelemetryProvider.java index 56186563ef0b..5fb6aa206840 100644 --- a/oap-server/server-telemetry/telemetry-prometheus/src/main/java/org/apache/skywalking/oap/server/telemetry/prometheus/PrometheusTelemetryProvider.java +++ b/oap-server/server-telemetry/telemetry-prometheus/src/main/java/org/apache/skywalking/oap/server/telemetry/prometheus/PrometheusTelemetryProvider.java @@ -19,9 +19,13 @@ package org.apache.skywalking.oap.server.telemetry.prometheus; import io.prometheus.client.exporter.HTTPServer; -import io.prometheus.client.hotspot.*; +import io.prometheus.client.hotspot.DefaultExports; import java.io.IOException; -import org.apache.skywalking.oap.server.library.module.*; +import org.apache.skywalking.oap.server.library.module.ModuleConfig; +import org.apache.skywalking.oap.server.library.module.ModuleDefine; +import org.apache.skywalking.oap.server.library.module.ModuleProvider; +import org.apache.skywalking.oap.server.library.module.ModuleStartException; +import org.apache.skywalking.oap.server.library.module.ServiceNotProvidedException; import org.apache.skywalking.oap.server.telemetry.TelemetryModule; import org.apache.skywalking.oap.server.telemetry.api.MetricsCollector; import org.apache.skywalking.oap.server.telemetry.api.MetricsCreator; @@ -29,8 +33,6 @@ /** * Start the Prometheus - * - * @author wusheng */ public class PrometheusTelemetryProvider extends ModuleProvider { private PrometheusConfig config; @@ -39,19 +41,23 @@ public PrometheusTelemetryProvider() { config = new PrometheusConfig(); } - @Override public String name() { + @Override + public String name() { return "prometheus"; } - @Override public Class module() { + @Override + public Class module() { return TelemetryModule.class; } - @Override public ModuleConfig createConfigBeanIfAbsent() { + @Override + public ModuleConfig createConfigBeanIfAbsent() { return config; } - @Override public void prepare() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void prepare() throws ServiceNotProvidedException, ModuleStartException { this.registerServiceImplementation(MetricsCreator.class, new PrometheusMetricsCreator()); this.registerServiceImplementation(MetricsCollector.class, new MetricsCollectorNoop()); try { @@ -63,14 +69,17 @@ public PrometheusTelemetryProvider() { DefaultExports.initialize(); } - @Override public void start() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void start() throws ServiceNotProvidedException, ModuleStartException { } - @Override public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleStartException { } - @Override public String[] requiredModules() { + @Override + public String[] requiredModules() { return new String[0]; } } diff --git a/oap-server/server-telemetry/telemetry-so11y/pom.xml b/oap-server/server-telemetry/telemetry-so11y/pom.xml index f3eca87a01c0..0e059e3318ec 100644 --- a/oap-server/server-telemetry/telemetry-so11y/pom.xml +++ b/oap-server/server-telemetry/telemetry-so11y/pom.xml @@ -17,7 +17,8 @@ ~ --> - + server-telemetry org.apache.skywalking diff --git a/oap-server/server-telemetry/telemetry-so11y/src/main/java/org/apache/skywalking/oap/server/telemetry/so11y/So11yMetricsCollector.java b/oap-server/server-telemetry/telemetry-so11y/src/main/java/org/apache/skywalking/oap/server/telemetry/so11y/So11yMetricsCollector.java index de88bc9938a5..4c78f3ff2fdd 100644 --- a/oap-server/server-telemetry/telemetry-so11y/src/main/java/org/apache/skywalking/oap/server/telemetry/so11y/So11yMetricsCollector.java +++ b/oap-server/server-telemetry/telemetry-so11y/src/main/java/org/apache/skywalking/oap/server/telemetry/so11y/So11yMetricsCollector.java @@ -20,18 +20,15 @@ import io.prometheus.client.Collector; import io.prometheus.client.CollectorRegistry; -import org.apache.skywalking.oap.server.telemetry.api.MetricFamily; -import org.apache.skywalking.oap.server.telemetry.api.MetricsCollector; - import java.util.ArrayList; import java.util.Enumeration; import java.util.LinkedList; import java.util.List; +import org.apache.skywalking.oap.server.telemetry.api.MetricFamily; +import org.apache.skywalking.oap.server.telemetry.api.MetricsCollector; /** * Implement MetricCollector to generate prometheus metrics. - * - * @author gaohongtao */ public class So11yMetricsCollector implements MetricsCollector { @Override @@ -41,10 +38,10 @@ public Iterable collect() { while (mfs.hasMoreElements()) { Collector.MetricFamilySamples metricFamilySamples = mfs.nextElement(); List samples = new ArrayList<>(metricFamilySamples.samples.size()); - MetricFamily m = new MetricFamily(metricFamilySamples.name, MetricFamily.Type.valueOf(metricFamilySamples.type.name()), - metricFamilySamples.help, samples); + MetricFamily m = new MetricFamily(metricFamilySamples.name, MetricFamily.Type.valueOf(metricFamilySamples.type + .name()), metricFamilySamples.help, samples); result.add(m); - for (Collector.MetricFamilySamples.Sample sample: metricFamilySamples.samples) { + for (Collector.MetricFamilySamples.Sample sample : metricFamilySamples.samples) { samples.add(new MetricFamily.Sample(sample.name, sample.labelNames, sample.labelValues, sample.value, sample.timestampMs)); } } diff --git a/oap-server/server-telemetry/telemetry-so11y/src/main/java/org/apache/skywalking/oap/server/telemetry/so11y/So11yMetricsCreator.java b/oap-server/server-telemetry/telemetry-so11y/src/main/java/org/apache/skywalking/oap/server/telemetry/so11y/So11yMetricsCreator.java index ddad834a6109..1bd85204ac39 100644 --- a/oap-server/server-telemetry/telemetry-so11y/src/main/java/org/apache/skywalking/oap/server/telemetry/so11y/So11yMetricsCreator.java +++ b/oap-server/server-telemetry/telemetry-so11y/src/main/java/org/apache/skywalking/oap/server/telemetry/so11y/So11yMetricsCreator.java @@ -26,13 +26,12 @@ /** * Delegate prometheus metrics creator. - * - * @author gaohongtao */ public class So11yMetricsCreator extends PrometheusMetricsCreator { @Override - public CounterMetrics createCounter(String name, String tips, MetricsTag.Keys tagKeys, MetricsTag.Values tagValues) { + public CounterMetrics createCounter(String name, String tips, MetricsTag.Keys tagKeys, + MetricsTag.Values tagValues) { return super.createCounter(name, tips, tagKeys, tagValues); } @@ -42,7 +41,8 @@ public GaugeMetrics createGauge(String name, String tips, MetricsTag.Keys tagKey } @Override - public HistogramMetrics createHistogramMetric(String name, String tips, MetricsTag.Keys tagKeys, MetricsTag.Values tagValues, double... buckets) { + public HistogramMetrics createHistogramMetric(String name, String tips, MetricsTag.Keys tagKeys, + MetricsTag.Values tagValues, double... buckets) { return super.createHistogramMetric(name, tips, tagKeys, tagValues, buckets); } } diff --git a/oap-server/server-telemetry/telemetry-so11y/src/main/java/org/apache/skywalking/oap/server/telemetry/so11y/So11yTelemetryProvider.java b/oap-server/server-telemetry/telemetry-so11y/src/main/java/org/apache/skywalking/oap/server/telemetry/so11y/So11yTelemetryProvider.java index 27c887497fa9..a618a8a9d516 100644 --- a/oap-server/server-telemetry/telemetry-so11y/src/main/java/org/apache/skywalking/oap/server/telemetry/so11y/So11yTelemetryProvider.java +++ b/oap-server/server-telemetry/telemetry-so11y/src/main/java/org/apache/skywalking/oap/server/telemetry/so11y/So11yTelemetryProvider.java @@ -20,17 +20,18 @@ import io.prometheus.client.exporter.HTTPServer; import io.prometheus.client.hotspot.DefaultExports; -import org.apache.skywalking.oap.server.library.module.*; +import java.io.IOException; +import org.apache.skywalking.oap.server.library.module.ModuleConfig; +import org.apache.skywalking.oap.server.library.module.ModuleDefine; +import org.apache.skywalking.oap.server.library.module.ModuleProvider; +import org.apache.skywalking.oap.server.library.module.ModuleStartException; +import org.apache.skywalking.oap.server.library.module.ServiceNotProvidedException; import org.apache.skywalking.oap.server.telemetry.TelemetryModule; import org.apache.skywalking.oap.server.telemetry.api.MetricsCollector; import org.apache.skywalking.oap.server.telemetry.api.MetricsCreator; -import java.io.IOException; - /** * Self observability telemetry provider. - * - * @author gaohongtao */ public class So11yTelemetryProvider extends ModuleProvider { private So11yConfig config; @@ -39,19 +40,23 @@ public So11yTelemetryProvider() { config = new So11yConfig(); } - @Override public String name() { + @Override + public String name() { return "so11y"; } - @Override public Class module() { + @Override + public Class module() { return TelemetryModule.class; } - @Override public ModuleConfig createConfigBeanIfAbsent() { + @Override + public ModuleConfig createConfigBeanIfAbsent() { return config; } - @Override public void prepare() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void prepare() throws ServiceNotProvidedException, ModuleStartException { this.registerServiceImplementation(MetricsCreator.class, new So11yMetricsCreator()); this.registerServiceImplementation(MetricsCollector.class, new So11yMetricsCollector()); if (config.isPrometheusExporterEnabled()) { @@ -64,14 +69,17 @@ public So11yTelemetryProvider() { DefaultExports.initialize(); } - @Override public void start() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void start() throws ServiceNotProvidedException, ModuleStartException { } - @Override public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleStartException { + @Override + public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleStartException { } - @Override public String[] requiredModules() { + @Override + public String[] requiredModules() { return new String[0]; } } diff --git a/oap-server/server-testing/pom.xml b/oap-server/server-testing/pom.xml index cb578a6d747f..0550aadabb67 100644 --- a/oap-server/server-testing/pom.xml +++ b/oap-server/server-testing/pom.xml @@ -17,7 +17,8 @@ ~ --> - + oap-server org.apache.skywalking diff --git a/oap-server/server-testing/src/main/java/org/apache/skywalking/oap/server/testing/module/ModuleDefineTesting.java b/oap-server/server-testing/src/main/java/org/apache/skywalking/oap/server/testing/module/ModuleDefineTesting.java index 53ebee46db46..73a45dc5a7d5 100644 --- a/oap-server/server-testing/src/main/java/org/apache/skywalking/oap/server/testing/module/ModuleDefineTesting.java +++ b/oap-server/server-testing/src/main/java/org/apache/skywalking/oap/server/testing/module/ModuleDefineTesting.java @@ -18,11 +18,9 @@ package org.apache.skywalking.oap.server.testing.module; -import org.apache.skywalking.oap.server.library.module.*; +import org.apache.skywalking.oap.server.library.module.ModuleProviderHolder; +import org.apache.skywalking.oap.server.library.module.ModuleServiceHolder; -/** - * @author peng-yongsheng - */ public class ModuleDefineTesting implements ModuleProviderHolder { private final ModuleProviderTesting moduleProvider; @@ -31,7 +29,8 @@ public ModuleDefineTesting() { this.moduleProvider = new ModuleProviderTesting(); } - @Override public ModuleServiceHolder provider() { + @Override + public ModuleServiceHolder provider() { return moduleProvider; } } diff --git a/oap-server/server-testing/src/main/java/org/apache/skywalking/oap/server/testing/module/ModuleManagerTesting.java b/oap-server/server-testing/src/main/java/org/apache/skywalking/oap/server/testing/module/ModuleManagerTesting.java index 31380038404b..5db2c9992838 100644 --- a/oap-server/server-testing/src/main/java/org/apache/skywalking/oap/server/testing/module/ModuleManagerTesting.java +++ b/oap-server/server-testing/src/main/java/org/apache/skywalking/oap/server/testing/module/ModuleManagerTesting.java @@ -18,21 +18,23 @@ package org.apache.skywalking.oap.server.testing.module; -import java.util.*; -import org.apache.skywalking.oap.server.library.module.*; +import java.util.HashMap; +import java.util.Map; +import org.apache.skywalking.oap.server.library.module.ModuleDefineHolder; +import org.apache.skywalking.oap.server.library.module.ModuleNotFoundRuntimeException; +import org.apache.skywalking.oap.server.library.module.ModuleProviderHolder; -/** - * @author peng-yongsheng - */ public class ModuleManagerTesting implements ModuleDefineHolder { private final Map modules = new HashMap<>(); - @Override public boolean has(String moduleName) { + @Override + public boolean has(String moduleName) { return false; } - @Override public ModuleProviderHolder find(String moduleName) throws ModuleNotFoundRuntimeException { + @Override + public ModuleProviderHolder find(String moduleName) throws ModuleNotFoundRuntimeException { return modules.get(moduleName); } diff --git a/oap-server/server-testing/src/main/java/org/apache/skywalking/oap/server/testing/module/ModuleProviderTesting.java b/oap-server/server-testing/src/main/java/org/apache/skywalking/oap/server/testing/module/ModuleProviderTesting.java index 29fe3bce1a57..456a012e084f 100644 --- a/oap-server/server-testing/src/main/java/org/apache/skywalking/oap/server/testing/module/ModuleProviderTesting.java +++ b/oap-server/server-testing/src/main/java/org/apache/skywalking/oap/server/testing/module/ModuleProviderTesting.java @@ -18,17 +18,18 @@ package org.apache.skywalking.oap.server.testing.module; -import java.util.*; -import org.apache.skywalking.oap.server.library.module.*; +import java.util.HashMap; +import java.util.Map; +import org.apache.skywalking.oap.server.library.module.ModuleServiceHolder; +import org.apache.skywalking.oap.server.library.module.Service; +import org.apache.skywalking.oap.server.library.module.ServiceNotProvidedException; -/** - * @author peng-yongsheng - */ public class ModuleProviderTesting implements ModuleServiceHolder { private final Map, Service> services = new HashMap<>(); - @Override public void registerServiceImplementation(Class serviceType, + @Override + public void registerServiceImplementation(Class serviceType, Service service) throws ServiceNotProvidedException { if (serviceType.isInstance(service)) { this.services.put(serviceType, service); @@ -37,7 +38,8 @@ public class ModuleProviderTesting implements ModuleServiceHolder { } } - @Override public T getService(Class serviceType) throws ServiceNotProvidedException { - return (T)services.get(serviceType); + @Override + public T getService(Class serviceType) throws ServiceNotProvidedException { + return (T) services.get(serviceType); } } diff --git a/oap-server/server-testing/src/test/java/org/apache/skywalking/oap/server/testing/module/ModuleManagerTestCase.java b/oap-server/server-testing/src/test/java/org/apache/skywalking/oap/server/testing/module/ModuleManagerTestCase.java index 1a673e3a28bf..5cae463e513a 100644 --- a/oap-server/server-testing/src/test/java/org/apache/skywalking/oap/server/testing/module/ModuleManagerTestCase.java +++ b/oap-server/server-testing/src/test/java/org/apache/skywalking/oap/server/testing/module/ModuleManagerTestCase.java @@ -19,11 +19,9 @@ package org.apache.skywalking.oap.server.testing.module; import org.apache.skywalking.oap.server.library.module.Service; -import org.junit.*; +import org.junit.Assert; +import org.junit.Test; -/** - * @author peng-yongsheng - */ public class ModuleManagerTestCase { @Test diff --git a/pom.xml b/pom.xml index 23ce62703bc3..2cd9fccc8498 100755 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,8 @@ ~ --> - + 4.0.0 org.apache.skywalking @@ -28,7 +29,7 @@ org.apache apache 21 - + @@ -218,6 +219,7 @@ 1.21 1.5 2.7 + true @@ -531,7 +533,7 @@ UTF-8 true true - true + ${checkstyle.fails.on.error} ${project.build.sourceDirectory} ${project.build.testSourceDirectory} @@ -571,13 +573,13 @@ cobertura-maven-plugin ${cobertura-maven-plugin.version} - + true ${project.build.sourceEncoding} true - html - xml + html + xml true diff --git a/test/e2e-mesh/e2e-istio/scripts/compile_build.sh b/test/e2e-mesh/e2e-istio/scripts/compile_build.sh index 26a964e52cc2..860c09141b15 100755 --- a/test/e2e-mesh/e2e-istio/scripts/compile_build.sh +++ b/test/e2e-mesh/e2e-istio/scripts/compile_build.sh @@ -27,4 +27,4 @@ git rev-parse HEAD git submodule init git submodule update -make build.all && make docker.oap -e TAG=$TAG +SKIP_TEST=true make build.all && make docker.oap -e TAG=$TAG diff --git a/test/e2e/e2e-6.x-agent-7.x-oap-compatibility/pom.xml b/test/e2e/e2e-6.x-agent-7.x-oap-compatibility/pom.xml index 56e671781035..df1c91864cdd 100755 --- a/test/e2e/e2e-6.x-agent-7.x-oap-compatibility/pom.xml +++ b/test/e2e/e2e-6.x-agent-7.x-oap-compatibility/pom.xml @@ -29,10 +29,12 @@ 4.0.0 e2e-6.x-agent-7.x-oap-compatibility - This test case verifies the compatibility between SkyWalking 6.x agents and SkyWalking 7.x backend + This test case verifies the compatibility between SkyWalking 6.x agents and SkyWalking 7.x backend + - skywalking-e2e-container-${build.id}-e2e-6.x-agent-7.x-oap-compatibility + skywalking-e2e-container-${build.id}-e2e-6.x-agent-7.x-oap-compatibility + diff --git a/test/e2e/e2e-6.x-agent-7.x-oap-compatibility/src/main/java/org/apache/skywalking/e2e/sample/client/SampleClientApplication.java b/test/e2e/e2e-6.x-agent-7.x-oap-compatibility/src/main/java/org/apache/skywalking/e2e/sample/client/SampleClientApplication.java index a55dbd685769..67ba54eedfd4 100644 --- a/test/e2e/e2e-6.x-agent-7.x-oap-compatibility/src/main/java/org/apache/skywalking/e2e/sample/client/SampleClientApplication.java +++ b/test/e2e/e2e-6.x-agent-7.x-oap-compatibility/src/main/java/org/apache/skywalking/e2e/sample/client/SampleClientApplication.java @@ -22,9 +22,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; -/** - * @author kezhenxu94 - */ @EnableJpaRepositories @SpringBootApplication public class SampleClientApplication { diff --git a/test/e2e/e2e-6.x-agent-7.x-oap-compatibility/src/main/java/org/apache/skywalking/e2e/sample/client/TestController.java b/test/e2e/e2e-6.x-agent-7.x-oap-compatibility/src/main/java/org/apache/skywalking/e2e/sample/client/TestController.java index 566bcdea4aa9..1a344ab45c45 100644 --- a/test/e2e/e2e-6.x-agent-7.x-oap-compatibility/src/main/java/org/apache/skywalking/e2e/sample/client/TestController.java +++ b/test/e2e/e2e-6.x-agent-7.x-oap-compatibility/src/main/java/org/apache/skywalking/e2e/sample/client/TestController.java @@ -24,9 +24,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -/** - * @author kezhenxu94 - */ @RestController @RequestMapping("/e2e") public class TestController { diff --git a/test/e2e/e2e-6.x-agent-7.x-oap-compatibility/src/main/java/org/apache/skywalking/e2e/sample/client/User.java b/test/e2e/e2e-6.x-agent-7.x-oap-compatibility/src/main/java/org/apache/skywalking/e2e/sample/client/User.java index 4589c7f2c424..3b6c317440de 100644 --- a/test/e2e/e2e-6.x-agent-7.x-oap-compatibility/src/main/java/org/apache/skywalking/e2e/sample/client/User.java +++ b/test/e2e/e2e-6.x-agent-7.x-oap-compatibility/src/main/java/org/apache/skywalking/e2e/sample/client/User.java @@ -23,9 +23,6 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; -/** - * @author kezhenxu94 - */ @Entity public class User { public User() { diff --git a/test/e2e/e2e-6.x-agent-7.x-oap-compatibility/src/main/java/org/apache/skywalking/e2e/sample/client/UserRepo.java b/test/e2e/e2e-6.x-agent-7.x-oap-compatibility/src/main/java/org/apache/skywalking/e2e/sample/client/UserRepo.java index 882af92a8211..2ee38a60dd3c 100644 --- a/test/e2e/e2e-6.x-agent-7.x-oap-compatibility/src/main/java/org/apache/skywalking/e2e/sample/client/UserRepo.java +++ b/test/e2e/e2e-6.x-agent-7.x-oap-compatibility/src/main/java/org/apache/skywalking/e2e/sample/client/UserRepo.java @@ -20,8 +20,5 @@ import org.springframework.data.jpa.repository.JpaRepository; -/** - * @author kezhenxu94 - */ public interface UserRepo extends JpaRepository { } diff --git a/test/e2e/e2e-6.x-agent-7.x-oap-compatibility/src/test/java/org/apache/skywalking/e2e/SampleVerificationITCase.java b/test/e2e/e2e-6.x-agent-7.x-oap-compatibility/src/test/java/org/apache/skywalking/e2e/SampleVerificationITCase.java index 95a5719c6593..0d290bd0a433 100644 --- a/test/e2e/e2e-6.x-agent-7.x-oap-compatibility/src/test/java/org/apache/skywalking/e2e/SampleVerificationITCase.java +++ b/test/e2e/e2e-6.x-agent-7.x-oap-compatibility/src/test/java/org/apache/skywalking/e2e/SampleVerificationITCase.java @@ -18,6 +18,12 @@ package org.apache.skywalking.e2e; +import java.io.InputStream; +import java.time.LocalDateTime; +import java.time.ZoneOffset; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import org.apache.skywalking.e2e.metrics.AtLeastOneOfMetricsMatcher; import org.apache.skywalking.e2e.metrics.Metrics; import org.apache.skywalking.e2e.metrics.MetricsQuery; @@ -33,7 +39,13 @@ import org.apache.skywalking.e2e.service.instance.Instances; import org.apache.skywalking.e2e.service.instance.InstancesMatcher; import org.apache.skywalking.e2e.service.instance.InstancesQuery; -import org.apache.skywalking.e2e.topo.*; +import org.apache.skywalking.e2e.topo.Call; +import org.apache.skywalking.e2e.topo.ServiceInstanceTopoData; +import org.apache.skywalking.e2e.topo.ServiceInstanceTopoMatcher; +import org.apache.skywalking.e2e.topo.ServiceInstanceTopoQuery; +import org.apache.skywalking.e2e.topo.TopoData; +import org.apache.skywalking.e2e.topo.TopoMatcher; +import org.apache.skywalking.e2e.topo.TopoQuery; import org.apache.skywalking.e2e.trace.Trace; import org.apache.skywalking.e2e.trace.TracesMatcher; import org.apache.skywalking.e2e.trace.TracesQuery; @@ -50,20 +62,16 @@ import org.springframework.web.client.RestTemplate; import org.yaml.snakeyaml.Yaml; -import java.io.InputStream; -import java.time.LocalDateTime; -import java.time.ZoneOffset; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import static org.apache.skywalking.e2e.metrics.MetricsMatcher.verifyMetrics; -import static org.apache.skywalking.e2e.metrics.MetricsQuery.*; +import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_ENDPOINT_METRICS; +import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_INSTANCE_METRICS; +import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_SERVICE_INSTANCE_RELATION_CLIENT_METRICS; +import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_SERVICE_INSTANCE_RELATION_SERVER_METRICS; +import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_SERVICE_METRICS; +import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_SERVICE_RELATION_CLIENT_METRICS; +import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_SERVICE_RELATION_SERVER_METRICS; import static org.assertj.core.api.Assertions.assertThat; -/** - * @author kezhenxu94 - */ @RunWith(SpringJUnit4ClassRunner.class) public class SampleVerificationITCase { private static final Logger LOGGER = LoggerFactory.getLogger(SampleVerificationITCase.class); @@ -93,19 +101,12 @@ public void verify() throws Exception { try { final Map user = new HashMap<>(); user.put("name", "SkyWalking"); - final ResponseEntity responseEntity = restTemplate.postForEntity( - instrumentedServiceUrl + "/e2e/users", - user, - String.class - ); + final ResponseEntity responseEntity = restTemplate.postForEntity(instrumentedServiceUrl + "/e2e/users", user, String.class); LOGGER.info("responseEntity: {}", responseEntity); assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); - final List traces = queryClient.traces( - new TracesQuery() - .start(minutesAgo) - .end(LocalDateTime.now()) - .orderByDuration() - ); + final List traces = queryClient.traces(new TracesQuery().start(minutesAgo) + .end(LocalDateTime.now()) + .orderByDuration()); if (!traces.isEmpty()) { break; } @@ -139,9 +140,9 @@ public void verify() throws Exception { }); doRetryableVerification(() -> { - try{ + try { verifyServiceInstanceTopo(minutesAgo); - }catch (Exception e) { + } catch (Exception e) { LOGGER.warn(e.getMessage(), e); } }); @@ -150,16 +151,13 @@ public void verify() throws Exception { private void verifyTopo(LocalDateTime minutesAgo) throws Exception { final LocalDateTime now = LocalDateTime.now(ZoneOffset.UTC); - final TopoData topoData = queryClient.topo( - new TopoQuery() - .stepByMinute() - .start(minutesAgo.minusDays(1)) - .end(now) - ); + final TopoData topoData = queryClient.topo(new TopoQuery().stepByMinute() + .start(minutesAgo.minusDays(1)) + .end(now)); LOGGER.info("topoData: {}", topoData); - InputStream expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.topo.yml").getInputStream(); + InputStream expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.topo.yml") + .getInputStream(); final TopoMatcher topoMatcher = new Yaml().loadAs(expectedInputStream, TopoMatcher.class); topoMatcher.verify(topoData); @@ -169,18 +167,16 @@ private void verifyTopo(LocalDateTime minutesAgo) throws Exception { private void verifyServiceInstanceTopo(LocalDateTime minutesAgo) throws Exception { final LocalDateTime now = LocalDateTime.now(ZoneOffset.UTC); - final ServiceInstanceTopoData topoData = queryClient.serviceInstanceTopo( - new ServiceInstanceTopoQuery() - .stepByMinute() - .start(minutesAgo.minusDays(1)) - .end(now) - .clientServiceId("1") - .serverServiceId("2") - ); + final ServiceInstanceTopoData topoData = queryClient.serviceInstanceTopo(new ServiceInstanceTopoQuery().stepByMinute() + .start(minutesAgo + .minusDays(1)) + .end(now) + .clientServiceId("1") + .serverServiceId("2")); LOGGER.info("instanceTopoData: {}", topoData); - InputStream expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.serviceInstanceTopo.yml").getInputStream(); + InputStream expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.serviceInstanceTopo.yml") + .getInputStream(); final ServiceInstanceTopoMatcher topoMatcher = new Yaml().loadAs(expectedInputStream, ServiceInstanceTopoMatcher.class); topoMatcher.verify(topoData); @@ -190,15 +186,11 @@ private void verifyServiceInstanceTopo(LocalDateTime minutesAgo) throws Exceptio private void verifyServices(LocalDateTime minutesAgo) throws Exception { final LocalDateTime now = LocalDateTime.now(ZoneOffset.UTC); - final List services = queryClient.services( - new ServicesQuery() - .start(minutesAgo) - .end(now) - ); + final List services = queryClient.services(new ServicesQuery().start(minutesAgo).end(now)); LOGGER.info("services: {}", services); - InputStream expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.services.yml").getInputStream(); + InputStream expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.services.yml") + .getInputStream(); final ServicesMatcher servicesMatcher = new Yaml().loadAs(expectedInputStream, ServicesMatcher.class); servicesMatcher.verify(services); @@ -221,15 +213,12 @@ private void verifyServices(LocalDateTime minutesAgo) throws Exception { private Instances verifyServiceInstances(LocalDateTime minutesAgo, LocalDateTime now, Service service) throws Exception { InputStream expectedInputStream; - Instances instances = queryClient.instances( - new InstancesQuery() - .serviceId(service.getKey()) - .start(minutesAgo) - .end(now) - ); + Instances instances = queryClient.instances(new InstancesQuery().serviceId(service.getKey()) + .start(minutesAgo) + .end(now)); LOGGER.info("instances: {}", instances); - expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.instances.yml").getInputStream(); + expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.instances.yml") + .getInputStream(); final InstancesMatcher instancesMatcher = new Yaml().loadAs(expectedInputStream, InstancesMatcher.class); instancesMatcher.verify(instances); return instances; @@ -237,12 +226,10 @@ private Instances verifyServiceInstances(LocalDateTime minutesAgo, LocalDateTime private Endpoints verifyServiceEndpoints(LocalDateTime minutesAgo, LocalDateTime now, Service service) throws Exception { - Endpoints instances = queryClient.endpoints( - new EndpointQuery().serviceId(service.getKey()) - ); + Endpoints instances = queryClient.endpoints(new EndpointQuery().serviceId(service.getKey())); LOGGER.info("instances: {}", instances); - InputStream expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.endpoints.yml").getInputStream(); + InputStream expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.endpoints.yml") + .getInputStream(); final EndpointsMatcher endpointsMatcher = new Yaml().loadAs(expectedInputStream, EndpointsMatcher.class); endpointsMatcher.verify(instances); return instances; @@ -252,12 +239,9 @@ private void verifyInstancesMetrics(Instances instances) throws Exception { for (Instance instance : instances.getInstances()) { for (String metricsName : ALL_INSTANCE_METRICS) { LOGGER.info("verifying service instance response time: {}", instance); - final Metrics instanceMetrics = queryClient.metrics( - new MetricsQuery() - .stepByMinute() - .metricsName(metricsName) - .id(instance.getKey()) - ); + final Metrics instanceMetrics = queryClient.metrics(new MetricsQuery().stepByMinute() + .metricsName(metricsName) + .id(instance.getKey())); LOGGER.info("instanceMetrics: {}", instanceMetrics); AtLeastOneOfMetricsMatcher instanceRespTimeMatcher = new AtLeastOneOfMetricsMatcher(); MetricsValueMatcher greaterThanZero = new MetricsValueMatcher(); @@ -276,12 +260,9 @@ private void verifyEndpointsMetrics(Endpoints endpoints) throws Exception { } for (String metricName : ALL_ENDPOINT_METRICS) { LOGGER.info("verifying endpoint {}, metrics: {}", endpoint, metricName); - final Metrics metrics = queryClient.metrics( - new MetricsQuery() - .stepByMinute() - .metricsName(metricName) - .id(endpoint.getKey()) - ); + final Metrics metrics = queryClient.metrics(new MetricsQuery().stepByMinute() + .metricsName(metricName) + .id(endpoint.getKey())); LOGGER.info("metrics: {}", metrics); AtLeastOneOfMetricsMatcher instanceRespTimeMatcher = new AtLeastOneOfMetricsMatcher(); MetricsValueMatcher greaterThanZero = new MetricsValueMatcher(); @@ -296,12 +277,9 @@ private void verifyEndpointsMetrics(Endpoints endpoints) throws Exception { private void verifyServiceMetrics(Service service) throws Exception { for (String metricName : ALL_SERVICE_METRICS) { LOGGER.info("verifying service {}, metrics: {}", service, metricName); - final Metrics serviceMetrics = queryClient.metrics( - new MetricsQuery() - .stepByMinute() - .metricsName(metricName) - .id(service.getKey()) - ); + final Metrics serviceMetrics = queryClient.metrics(new MetricsQuery().stepByMinute() + .metricsName(metricName) + .id(service.getKey())); LOGGER.info("serviceMetrics: {}", serviceMetrics); AtLeastOneOfMetricsMatcher instanceRespTimeMatcher = new AtLeastOneOfMetricsMatcher(); MetricsValueMatcher greaterThanZero = new MetricsValueMatcher(); @@ -315,22 +293,18 @@ private void verifyServiceMetrics(Service service) throws Exception { private void verifyTraces(LocalDateTime minutesAgo) throws Exception { final LocalDateTime now = LocalDateTime.now(ZoneOffset.UTC); - final List traces = queryClient.traces( - new TracesQuery() - .start(minutesAgo) - .end(now) - .orderByDuration() - ); + final List traces = queryClient.traces(new TracesQuery().start(minutesAgo).end(now).orderByDuration()); LOGGER.info("traces: {}", traces); - InputStream expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.traces.yml").getInputStream(); + InputStream expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.traces.yml") + .getInputStream(); final TracesMatcher tracesMatcher = new Yaml().loadAs(expectedInputStream, TracesMatcher.class); tracesMatcher.verifyLoosely(traces); } - private void verifyServiceInstanceRelationMetrics(List calls, final LocalDateTime minutesAgo) throws Exception { + private void verifyServiceInstanceRelationMetrics(List calls, + final LocalDateTime minutesAgo) throws Exception { verifyRelationMetrics(calls, minutesAgo, ALL_SERVICE_INSTANCE_RELATION_CLIENT_METRICS, ALL_SERVICE_INSTANCE_RELATION_SERVER_METRICS); } @@ -338,7 +312,8 @@ private void verifyServiceRelationMetrics(List calls, final LocalDateTime verifyRelationMetrics(calls, minutesAgo, ALL_SERVICE_RELATION_CLIENT_METRICS, ALL_SERVICE_RELATION_SERVER_METRICS); } - private void verifyRelationMetrics(List calls, final LocalDateTime minutesAgo, String[] relationClientMetrics, String[] relationServerMetrics) throws Exception { + private void verifyRelationMetrics(List calls, final LocalDateTime minutesAgo, String[] relationClientMetrics, + String[] relationServerMetrics) throws Exception { for (Call call : calls) { for (String detectPoint : call.getDetectPoints()) { switch (detectPoint) { diff --git a/test/e2e/e2e-agent-auth/src/main/java/org/apache/skywalking/e2e/sample/client/SampleClientApplication.java b/test/e2e/e2e-agent-auth/src/main/java/org/apache/skywalking/e2e/sample/client/SampleClientApplication.java index 37a98582897f..67ba54eedfd4 100644 --- a/test/e2e/e2e-agent-auth/src/main/java/org/apache/skywalking/e2e/sample/client/SampleClientApplication.java +++ b/test/e2e/e2e-agent-auth/src/main/java/org/apache/skywalking/e2e/sample/client/SampleClientApplication.java @@ -22,9 +22,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; -/** - * @author kezhenxu94, jian.tan - */ @EnableJpaRepositories @SpringBootApplication public class SampleClientApplication { diff --git a/test/e2e/e2e-agent-auth/src/main/java/org/apache/skywalking/e2e/sample/client/TestController.java b/test/e2e/e2e-agent-auth/src/main/java/org/apache/skywalking/e2e/sample/client/TestController.java index 6f5b98343e5c..1a344ab45c45 100644 --- a/test/e2e/e2e-agent-auth/src/main/java/org/apache/skywalking/e2e/sample/client/TestController.java +++ b/test/e2e/e2e-agent-auth/src/main/java/org/apache/skywalking/e2e/sample/client/TestController.java @@ -24,9 +24,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -/** - * @author kezhenxu94, jian.tan - */ @RestController @RequestMapping("/e2e") public class TestController { diff --git a/test/e2e/e2e-agent-auth/src/main/java/org/apache/skywalking/e2e/sample/client/User.java b/test/e2e/e2e-agent-auth/src/main/java/org/apache/skywalking/e2e/sample/client/User.java index b34755c1bc2d..3b6c317440de 100644 --- a/test/e2e/e2e-agent-auth/src/main/java/org/apache/skywalking/e2e/sample/client/User.java +++ b/test/e2e/e2e-agent-auth/src/main/java/org/apache/skywalking/e2e/sample/client/User.java @@ -23,9 +23,6 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; -/** - * @author kezhenxu94, jian.tan - */ @Entity public class User { public User() { diff --git a/test/e2e/e2e-agent-auth/src/main/java/org/apache/skywalking/e2e/sample/client/UserRepo.java b/test/e2e/e2e-agent-auth/src/main/java/org/apache/skywalking/e2e/sample/client/UserRepo.java index 472ddfcbe981..2ee38a60dd3c 100644 --- a/test/e2e/e2e-agent-auth/src/main/java/org/apache/skywalking/e2e/sample/client/UserRepo.java +++ b/test/e2e/e2e-agent-auth/src/main/java/org/apache/skywalking/e2e/sample/client/UserRepo.java @@ -20,8 +20,5 @@ import org.springframework.data.jpa.repository.JpaRepository; -/** - * @author kezhenxu94, jian.tan - */ public interface UserRepo extends JpaRepository { } diff --git a/test/e2e/e2e-agent-auth/src/test/java/org/apache/skywalking/e2e/SampleVerificationITCase.java b/test/e2e/e2e-agent-auth/src/test/java/org/apache/skywalking/e2e/SampleVerificationITCase.java index 84d7ab8c48e0..0d290bd0a433 100644 --- a/test/e2e/e2e-agent-auth/src/test/java/org/apache/skywalking/e2e/SampleVerificationITCase.java +++ b/test/e2e/e2e-agent-auth/src/test/java/org/apache/skywalking/e2e/SampleVerificationITCase.java @@ -72,9 +72,6 @@ import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_SERVICE_RELATION_SERVER_METRICS; import static org.assertj.core.api.Assertions.assertThat; -/** - * @author kezhenxu94, jian.tan - */ @RunWith(SpringJUnit4ClassRunner.class) public class SampleVerificationITCase { private static final Logger LOGGER = LoggerFactory.getLogger(SampleVerificationITCase.class); @@ -104,19 +101,12 @@ public void verify() throws Exception { try { final Map user = new HashMap<>(); user.put("name", "SkyWalking"); - final ResponseEntity responseEntity = restTemplate.postForEntity( - instrumentedServiceUrl + "/e2e/users", - user, - String.class - ); + final ResponseEntity responseEntity = restTemplate.postForEntity(instrumentedServiceUrl + "/e2e/users", user, String.class); LOGGER.info("responseEntity: {}", responseEntity); assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); - final List traces = queryClient.traces( - new TracesQuery() - .start(minutesAgo) - .end(LocalDateTime.now()) - .orderByDuration() - ); + final List traces = queryClient.traces(new TracesQuery().start(minutesAgo) + .end(LocalDateTime.now()) + .orderByDuration()); if (!traces.isEmpty()) { break; } @@ -150,9 +140,9 @@ public void verify() throws Exception { }); doRetryableVerification(() -> { - try{ + try { verifyServiceInstanceTopo(minutesAgo); - }catch (Exception e) { + } catch (Exception e) { LOGGER.warn(e.getMessage(), e); } }); @@ -161,16 +151,13 @@ public void verify() throws Exception { private void verifyTopo(LocalDateTime minutesAgo) throws Exception { final LocalDateTime now = LocalDateTime.now(ZoneOffset.UTC); - final TopoData topoData = queryClient.topo( - new TopoQuery() - .stepByMinute() - .start(minutesAgo.minusDays(1)) - .end(now) - ); + final TopoData topoData = queryClient.topo(new TopoQuery().stepByMinute() + .start(minutesAgo.minusDays(1)) + .end(now)); LOGGER.info("topoData: {}", topoData); - InputStream expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.topo.yml").getInputStream(); + InputStream expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.topo.yml") + .getInputStream(); final TopoMatcher topoMatcher = new Yaml().loadAs(expectedInputStream, TopoMatcher.class); topoMatcher.verify(topoData); @@ -180,18 +167,16 @@ private void verifyTopo(LocalDateTime minutesAgo) throws Exception { private void verifyServiceInstanceTopo(LocalDateTime minutesAgo) throws Exception { final LocalDateTime now = LocalDateTime.now(ZoneOffset.UTC); - final ServiceInstanceTopoData topoData = queryClient.serviceInstanceTopo( - new ServiceInstanceTopoQuery() - .stepByMinute() - .start(minutesAgo.minusDays(1)) - .end(now) - .clientServiceId("1") - .serverServiceId("2") - ); + final ServiceInstanceTopoData topoData = queryClient.serviceInstanceTopo(new ServiceInstanceTopoQuery().stepByMinute() + .start(minutesAgo + .minusDays(1)) + .end(now) + .clientServiceId("1") + .serverServiceId("2")); LOGGER.info("instanceTopoData: {}", topoData); - InputStream expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.serviceInstanceTopo.yml").getInputStream(); + InputStream expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.serviceInstanceTopo.yml") + .getInputStream(); final ServiceInstanceTopoMatcher topoMatcher = new Yaml().loadAs(expectedInputStream, ServiceInstanceTopoMatcher.class); topoMatcher.verify(topoData); @@ -201,15 +186,11 @@ private void verifyServiceInstanceTopo(LocalDateTime minutesAgo) throws Exceptio private void verifyServices(LocalDateTime minutesAgo) throws Exception { final LocalDateTime now = LocalDateTime.now(ZoneOffset.UTC); - final List services = queryClient.services( - new ServicesQuery() - .start(minutesAgo) - .end(now) - ); + final List services = queryClient.services(new ServicesQuery().start(minutesAgo).end(now)); LOGGER.info("services: {}", services); - InputStream expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.services.yml").getInputStream(); + InputStream expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.services.yml") + .getInputStream(); final ServicesMatcher servicesMatcher = new Yaml().loadAs(expectedInputStream, ServicesMatcher.class); servicesMatcher.verify(services); @@ -232,15 +213,12 @@ private void verifyServices(LocalDateTime minutesAgo) throws Exception { private Instances verifyServiceInstances(LocalDateTime minutesAgo, LocalDateTime now, Service service) throws Exception { InputStream expectedInputStream; - Instances instances = queryClient.instances( - new InstancesQuery() - .serviceId(service.getKey()) - .start(minutesAgo) - .end(now) - ); + Instances instances = queryClient.instances(new InstancesQuery().serviceId(service.getKey()) + .start(minutesAgo) + .end(now)); LOGGER.info("instances: {}", instances); - expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.instances.yml").getInputStream(); + expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.instances.yml") + .getInputStream(); final InstancesMatcher instancesMatcher = new Yaml().loadAs(expectedInputStream, InstancesMatcher.class); instancesMatcher.verify(instances); return instances; @@ -248,12 +226,10 @@ private Instances verifyServiceInstances(LocalDateTime minutesAgo, LocalDateTime private Endpoints verifyServiceEndpoints(LocalDateTime minutesAgo, LocalDateTime now, Service service) throws Exception { - Endpoints instances = queryClient.endpoints( - new EndpointQuery().serviceId(service.getKey()) - ); + Endpoints instances = queryClient.endpoints(new EndpointQuery().serviceId(service.getKey())); LOGGER.info("instances: {}", instances); - InputStream expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.endpoints.yml").getInputStream(); + InputStream expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.endpoints.yml") + .getInputStream(); final EndpointsMatcher endpointsMatcher = new Yaml().loadAs(expectedInputStream, EndpointsMatcher.class); endpointsMatcher.verify(instances); return instances; @@ -263,12 +239,9 @@ private void verifyInstancesMetrics(Instances instances) throws Exception { for (Instance instance : instances.getInstances()) { for (String metricsName : ALL_INSTANCE_METRICS) { LOGGER.info("verifying service instance response time: {}", instance); - final Metrics instanceMetrics = queryClient.metrics( - new MetricsQuery() - .stepByMinute() - .metricsName(metricsName) - .id(instance.getKey()) - ); + final Metrics instanceMetrics = queryClient.metrics(new MetricsQuery().stepByMinute() + .metricsName(metricsName) + .id(instance.getKey())); LOGGER.info("instanceMetrics: {}", instanceMetrics); AtLeastOneOfMetricsMatcher instanceRespTimeMatcher = new AtLeastOneOfMetricsMatcher(); MetricsValueMatcher greaterThanZero = new MetricsValueMatcher(); @@ -287,12 +260,9 @@ private void verifyEndpointsMetrics(Endpoints endpoints) throws Exception { } for (String metricName : ALL_ENDPOINT_METRICS) { LOGGER.info("verifying endpoint {}, metrics: {}", endpoint, metricName); - final Metrics metrics = queryClient.metrics( - new MetricsQuery() - .stepByMinute() - .metricsName(metricName) - .id(endpoint.getKey()) - ); + final Metrics metrics = queryClient.metrics(new MetricsQuery().stepByMinute() + .metricsName(metricName) + .id(endpoint.getKey())); LOGGER.info("metrics: {}", metrics); AtLeastOneOfMetricsMatcher instanceRespTimeMatcher = new AtLeastOneOfMetricsMatcher(); MetricsValueMatcher greaterThanZero = new MetricsValueMatcher(); @@ -307,12 +277,9 @@ private void verifyEndpointsMetrics(Endpoints endpoints) throws Exception { private void verifyServiceMetrics(Service service) throws Exception { for (String metricName : ALL_SERVICE_METRICS) { LOGGER.info("verifying service {}, metrics: {}", service, metricName); - final Metrics serviceMetrics = queryClient.metrics( - new MetricsQuery() - .stepByMinute() - .metricsName(metricName) - .id(service.getKey()) - ); + final Metrics serviceMetrics = queryClient.metrics(new MetricsQuery().stepByMinute() + .metricsName(metricName) + .id(service.getKey())); LOGGER.info("serviceMetrics: {}", serviceMetrics); AtLeastOneOfMetricsMatcher instanceRespTimeMatcher = new AtLeastOneOfMetricsMatcher(); MetricsValueMatcher greaterThanZero = new MetricsValueMatcher(); @@ -326,22 +293,18 @@ private void verifyServiceMetrics(Service service) throws Exception { private void verifyTraces(LocalDateTime minutesAgo) throws Exception { final LocalDateTime now = LocalDateTime.now(ZoneOffset.UTC); - final List traces = queryClient.traces( - new TracesQuery() - .start(minutesAgo) - .end(now) - .orderByDuration() - ); + final List traces = queryClient.traces(new TracesQuery().start(minutesAgo).end(now).orderByDuration()); LOGGER.info("traces: {}", traces); - InputStream expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.traces.yml").getInputStream(); + InputStream expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.traces.yml") + .getInputStream(); final TracesMatcher tracesMatcher = new Yaml().loadAs(expectedInputStream, TracesMatcher.class); tracesMatcher.verifyLoosely(traces); } - private void verifyServiceInstanceRelationMetrics(List calls, final LocalDateTime minutesAgo) throws Exception { + private void verifyServiceInstanceRelationMetrics(List calls, + final LocalDateTime minutesAgo) throws Exception { verifyRelationMetrics(calls, minutesAgo, ALL_SERVICE_INSTANCE_RELATION_CLIENT_METRICS, ALL_SERVICE_INSTANCE_RELATION_SERVER_METRICS); } @@ -349,7 +312,8 @@ private void verifyServiceRelationMetrics(List calls, final LocalDateTime verifyRelationMetrics(calls, minutesAgo, ALL_SERVICE_RELATION_CLIENT_METRICS, ALL_SERVICE_RELATION_SERVER_METRICS); } - private void verifyRelationMetrics(List calls, final LocalDateTime minutesAgo, String[] relationClientMetrics, String[] relationServerMetrics) throws Exception { + private void verifyRelationMetrics(List calls, final LocalDateTime minutesAgo, String[] relationClientMetrics, + String[] relationServerMetrics) throws Exception { for (Call call : calls) { for (String detectPoint : call.getDetectPoints()) { switch (detectPoint) { diff --git a/test/e2e/e2e-agent-reboot/pom.xml b/test/e2e/e2e-agent-reboot/pom.xml index 65e3f9eb494c..824f379a81b8 100755 --- a/test/e2e/e2e-agent-reboot/pom.xml +++ b/test/e2e/e2e-agent-reboot/pom.xml @@ -84,7 +84,8 @@ ${project.build.finalName}.jar - -Dskywalking.agent.cool_down_threshold=1 + -Dskywalking.agent.cool_down_threshold=1 + +webapp.host:webapp.port:8080 diff --git a/test/e2e/e2e-agent-reboot/src/main/java/org/apache/skywalking/e2e/sample/client/SampleClientApplication.java b/test/e2e/e2e-agent-reboot/src/main/java/org/apache/skywalking/e2e/sample/client/SampleClientApplication.java index a55dbd685769..67ba54eedfd4 100644 --- a/test/e2e/e2e-agent-reboot/src/main/java/org/apache/skywalking/e2e/sample/client/SampleClientApplication.java +++ b/test/e2e/e2e-agent-reboot/src/main/java/org/apache/skywalking/e2e/sample/client/SampleClientApplication.java @@ -22,9 +22,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; -/** - * @author kezhenxu94 - */ @EnableJpaRepositories @SpringBootApplication public class SampleClientApplication { diff --git a/test/e2e/e2e-agent-reboot/src/main/java/org/apache/skywalking/e2e/sample/client/TestController.java b/test/e2e/e2e-agent-reboot/src/main/java/org/apache/skywalking/e2e/sample/client/TestController.java index 566bcdea4aa9..1a344ab45c45 100644 --- a/test/e2e/e2e-agent-reboot/src/main/java/org/apache/skywalking/e2e/sample/client/TestController.java +++ b/test/e2e/e2e-agent-reboot/src/main/java/org/apache/skywalking/e2e/sample/client/TestController.java @@ -24,9 +24,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -/** - * @author kezhenxu94 - */ @RestController @RequestMapping("/e2e") public class TestController { diff --git a/test/e2e/e2e-agent-reboot/src/main/java/org/apache/skywalking/e2e/sample/client/User.java b/test/e2e/e2e-agent-reboot/src/main/java/org/apache/skywalking/e2e/sample/client/User.java index 4589c7f2c424..3b6c317440de 100644 --- a/test/e2e/e2e-agent-reboot/src/main/java/org/apache/skywalking/e2e/sample/client/User.java +++ b/test/e2e/e2e-agent-reboot/src/main/java/org/apache/skywalking/e2e/sample/client/User.java @@ -23,9 +23,6 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; -/** - * @author kezhenxu94 - */ @Entity public class User { public User() { diff --git a/test/e2e/e2e-agent-reboot/src/main/java/org/apache/skywalking/e2e/sample/client/UserRepo.java b/test/e2e/e2e-agent-reboot/src/main/java/org/apache/skywalking/e2e/sample/client/UserRepo.java index 882af92a8211..2ee38a60dd3c 100644 --- a/test/e2e/e2e-agent-reboot/src/main/java/org/apache/skywalking/e2e/sample/client/UserRepo.java +++ b/test/e2e/e2e-agent-reboot/src/main/java/org/apache/skywalking/e2e/sample/client/UserRepo.java @@ -20,8 +20,5 @@ import org.springframework.data.jpa.repository.JpaRepository; -/** - * @author kezhenxu94 - */ public interface UserRepo extends JpaRepository { } diff --git a/test/e2e/e2e-agent-reboot/src/test/java/org/apache/skywalking/e2e/AgentRebootITCase.java b/test/e2e/e2e-agent-reboot/src/test/java/org/apache/skywalking/e2e/AgentRebootITCase.java index 8b1b44c9349e..451d68d2d585 100644 --- a/test/e2e/e2e-agent-reboot/src/test/java/org/apache/skywalking/e2e/AgentRebootITCase.java +++ b/test/e2e/e2e-agent-reboot/src/test/java/org/apache/skywalking/e2e/AgentRebootITCase.java @@ -18,6 +18,12 @@ package org.apache.skywalking.e2e; +import java.io.InputStream; +import java.time.LocalDateTime; +import java.time.ZoneOffset; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import org.apache.skywalking.e2e.metrics.AtLeastOneOfMetricsMatcher; import org.apache.skywalking.e2e.metrics.Metrics; import org.apache.skywalking.e2e.metrics.MetricsQuery; @@ -52,21 +58,11 @@ import org.springframework.web.client.RestTemplate; import org.yaml.snakeyaml.Yaml; -import java.io.InputStream; -import java.time.LocalDateTime; -import java.time.ZoneOffset; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_ENDPOINT_METRICS; import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_INSTANCE_METRICS; import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_SERVICE_METRICS; import static org.assertj.core.api.Assertions.assertThat; -/** - * @author kezhenxu94 - */ @RunWith(SpringJUnit4ClassRunner.class) public class AgentRebootITCase { private static final Logger LOGGER = LoggerFactory.getLogger(AgentRebootITCase.class); @@ -114,18 +110,11 @@ private void doVerify() throws InterruptedException { try { final Map user = new HashMap<>(); user.put("name", "SkyWalking"); - final ResponseEntity responseEntity = restTemplate.postForEntity( - instrumentedServiceUrl + "/e2e/users", - user, - String.class - ); + final ResponseEntity responseEntity = restTemplate.postForEntity(instrumentedServiceUrl + "/e2e/users", user, String.class); assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); - final List traces = queryClient.traces( - new TracesQuery() - .start(minutesAgo) - .end(LocalDateTime.now()) - .orderByDuration() - ); + final List traces = queryClient.traces(new TracesQuery().start(minutesAgo) + .end(LocalDateTime.now()) + .orderByDuration()); if (!traces.isEmpty()) { break; } @@ -162,15 +151,12 @@ private void doVerify() throws InterruptedException { private void verifyTopo(LocalDateTime minutesAgo) throws Exception { final LocalDateTime now = LocalDateTime.now(ZoneOffset.UTC); - final TopoData topoData = queryClient.topo( - new TopoQuery() - .stepByMinute() - .start(minutesAgo.minusDays(1)) - .end(now) - ); + final TopoData topoData = queryClient.topo(new TopoQuery().stepByMinute() + .start(minutesAgo.minusDays(1)) + .end(now)); - InputStream expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.topo.yml").getInputStream(); + InputStream expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.topo.yml") + .getInputStream(); final TopoMatcher topoMatcher = new Yaml().loadAs(expectedInputStream, TopoMatcher.class); topoMatcher.verify(topoData); @@ -179,14 +165,10 @@ private void verifyTopo(LocalDateTime minutesAgo) throws Exception { private void verifyServices(LocalDateTime minutesAgo) throws Exception { final LocalDateTime now = LocalDateTime.now(ZoneOffset.UTC); - final List services = queryClient.services( - new ServicesQuery() - .start(minutesAgo) - .end(now) - ); + final List services = queryClient.services(new ServicesQuery().start(minutesAgo).end(now)); - InputStream expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.services.yml").getInputStream(); + InputStream expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.services.yml") + .getInputStream(); final ServicesMatcher servicesMatcher = new Yaml().loadAs(expectedInputStream, ServicesMatcher.class); servicesMatcher.verify(services); @@ -206,27 +188,24 @@ private void verifyServices(LocalDateTime minutesAgo) throws Exception { } } - private Instances verifyServiceInstances(LocalDateTime minutesAgo, LocalDateTime now, Service service) throws Exception { + private Instances verifyServiceInstances(LocalDateTime minutesAgo, LocalDateTime now, + Service service) throws Exception { InputStream expectedInputStream; - Instances instances = queryClient.instances( - new InstancesQuery() - .serviceId(service.getKey()) - .start(minutesAgo) - .end(now) - ); - expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.instances.yml").getInputStream(); + Instances instances = queryClient.instances(new InstancesQuery().serviceId(service.getKey()) + .start(minutesAgo) + .end(now)); + expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.instances.yml") + .getInputStream(); final InstancesMatcher instancesMatcher = new Yaml().loadAs(expectedInputStream, InstancesMatcher.class); instancesMatcher.verify(instances); return instances; } - private Endpoints verifyServiceEndpoints(LocalDateTime minutesAgo, LocalDateTime now, Service service) throws Exception { - Endpoints instances = queryClient.endpoints( - new EndpointQuery().serviceId(service.getKey()) - ); - InputStream expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.endpoints.yml").getInputStream(); + private Endpoints verifyServiceEndpoints(LocalDateTime minutesAgo, LocalDateTime now, + Service service) throws Exception { + Endpoints instances = queryClient.endpoints(new EndpointQuery().serviceId(service.getKey())); + InputStream expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.endpoints.yml") + .getInputStream(); final EndpointsMatcher endpointsMatcher = new Yaml().loadAs(expectedInputStream, EndpointsMatcher.class); endpointsMatcher.verify(instances); return instances; @@ -236,12 +215,9 @@ private void verifyInstancesMetrics(Instances instances) throws Exception { for (Instance instance : instances.getInstances()) { for (String metricsName : ALL_INSTANCE_METRICS) { LOGGER.info("verifying service instance {}, metrics {}", instance, metricsName); - final Metrics instanceMetrics = queryClient.metrics( - new MetricsQuery() - .stepByMinute() - .metricsName(metricsName) - .id(instance.getKey()) - ); + final Metrics instanceMetrics = queryClient.metrics(new MetricsQuery().stepByMinute() + .metricsName(metricsName) + .id(instance.getKey())); AtLeastOneOfMetricsMatcher instanceRespTimeMatcher = new AtLeastOneOfMetricsMatcher(); MetricsValueMatcher greaterThanZero = new MetricsValueMatcher(); greaterThanZero.setValue("gt 0"); @@ -259,12 +235,9 @@ private void verifyEndpointsMetrics(Endpoints endpoints) throws Exception { } for (String metricsName : ALL_ENDPOINT_METRICS) { LOGGER.info("verifying endpoint {}, metrics: {}", endpoint, metricsName); - final Metrics metrics = queryClient.metrics( - new MetricsQuery() - .stepByMinute() - .metricsName(metricsName) - .id(endpoint.getKey()) - ); + final Metrics metrics = queryClient.metrics(new MetricsQuery().stepByMinute() + .metricsName(metricsName) + .id(endpoint.getKey())); AtLeastOneOfMetricsMatcher instanceRespTimeMatcher = new AtLeastOneOfMetricsMatcher(); MetricsValueMatcher greaterThanZero = new MetricsValueMatcher(); greaterThanZero.setValue("gt 0"); @@ -278,12 +251,9 @@ private void verifyEndpointsMetrics(Endpoints endpoints) throws Exception { private void verifyServiceMetrics(Service service) throws Exception { for (String metricsName : ALL_SERVICE_METRICS) { LOGGER.info("verifying service {}, metrics: {}", service, metricsName); - final Metrics serviceMetrics = queryClient.metrics( - new MetricsQuery() - .stepByMinute() - .metricsName(metricsName) - .id(service.getKey()) - ); + final Metrics serviceMetrics = queryClient.metrics(new MetricsQuery().stepByMinute() + .metricsName(metricsName) + .id(service.getKey())); AtLeastOneOfMetricsMatcher instanceRespTimeMatcher = new AtLeastOneOfMetricsMatcher(); MetricsValueMatcher greaterThanZero = new MetricsValueMatcher(); greaterThanZero.setValue("gt 0"); @@ -296,15 +266,10 @@ private void verifyServiceMetrics(Service service) throws Exception { private void verifyTraces(LocalDateTime minutesAgo) throws Exception { final LocalDateTime now = LocalDateTime.now(ZoneOffset.UTC); - final List traces = queryClient.traces( - new TracesQuery() - .start(minutesAgo) - .end(now) - .orderByDuration() - ); + final List traces = queryClient.traces(new TracesQuery().start(minutesAgo).end(now).orderByDuration()); - InputStream expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.traces.yml").getInputStream(); + InputStream expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.traces.yml") + .getInputStream(); final TracesMatcher tracesMatcher = new Yaml().loadAs(expectedInputStream, TracesMatcher.class); tracesMatcher.verifyLoosely(traces); @@ -336,12 +301,9 @@ private void restartOAP() { private void waitOAPStartUp() { for (int i = 0; ; i++) { try { - queryClient.traces( - new TracesQuery() - .start(LocalDateTime.now()) - .end(LocalDateTime.now()) - .orderByDuration() - ); + queryClient.traces(new TracesQuery().start(LocalDateTime.now()) + .end(LocalDateTime.now()) + .orderByDuration()); break; } catch (Throwable e) { LOGGER.info("OAP restart not ready, waited {} seconds, {}", i * 10, e.getMessage()); @@ -356,12 +318,9 @@ private void waitOAPStartUp() { private void assertDataErased() throws Exception { final LocalDateTime now = LocalDateTime.now(ZoneOffset.UTC); - final List traces = queryClient.traces( - new TracesQuery() - .start(now.minusMinutes(10)) - .end(now) - .orderByDuration() - ); + final List traces = queryClient.traces(new TracesQuery().start(now.minusMinutes(10)) + .end(now) + .orderByDuration()); assertThat(traces).isEmpty(); } diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/AbstractQuery.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/AbstractQuery.java index f09c177105e3..33035ccbbc77 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/AbstractQuery.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/AbstractQuery.java @@ -22,9 +22,6 @@ import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; -/** - * @author kezhenxu94 - */ public abstract class AbstractQuery> { private static final DateTimeFormatter TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HHmmss"); private static final DateTimeFormatter MINUTE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HHmm"); diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/GQLResponse.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/GQLResponse.java index 134f10b8fe9c..ef58b6be1b82 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/GQLResponse.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/GQLResponse.java @@ -20,8 +20,6 @@ /** * GraphQL response for easily test - * - * @author kezhenxu94 */ public class GQLResponse { private T data; @@ -36,8 +34,6 @@ public void setData(final T data) { @Override public String toString() { - return "GQLResponse{" + - "data=" + data + - '}'; + return "GQLResponse{" + "data=" + data + '}'; } } diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/SimpleQueryClient.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/SimpleQueryClient.java index caae4fb569eb..3f3db3701351 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/SimpleQueryClient.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/SimpleQueryClient.java @@ -19,6 +19,12 @@ package org.apache.skywalking.e2e; import com.google.common.io.Resources; +import java.net.URI; +import java.net.URL; +import java.nio.charset.Charset; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; import org.apache.skywalking.e2e.metrics.Metrics; import org.apache.skywalking.e2e.metrics.MetricsData; import org.apache.skywalking.e2e.metrics.MetricsQuery; @@ -30,7 +36,12 @@ import org.apache.skywalking.e2e.service.endpoint.Endpoints; import org.apache.skywalking.e2e.service.instance.Instances; import org.apache.skywalking.e2e.service.instance.InstancesQuery; -import org.apache.skywalking.e2e.topo.*; +import org.apache.skywalking.e2e.topo.ServiceInstanceTopoData; +import org.apache.skywalking.e2e.topo.ServiceInstanceTopoQuery; +import org.apache.skywalking.e2e.topo.ServiceInstanceTopoResponse; +import org.apache.skywalking.e2e.topo.TopoData; +import org.apache.skywalking.e2e.topo.TopoQuery; +import org.apache.skywalking.e2e.topo.TopoResponse; import org.apache.skywalking.e2e.trace.Trace; import org.apache.skywalking.e2e.trace.TracesData; import org.apache.skywalking.e2e.trace.TracesQuery; @@ -41,16 +52,6 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.client.RestTemplate; -import java.net.URI; -import java.net.URL; -import java.nio.charset.Charset; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; - -/** - * @author kezhenxu94 - */ public class SimpleQueryClient { protected final RestTemplate restTemplate = new RestTemplate(); @@ -67,22 +68,20 @@ public SimpleQueryClient(String endpointUrl) { public List traces(final TracesQuery query) throws Exception { final URL queryFileUrl = Resources.getResource("traces.gql"); final String queryString = Resources.readLines(queryFileUrl, Charset.forName("UTF8")) - .stream() - .filter(it -> !it.startsWith("#")) - .collect(Collectors.joining()) - .replace("{start}", query.start()) - .replace("{end}", query.end()) - .replace("{step}", query.step()) - .replace("{traceState}", query.traceState()) - .replace("{pageNum}", query.pageNum()) - .replace("{pageSize}", query.pageSize()) - .replace("{needTotal}", query.needTotal()) - .replace("{queryOrder}", query.queryOrder()); - final ResponseEntity> responseEntity = restTemplate.exchange( - new RequestEntity<>(queryString, HttpMethod.POST, URI.create(endpointUrl)), - new ParameterizedTypeReference>() { - } - ); + .stream() + .filter(it -> !it.startsWith("#")) + .collect(Collectors.joining()) + .replace("{start}", query.start()) + .replace("{end}", query.end()) + .replace("{step}", query.step()) + .replace("{traceState}", query.traceState()) + .replace("{pageNum}", query.pageNum()) + .replace("{pageSize}", query.pageSize()) + .replace("{needTotal}", query.needTotal()) + .replace("{queryOrder}", query.queryOrder()); + final ResponseEntity> responseEntity = restTemplate.exchange(new RequestEntity<>(queryString, HttpMethod.POST, URI + .create(endpointUrl)), new ParameterizedTypeReference>() { + }); if (responseEntity.getStatusCode() != HttpStatus.OK) { throw new RuntimeException("Response status != 200, actual: " + responseEntity.getStatusCode()); @@ -94,17 +93,15 @@ public List traces(final TracesQuery query) throws Exception { public List services(final ServicesQuery query) throws Exception { final URL queryFileUrl = Resources.getResource("services.gql"); final String queryString = Resources.readLines(queryFileUrl, Charset.forName("UTF8")) - .stream() - .filter(it -> !it.startsWith("#")) - .collect(Collectors.joining()) - .replace("{start}", query.start()) - .replace("{end}", query.end()) - .replace("{step}", query.step()); - final ResponseEntity> responseEntity = restTemplate.exchange( - new RequestEntity<>(queryString, HttpMethod.POST, URI.create(endpointUrl)), - new ParameterizedTypeReference>() { - } - ); + .stream() + .filter(it -> !it.startsWith("#")) + .collect(Collectors.joining()) + .replace("{start}", query.start()) + .replace("{end}", query.end()) + .replace("{step}", query.step()); + final ResponseEntity> responseEntity = restTemplate.exchange(new RequestEntity<>(queryString, HttpMethod.POST, URI + .create(endpointUrl)), new ParameterizedTypeReference>() { + }); if (responseEntity.getStatusCode() != HttpStatus.OK) { throw new RuntimeException("Response status != 200, actual: " + responseEntity.getStatusCode()); @@ -116,18 +113,16 @@ public List services(final ServicesQuery query) throws Exception { public Instances instances(final InstancesQuery query) throws Exception { final URL queryFileUrl = Resources.getResource("instances.gql"); final String queryString = Resources.readLines(queryFileUrl, Charset.forName("UTF8")) - .stream() - .filter(it -> !it.startsWith("#")) - .collect(Collectors.joining()) - .replace("{serviceId}", query.serviceId()) - .replace("{start}", query.start()) - .replace("{end}", query.end()) - .replace("{step}", query.step()); - final ResponseEntity> responseEntity = restTemplate.exchange( - new RequestEntity<>(queryString, HttpMethod.POST, URI.create(endpointUrl)), - new ParameterizedTypeReference>() { - } - ); + .stream() + .filter(it -> !it.startsWith("#")) + .collect(Collectors.joining()) + .replace("{serviceId}", query.serviceId()) + .replace("{start}", query.start()) + .replace("{end}", query.end()) + .replace("{step}", query.step()); + final ResponseEntity> responseEntity = restTemplate.exchange(new RequestEntity<>(queryString, HttpMethod.POST, URI + .create(endpointUrl)), new ParameterizedTypeReference>() { + }); if (responseEntity.getStatusCode() != HttpStatus.OK) { throw new RuntimeException("Response status != 200, actual: " + responseEntity.getStatusCode()); @@ -139,15 +134,13 @@ public Instances instances(final InstancesQuery query) throws Exception { public Endpoints endpoints(final EndpointQuery query) throws Exception { final URL queryFileUrl = Resources.getResource("endpoints.gql"); final String queryString = Resources.readLines(queryFileUrl, Charset.forName("UTF8")) - .stream() - .filter(it -> !it.startsWith("#")) - .collect(Collectors.joining()) - .replace("{serviceId}", query.serviceId()); - final ResponseEntity> responseEntity = restTemplate.exchange( - new RequestEntity<>(queryString, HttpMethod.POST, URI.create(endpointUrl)), - new ParameterizedTypeReference>() { - } - ); + .stream() + .filter(it -> !it.startsWith("#")) + .collect(Collectors.joining()) + .replace("{serviceId}", query.serviceId()); + final ResponseEntity> responseEntity = restTemplate.exchange(new RequestEntity<>(queryString, HttpMethod.POST, URI + .create(endpointUrl)), new ParameterizedTypeReference>() { + }); if (responseEntity.getStatusCode() != HttpStatus.OK) { throw new RuntimeException("Response status != 200, actual: " + responseEntity.getStatusCode()); @@ -159,17 +152,15 @@ public Endpoints endpoints(final EndpointQuery query) throws Exception { public TopoData topo(final TopoQuery query) throws Exception { final URL queryFileUrl = Resources.getResource("topo.gql"); final String queryString = Resources.readLines(queryFileUrl, Charset.forName("UTF8")) - .stream() - .filter(it -> !it.startsWith("#")) - .collect(Collectors.joining()) - .replace("{step}", query.step()) - .replace("{start}", query.start()) - .replace("{end}", query.end()); - final ResponseEntity> responseEntity = restTemplate.exchange( - new RequestEntity<>(queryString, HttpMethod.POST, URI.create(endpointUrl)), - new ParameterizedTypeReference>() { - } - ); + .stream() + .filter(it -> !it.startsWith("#")) + .collect(Collectors.joining()) + .replace("{step}", query.step()) + .replace("{start}", query.start()) + .replace("{end}", query.end()); + final ResponseEntity> responseEntity = restTemplate.exchange(new RequestEntity<>(queryString, HttpMethod.POST, URI + .create(endpointUrl)), new ParameterizedTypeReference>() { + }); if (responseEntity.getStatusCode() != HttpStatus.OK) { throw new RuntimeException("Response status != 200, actual: " + responseEntity.getStatusCode()); @@ -181,19 +172,17 @@ public TopoData topo(final TopoQuery query) throws Exception { public ServiceInstanceTopoData serviceInstanceTopo(final ServiceInstanceTopoQuery query) throws Exception { final URL queryFileUrl = Resources.getResource("instanceTopo.gql"); final String queryString = Resources.readLines(queryFileUrl, Charset.forName("UTF8")) - .stream() - .filter(it -> !it.startsWith("#")) - .collect(Collectors.joining()) - .replace("{step}", query.step()) - .replace("{start}", query.start()) - .replace("{end}", query.end()) - .replace("{clientServiceId}", query.clientServiceId()) - .replace("{serverServiceId}", query.serverServiceId()); - final ResponseEntity> responseEntity = restTemplate.exchange( - new RequestEntity<>(queryString, HttpMethod.POST, URI.create(endpointUrl)), - new ParameterizedTypeReference>() { - } - ); + .stream() + .filter(it -> !it.startsWith("#")) + .collect(Collectors.joining()) + .replace("{step}", query.step()) + .replace("{start}", query.start()) + .replace("{end}", query.end()) + .replace("{clientServiceId}", query.clientServiceId()) + .replace("{serverServiceId}", query.serverServiceId()); + final ResponseEntity> responseEntity = restTemplate.exchange(new RequestEntity<>(queryString, HttpMethod.POST, URI + .create(endpointUrl)), new ParameterizedTypeReference>() { + }); if (responseEntity.getStatusCode() != HttpStatus.OK) { throw new RuntimeException("Response status != 200, actual: " + responseEntity.getStatusCode()); @@ -205,19 +194,17 @@ public ServiceInstanceTopoData serviceInstanceTopo(final ServiceInstanceTopoQuer public Metrics metrics(final MetricsQuery query) throws Exception { final URL queryFileUrl = Resources.getResource("metrics.gql"); final String queryString = Resources.readLines(queryFileUrl, Charset.forName("UTF8")) - .stream() - .filter(it -> !it.startsWith("#")) - .collect(Collectors.joining()) - .replace("{step}", query.step()) - .replace("{start}", query.start()) - .replace("{end}", query.end()) - .replace("{metricsName}", query.metricsName()) - .replace("{id}", query.id()); - final ResponseEntity> responseEntity = restTemplate.exchange( - new RequestEntity<>(queryString, HttpMethod.POST, URI.create(endpointUrl)), - new ParameterizedTypeReference>() { - } - ); + .stream() + .filter(it -> !it.startsWith("#")) + .collect(Collectors.joining()) + .replace("{step}", query.step()) + .replace("{start}", query.start()) + .replace("{end}", query.end()) + .replace("{metricsName}", query.metricsName()) + .replace("{id}", query.id()); + final ResponseEntity> responseEntity = restTemplate.exchange(new RequestEntity<>(queryString, HttpMethod.POST, URI + .create(endpointUrl)), new ParameterizedTypeReference>() { + }); if (responseEntity.getStatusCode() != HttpStatus.OK) { throw new RuntimeException("Response status != 200, actual: " + responseEntity.getStatusCode()); @@ -229,20 +216,18 @@ public Metrics metrics(final MetricsQuery query) throws Exception { public List multipleLinearMetrics(final MetricsQuery query, String numOfLinear) throws Exception { final URL queryFileUrl = Resources.getResource("metrics-multiLines.gql"); final String queryString = Resources.readLines(queryFileUrl, Charset.forName("UTF8")) - .stream() - .filter(it -> !it.startsWith("#")) - .collect(Collectors.joining()) - .replace("{step}", query.step()) - .replace("{start}", query.start()) - .replace("{end}", query.end()) - .replace("{metricsName}", query.metricsName()) - .replace("{id}", query.id()) - .replace("{numOfLinear}", numOfLinear); - final ResponseEntity> responseEntity = restTemplate.exchange( - new RequestEntity<>(queryString, HttpMethod.POST, URI.create(endpointUrl)), - new ParameterizedTypeReference>() { - } - ); + .stream() + .filter(it -> !it.startsWith("#")) + .collect(Collectors.joining()) + .replace("{step}", query.step()) + .replace("{start}", query.start()) + .replace("{end}", query.end()) + .replace("{metricsName}", query.metricsName()) + .replace("{id}", query.id()) + .replace("{numOfLinear}", numOfLinear); + final ResponseEntity> responseEntity = restTemplate.exchange(new RequestEntity<>(queryString, HttpMethod.POST, URI + .create(endpointUrl)), new ParameterizedTypeReference>() { + }); if (responseEntity.getStatusCode() != HttpStatus.OK) { throw new RuntimeException("Response status != 200, actual: " + responseEntity.getStatusCode()); diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/assertor/VariableExpressParser.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/assertor/VariableExpressParser.java index 73daaa2ef050..6091536d5500 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/assertor/VariableExpressParser.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/assertor/VariableExpressParser.java @@ -17,20 +17,15 @@ package org.apache.skywalking.e2e.assertor; -import org.apache.skywalking.e2e.assertor.exception.VariableNotFoundException; - import java.util.List; import java.util.function.Function; import java.util.regex.Pattern; +import org.apache.skywalking.e2e.assertor.exception.VariableNotFoundException; import static java.util.Objects.isNull; -/** - * @author zhangwei - */ public class VariableExpressParser { - public static T parse(final String express, List actual, Function getFiled) { String variable = express.trim(); if (!(variable.startsWith("${") && variable.endsWith("}"))) { diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/assertor/exception/VariableNotFoundException.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/assertor/exception/VariableNotFoundException.java index a90e4be8ccb7..851ef4d61b77 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/assertor/exception/VariableNotFoundException.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/assertor/exception/VariableNotFoundException.java @@ -19,9 +19,6 @@ import org.apache.skywalking.e2e.exception.AssertFailedException; -/** - * @author zhangwei - */ public class VariableNotFoundException extends AssertFailedException { private static final long serialVersionUID = 1337142072507388456L; diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/exception/AssertFailedException.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/exception/AssertFailedException.java index a1e0cf3b7fad..f0f5933c18d6 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/exception/AssertFailedException.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/exception/AssertFailedException.java @@ -16,9 +16,7 @@ */ package org.apache.skywalking.e2e.exception; -/** - * Created by xin on 2017/7/15. - */ + public abstract class AssertFailedException extends RuntimeException { private static final long serialVersionUID = 8870675340514007954L; @@ -27,7 +25,7 @@ protected AssertFailedException(String message) { super(message); } - protected AssertFailedException(){ + protected AssertFailedException() { } public abstract String getCauseMessage(); diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/AllOfMetricsMatcher.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/AllOfMetricsMatcher.java index 570cfc4d44fe..2ea97d2ba982 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/AllOfMetricsMatcher.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/AllOfMetricsMatcher.java @@ -18,15 +18,9 @@ package org.apache.skywalking.e2e.metrics; import org.apache.skywalking.e2e.verification.AbstractMatcher; -import org.assertj.core.api.Condition; - -import java.util.function.Predicate; import static org.assertj.core.api.Assertions.assertThat; -/** - * @author kezhenxu94 - */ public class AllOfMetricsMatcher extends AbstractMatcher { private MetricsValueMatcher value; @@ -53,8 +47,6 @@ public void setValue(MetricsValueMatcher value) { @Override public String toString() { - return "AllOfMetricsMatcher{" + - "value=" + value + - '}'; + return "AllOfMetricsMatcher{" + "value=" + value + '}'; } } diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/AtLeastOneOfMetricsMatcher.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/AtLeastOneOfMetricsMatcher.java index 5a47b0029504..b2c83e969193 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/AtLeastOneOfMetricsMatcher.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/AtLeastOneOfMetricsMatcher.java @@ -23,16 +23,13 @@ import static org.assertj.core.api.Assertions.assertThat; -/** - * @author kezhenxu94 - */ public class AtLeastOneOfMetricsMatcher extends AbstractMatcher { private MetricsValueMatcher value; @Override public void verify(Metrics metrics) { assertThat(metrics.getValues()).isNotEmpty(); - assertThat(metrics.getValues()).areAtLeastOne(new Condition(){ + assertThat(metrics.getValues()).areAtLeastOne(new Condition() { @Override public boolean matches(MetricsValue value) { try { @@ -55,8 +52,6 @@ public void setValue(MetricsValueMatcher value) { @Override public String toString() { - return "OneOfMetricsMatcher{" + - "value=" + value + - '}'; + return "OneOfMetricsMatcher{" + "value=" + value + '}'; } } diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/Metrics.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/Metrics.java index b0cf0e387bba..4cc71390e175 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/Metrics.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/Metrics.java @@ -21,9 +21,6 @@ import java.util.ArrayList; import java.util.List; -/** - * @author kezhenxu94 - */ public class Metrics { private List values = new ArrayList<>(); @@ -37,8 +34,6 @@ public void setValues(List values) { @Override public String toString() { - return "Metrics{" + - "values=" + values + - '}'; + return "Metrics{" + "values=" + values + '}'; } } diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/MetricsData.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/MetricsData.java index db085c1df992..519a128049cb 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/MetricsData.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/MetricsData.java @@ -21,9 +21,6 @@ import lombok.Data; import lombok.ToString; -/** - * @author kezhenxu94 - */ @Data @ToString public class MetricsData { diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/MetricsMatcher.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/MetricsMatcher.java index 06a3ffcbcd91..8aca01c3aa31 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/MetricsMatcher.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/MetricsMatcher.java @@ -25,9 +25,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * @author zhangwei - */ public class MetricsMatcher { private static final Logger LOGGER = LoggerFactory.getLogger(MetricsMatcher.class); @@ -41,14 +38,12 @@ public static void verifyMetrics(SimpleQueryClient queryClient, String metricNam final LocalDateTime minutesAgo, long retryInterval, Runnable generateTraffic) throws Exception { boolean valid = false; while (!valid) { - Metrics metrics = queryClient.metrics( - new MetricsQuery() - .stepByMinute() - .metricsName(metricName) - .start(minutesAgo) - .end(LocalDateTime.now(ZoneOffset.UTC).plusMinutes(1)) - .id(id) - ); + Metrics metrics = queryClient.metrics(new MetricsQuery().stepByMinute() + .metricsName(metricName) + .start(minutesAgo) + .end(LocalDateTime.now(ZoneOffset.UTC) + .plusMinutes(1)) + .id(id)); LOGGER.info("{}: {}", metricName, metrics); AtLeastOneOfMetricsMatcher instanceRespTimeMatcher = new AtLeastOneOfMetricsMatcher(); MetricsValueMatcher greaterThanZero = new MetricsValueMatcher(); @@ -72,15 +67,12 @@ public static void verifyPercentileMetrics(SimpleQueryClient queryClient, String final LocalDateTime minutesAgo, long retryInterval, Runnable generateTraffic) throws Exception { boolean valid = false; while (!valid) { - List metricsArray = queryClient.multipleLinearMetrics( - new MetricsQuery() - .stepByMinute() - .metricsName(metricName) - .start(minutesAgo) - .end(LocalDateTime.now(ZoneOffset.UTC).plusMinutes(1)) - .id(id), - "5" - ); + List metricsArray = queryClient.multipleLinearMetrics(new MetricsQuery().stepByMinute() + .metricsName(metricName) + .start(minutesAgo) + .end(LocalDateTime.now(ZoneOffset.UTC) + .plusMinutes(1)) + .id(id), "5"); LOGGER.info("{}: {}", metricName, metricsArray); AtLeastOneOfMetricsMatcher matcher = new AtLeastOneOfMetricsMatcher(); MetricsValueMatcher greaterThanZero = new MetricsValueMatcher(); diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/MetricsQuery.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/MetricsQuery.java index 6b532c9552e5..fc9ff1bdc821 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/MetricsQuery.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/MetricsQuery.java @@ -20,9 +20,6 @@ import org.apache.skywalking.e2e.AbstractQuery; -/** - * @author kezhenxu94 - */ public class MetricsQuery extends AbstractQuery { public static String SERVICE_SLA = "service_sla"; public static String SERVICE_CPM = "service_cpm"; @@ -46,7 +43,7 @@ public class MetricsQuery extends AbstractQuery { ENDPOINT_CPM, ENDPOINT_AVG, ENDPOINT_SLA, - }; + }; public static String ENDPOINT_PERCENTILE = "endpoint_percentile"; public static String[] ALL_ENDPOINT_MULTIPLE_LINEAR_METRICS = { ENDPOINT_PERCENTILE @@ -116,9 +113,6 @@ public MetricsQuery metricsName(String metricsName) { @Override public String toString() { - return "MetricsQuery{" + - "id='" + id + '\'' + - ", metricsName='" + metricsName + '\'' + - '}'; + return "MetricsQuery{" + "id='" + id + '\'' + ", metricsName='" + metricsName + '\'' + '}'; } } diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/MetricsValue.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/MetricsValue.java index 6b27ce96a428..fa7985c028ba 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/MetricsValue.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/MetricsValue.java @@ -18,9 +18,6 @@ package org.apache.skywalking.e2e.metrics; -/** - * @author kezhenxu94 - */ public class MetricsValue { private String value; @@ -35,8 +32,6 @@ public MetricsValue setValue(String value) { @Override public String toString() { - return "MetricsValue{" + - "value='" + value + '\'' + - '}'; + return "MetricsValue{" + "value='" + value + '\'' + '}'; } } diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/MetricsValueMatcher.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/MetricsValueMatcher.java index f3e70f3071e2..37b4f0519f23 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/MetricsValueMatcher.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/MetricsValueMatcher.java @@ -18,13 +18,9 @@ package org.apache.skywalking.e2e.metrics; -import org.apache.skywalking.e2e.verification.AbstractMatcher; - import java.util.Objects; +import org.apache.skywalking.e2e.verification.AbstractMatcher; -/** - * @author kezhenxu94 - */ public class MetricsValueMatcher extends AbstractMatcher { private String value; @@ -45,8 +41,6 @@ public void setValue(String value) { @Override public String toString() { - return "MetricsValueMatcher{" + - "value='" + value + '\'' + - '}'; + return "MetricsValueMatcher{" + "value='" + value + '\'' + '}'; } } diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/MultiMetricsData.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/MultiMetricsData.java index 02ee580dc18f..6dd1389d39ee 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/MultiMetricsData.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/metrics/MultiMetricsData.java @@ -18,14 +18,10 @@ package org.apache.skywalking.e2e.metrics; +import java.util.List; import lombok.Data; import lombok.ToString; -import java.util.List; - -/** - * @author kezhenxu94 - */ @Data @ToString public class MultiMetricsData { diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/Service.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/Service.java index 3df175c02f26..3d0ef70445c7 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/Service.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/Service.java @@ -18,9 +18,6 @@ package org.apache.skywalking.e2e.service; -/** - * @author kezhenxu94 - */ public class Service { private String key; private String label; @@ -45,9 +42,6 @@ public Service setLabel(String label) { @Override public String toString() { - return "Service{" + - "key='" + key + '\'' + - ", label='" + label + '\'' + - '}'; + return "Service{" + "key='" + key + '\'' + ", label='" + label + '\'' + '}'; } } diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/ServiceMatcher.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/ServiceMatcher.java index 8aec4785a192..8ba601f5bb4e 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/ServiceMatcher.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/ServiceMatcher.java @@ -18,14 +18,11 @@ package org.apache.skywalking.e2e.service; -import org.apache.skywalking.e2e.verification.AbstractMatcher; - import java.util.Objects; +import org.apache.skywalking.e2e.verification.AbstractMatcher; /** * A simple matcher to verify the given {@code Service} is expected - * - * @author kezhenxu94 */ public class ServiceMatcher extends AbstractMatcher { @@ -75,9 +72,6 @@ public void setLabel(String label) { @Override public String toString() { - return "ServiceMatcher{" + - "key='" + key + '\'' + - ", label='" + label + '\'' + - '}'; + return "ServiceMatcher{" + "key='" + key + '\'' + ", label='" + label + '\'' + '}'; } } diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/ServicesData.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/ServicesData.java index c14a9d25df21..f53d54704bf2 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/ServicesData.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/ServicesData.java @@ -20,17 +20,14 @@ import java.util.List; -/** - * @author kezhenxu94 - */ public class ServicesData { private List services; public List getServices() { - return services; + return services; } public void setServices(List services) { - this.services = services; + this.services = services; } } diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/ServicesMatcher.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/ServicesMatcher.java index 54dccfee2e9e..3641bd1d24f9 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/ServicesMatcher.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/ServicesMatcher.java @@ -24,9 +24,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; -/** - * @author kezhenxu94 - */ public class ServicesMatcher { private List services; @@ -62,8 +59,6 @@ public void verify(final List services) { @Override public String toString() { - return "ServicesMatcher{" + - "services=" + services + - '}'; + return "ServicesMatcher{" + "services=" + services + '}'; } } diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/ServicesQuery.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/ServicesQuery.java index d1400f4f1e51..67fc88f8218d 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/ServicesQuery.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/ServicesQuery.java @@ -20,8 +20,5 @@ import org.apache.skywalking.e2e.AbstractQuery; -/** - * @author kezhenxu94 - */ public class ServicesQuery extends AbstractQuery { } diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/endpoint/Endpoint.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/endpoint/Endpoint.java index b23f45064c4a..1957addfe3b6 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/endpoint/Endpoint.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/endpoint/Endpoint.java @@ -18,9 +18,6 @@ package org.apache.skywalking.e2e.service.endpoint; -/** - * @author kezhenxu94 - */ public class Endpoint { private String key; private String label; @@ -43,9 +40,6 @@ public void setLabel(String label) { @Override public String toString() { - return "Endpoint{" + - "key='" + key + '\'' + - ", label='" + label + '\'' + - '}'; + return "Endpoint{" + "key='" + key + '\'' + ", label='" + label + '\'' + '}'; } } diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/endpoint/EndpointMatcher.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/endpoint/EndpointMatcher.java index f35da29ac3f5..0f09a1a14f48 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/endpoint/EndpointMatcher.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/endpoint/EndpointMatcher.java @@ -18,13 +18,9 @@ package org.apache.skywalking.e2e.service.endpoint; -import org.apache.skywalking.e2e.verification.AbstractMatcher; - import java.util.Objects; +import org.apache.skywalking.e2e.verification.AbstractMatcher; -/** - * @author kezhenxu94 - */ public class EndpointMatcher extends AbstractMatcher { private String key; private String label; diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/endpoint/EndpointQuery.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/endpoint/EndpointQuery.java index d6be61d7ec15..5bf76d4e0d6d 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/endpoint/EndpointQuery.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/endpoint/EndpointQuery.java @@ -18,9 +18,6 @@ package org.apache.skywalking.e2e.service.endpoint; -/** - * @author kezhenxu94 - */ public class EndpointQuery { private String serviceId; private String keyword; @@ -45,9 +42,6 @@ public EndpointQuery keyword(String keyword) { @Override public String toString() { - return "EndpointQuery{" + - "serviceId='" + serviceId + '\'' + - ", keyword='" + keyword + '\'' + - '}'; + return "EndpointQuery{" + "serviceId='" + serviceId + '\'' + ", keyword='" + keyword + '\'' + '}'; } } diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/endpoint/Endpoints.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/endpoint/Endpoints.java index cd89860cc754..509122d83bbe 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/endpoint/Endpoints.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/endpoint/Endpoints.java @@ -20,9 +20,6 @@ import java.util.List; -/** - * @author kezhenxu94 - */ public class Endpoints { private List endpoints; @@ -36,8 +33,6 @@ public void setEndpoints(List endpoints) { @Override public String toString() { - return "Endpoints{" + - "endpoints=" + endpoints + - '}'; + return "Endpoints{" + "endpoints=" + endpoints + '}'; } } diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/endpoint/EndpointsMatcher.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/endpoint/EndpointsMatcher.java index 89c980b2a76c..5a63afad444b 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/endpoint/EndpointsMatcher.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/endpoint/EndpointsMatcher.java @@ -18,16 +18,12 @@ package org.apache.skywalking.e2e.service.endpoint; -import org.apache.skywalking.e2e.verification.AbstractMatcher; - import java.util.List; import java.util.Objects; +import org.apache.skywalking.e2e.verification.AbstractMatcher; import static org.assertj.core.api.Assertions.assertThat; -/** - * @author kezhenxu94 - */ public class EndpointsMatcher extends AbstractMatcher { private List endpoints; @@ -54,8 +50,6 @@ public void verify(Endpoints endpoints) { @Override public String toString() { - return "EndpointsMatcher{" + - "endpoints=" + endpoints + - '}'; + return "EndpointsMatcher{" + "endpoints=" + endpoints + '}'; } } diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/instance/Attribute.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/instance/Attribute.java index c81b3b608e65..6661cf17772c 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/instance/Attribute.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/instance/Attribute.java @@ -18,9 +18,6 @@ package org.apache.skywalking.e2e.service.instance; -/** - * @author kezhenxu94 - */ public class Attribute { private String name; private String value; @@ -43,9 +40,6 @@ public void setValue(String value) { @Override public String toString() { - return "Attribute{" + - "name='" + name + '\'' + - ", value='" + value + '\'' + - '}'; + return "Attribute{" + "name='" + name + '\'' + ", value='" + value + '\'' + '}'; } } diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/instance/AttributeMatcher.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/instance/AttributeMatcher.java index 2293389c4719..4fa124ce5698 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/instance/AttributeMatcher.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/instance/AttributeMatcher.java @@ -18,13 +18,9 @@ package org.apache.skywalking.e2e.service.instance; -import org.apache.skywalking.e2e.verification.AbstractMatcher; - import java.util.Objects; +import org.apache.skywalking.e2e.verification.AbstractMatcher; -/** - * @author kezhenxu94 - */ public class AttributeMatcher extends AbstractMatcher { private String name; private String value; @@ -55,9 +51,6 @@ public void setValue(String value) { @Override public String toString() { - return "Attribute{" + - "name='" + name + '\'' + - ", value='" + value + '\'' + - '}'; + return "Attribute{" + "name='" + name + '\'' + ", value='" + value + '\'' + '}'; } } diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/instance/Instance.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/instance/Instance.java index 1e5323ef4134..8498733766c3 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/instance/Instance.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/instance/Instance.java @@ -20,9 +20,6 @@ import java.util.List; -/** - * @author kezhenxu94 - */ public class Instance { private String key; private String label; @@ -66,11 +63,6 @@ public Instance setInstanceUUID(String instanceUUID) { @Override public String toString() { - return "Instance{" + - "key='" + key + '\'' + - ", label='" + label + '\'' + - ", attributes=" + attributes + - ", instanceUUID=" + instanceUUID + - '}'; + return "Instance{" + "key='" + key + '\'' + ", label='" + label + '\'' + ", attributes=" + attributes + ", instanceUUID=" + instanceUUID + '}'; } } diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/instance/InstanceMatcher.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/instance/InstanceMatcher.java index 6bcc4b8f96a6..3b91b789f7da 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/instance/InstanceMatcher.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/instance/InstanceMatcher.java @@ -18,17 +18,14 @@ package org.apache.skywalking.e2e.service.instance; -import org.apache.skywalking.e2e.verification.AbstractMatcher; - import java.util.List; import java.util.Objects; +import org.apache.skywalking.e2e.verification.AbstractMatcher; import static org.assertj.core.api.Assertions.assertThat; /** * A simple matcher to verify the given {@code Service} is expected - * - * @author kezhenxu94 */ public class InstanceMatcher extends AbstractMatcher { @@ -124,11 +121,6 @@ public void setAttributes(List attributes) { @Override public String toString() { - return "InstanceMatcher{" + - "key='" + key + '\'' + - ", label='" + label + '\'' + - ", instanceUUID='" + instanceUUID + '\'' + - ", attributes=" + attributes + - '}'; + return "InstanceMatcher{" + "key='" + key + '\'' + ", label='" + label + '\'' + ", instanceUUID='" + instanceUUID + '\'' + ", attributes=" + attributes + '}'; } } diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/instance/Instances.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/instance/Instances.java index 6896a03f101c..a1fec4b7708c 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/instance/Instances.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/instance/Instances.java @@ -20,9 +20,6 @@ import java.util.List; -/** - * @author kezhenxu94 - */ public class Instances { private List instances; diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/instance/InstancesMatcher.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/instance/InstancesMatcher.java index c367958a61ea..6d67ef61c668 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/instance/InstancesMatcher.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/instance/InstancesMatcher.java @@ -18,15 +18,11 @@ package org.apache.skywalking.e2e.service.instance; -import org.apache.skywalking.e2e.verification.AbstractMatcher; -import org.assertj.core.api.Assertions; - import java.util.LinkedList; import java.util.List; +import org.apache.skywalking.e2e.verification.AbstractMatcher; +import org.assertj.core.api.Assertions; -/** - * @author kezhenxu94 - */ public class InstancesMatcher extends AbstractMatcher { private List instances; diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/instance/InstancesQuery.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/instance/InstancesQuery.java index 59878f9d9bc8..ca393346439a 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/instance/InstancesQuery.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/service/instance/InstancesQuery.java @@ -22,9 +22,6 @@ import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; -/** - * @author kezhenxu94 - */ public class InstancesQuery { private static final DateTimeFormatter TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HHmmss"); @@ -76,5 +73,6 @@ public String step() { public InstancesQuery step(String step) { this.step = step; - return this; } + return this; + } } diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/Call.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/Call.java index e2104d8a828d..d012fe3244ab 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/Call.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/Call.java @@ -20,9 +20,6 @@ import java.util.List; -/** - * @author kezhenxu94 - */ public class Call { private String id; private String source; @@ -67,11 +64,6 @@ public Call setTarget(String target) { @Override public String toString() { - return "Call{" + - "id='" + id + '\'' + - ", source='" + source + '\'' + - ", detectPoints=" + detectPoints + - ", target='" + target + '\'' + - '}'; + return "Call{" + "id='" + id + '\'' + ", source='" + source + '\'' + ", detectPoints=" + detectPoints + ", target='" + target + '\'' + '}'; } } diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/CallMatcher.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/CallMatcher.java index 1b73e90035c2..248d9b430de1 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/CallMatcher.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/CallMatcher.java @@ -18,16 +18,12 @@ package org.apache.skywalking.e2e.topo; -import org.apache.skywalking.e2e.verification.AbstractMatcher; - import java.util.List; import java.util.Objects; +import org.apache.skywalking.e2e.verification.AbstractMatcher; import static org.assertj.core.api.Assertions.assertThat; -/** - * @author kezhenxu94 - */ public class CallMatcher extends AbstractMatcher { private String id; private String source; @@ -104,11 +100,6 @@ public void setTarget(String target) { @Override public String toString() { - return "CallMatcher{" + - "id='" + id + '\'' + - ", source='" + source + '\'' + - ", detectPoints=" + detectPoints + - ", target='" + target + '\'' + - '}'; + return "CallMatcher{" + "id='" + id + '\'' + ", source='" + source + '\'' + ", detectPoints=" + detectPoints + ", target='" + target + '\'' + '}'; } } diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/Node.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/Node.java index 413894a3df38..634b9b318edc 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/Node.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/Node.java @@ -18,9 +18,6 @@ package org.apache.skywalking.e2e.topo; -/** - * @author kezhenxu94 - */ public class Node { private String id; private String name; @@ -65,11 +62,6 @@ public Node setIsReal(String real) { @Override public String toString() { - return "Node{" + - "id='" + id + '\'' + - ", name='" + name + '\'' + - ", type='" + type + '\'' + - ", isReal='" + isReal + '\'' + - '}'; + return "Node{" + "id='" + id + '\'' + ", name='" + name + '\'' + ", type='" + type + '\'' + ", isReal='" + isReal + '\'' + '}'; } } diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/NodeMatcher.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/NodeMatcher.java index 89cc07e8e563..d600beacde1d 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/NodeMatcher.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/NodeMatcher.java @@ -18,13 +18,9 @@ package org.apache.skywalking.e2e.topo; -import org.apache.skywalking.e2e.verification.AbstractMatcher; - import java.util.Objects; +import org.apache.skywalking.e2e.verification.AbstractMatcher; -/** - * @author kezhenxu94 - */ public class NodeMatcher extends AbstractMatcher { private String id; private String name; @@ -96,11 +92,6 @@ public void setIsReal(String isReal) { @Override public String toString() { - return "NodeMatcher{" + - "id='" + id + '\'' + - ", name='" + name + '\'' + - ", type='" + type + '\'' + - ", isReal='" + isReal + '\'' + - '}'; + return "NodeMatcher{" + "id='" + id + '\'' + ", name='" + name + '\'' + ", type='" + type + '\'' + ", isReal='" + isReal + '\'' + '}'; } } diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/ServiceInstanceNode.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/ServiceInstanceNode.java index 58a6ed80408f..9d339bffb822 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/ServiceInstanceNode.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/ServiceInstanceNode.java @@ -23,9 +23,6 @@ import lombok.ToString; import lombok.experimental.Accessors; -/** - * @author zhangwei - */ @Setter @Getter @Accessors(chain = true) diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/ServiceInstanceNodeMatcher.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/ServiceInstanceNodeMatcher.java index 13393ecf1f34..fd598481b22a 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/ServiceInstanceNodeMatcher.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/ServiceInstanceNodeMatcher.java @@ -25,9 +25,6 @@ import static java.util.Objects.nonNull; -/** - * @author zhangwei - */ @Setter @Getter @ToString diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/ServiceInstanceTopoData.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/ServiceInstanceTopoData.java index 650841068d5b..e40d9a9ac863 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/ServiceInstanceTopoData.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/ServiceInstanceTopoData.java @@ -18,17 +18,13 @@ package org.apache.skywalking.e2e.topo; +import java.util.ArrayList; +import java.util.List; import lombok.Getter; import lombok.Setter; import lombok.ToString; import lombok.experimental.Accessors; -import java.util.ArrayList; -import java.util.List; - -/** - * @author zhangwei - */ @Setter @Getter @Accessors(chain = true) diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/ServiceInstanceTopoMatcher.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/ServiceInstanceTopoMatcher.java index 94f7445c69d3..e740110a8564 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/ServiceInstanceTopoMatcher.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/ServiceInstanceTopoMatcher.java @@ -18,20 +18,16 @@ package org.apache.skywalking.e2e.topo; +import java.util.List; import lombok.Getter; import lombok.Setter; import lombok.ToString; import org.apache.skywalking.e2e.assertor.VariableExpressParser; import org.apache.skywalking.e2e.verification.AbstractMatcher; -import java.util.List; - import static java.util.Objects.nonNull; import static org.assertj.core.api.Assertions.fail; -/** - * @author zhangwei - */ @Setter @Getter @ToString diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/ServiceInstanceTopoQuery.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/ServiceInstanceTopoQuery.java index d0e69f4b73ff..7f79278770d5 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/ServiceInstanceTopoQuery.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/ServiceInstanceTopoQuery.java @@ -20,9 +20,6 @@ import org.apache.skywalking.e2e.AbstractQuery; -/** - * @author zhangwei - */ public class ServiceInstanceTopoQuery extends AbstractQuery { private String clientServiceId; diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/ServiceInstanceTopoResponse.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/ServiceInstanceTopoResponse.java index 425de378d010..c3eb724cd5d3 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/ServiceInstanceTopoResponse.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/ServiceInstanceTopoResponse.java @@ -21,9 +21,6 @@ import lombok.Getter; import lombok.Setter; -/** - * @author zhangwei - */ @Setter @Getter public class ServiceInstanceTopoResponse { diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/TopoData.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/TopoData.java index 3a361273d4c7..7638d667fcb6 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/TopoData.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/TopoData.java @@ -21,9 +21,6 @@ import java.util.ArrayList; import java.util.List; -/** - * @author kezhenxu94 - */ public class TopoData { private List nodes; private List calls; @@ -53,9 +50,6 @@ public TopoData setCalls(List calls) { @Override public String toString() { - return "TopoData{" + - "nodes=" + nodes + - ", calls=" + calls + - '}'; + return "TopoData{" + "nodes=" + nodes + ", calls=" + calls + '}'; } } diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/TopoMatcher.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/TopoMatcher.java index bc143b29ce1b..4e83fa4b2027 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/TopoMatcher.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/TopoMatcher.java @@ -18,18 +18,15 @@ package org.apache.skywalking.e2e.topo; +import java.util.List; import org.apache.skywalking.e2e.assertor.VariableExpressParser; import org.apache.skywalking.e2e.verification.AbstractMatcher; -import java.util.List; - import static java.util.Objects.nonNull; import static org.assertj.core.api.Assertions.fail; /** * A simple matcher to verify the given {@code Service} is expected - * - * @author kezhenxu94 */ public class TopoMatcher extends AbstractMatcher { @@ -98,13 +95,9 @@ public void setCalls(List calls) { @Override public String toString() { - return "TopoMatcher{" + - "nodes=" + nodes + - ", calls=" + calls + - '}'; + return "TopoMatcher{" + "nodes=" + nodes + ", calls=" + calls + '}'; } - private static void convertNodeId(List callMatchers, List nodes) { for (CallMatcher callMatcher : callMatchers) { Node sourceNode = VariableExpressParser.parse(callMatcher.getSource(), nodes, Node::getName); diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/TopoQuery.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/TopoQuery.java index ea318a234364..4ba3b82af412 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/TopoQuery.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/TopoQuery.java @@ -20,8 +20,5 @@ import org.apache.skywalking.e2e.AbstractQuery; -/** - * @author kezhenxu94 - */ public class TopoQuery extends AbstractQuery { } diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/TopoResponse.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/TopoResponse.java index 6aadb9d5124d..ed67ad32eccb 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/TopoResponse.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/topo/TopoResponse.java @@ -18,9 +18,6 @@ package org.apache.skywalking.e2e.topo; -/** - * @author kezhenxu94 - */ public class TopoResponse { private TopoData topo; diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/trace/Span.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/trace/Span.java index 98ebe66a8ae9..19843de678a6 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/trace/Span.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/trace/Span.java @@ -18,13 +18,9 @@ package org.apache.skywalking.e2e.trace; -import lombok.Data; - import java.util.List; +import lombok.Data; -/** - * @author kezhenxu94 - */ @Data public class Span { private String traceId; diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/trace/SpanMatcher.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/trace/SpanMatcher.java index 09491f25f7db..86d97090cb9d 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/trace/SpanMatcher.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/trace/SpanMatcher.java @@ -19,16 +19,12 @@ package org.apache.skywalking.e2e.trace; import com.google.common.base.Strings; +import java.util.List; +import java.util.Objects; import lombok.Data; import lombok.ToString; import org.apache.skywalking.e2e.verification.AbstractMatcher; -import java.util.List; -import java.util.Objects; - -/** - * @author kezhenxu94 - */ @Data @ToString(callSuper = true) public class SpanMatcher extends AbstractMatcher { diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/trace/Tag.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/trace/Tag.java index a55cdefaa372..f415e16a944c 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/trace/Tag.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/trace/Tag.java @@ -18,9 +18,6 @@ package org.apache.skywalking.e2e.trace; -/** - * @author kezhenxu94 - */ public class Tag { private String key; private String value; diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/trace/Trace.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/trace/Trace.java index 913e28066b8c..b22d8fd298a0 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/trace/Trace.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/trace/Trace.java @@ -21,9 +21,6 @@ import java.util.ArrayList; import java.util.List; -/** - * @author kezhenxu94 - */ public class Trace { private String key; private final List endpointNames; @@ -89,13 +86,6 @@ public List getSpans() { @Override public String toString() { - return "Trace{" + - "key='" + key + '\'' + - ", endpointNames=" + endpointNames + - ", duration=" + duration + - ", start='" + start + '\'' + - ", isError=" + isError + - ", traceIds=" + traceIds + - '}'; + return "Trace{" + "key='" + key + '\'' + ", endpointNames=" + endpointNames + ", duration=" + duration + ", start='" + start + '\'' + ", isError=" + isError + ", traceIds=" + traceIds + '}'; } } diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/trace/TraceMatcher.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/trace/TraceMatcher.java index 87d7b7698ced..0e509ee92484 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/trace/TraceMatcher.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/trace/TraceMatcher.java @@ -19,18 +19,15 @@ package org.apache.skywalking.e2e.trace; import com.google.common.base.Strings; -import org.apache.skywalking.e2e.verification.AbstractMatcher; - import java.util.ArrayList; import java.util.List; import java.util.Objects; +import org.apache.skywalking.e2e.verification.AbstractMatcher; import static org.assertj.core.api.Assertions.assertThat; /** * A simple matcher to verify the given {@code Trace} is expected - * - * @author kezhenxu94 */ public class TraceMatcher extends AbstractMatcher { private String key; @@ -194,14 +191,6 @@ public void setSpans(final List spans) { @Override public String toString() { - return "TraceMatcher{" + - "key='" + key + '\'' + - ", endpointNames=" + endpointNames + - ", duration='" + duration + '\'' + - ", start='" + start + '\'' + - ", isError='" + isError + '\'' + - ", traceIds=" + traceIds + - ", spans=" + spans + - '}'; + return "TraceMatcher{" + "key='" + key + '\'' + ", endpointNames=" + endpointNames + ", duration='" + duration + '\'' + ", start='" + start + '\'' + ", isError='" + isError + '\'' + ", traceIds=" + traceIds + ", spans=" + spans + '}'; } } diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/trace/TracesData.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/trace/TracesData.java index 2832bd2e9df4..2fb38251197b 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/trace/TracesData.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/trace/TracesData.java @@ -20,9 +20,6 @@ import java.util.List; -/** - * @author kezhenxu94 - */ public class TracesData { public static class Traces { private List data; diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/trace/TracesMatcher.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/trace/TracesMatcher.java index a09d42520aab..62ee15c78408 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/trace/TracesMatcher.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/trace/TracesMatcher.java @@ -24,9 +24,6 @@ import static org.assertj.core.api.Assertions.fail; -/** - * @author kezhenxu94 - */ @Data public class TracesMatcher { private List traces; diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/trace/TracesQuery.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/trace/TracesQuery.java index 410586a5f66c..7a74b0cb2553 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/trace/TracesQuery.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/trace/TracesQuery.java @@ -20,9 +20,6 @@ import org.apache.skywalking.e2e.AbstractQuery; -/** - * @author kezhenxu94 - */ public class TracesQuery extends AbstractQuery { private String traceState = "ALL"; private String pageNum = "1"; diff --git a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/verification/AbstractMatcher.java b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/verification/AbstractMatcher.java index ae829145459a..0d6624e06ba0 100644 --- a/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/verification/AbstractMatcher.java +++ b/test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/verification/AbstractMatcher.java @@ -23,9 +23,6 @@ import static org.assertj.core.api.Assertions.assertThat; -/** - * @author kezhenxu94 - */ public abstract class AbstractMatcher { private static final Pattern NE_MATCHER = Pattern.compile("ne\\s+(?.+)"); private static final Pattern EQ_MATCHER = Pattern.compile("eq\\s+(?.+)"); diff --git a/test/e2e/e2e-base/src/test/java/org/apache/skywalking/e2e/TestMatcher.java b/test/e2e/e2e-base/src/test/java/org/apache/skywalking/e2e/TestMatcher.java index 44e5f69cc90e..1acb57ae7720 100644 --- a/test/e2e/e2e-base/src/test/java/org/apache/skywalking/e2e/TestMatcher.java +++ b/test/e2e/e2e-base/src/test/java/org/apache/skywalking/e2e/TestMatcher.java @@ -18,6 +18,8 @@ package org.apache.skywalking.e2e; +import java.io.IOException; +import java.io.InputStream; import org.apache.skywalking.e2e.trace.Trace; import org.apache.skywalking.e2e.trace.TraceMatcher; import org.junit.Before; @@ -25,12 +27,6 @@ import org.springframework.core.io.ClassPathResource; import org.yaml.snakeyaml.Yaml; -import java.io.IOException; -import java.io.InputStream; - -/** - * @author kezhenxu94 - */ public class TestMatcher { private InputStream expectedInputStream; private TraceMatcher traceMatcher; @@ -42,11 +38,8 @@ public void setUp() throws IOException { } @Test - public void shouldSuccess() { - final Trace trace = new Trace() - .setKey("abc") - .setStart("1") - .setError(false); + public void shouldSuccess() { + final Trace trace = new Trace().setKey("abc").setStart("1").setError(false); trace.getEndpointNames().add("e2e/test"); trace.getTraceIds().add("id1"); trace.getTraceIds().add("id2"); @@ -55,9 +48,7 @@ public void shouldSuccess() { @Test(expected = AssertionError.class) public void shouldVerifyNotNull() { - final Trace trace = new Trace() - .setStart("1") - .setError(false); + final Trace trace = new Trace().setStart("1").setError(false); trace.getEndpointNames().add("e2e/test"); trace.getTraceIds().add("id1"); trace.getTraceIds().add("id2"); @@ -66,11 +57,7 @@ public void shouldVerifyNotNull() { @Test(expected = AssertionError.class) public void shouldVerifyGreaterOrEqualTo() { - final Trace trace = new Trace() - .setKey("abc") - .setDuration(-1) - .setStart("1") - .setError(false); + final Trace trace = new Trace().setKey("abc").setDuration(-1).setStart("1").setError(false); trace.getEndpointNames().add("e2e/test"); trace.getTraceIds().add("id1"); trace.getTraceIds().add("id2"); @@ -79,11 +66,7 @@ public void shouldVerifyGreaterOrEqualTo() { @Test(expected = AssertionError.class) public void shouldVerifyGreaterThan() { - final Trace trace = new Trace() - .setKey("abc") - .setDuration(1) - .setStart("0") - .setError(false); + final Trace trace = new Trace().setKey("abc").setDuration(1).setStart("0").setError(false); trace.getEndpointNames().add("e2e/test"); trace.getTraceIds().add("id1"); trace.getTraceIds().add("id2"); diff --git a/test/e2e/e2e-base/src/test/java/org/apache/skywalking/e2e/TestMetricsMatcher.java b/test/e2e/e2e-base/src/test/java/org/apache/skywalking/e2e/TestMetricsMatcher.java index 096032d5dd24..5a79ebf4c406 100644 --- a/test/e2e/e2e-base/src/test/java/org/apache/skywalking/e2e/TestMetricsMatcher.java +++ b/test/e2e/e2e-base/src/test/java/org/apache/skywalking/e2e/TestMetricsMatcher.java @@ -24,9 +24,6 @@ import org.apache.skywalking.e2e.metrics.MetricsValueMatcher; import org.junit.Test; -/** - * @author kezhenxu94 - */ public class TestMetricsMatcher { @Test public void shouldVerifyOneOf() { diff --git a/test/e2e/e2e-base/src/test/java/org/apache/skywalking/e2e/TestServiceInstanceTopoMatcher.java b/test/e2e/e2e-base/src/test/java/org/apache/skywalking/e2e/TestServiceInstanceTopoMatcher.java index 816d5d1035b6..0257af1c3765 100644 --- a/test/e2e/e2e-base/src/test/java/org/apache/skywalking/e2e/TestServiceInstanceTopoMatcher.java +++ b/test/e2e/e2e-base/src/test/java/org/apache/skywalking/e2e/TestServiceInstanceTopoMatcher.java @@ -17,21 +17,20 @@ package org.apache.skywalking.e2e; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; import org.apache.skywalking.e2e.assertor.exception.VariableNotFoundException; -import org.apache.skywalking.e2e.topo.*; +import org.apache.skywalking.e2e.topo.Call; +import org.apache.skywalking.e2e.topo.ServiceInstanceNode; +import org.apache.skywalking.e2e.topo.ServiceInstanceTopoData; +import org.apache.skywalking.e2e.topo.ServiceInstanceTopoMatcher; import org.junit.Before; import org.junit.Test; import org.springframework.core.io.ClassPathResource; import org.yaml.snakeyaml.Yaml; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; - -/** - * @author zhangwei - */ public class TestServiceInstanceTopoMatcher { private ServiceInstanceTopoMatcher topoMatcher; @@ -46,10 +45,23 @@ public void setUp() throws IOException { @Test public void shouldSuccess() { final List nodes = new ArrayList<>(); - nodes.add(new ServiceInstanceNode().setId("2").setName("e2e-cluster-provider-pid:1582@2ffd0ee4eeb1").setServiceId("2").setServiceName("e2e-cluster-provider").setType("Tomcat").setIsReal("true")); - nodes.add(new ServiceInstanceNode().setId("3").setName("e2e-cluster-provider-pid:1583@2ffd0ee4eeb1").setServiceId("2").setServiceName("e2e-cluster-provider").setType("Tomcat").setIsReal("true")); - nodes.add(new ServiceInstanceNode().setId("4").setName("e2e-cluster-consumer-pid:1591@2ffd0ee4eeb1").setServiceId("3").setServiceName("e2e-cluster-consumer").setIsReal("true")); - + nodes.add(new ServiceInstanceNode().setId("2") + .setName("e2e-cluster-provider-pid:1582@2ffd0ee4eeb1") + .setServiceId("2") + .setServiceName("e2e-cluster-provider") + .setType("Tomcat") + .setIsReal("true")); + nodes.add(new ServiceInstanceNode().setId("3") + .setName("e2e-cluster-provider-pid:1583@2ffd0ee4eeb1") + .setServiceId("2") + .setServiceName("e2e-cluster-provider") + .setType("Tomcat") + .setIsReal("true")); + nodes.add(new ServiceInstanceNode().setId("4") + .setName("e2e-cluster-consumer-pid:1591@2ffd0ee4eeb1") + .setServiceId("3") + .setServiceName("e2e-cluster-consumer") + .setIsReal("true")); final List calls = new ArrayList<>(); calls.add(new Call().setId("4_3").setSource("4").setTarget("3")); @@ -63,10 +75,23 @@ public void shouldSuccess() { @Test(expected = VariableNotFoundException.class) public void shouldVariableNotFound() { final List nodes = new ArrayList<>(); - nodes.add(new ServiceInstanceNode().setId("2").setName("e2e-cluster-provider-pid:1582@2ffd0ee4eeb1").setServiceId("2").setServiceName("e2e-cluster-provider").setType("Tomcat").setIsReal("true")); - nodes.add(new ServiceInstanceNode().setId("3").setName("e2e-cluster-Aprovider-pid:1583@2ffd0ee4eeb1").setServiceId("2").setServiceName("e2e-cluster-provider").setType("Tomcat").setIsReal("true")); - nodes.add(new ServiceInstanceNode().setId("4").setName("e2e-cluster-consumer-pid:1591@2ffd0ee4eeb1").setServiceId("3").setServiceName("e2e-cluster-consumer").setIsReal("true")); - + nodes.add(new ServiceInstanceNode().setId("2") + .setName("e2e-cluster-provider-pid:1582@2ffd0ee4eeb1") + .setServiceId("2") + .setServiceName("e2e-cluster-provider") + .setType("Tomcat") + .setIsReal("true")); + nodes.add(new ServiceInstanceNode().setId("3") + .setName("e2e-cluster-Aprovider-pid:1583@2ffd0ee4eeb1") + .setServiceId("2") + .setServiceName("e2e-cluster-provider") + .setType("Tomcat") + .setIsReal("true")); + nodes.add(new ServiceInstanceNode().setId("4") + .setName("e2e-cluster-consumer-pid:1591@2ffd0ee4eeb1") + .setServiceId("3") + .setServiceName("e2e-cluster-consumer") + .setIsReal("true")); final List calls = new ArrayList<>(); calls.add(new Call().setId("4_3").setSource("4").setTarget("3")); diff --git a/test/e2e/e2e-base/src/test/java/org/apache/skywalking/e2e/TestTopoMatcher.java b/test/e2e/e2e-base/src/test/java/org/apache/skywalking/e2e/TestTopoMatcher.java index 13885f075baf..3ae2a2fc034f 100644 --- a/test/e2e/e2e-base/src/test/java/org/apache/skywalking/e2e/TestTopoMatcher.java +++ b/test/e2e/e2e-base/src/test/java/org/apache/skywalking/e2e/TestTopoMatcher.java @@ -17,6 +17,10 @@ package org.apache.skywalking.e2e; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; import org.apache.skywalking.e2e.assertor.exception.VariableNotFoundException; import org.apache.skywalking.e2e.topo.Call; import org.apache.skywalking.e2e.topo.Node; @@ -27,14 +31,6 @@ import org.springframework.core.io.ClassPathResource; import org.yaml.snakeyaml.Yaml; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; - -/** - * @author zhangwei - */ public class TestTopoMatcher { private TopoMatcher topoMatcher; @@ -50,9 +46,14 @@ public void setUp() throws IOException { public void shouldSuccess() { final List nodes = new ArrayList<>(); nodes.add(new Node().setId("1").setName("User").setType("USER").setIsReal("false")); - nodes.add(new Node().setId("2").setName("projectB-pid:27960@skywalking-server-0001").setType("Tomcat").setIsReal("true")); - nodes.add(new Node().setId("3").setName("projectB-pid:27961@skywalking-server-0001").setType("Tomcat").setIsReal("true")); - + nodes.add(new Node().setId("2") + .setName("projectB-pid:27960@skywalking-server-0001") + .setType("Tomcat") + .setIsReal("true")); + nodes.add(new Node().setId("3") + .setName("projectB-pid:27961@skywalking-server-0001") + .setType("Tomcat") + .setIsReal("true")); final List calls = new ArrayList<>(); calls.add(new Call().setId("1_2").setSource("1").setTarget("2")); @@ -67,9 +68,14 @@ public void shouldSuccess() { public void shouldVariableNotFound() { final List nodes = new ArrayList<>(); nodes.add(new Node().setId("1").setName("User").setType("USER").setIsReal("false")); - nodes.add(new Node().setId("2").setName("projectA-pid:27960@skywalking-server-0001").setType("Tomcat").setIsReal("true")); - nodes.add(new Node().setId("3").setName("projectB-pid:27961@skywalking-server-0001").setType("Tomcat").setIsReal("true")); - + nodes.add(new Node().setId("2") + .setName("projectA-pid:27960@skywalking-server-0001") + .setType("Tomcat") + .setIsReal("true")); + nodes.add(new Node().setId("3") + .setName("projectB-pid:27961@skywalking-server-0001") + .setType("Tomcat") + .setIsReal("true")); final List calls = new ArrayList<>(); calls.add(new Call().setId("1_2").setSource("1").setTarget("2")); diff --git a/test/e2e/e2e-cluster-with-gateway/e2e-cluster-with-gateway-consumer/src/main/java/org/apache/skywalking/e2e/cluster/Service1Application.java b/test/e2e/e2e-cluster-with-gateway/e2e-cluster-with-gateway-consumer/src/main/java/org/apache/skywalking/e2e/cluster/Service1Application.java index 7ba83aac777e..5a2cef1158e1 100644 --- a/test/e2e/e2e-cluster-with-gateway/e2e-cluster-with-gateway-consumer/src/main/java/org/apache/skywalking/e2e/cluster/Service1Application.java +++ b/test/e2e/e2e-cluster-with-gateway/e2e-cluster-with-gateway-consumer/src/main/java/org/apache/skywalking/e2e/cluster/Service1Application.java @@ -21,9 +21,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -/** - * @author kezhenxu94 - */ @SpringBootApplication public class Service1Application { public static void main(String[] args) { diff --git a/test/e2e/e2e-cluster-with-gateway/e2e-cluster-with-gateway-consumer/src/main/java/org/apache/skywalking/e2e/cluster/TestController.java b/test/e2e/e2e-cluster-with-gateway/e2e-cluster-with-gateway-consumer/src/main/java/org/apache/skywalking/e2e/cluster/TestController.java index c10c1a436b9f..a2f1125f40cf 100644 --- a/test/e2e/e2e-cluster-with-gateway/e2e-cluster-with-gateway-consumer/src/main/java/org/apache/skywalking/e2e/cluster/TestController.java +++ b/test/e2e/e2e-cluster-with-gateway/e2e-cluster-with-gateway-consumer/src/main/java/org/apache/skywalking/e2e/cluster/TestController.java @@ -26,9 +26,6 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.RestTemplate; -/** - * @author kezhenxu94 - */ @RestController @RequestMapping("/e2e") public class TestController { @@ -44,9 +41,7 @@ public User createAuthor(@RequestBody final User user) throws InterruptedExcepti Thread.sleep(1000L); ResponseEntity response = null; for (int i = 0; i < 2; i++) { - response = restTemplate.postForEntity( - "http://127.0.0.1:9099/e2e/users", user, User.class - ); + response = restTemplate.postForEntity("http://127.0.0.1:9099/e2e/users", user, User.class); } return response.getBody(); } diff --git a/test/e2e/e2e-cluster-with-gateway/e2e-cluster-with-gateway-consumer/src/main/java/org/apache/skywalking/e2e/cluster/User.java b/test/e2e/e2e-cluster-with-gateway/e2e-cluster-with-gateway-consumer/src/main/java/org/apache/skywalking/e2e/cluster/User.java index f62d1e7bcc71..27a7c564b653 100644 --- a/test/e2e/e2e-cluster-with-gateway/e2e-cluster-with-gateway-consumer/src/main/java/org/apache/skywalking/e2e/cluster/User.java +++ b/test/e2e/e2e-cluster-with-gateway/e2e-cluster-with-gateway-consumer/src/main/java/org/apache/skywalking/e2e/cluster/User.java @@ -18,9 +18,6 @@ package org.apache.skywalking.e2e.cluster; -/** - * @author kezhenxu94 - */ public class User { public User() { } diff --git a/test/e2e/e2e-cluster-with-gateway/e2e-cluster-with-gateway-gateway/src/main/java/org/apache/skywalking/e2e/GatewayApplication.java b/test/e2e/e2e-cluster-with-gateway/e2e-cluster-with-gateway-gateway/src/main/java/org/apache/skywalking/e2e/GatewayApplication.java index a4e4311f2c55..897aa02f5900 100644 --- a/test/e2e/e2e-cluster-with-gateway/e2e-cluster-with-gateway-gateway/src/main/java/org/apache/skywalking/e2e/GatewayApplication.java +++ b/test/e2e/e2e-cluster-with-gateway/e2e-cluster-with-gateway-gateway/src/main/java/org/apache/skywalking/e2e/GatewayApplication.java @@ -21,9 +21,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.netflix.zuul.EnableZuulProxy; -/** - * @author kezhenxu94 - */ @EnableZuulProxy @SpringBootApplication public class GatewayApplication { diff --git a/test/e2e/e2e-cluster-with-gateway/e2e-cluster-with-gateway-provider/src/main/java/org/apache/skywalking/e2e/cluster/Service0Application.java b/test/e2e/e2e-cluster-with-gateway/e2e-cluster-with-gateway-provider/src/main/java/org/apache/skywalking/e2e/cluster/Service0Application.java index 791eab1a0b3a..521f7381f2bc 100644 --- a/test/e2e/e2e-cluster-with-gateway/e2e-cluster-with-gateway-provider/src/main/java/org/apache/skywalking/e2e/cluster/Service0Application.java +++ b/test/e2e/e2e-cluster-with-gateway/e2e-cluster-with-gateway-provider/src/main/java/org/apache/skywalking/e2e/cluster/Service0Application.java @@ -22,9 +22,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; -/** - * @author kezhenxu94 - */ @EnableJpaRepositories @SpringBootApplication public class Service0Application { diff --git a/test/e2e/e2e-cluster-with-gateway/e2e-cluster-with-gateway-provider/src/main/java/org/apache/skywalking/e2e/cluster/TestController.java b/test/e2e/e2e-cluster-with-gateway/e2e-cluster-with-gateway-provider/src/main/java/org/apache/skywalking/e2e/cluster/TestController.java index 39076484f969..2e7390322e64 100644 --- a/test/e2e/e2e-cluster-with-gateway/e2e-cluster-with-gateway-provider/src/main/java/org/apache/skywalking/e2e/cluster/TestController.java +++ b/test/e2e/e2e-cluster-with-gateway/e2e-cluster-with-gateway-provider/src/main/java/org/apache/skywalking/e2e/cluster/TestController.java @@ -24,9 +24,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -/** - * @author kezhenxu94 - */ @RestController @RequestMapping("/e2e") public class TestController { diff --git a/test/e2e/e2e-cluster-with-gateway/e2e-cluster-with-gateway-provider/src/main/java/org/apache/skywalking/e2e/cluster/User.java b/test/e2e/e2e-cluster-with-gateway/e2e-cluster-with-gateway-provider/src/main/java/org/apache/skywalking/e2e/cluster/User.java index 043127f21436..153fdcabb00f 100644 --- a/test/e2e/e2e-cluster-with-gateway/e2e-cluster-with-gateway-provider/src/main/java/org/apache/skywalking/e2e/cluster/User.java +++ b/test/e2e/e2e-cluster-with-gateway/e2e-cluster-with-gateway-provider/src/main/java/org/apache/skywalking/e2e/cluster/User.java @@ -23,9 +23,6 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; -/** - * @author kezhenxu94 - */ @Entity public class User { public User() { diff --git a/test/e2e/e2e-cluster-with-gateway/e2e-cluster-with-gateway-provider/src/main/java/org/apache/skywalking/e2e/cluster/UserRepo.java b/test/e2e/e2e-cluster-with-gateway/e2e-cluster-with-gateway-provider/src/main/java/org/apache/skywalking/e2e/cluster/UserRepo.java index f798f63e0795..c1879d73868f 100644 --- a/test/e2e/e2e-cluster-with-gateway/e2e-cluster-with-gateway-provider/src/main/java/org/apache/skywalking/e2e/cluster/UserRepo.java +++ b/test/e2e/e2e-cluster-with-gateway/e2e-cluster-with-gateway-provider/src/main/java/org/apache/skywalking/e2e/cluster/UserRepo.java @@ -20,8 +20,5 @@ import org.springframework.data.jpa.repository.JpaRepository; -/** - * @author kezhenxu94 - */ public interface UserRepo extends JpaRepository { } diff --git a/test/e2e/e2e-cluster-with-gateway/e2e-cluster-with-gateway-test-runner/src/test/java/org/apache/skywalking/e2e/ClusterVerificationITCase.java b/test/e2e/e2e-cluster-with-gateway/e2e-cluster-with-gateway-test-runner/src/test/java/org/apache/skywalking/e2e/ClusterVerificationITCase.java index 36fabded917f..cff759d64e41 100755 --- a/test/e2e/e2e-cluster-with-gateway/e2e-cluster-with-gateway-test-runner/src/test/java/org/apache/skywalking/e2e/ClusterVerificationITCase.java +++ b/test/e2e/e2e-cluster-with-gateway/e2e-cluster-with-gateway-test-runner/src/test/java/org/apache/skywalking/e2e/ClusterVerificationITCase.java @@ -18,6 +18,14 @@ package org.apache.skywalking.e2e; +import java.io.InputStream; +import java.time.LocalDateTime; +import java.time.ZoneOffset; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; import org.apache.skywalking.e2e.service.Service; import org.apache.skywalking.e2e.service.ServicesMatcher; import org.apache.skywalking.e2e.service.ServicesQuery; @@ -29,7 +37,14 @@ import org.apache.skywalking.e2e.service.instance.Instances; import org.apache.skywalking.e2e.service.instance.InstancesMatcher; import org.apache.skywalking.e2e.service.instance.InstancesQuery; -import org.apache.skywalking.e2e.topo.*; +import org.apache.skywalking.e2e.topo.Call; +import org.apache.skywalking.e2e.topo.Node; +import org.apache.skywalking.e2e.topo.ServiceInstanceTopoData; +import org.apache.skywalking.e2e.topo.ServiceInstanceTopoMatcher; +import org.apache.skywalking.e2e.topo.ServiceInstanceTopoQuery; +import org.apache.skywalking.e2e.topo.TopoData; +import org.apache.skywalking.e2e.topo.TopoMatcher; +import org.apache.skywalking.e2e.topo.TopoQuery; import org.apache.skywalking.e2e.trace.Trace; import org.apache.skywalking.e2e.trace.TracesMatcher; import org.apache.skywalking.e2e.trace.TracesQuery; @@ -45,22 +60,16 @@ import org.springframework.web.client.RestTemplate; import org.yaml.snakeyaml.Yaml; -import java.io.InputStream; -import java.time.LocalDateTime; -import java.time.ZoneOffset; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.TimeUnit; - import static org.apache.skywalking.e2e.metrics.MetricsMatcher.verifyMetrics; -import static org.apache.skywalking.e2e.metrics.MetricsQuery.*; +import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_ENDPOINT_METRICS; +import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_INSTANCE_METRICS; +import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_SERVICE_INSTANCE_RELATION_CLIENT_METRICS; +import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_SERVICE_INSTANCE_RELATION_SERVER_METRICS; +import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_SERVICE_METRICS; +import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_SERVICE_RELATION_CLIENT_METRICS; +import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_SERVICE_RELATION_SERVER_METRICS; import static org.assertj.core.api.Assertions.fail; -/** - * @author kezhenxu94 - */ @RunWith(SpringJUnit4ClassRunner.class) public class ClusterVerificationITCase { private static final Logger LOGGER = LoggerFactory.getLogger(ClusterVerificationITCase.class); @@ -75,7 +84,6 @@ public class ClusterVerificationITCase { private String providerName; private String gateWayName; - @Before public void setUp() { providerName = System.getProperty("provider.name", "e2e-cluster-provider"); @@ -99,11 +107,9 @@ public void verify() throws Exception { List services = Collections.emptyList(); while (services.size() < 2) { try { - services = queryClient.services( - new ServicesQuery() - .start(startTime) - .end(LocalDateTime.now(ZoneOffset.UTC).plusMinutes(1)) - ); + services = queryClient.services(new ServicesQuery().start(startTime) + .end(LocalDateTime.now(ZoneOffset.UTC) + .plusMinutes(1))); Thread.sleep(500); // take a nap to avoid high payload } catch (Throwable ignored) { } @@ -121,16 +127,14 @@ private void verifyTopo(LocalDateTime minutesAgo) throws Exception { boolean valid = false; while (!valid) { try { - final TopoData topoData = queryClient.topo( - new TopoQuery() - .stepByMinute() - .start(minutesAgo) - .end(LocalDateTime.now(ZoneOffset.UTC).plusMinutes(1)) - ); + final TopoData topoData = queryClient.topo(new TopoQuery().stepByMinute() + .start(minutesAgo) + .end(LocalDateTime.now(ZoneOffset.UTC) + .plusMinutes(1))); LOGGER.info("Actual topology: {}", topoData); - InputStream expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.ClusterVerificationITCase.topo.yml").getInputStream(); + InputStream expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.ClusterVerificationITCase.topo.yml") + .getInputStream(); final TopoMatcher topoMatcher = yaml.loadAs(expectedInputStream, TopoMatcher.class); topoMatcher.verify(topoData); @@ -153,32 +157,33 @@ private void verifyTopo(LocalDateTime minutesAgo) throws Exception { verifyServiceInstanceTopo(minutesAgo, clientServiceId, serverServiceId); } - private void verifyServiceInstanceTopo(LocalDateTime minutesAgo, String clientServiceId, String serverServiceId) throws Exception { + private void verifyServiceInstanceTopo(LocalDateTime minutesAgo, String clientServiceId, + String serverServiceId) throws Exception { if (clientServiceId == null || serverServiceId == null) { fail("clientService or serverService not found"); } boolean valid = false; while (!valid) { try { - final ServiceInstanceTopoData topoData = queryClient.serviceInstanceTopo( - new ServiceInstanceTopoQuery() - .stepByMinute() - .start(minutesAgo.minusDays(1)) - .end(LocalDateTime.now(ZoneOffset.UTC).plusMinutes(1)) - .clientServiceId(clientServiceId) - .serverServiceId(serverServiceId) - ); + final ServiceInstanceTopoData topoData = queryClient.serviceInstanceTopo(new ServiceInstanceTopoQuery().stepByMinute() + .start(minutesAgo + .minusDays(1)) + .end(LocalDateTime + .now(ZoneOffset.UTC) + .plusMinutes(1)) + .clientServiceId(clientServiceId) + .serverServiceId(serverServiceId)); LOGGER.info("Actual service instance topology: {}", topoData); - InputStream expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.ClusterVerificationITCase.serviceInstanceTopo.yml").getInputStream(); + InputStream expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.ClusterVerificationITCase.serviceInstanceTopo.yml") + .getInputStream(); final ServiceInstanceTopoMatcher topoMatcher = yaml.loadAs(expectedInputStream, ServiceInstanceTopoMatcher.class); topoMatcher.verify(topoData); verifyServiceInstanceRelationMetrics(topoData.getCalls(), minutesAgo); valid = true; - }catch (Throwable t){ + } catch (Throwable t) { LOGGER.warn(t.getMessage(), t); generateTraffic(); Thread.sleep(retryInterval); @@ -187,23 +192,18 @@ private void verifyServiceInstanceTopo(LocalDateTime minutesAgo, String clientSe } private void verifyServices(LocalDateTime minutesAgo) throws Exception { - List services = queryClient.services( - new ServicesQuery() - .start(minutesAgo) - .end(LocalDateTime.now(ZoneOffset.UTC).plusMinutes(1)) - ); + List services = queryClient.services(new ServicesQuery().start(minutesAgo) + .end(LocalDateTime.now(ZoneOffset.UTC) + .plusMinutes(1))); while (services.isEmpty()) { LOGGER.warn("services is null, will retry to query"); - services = queryClient.services( - new ServicesQuery() - .start(minutesAgo) - .end(LocalDateTime.now(ZoneOffset.UTC)) - ); + services = queryClient.services(new ServicesQuery().start(minutesAgo) + .end(LocalDateTime.now(ZoneOffset.UTC))); Thread.sleep(retryInterval); } - InputStream expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.ClusterVerificationITCase.services.yml").getInputStream(); + InputStream expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.ClusterVerificationITCase.services.yml") + .getInputStream(); final ServicesMatcher servicesMatcher = yaml.loadAs(expectedInputStream, ServicesMatcher.class); servicesMatcher.verify(services); @@ -224,31 +224,27 @@ private void verifyServices(LocalDateTime minutesAgo) throws Exception { } private Instances verifyServiceInstances(LocalDateTime minutesAgo, Service service) throws Exception { - Instances instances = queryClient.instances( - new InstancesQuery() - .serviceId(service.getKey()) - .start(minutesAgo) - .end(LocalDateTime.now(ZoneOffset.UTC).plusMinutes(1)) - ); + Instances instances = queryClient.instances(new InstancesQuery().serviceId(service.getKey()) + .start(minutesAgo) + .end(LocalDateTime.now(ZoneOffset.UTC) + .plusMinutes(1))); while (instances == null) { LOGGER.warn("instances is null, will send traffic data and retry to query"); generateTraffic(); Thread.sleep(retryInterval); - instances = queryClient.instances( - new InstancesQuery() - .serviceId(service.getKey()) - .start(minutesAgo) - .end(LocalDateTime.now(ZoneOffset.UTC).plusMinutes(1)) - ); + instances = queryClient.instances(new InstancesQuery().serviceId(service.getKey()) + .start(minutesAgo) + .end(LocalDateTime.now(ZoneOffset.UTC) + .plusMinutes(1))); } InputStream expectedInputStream; if (providerName.equals(service.getLabel())) { - expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.ClusterVerificationITCase.providerInstances.yml").getInputStream(); + expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.ClusterVerificationITCase.providerInstances.yml") + .getInputStream(); } else { - expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.ClusterVerificationITCase.instances.yml").getInputStream(); + expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.ClusterVerificationITCase.instances.yml") + .getInputStream(); } final InstancesMatcher instancesMatcher = yaml.loadAs(expectedInputStream, InstancesMatcher.class); @@ -257,19 +253,15 @@ private Instances verifyServiceInstances(LocalDateTime minutesAgo, Service servi } private Endpoints verifyServiceEndpoints(LocalDateTime minutesAgo, Service service) throws Exception { - Endpoints endpoints = queryClient.endpoints( - new EndpointQuery().serviceId(service.getKey()) - ); + Endpoints endpoints = queryClient.endpoints(new EndpointQuery().serviceId(service.getKey())); while (endpoints == null) { LOGGER.warn("endpoints is null, will send traffic data and retry to query"); generateTraffic(); Thread.sleep(retryInterval); - endpoints = queryClient.endpoints( - new EndpointQuery().serviceId(service.getKey()) - ); + endpoints = queryClient.endpoints(new EndpointQuery().serviceId(service.getKey())); } - InputStream expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.ClusterVerificationITCase.endpoints.yml").getInputStream(); + InputStream expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.ClusterVerificationITCase.endpoints.yml") + .getInputStream(); final EndpointsMatcher endpointsMatcher = yaml.loadAs(expectedInputStream, EndpointsMatcher.class); endpointsMatcher.verify(endpoints); return endpoints; @@ -305,10 +297,7 @@ private void verifyServiceMetrics(Service service, final LocalDateTime minutesAg } private void verifyTraces(LocalDateTime minutesAgo) throws Exception { - final TracesQuery query = new TracesQuery() - .stepBySecond() - .start(minutesAgo) - .orderByStartTime(); + final TracesQuery query = new TracesQuery().stepBySecond().start(minutesAgo).orderByStartTime(); List traces = queryClient.traces(query.end(LocalDateTime.now(ZoneOffset.UTC))); while (traces.isEmpty()) { @@ -318,14 +307,15 @@ private void verifyTraces(LocalDateTime minutesAgo) throws Exception { traces = queryClient.traces(query.end(LocalDateTime.now(ZoneOffset.UTC))); } - InputStream expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.ClusterVerificationITCase.traces.yml").getInputStream(); + InputStream expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.ClusterVerificationITCase.traces.yml") + .getInputStream(); final TracesMatcher tracesMatcher = yaml.loadAs(expectedInputStream, TracesMatcher.class); tracesMatcher.verifyLoosely(traces); } - private void verifyServiceInstanceRelationMetrics(List calls, final LocalDateTime minutesAgo) throws Exception { + private void verifyServiceInstanceRelationMetrics(List calls, + final LocalDateTime minutesAgo) throws Exception { verifyRelationMetrics(calls, minutesAgo, ALL_SERVICE_INSTANCE_RELATION_CLIENT_METRICS, ALL_SERVICE_INSTANCE_RELATION_SERVER_METRICS); } @@ -333,7 +323,8 @@ private void verifyServiceRelationMetrics(List calls, final LocalDateTime verifyRelationMetrics(calls, minutesAgo, ALL_SERVICE_RELATION_CLIENT_METRICS, ALL_SERVICE_RELATION_SERVER_METRICS); } - private void verifyRelationMetrics(List calls, final LocalDateTime minutesAgo, String[] relationClientMetrics, String[] relationServerMetrics) throws Exception { + private void verifyRelationMetrics(List calls, final LocalDateTime minutesAgo, String[] relationClientMetrics, + String[] relationServerMetrics) throws Exception { for (Call call : calls) { for (String detectPoint : call.getDetectPoints()) { switch (detectPoint) { @@ -358,11 +349,7 @@ private void generateTraffic() { try { final Map user = new HashMap<>(); user.put("name", "SkyWalking"); - final ResponseEntity responseEntity = restTemplate.postForEntity( - instrumentedServiceUrl + "/e2e/users", - user, - String.class - ); + final ResponseEntity responseEntity = restTemplate.postForEntity(instrumentedServiceUrl + "/e2e/users", user, String.class); LOGGER.info("responseEntity: {}, {}", responseEntity.getStatusCode(), responseEntity.getBody()); } catch (Throwable t) { LOGGER.warn(t.getMessage(), t); diff --git a/test/e2e/e2e-cluster/e2e-cluster-consumer/src/main/java/org/apache/skywalking/e2e/cluster/Service1Application.java b/test/e2e/e2e-cluster/e2e-cluster-consumer/src/main/java/org/apache/skywalking/e2e/cluster/Service1Application.java index 7ba83aac777e..5a2cef1158e1 100644 --- a/test/e2e/e2e-cluster/e2e-cluster-consumer/src/main/java/org/apache/skywalking/e2e/cluster/Service1Application.java +++ b/test/e2e/e2e-cluster/e2e-cluster-consumer/src/main/java/org/apache/skywalking/e2e/cluster/Service1Application.java @@ -21,9 +21,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -/** - * @author kezhenxu94 - */ @SpringBootApplication public class Service1Application { public static void main(String[] args) { diff --git a/test/e2e/e2e-cluster/e2e-cluster-consumer/src/main/java/org/apache/skywalking/e2e/cluster/TestController.java b/test/e2e/e2e-cluster/e2e-cluster-consumer/src/main/java/org/apache/skywalking/e2e/cluster/TestController.java index 7e99ff5ae356..8900fb46eaf5 100644 --- a/test/e2e/e2e-cluster/e2e-cluster-consumer/src/main/java/org/apache/skywalking/e2e/cluster/TestController.java +++ b/test/e2e/e2e-cluster/e2e-cluster-consumer/src/main/java/org/apache/skywalking/e2e/cluster/TestController.java @@ -26,15 +26,15 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.RestTemplate; -/** - * @author kezhenxu94 - */ @RestController @RequestMapping("/e2e") public class TestController { private final RestTemplate restTemplate = new RestTemplate(); - private static final String[] URL = {"http://127.0.0.1:9090/e2e/users", "http://127.0.0.1:9091/e2e/users"}; + private static final String[] URL = { + "http://127.0.0.1:9090/e2e/users", + "http://127.0.0.1:9091/e2e/users" + }; @GetMapping("/health-check") public String hello() { @@ -46,9 +46,7 @@ public User createAuthor(@RequestBody final User user) throws InterruptedExcepti Thread.sleep(1000L); ResponseEntity response = null; for (String url : URL) { - response = restTemplate.postForEntity( - url, user, User.class - ); + response = restTemplate.postForEntity(url, user, User.class); } return response.getBody(); } diff --git a/test/e2e/e2e-cluster/e2e-cluster-consumer/src/main/java/org/apache/skywalking/e2e/cluster/User.java b/test/e2e/e2e-cluster/e2e-cluster-consumer/src/main/java/org/apache/skywalking/e2e/cluster/User.java index f62d1e7bcc71..27a7c564b653 100644 --- a/test/e2e/e2e-cluster/e2e-cluster-consumer/src/main/java/org/apache/skywalking/e2e/cluster/User.java +++ b/test/e2e/e2e-cluster/e2e-cluster-consumer/src/main/java/org/apache/skywalking/e2e/cluster/User.java @@ -18,9 +18,6 @@ package org.apache.skywalking.e2e.cluster; -/** - * @author kezhenxu94 - */ public class User { public User() { } diff --git a/test/e2e/e2e-cluster/e2e-cluster-provider/src/main/java/org/apache/skywalking/e2e/cluster/Service0Application.java b/test/e2e/e2e-cluster/e2e-cluster-provider/src/main/java/org/apache/skywalking/e2e/cluster/Service0Application.java index 791eab1a0b3a..521f7381f2bc 100644 --- a/test/e2e/e2e-cluster/e2e-cluster-provider/src/main/java/org/apache/skywalking/e2e/cluster/Service0Application.java +++ b/test/e2e/e2e-cluster/e2e-cluster-provider/src/main/java/org/apache/skywalking/e2e/cluster/Service0Application.java @@ -22,9 +22,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; -/** - * @author kezhenxu94 - */ @EnableJpaRepositories @SpringBootApplication public class Service0Application { diff --git a/test/e2e/e2e-cluster/e2e-cluster-provider/src/main/java/org/apache/skywalking/e2e/cluster/TestController.java b/test/e2e/e2e-cluster/e2e-cluster-provider/src/main/java/org/apache/skywalking/e2e/cluster/TestController.java index 39076484f969..2e7390322e64 100644 --- a/test/e2e/e2e-cluster/e2e-cluster-provider/src/main/java/org/apache/skywalking/e2e/cluster/TestController.java +++ b/test/e2e/e2e-cluster/e2e-cluster-provider/src/main/java/org/apache/skywalking/e2e/cluster/TestController.java @@ -24,9 +24,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -/** - * @author kezhenxu94 - */ @RestController @RequestMapping("/e2e") public class TestController { diff --git a/test/e2e/e2e-cluster/e2e-cluster-provider/src/main/java/org/apache/skywalking/e2e/cluster/User.java b/test/e2e/e2e-cluster/e2e-cluster-provider/src/main/java/org/apache/skywalking/e2e/cluster/User.java index 043127f21436..153fdcabb00f 100644 --- a/test/e2e/e2e-cluster/e2e-cluster-provider/src/main/java/org/apache/skywalking/e2e/cluster/User.java +++ b/test/e2e/e2e-cluster/e2e-cluster-provider/src/main/java/org/apache/skywalking/e2e/cluster/User.java @@ -23,9 +23,6 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; -/** - * @author kezhenxu94 - */ @Entity public class User { public User() { diff --git a/test/e2e/e2e-cluster/e2e-cluster-provider/src/main/java/org/apache/skywalking/e2e/cluster/UserRepo.java b/test/e2e/e2e-cluster/e2e-cluster-provider/src/main/java/org/apache/skywalking/e2e/cluster/UserRepo.java index f798f63e0795..c1879d73868f 100644 --- a/test/e2e/e2e-cluster/e2e-cluster-provider/src/main/java/org/apache/skywalking/e2e/cluster/UserRepo.java +++ b/test/e2e/e2e-cluster/e2e-cluster-provider/src/main/java/org/apache/skywalking/e2e/cluster/UserRepo.java @@ -20,8 +20,5 @@ import org.springframework.data.jpa.repository.JpaRepository; -/** - * @author kezhenxu94 - */ public interface UserRepo extends JpaRepository { } diff --git a/test/e2e/e2e-cluster/e2e-cluster-test-runner/src/test/java/org/apache/skywalking/e2e/ClusterVerificationITCase.java b/test/e2e/e2e-cluster/e2e-cluster-test-runner/src/test/java/org/apache/skywalking/e2e/ClusterVerificationITCase.java index b3fa976725dc..ee8635f61795 100755 --- a/test/e2e/e2e-cluster/e2e-cluster-test-runner/src/test/java/org/apache/skywalking/e2e/ClusterVerificationITCase.java +++ b/test/e2e/e2e-cluster/e2e-cluster-test-runner/src/test/java/org/apache/skywalking/e2e/ClusterVerificationITCase.java @@ -18,6 +18,14 @@ package org.apache.skywalking.e2e; +import java.io.InputStream; +import java.time.LocalDateTime; +import java.time.ZoneOffset; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; import org.apache.skywalking.e2e.service.Service; import org.apache.skywalking.e2e.service.ServicesMatcher; import org.apache.skywalking.e2e.service.ServicesQuery; @@ -29,7 +37,14 @@ import org.apache.skywalking.e2e.service.instance.Instances; import org.apache.skywalking.e2e.service.instance.InstancesMatcher; import org.apache.skywalking.e2e.service.instance.InstancesQuery; -import org.apache.skywalking.e2e.topo.*; +import org.apache.skywalking.e2e.topo.Call; +import org.apache.skywalking.e2e.topo.Node; +import org.apache.skywalking.e2e.topo.ServiceInstanceTopoData; +import org.apache.skywalking.e2e.topo.ServiceInstanceTopoMatcher; +import org.apache.skywalking.e2e.topo.ServiceInstanceTopoQuery; +import org.apache.skywalking.e2e.topo.TopoData; +import org.apache.skywalking.e2e.topo.TopoMatcher; +import org.apache.skywalking.e2e.topo.TopoQuery; import org.apache.skywalking.e2e.trace.Trace; import org.apache.skywalking.e2e.trace.TracesMatcher; import org.apache.skywalking.e2e.trace.TracesQuery; @@ -45,23 +60,19 @@ import org.springframework.web.client.RestTemplate; import org.yaml.snakeyaml.Yaml; -import java.io.InputStream; -import java.time.LocalDateTime; -import java.time.ZoneOffset; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.TimeUnit; - import static org.apache.skywalking.e2e.metrics.MetricsMatcher.verifyMetrics; import static org.apache.skywalking.e2e.metrics.MetricsMatcher.verifyPercentileMetrics; -import static org.apache.skywalking.e2e.metrics.MetricsQuery.*; +import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_ENDPOINT_METRICS; +import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_ENDPOINT_MULTIPLE_LINEAR_METRICS; +import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_INSTANCE_METRICS; +import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_SERVICE_INSTANCE_RELATION_CLIENT_METRICS; +import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_SERVICE_INSTANCE_RELATION_SERVER_METRICS; +import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_SERVICE_METRICS; +import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_SERVICE_MULTIPLE_LINEAR_METRICS; +import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_SERVICE_RELATION_CLIENT_METRICS; +import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_SERVICE_RELATION_SERVER_METRICS; import static org.assertj.core.api.Assertions.fail; -/** - * @author kezhenxu94 - */ @RunWith(SpringJUnit4ClassRunner.class) public class ClusterVerificationITCase { private static final Logger LOGGER = LoggerFactory.getLogger(ClusterVerificationITCase.class); @@ -99,11 +110,9 @@ public void verify() throws Exception { List services = Collections.emptyList(); while (services.size() < 2) { try { - services = queryClient.services( - new ServicesQuery() - .start(startTime) - .end(LocalDateTime.now(ZoneOffset.UTC).plusMinutes(1)) - ); + services = queryClient.services(new ServicesQuery().start(startTime) + .end(LocalDateTime.now(ZoneOffset.UTC) + .plusMinutes(1))); Thread.sleep(500); // take a nap to avoid high payload } catch (Throwable ignored) { } @@ -121,16 +130,14 @@ private void verifyTopo(LocalDateTime minutesAgo) throws Exception { boolean valid = false; while (!valid) { try { - final TopoData topoData = queryClient.topo( - new TopoQuery() - .stepByMinute() - .start(minutesAgo) - .end(LocalDateTime.now(ZoneOffset.UTC).plusMinutes(1)) - ); + final TopoData topoData = queryClient.topo(new TopoQuery().stepByMinute() + .start(minutesAgo) + .end(LocalDateTime.now(ZoneOffset.UTC) + .plusMinutes(1))); LOGGER.info("Actual topology: {}", topoData); - InputStream expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.ClusterVerificationITCase.topo.yml").getInputStream(); + InputStream expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.ClusterVerificationITCase.topo.yml") + .getInputStream(); final TopoMatcher topoMatcher = yaml.loadAs(expectedInputStream, TopoMatcher.class); topoMatcher.verify(topoData); @@ -153,25 +160,26 @@ private void verifyTopo(LocalDateTime minutesAgo) throws Exception { verifyServiceInstanceTopo(minutesAgo, clientServiceId, serverServiceId); } - private void verifyServiceInstanceTopo(LocalDateTime minutesAgo, String clientServiceId, String serverServiceId) throws Exception { + private void verifyServiceInstanceTopo(LocalDateTime minutesAgo, String clientServiceId, + String serverServiceId) throws Exception { if (clientServiceId == null || serverServiceId == null) { fail("clientService or serverService not found"); } boolean valid = false; while (!valid) { try { - final ServiceInstanceTopoData topoData = queryClient.serviceInstanceTopo( - new ServiceInstanceTopoQuery() - .stepByMinute() - .start(minutesAgo.minusDays(1)) - .end(LocalDateTime.now(ZoneOffset.UTC).plusMinutes(1)) - .clientServiceId(clientServiceId) - .serverServiceId(serverServiceId) - ); + final ServiceInstanceTopoData topoData = queryClient.serviceInstanceTopo(new ServiceInstanceTopoQuery().stepByMinute() + .start(minutesAgo + .minusDays(1)) + .end(LocalDateTime + .now(ZoneOffset.UTC) + .plusMinutes(1)) + .clientServiceId(clientServiceId) + .serverServiceId(serverServiceId)); LOGGER.info("Actual service instance topology: {}", topoData); - InputStream expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.ClusterVerificationITCase.serviceInstanceTopo.yml").getInputStream(); + InputStream expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.ClusterVerificationITCase.serviceInstanceTopo.yml") + .getInputStream(); final ServiceInstanceTopoMatcher topoMatcher = yaml.loadAs(expectedInputStream, ServiceInstanceTopoMatcher.class); topoMatcher.verify(topoData); verifyServiceInstanceRelationMetrics(topoData.getCalls(), minutesAgo); @@ -185,23 +193,18 @@ private void verifyServiceInstanceTopo(LocalDateTime minutesAgo, String clientSe } private void verifyServices(LocalDateTime minutesAgo) throws Exception { - List services = queryClient.services( - new ServicesQuery() - .start(minutesAgo) - .end(LocalDateTime.now(ZoneOffset.UTC).plusMinutes(1)) - ); + List services = queryClient.services(new ServicesQuery().start(minutesAgo) + .end(LocalDateTime.now(ZoneOffset.UTC) + .plusMinutes(1))); while (services.isEmpty()) { LOGGER.warn("services is null, will retry to query"); - services = queryClient.services( - new ServicesQuery() - .start(minutesAgo) - .end(LocalDateTime.now(ZoneOffset.UTC)) - ); + services = queryClient.services(new ServicesQuery().start(minutesAgo) + .end(LocalDateTime.now(ZoneOffset.UTC))); Thread.sleep(retryInterval); } - InputStream expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.ClusterVerificationITCase.services.yml").getInputStream(); + InputStream expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.ClusterVerificationITCase.services.yml") + .getInputStream(); final ServicesMatcher servicesMatcher = yaml.loadAs(expectedInputStream, ServicesMatcher.class); servicesMatcher.verify(services); @@ -222,31 +225,27 @@ private void verifyServices(LocalDateTime minutesAgo) throws Exception { } private Instances verifyServiceInstances(LocalDateTime minutesAgo, Service service) throws Exception { - Instances instances = queryClient.instances( - new InstancesQuery() - .serviceId(service.getKey()) - .start(minutesAgo) - .end(LocalDateTime.now(ZoneOffset.UTC).plusMinutes(1)) - ); + Instances instances = queryClient.instances(new InstancesQuery().serviceId(service.getKey()) + .start(minutesAgo) + .end(LocalDateTime.now(ZoneOffset.UTC) + .plusMinutes(1))); while (instances == null) { LOGGER.warn("instances is null, will send traffic data and retry to query"); generateTraffic(); Thread.sleep(retryInterval); - instances = queryClient.instances( - new InstancesQuery() - .serviceId(service.getKey()) - .start(minutesAgo) - .end(LocalDateTime.now(ZoneOffset.UTC).plusMinutes(1)) - ); + instances = queryClient.instances(new InstancesQuery().serviceId(service.getKey()) + .start(minutesAgo) + .end(LocalDateTime.now(ZoneOffset.UTC) + .plusMinutes(1))); } InputStream expectedInputStream; if (providerName.equals(service.getLabel())) { - expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.ClusterVerificationITCase.providerInstances.yml").getInputStream(); + expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.ClusterVerificationITCase.providerInstances.yml") + .getInputStream(); } else { - expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.ClusterVerificationITCase.instances.yml").getInputStream(); + expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.ClusterVerificationITCase.instances.yml") + .getInputStream(); } final InstancesMatcher instancesMatcher = yaml.loadAs(expectedInputStream, InstancesMatcher.class); @@ -255,19 +254,15 @@ private Instances verifyServiceInstances(LocalDateTime minutesAgo, Service servi } private Endpoints verifyServiceEndpoints(LocalDateTime minutesAgo, Service service) throws Exception { - Endpoints endpoints = queryClient.endpoints( - new EndpointQuery().serviceId(service.getKey()) - ); + Endpoints endpoints = queryClient.endpoints(new EndpointQuery().serviceId(service.getKey())); while (endpoints == null) { LOGGER.warn("endpoints is null, will send traffic data and retry to query"); generateTraffic(); Thread.sleep(retryInterval); - endpoints = queryClient.endpoints( - new EndpointQuery().serviceId(service.getKey()) - ); + endpoints = queryClient.endpoints(new EndpointQuery().serviceId(service.getKey())); } - InputStream expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.ClusterVerificationITCase.endpoints.yml").getInputStream(); + InputStream expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.ClusterVerificationITCase.endpoints.yml") + .getInputStream(); final EndpointsMatcher endpointsMatcher = yaml.loadAs(expectedInputStream, EndpointsMatcher.class); endpointsMatcher.verify(endpoints); return endpoints; @@ -313,10 +308,7 @@ private void verifyServiceMetrics(Service service, final LocalDateTime minutesAg } private void verifyTraces(LocalDateTime minutesAgo) throws Exception { - final TracesQuery query = new TracesQuery() - .stepBySecond() - .start(minutesAgo) - .orderByStartTime(); + final TracesQuery query = new TracesQuery().stepBySecond().start(minutesAgo).orderByStartTime(); List traces = queryClient.traces(query.end(LocalDateTime.now(ZoneOffset.UTC))); while (traces.isEmpty()) { @@ -326,14 +318,15 @@ private void verifyTraces(LocalDateTime minutesAgo) throws Exception { traces = queryClient.traces(query.end(LocalDateTime.now(ZoneOffset.UTC))); } - InputStream expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.ClusterVerificationITCase.traces.yml").getInputStream(); + InputStream expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.ClusterVerificationITCase.traces.yml") + .getInputStream(); final TracesMatcher tracesMatcher = yaml.loadAs(expectedInputStream, TracesMatcher.class); tracesMatcher.verifyLoosely(traces); } - private void verifyServiceInstanceRelationMetrics(List calls, final LocalDateTime minutesAgo) throws Exception { + private void verifyServiceInstanceRelationMetrics(List calls, + final LocalDateTime minutesAgo) throws Exception { verifyRelationMetrics(calls, minutesAgo, ALL_SERVICE_INSTANCE_RELATION_CLIENT_METRICS, ALL_SERVICE_INSTANCE_RELATION_SERVER_METRICS); } @@ -341,7 +334,8 @@ private void verifyServiceRelationMetrics(List calls, final LocalDateTime verifyRelationMetrics(calls, minutesAgo, ALL_SERVICE_RELATION_CLIENT_METRICS, ALL_SERVICE_RELATION_SERVER_METRICS); } - private void verifyRelationMetrics(List calls, final LocalDateTime minutesAgo, String[] relationClientMetrics, String[] relationServerMetrics) throws Exception { + private void verifyRelationMetrics(List calls, final LocalDateTime minutesAgo, String[] relationClientMetrics, + String[] relationServerMetrics) throws Exception { for (Call call : calls) { for (String detectPoint : call.getDetectPoints()) { switch (detectPoint) { @@ -362,16 +356,11 @@ private void verifyRelationMetrics(List calls, final LocalDateTime minutes } } - private void generateTraffic() { try { final Map user = new HashMap<>(); user.put("name", "SkyWalking"); - final ResponseEntity responseEntity = restTemplate.postForEntity( - instrumentedServiceUrl + "/e2e/users", - user, - String.class - ); + final ResponseEntity responseEntity = restTemplate.postForEntity(instrumentedServiceUrl + "/e2e/users", user, String.class); LOGGER.info("responseEntity: {}, {}", responseEntity.getStatusCode(), responseEntity.getBody()); } catch (Throwable t) { LOGGER.warn(t.getMessage(), t); diff --git a/test/e2e/e2e-mysql/pom.xml b/test/e2e/e2e-mysql/pom.xml index 888c4b858173..94a9c927847d 100755 --- a/test/e2e/e2e-mysql/pom.xml +++ b/test/e2e/e2e-mysql/pom.xml @@ -102,14 +102,15 @@ ${project.build.finalName}.jar - jdbc:mysql://${e2e.container.name.prefix}-mysql:3306/swtest + jdbc:mysql://${e2e.container.name.prefix}-mysql:3306/swtest + - ${e2e.container.name.prefix}-mysql - - - ${e2e.container.name.prefix}-mysql - + ${e2e.container.name.prefix}-mysql + + + ${e2e.container.name.prefix}-mysql + +webapp.host:webapp.port:8081 +client.host:client.port:9090 diff --git a/test/e2e/e2e-mysql/src/main/java/org/apache/skywalking/e2e/sample/client/SampleClientApplication.java b/test/e2e/e2e-mysql/src/main/java/org/apache/skywalking/e2e/sample/client/SampleClientApplication.java index a55dbd685769..67ba54eedfd4 100644 --- a/test/e2e/e2e-mysql/src/main/java/org/apache/skywalking/e2e/sample/client/SampleClientApplication.java +++ b/test/e2e/e2e-mysql/src/main/java/org/apache/skywalking/e2e/sample/client/SampleClientApplication.java @@ -22,9 +22,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; -/** - * @author kezhenxu94 - */ @EnableJpaRepositories @SpringBootApplication public class SampleClientApplication { diff --git a/test/e2e/e2e-mysql/src/main/java/org/apache/skywalking/e2e/sample/client/TestController.java b/test/e2e/e2e-mysql/src/main/java/org/apache/skywalking/e2e/sample/client/TestController.java index 566bcdea4aa9..1a344ab45c45 100644 --- a/test/e2e/e2e-mysql/src/main/java/org/apache/skywalking/e2e/sample/client/TestController.java +++ b/test/e2e/e2e-mysql/src/main/java/org/apache/skywalking/e2e/sample/client/TestController.java @@ -24,9 +24,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -/** - * @author kezhenxu94 - */ @RestController @RequestMapping("/e2e") public class TestController { diff --git a/test/e2e/e2e-mysql/src/main/java/org/apache/skywalking/e2e/sample/client/User.java b/test/e2e/e2e-mysql/src/main/java/org/apache/skywalking/e2e/sample/client/User.java index 4589c7f2c424..3b6c317440de 100644 --- a/test/e2e/e2e-mysql/src/main/java/org/apache/skywalking/e2e/sample/client/User.java +++ b/test/e2e/e2e-mysql/src/main/java/org/apache/skywalking/e2e/sample/client/User.java @@ -23,9 +23,6 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; -/** - * @author kezhenxu94 - */ @Entity public class User { public User() { diff --git a/test/e2e/e2e-mysql/src/main/java/org/apache/skywalking/e2e/sample/client/UserRepo.java b/test/e2e/e2e-mysql/src/main/java/org/apache/skywalking/e2e/sample/client/UserRepo.java index 882af92a8211..2ee38a60dd3c 100644 --- a/test/e2e/e2e-mysql/src/main/java/org/apache/skywalking/e2e/sample/client/UserRepo.java +++ b/test/e2e/e2e-mysql/src/main/java/org/apache/skywalking/e2e/sample/client/UserRepo.java @@ -20,8 +20,5 @@ import org.springframework.data.jpa.repository.JpaRepository; -/** - * @author kezhenxu94 - */ public interface UserRepo extends JpaRepository { } diff --git a/test/e2e/e2e-mysql/src/test/java/org/apache/skywalking/e2e/SampleVerificationITCase.java b/test/e2e/e2e-mysql/src/test/java/org/apache/skywalking/e2e/SampleVerificationITCase.java index 95a5719c6593..0d290bd0a433 100644 --- a/test/e2e/e2e-mysql/src/test/java/org/apache/skywalking/e2e/SampleVerificationITCase.java +++ b/test/e2e/e2e-mysql/src/test/java/org/apache/skywalking/e2e/SampleVerificationITCase.java @@ -18,6 +18,12 @@ package org.apache.skywalking.e2e; +import java.io.InputStream; +import java.time.LocalDateTime; +import java.time.ZoneOffset; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import org.apache.skywalking.e2e.metrics.AtLeastOneOfMetricsMatcher; import org.apache.skywalking.e2e.metrics.Metrics; import org.apache.skywalking.e2e.metrics.MetricsQuery; @@ -33,7 +39,13 @@ import org.apache.skywalking.e2e.service.instance.Instances; import org.apache.skywalking.e2e.service.instance.InstancesMatcher; import org.apache.skywalking.e2e.service.instance.InstancesQuery; -import org.apache.skywalking.e2e.topo.*; +import org.apache.skywalking.e2e.topo.Call; +import org.apache.skywalking.e2e.topo.ServiceInstanceTopoData; +import org.apache.skywalking.e2e.topo.ServiceInstanceTopoMatcher; +import org.apache.skywalking.e2e.topo.ServiceInstanceTopoQuery; +import org.apache.skywalking.e2e.topo.TopoData; +import org.apache.skywalking.e2e.topo.TopoMatcher; +import org.apache.skywalking.e2e.topo.TopoQuery; import org.apache.skywalking.e2e.trace.Trace; import org.apache.skywalking.e2e.trace.TracesMatcher; import org.apache.skywalking.e2e.trace.TracesQuery; @@ -50,20 +62,16 @@ import org.springframework.web.client.RestTemplate; import org.yaml.snakeyaml.Yaml; -import java.io.InputStream; -import java.time.LocalDateTime; -import java.time.ZoneOffset; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import static org.apache.skywalking.e2e.metrics.MetricsMatcher.verifyMetrics; -import static org.apache.skywalking.e2e.metrics.MetricsQuery.*; +import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_ENDPOINT_METRICS; +import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_INSTANCE_METRICS; +import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_SERVICE_INSTANCE_RELATION_CLIENT_METRICS; +import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_SERVICE_INSTANCE_RELATION_SERVER_METRICS; +import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_SERVICE_METRICS; +import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_SERVICE_RELATION_CLIENT_METRICS; +import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_SERVICE_RELATION_SERVER_METRICS; import static org.assertj.core.api.Assertions.assertThat; -/** - * @author kezhenxu94 - */ @RunWith(SpringJUnit4ClassRunner.class) public class SampleVerificationITCase { private static final Logger LOGGER = LoggerFactory.getLogger(SampleVerificationITCase.class); @@ -93,19 +101,12 @@ public void verify() throws Exception { try { final Map user = new HashMap<>(); user.put("name", "SkyWalking"); - final ResponseEntity responseEntity = restTemplate.postForEntity( - instrumentedServiceUrl + "/e2e/users", - user, - String.class - ); + final ResponseEntity responseEntity = restTemplate.postForEntity(instrumentedServiceUrl + "/e2e/users", user, String.class); LOGGER.info("responseEntity: {}", responseEntity); assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); - final List traces = queryClient.traces( - new TracesQuery() - .start(minutesAgo) - .end(LocalDateTime.now()) - .orderByDuration() - ); + final List traces = queryClient.traces(new TracesQuery().start(minutesAgo) + .end(LocalDateTime.now()) + .orderByDuration()); if (!traces.isEmpty()) { break; } @@ -139,9 +140,9 @@ public void verify() throws Exception { }); doRetryableVerification(() -> { - try{ + try { verifyServiceInstanceTopo(minutesAgo); - }catch (Exception e) { + } catch (Exception e) { LOGGER.warn(e.getMessage(), e); } }); @@ -150,16 +151,13 @@ public void verify() throws Exception { private void verifyTopo(LocalDateTime minutesAgo) throws Exception { final LocalDateTime now = LocalDateTime.now(ZoneOffset.UTC); - final TopoData topoData = queryClient.topo( - new TopoQuery() - .stepByMinute() - .start(minutesAgo.minusDays(1)) - .end(now) - ); + final TopoData topoData = queryClient.topo(new TopoQuery().stepByMinute() + .start(minutesAgo.minusDays(1)) + .end(now)); LOGGER.info("topoData: {}", topoData); - InputStream expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.topo.yml").getInputStream(); + InputStream expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.topo.yml") + .getInputStream(); final TopoMatcher topoMatcher = new Yaml().loadAs(expectedInputStream, TopoMatcher.class); topoMatcher.verify(topoData); @@ -169,18 +167,16 @@ private void verifyTopo(LocalDateTime minutesAgo) throws Exception { private void verifyServiceInstanceTopo(LocalDateTime minutesAgo) throws Exception { final LocalDateTime now = LocalDateTime.now(ZoneOffset.UTC); - final ServiceInstanceTopoData topoData = queryClient.serviceInstanceTopo( - new ServiceInstanceTopoQuery() - .stepByMinute() - .start(minutesAgo.minusDays(1)) - .end(now) - .clientServiceId("1") - .serverServiceId("2") - ); + final ServiceInstanceTopoData topoData = queryClient.serviceInstanceTopo(new ServiceInstanceTopoQuery().stepByMinute() + .start(minutesAgo + .minusDays(1)) + .end(now) + .clientServiceId("1") + .serverServiceId("2")); LOGGER.info("instanceTopoData: {}", topoData); - InputStream expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.serviceInstanceTopo.yml").getInputStream(); + InputStream expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.serviceInstanceTopo.yml") + .getInputStream(); final ServiceInstanceTopoMatcher topoMatcher = new Yaml().loadAs(expectedInputStream, ServiceInstanceTopoMatcher.class); topoMatcher.verify(topoData); @@ -190,15 +186,11 @@ private void verifyServiceInstanceTopo(LocalDateTime minutesAgo) throws Exceptio private void verifyServices(LocalDateTime minutesAgo) throws Exception { final LocalDateTime now = LocalDateTime.now(ZoneOffset.UTC); - final List services = queryClient.services( - new ServicesQuery() - .start(minutesAgo) - .end(now) - ); + final List services = queryClient.services(new ServicesQuery().start(minutesAgo).end(now)); LOGGER.info("services: {}", services); - InputStream expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.services.yml").getInputStream(); + InputStream expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.services.yml") + .getInputStream(); final ServicesMatcher servicesMatcher = new Yaml().loadAs(expectedInputStream, ServicesMatcher.class); servicesMatcher.verify(services); @@ -221,15 +213,12 @@ private void verifyServices(LocalDateTime minutesAgo) throws Exception { private Instances verifyServiceInstances(LocalDateTime minutesAgo, LocalDateTime now, Service service) throws Exception { InputStream expectedInputStream; - Instances instances = queryClient.instances( - new InstancesQuery() - .serviceId(service.getKey()) - .start(minutesAgo) - .end(now) - ); + Instances instances = queryClient.instances(new InstancesQuery().serviceId(service.getKey()) + .start(minutesAgo) + .end(now)); LOGGER.info("instances: {}", instances); - expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.instances.yml").getInputStream(); + expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.instances.yml") + .getInputStream(); final InstancesMatcher instancesMatcher = new Yaml().loadAs(expectedInputStream, InstancesMatcher.class); instancesMatcher.verify(instances); return instances; @@ -237,12 +226,10 @@ private Instances verifyServiceInstances(LocalDateTime minutesAgo, LocalDateTime private Endpoints verifyServiceEndpoints(LocalDateTime minutesAgo, LocalDateTime now, Service service) throws Exception { - Endpoints instances = queryClient.endpoints( - new EndpointQuery().serviceId(service.getKey()) - ); + Endpoints instances = queryClient.endpoints(new EndpointQuery().serviceId(service.getKey())); LOGGER.info("instances: {}", instances); - InputStream expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.endpoints.yml").getInputStream(); + InputStream expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.endpoints.yml") + .getInputStream(); final EndpointsMatcher endpointsMatcher = new Yaml().loadAs(expectedInputStream, EndpointsMatcher.class); endpointsMatcher.verify(instances); return instances; @@ -252,12 +239,9 @@ private void verifyInstancesMetrics(Instances instances) throws Exception { for (Instance instance : instances.getInstances()) { for (String metricsName : ALL_INSTANCE_METRICS) { LOGGER.info("verifying service instance response time: {}", instance); - final Metrics instanceMetrics = queryClient.metrics( - new MetricsQuery() - .stepByMinute() - .metricsName(metricsName) - .id(instance.getKey()) - ); + final Metrics instanceMetrics = queryClient.metrics(new MetricsQuery().stepByMinute() + .metricsName(metricsName) + .id(instance.getKey())); LOGGER.info("instanceMetrics: {}", instanceMetrics); AtLeastOneOfMetricsMatcher instanceRespTimeMatcher = new AtLeastOneOfMetricsMatcher(); MetricsValueMatcher greaterThanZero = new MetricsValueMatcher(); @@ -276,12 +260,9 @@ private void verifyEndpointsMetrics(Endpoints endpoints) throws Exception { } for (String metricName : ALL_ENDPOINT_METRICS) { LOGGER.info("verifying endpoint {}, metrics: {}", endpoint, metricName); - final Metrics metrics = queryClient.metrics( - new MetricsQuery() - .stepByMinute() - .metricsName(metricName) - .id(endpoint.getKey()) - ); + final Metrics metrics = queryClient.metrics(new MetricsQuery().stepByMinute() + .metricsName(metricName) + .id(endpoint.getKey())); LOGGER.info("metrics: {}", metrics); AtLeastOneOfMetricsMatcher instanceRespTimeMatcher = new AtLeastOneOfMetricsMatcher(); MetricsValueMatcher greaterThanZero = new MetricsValueMatcher(); @@ -296,12 +277,9 @@ private void verifyEndpointsMetrics(Endpoints endpoints) throws Exception { private void verifyServiceMetrics(Service service) throws Exception { for (String metricName : ALL_SERVICE_METRICS) { LOGGER.info("verifying service {}, metrics: {}", service, metricName); - final Metrics serviceMetrics = queryClient.metrics( - new MetricsQuery() - .stepByMinute() - .metricsName(metricName) - .id(service.getKey()) - ); + final Metrics serviceMetrics = queryClient.metrics(new MetricsQuery().stepByMinute() + .metricsName(metricName) + .id(service.getKey())); LOGGER.info("serviceMetrics: {}", serviceMetrics); AtLeastOneOfMetricsMatcher instanceRespTimeMatcher = new AtLeastOneOfMetricsMatcher(); MetricsValueMatcher greaterThanZero = new MetricsValueMatcher(); @@ -315,22 +293,18 @@ private void verifyServiceMetrics(Service service) throws Exception { private void verifyTraces(LocalDateTime minutesAgo) throws Exception { final LocalDateTime now = LocalDateTime.now(ZoneOffset.UTC); - final List traces = queryClient.traces( - new TracesQuery() - .start(minutesAgo) - .end(now) - .orderByDuration() - ); + final List traces = queryClient.traces(new TracesQuery().start(minutesAgo).end(now).orderByDuration()); LOGGER.info("traces: {}", traces); - InputStream expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.traces.yml").getInputStream(); + InputStream expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.traces.yml") + .getInputStream(); final TracesMatcher tracesMatcher = new Yaml().loadAs(expectedInputStream, TracesMatcher.class); tracesMatcher.verifyLoosely(traces); } - private void verifyServiceInstanceRelationMetrics(List calls, final LocalDateTime minutesAgo) throws Exception { + private void verifyServiceInstanceRelationMetrics(List calls, + final LocalDateTime minutesAgo) throws Exception { verifyRelationMetrics(calls, minutesAgo, ALL_SERVICE_INSTANCE_RELATION_CLIENT_METRICS, ALL_SERVICE_INSTANCE_RELATION_SERVER_METRICS); } @@ -338,7 +312,8 @@ private void verifyServiceRelationMetrics(List calls, final LocalDateTime verifyRelationMetrics(calls, minutesAgo, ALL_SERVICE_RELATION_CLIENT_METRICS, ALL_SERVICE_RELATION_SERVER_METRICS); } - private void verifyRelationMetrics(List calls, final LocalDateTime minutesAgo, String[] relationClientMetrics, String[] relationServerMetrics) throws Exception { + private void verifyRelationMetrics(List calls, final LocalDateTime minutesAgo, String[] relationClientMetrics, + String[] relationServerMetrics) throws Exception { for (Call call : calls) { for (String detectPoint : call.getDetectPoints()) { switch (detectPoint) { diff --git a/test/e2e/e2e-profile/e2e-profile-service/src/main/java/org/apache/skywalking/e2e/profile/CreateUser.java b/test/e2e/e2e-profile/e2e-profile-service/src/main/java/org/apache/skywalking/e2e/profile/CreateUser.java index 158f0134a178..49cbe2896662 100644 --- a/test/e2e/e2e-profile/e2e-profile-service/src/main/java/org/apache/skywalking/e2e/profile/CreateUser.java +++ b/test/e2e/e2e-profile/e2e-profile-service/src/main/java/org/apache/skywalking/e2e/profile/CreateUser.java @@ -18,9 +18,6 @@ package org.apache.skywalking.e2e.profile; -/** - * @author MrPro - */ public class CreateUser { private String name; diff --git a/test/e2e/e2e-profile/e2e-profile-service/src/main/java/org/apache/skywalking/e2e/profile/ProfileApplication.java b/test/e2e/e2e-profile/e2e-profile-service/src/main/java/org/apache/skywalking/e2e/profile/ProfileApplication.java index 59581077601f..af650e388b51 100644 --- a/test/e2e/e2e-profile/e2e-profile-service/src/main/java/org/apache/skywalking/e2e/profile/ProfileApplication.java +++ b/test/e2e/e2e-profile/e2e-profile-service/src/main/java/org/apache/skywalking/e2e/profile/ProfileApplication.java @@ -22,9 +22,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; -/** - * @author MrPro - */ @EnableJpaRepositories @SpringBootApplication public class ProfileApplication { diff --git a/test/e2e/e2e-profile/e2e-profile-service/src/main/java/org/apache/skywalking/e2e/profile/TestController.java b/test/e2e/e2e-profile/e2e-profile-service/src/main/java/org/apache/skywalking/e2e/profile/TestController.java index d05fae9a8a89..ef4af874f502 100644 --- a/test/e2e/e2e-profile/e2e-profile-service/src/main/java/org/apache/skywalking/e2e/profile/TestController.java +++ b/test/e2e/e2e-profile/e2e-profile-service/src/main/java/org/apache/skywalking/e2e/profile/TestController.java @@ -18,13 +18,13 @@ package org.apache.skywalking.e2e.profile; -import org.springframework.web.bind.annotation.*; - import java.util.concurrent.TimeUnit; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; -/** - * @author MrPro - */ @RestController @RequestMapping("/e2e") public class TestController { diff --git a/test/e2e/e2e-profile/e2e-profile-service/src/main/java/org/apache/skywalking/e2e/profile/User.java b/test/e2e/e2e-profile/e2e-profile-service/src/main/java/org/apache/skywalking/e2e/profile/User.java index bcff90ef9b4d..e93237a85c79 100644 --- a/test/e2e/e2e-profile/e2e-profile-service/src/main/java/org/apache/skywalking/e2e/profile/User.java +++ b/test/e2e/e2e-profile/e2e-profile-service/src/main/java/org/apache/skywalking/e2e/profile/User.java @@ -23,9 +23,6 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; -/** - * @author MrPro - */ @Entity public class User { public User() { diff --git a/test/e2e/e2e-profile/e2e-profile-service/src/main/java/org/apache/skywalking/e2e/profile/UserRepo.java b/test/e2e/e2e-profile/e2e-profile-service/src/main/java/org/apache/skywalking/e2e/profile/UserRepo.java index f124a34ee994..e0450cd172ab 100644 --- a/test/e2e/e2e-profile/e2e-profile-service/src/main/java/org/apache/skywalking/e2e/profile/UserRepo.java +++ b/test/e2e/e2e-profile/e2e-profile-service/src/main/java/org/apache/skywalking/e2e/profile/UserRepo.java @@ -20,8 +20,5 @@ import org.springframework.data.jpa.repository.JpaRepository; -/** - * @author MrPro - */ public interface UserRepo extends JpaRepository { } diff --git a/test/e2e/e2e-profile/e2e-profile-test-runner/pom.xml b/test/e2e/e2e-profile/e2e-profile-test-runner/pom.xml index e3cfb070b24a..18dea8011e52 100644 --- a/test/e2e/e2e-profile/e2e-profile-test-runner/pom.xml +++ b/test/e2e/e2e-profile/e2e-profile-test-runner/pom.xml @@ -48,7 +48,7 @@ e2e-profile-service - 1.1 + 1.4 skywalking-e2e-container-${build.id}-profile @@ -69,7 +69,8 @@ ${e2e.container.name.prefix}-datasource - Socket: '/var/run/mysqld/mysqlx.sock' bind-address: '::' port: 3306 + Socket: '/var/run/mysqld/mysqlx.sock' bind-address: '::' port: 3306 + @@ -88,7 +89,9 @@ mysql - jdbc:mysql://${e2e.container.name.prefix}-datasource:3306/swtest + + jdbc:mysql://${e2e.container.name.prefix}-datasource:3306/swtest + ${provider.name}-${project.version}.jar @@ -113,10 +116,16 @@ ${sw.home}:/sw ${project.build.directory}:/home - ../${provider.name}/target/${provider.name}-${project.version}.jar:/home/${provider.name}-${project.version}.jar + + ../${provider.name}/target/${provider.name}-${project.version}.jar:/home/${provider.name}-${project.version}.jar + ${project.basedir}/src/docker/rc.d:/rc.d:ro - ${project.basedir}/src/docker/adapt_storage.awk:/adapt_storage.awk - ${project.basedir}/src/docker/profile_official_analysis.oal:/profile_official_analysis.oal + + ${project.basedir}/src/docker/adapt_storage.awk:/adapt_storage.awk + + + ${project.basedir}/src/docker/profile_official_analysis.oal:/profile_official_analysis.oal + @@ -167,10 +176,16 @@ ${sw.home}:/sw - ../${provider.name}/target/${provider.name}-${project.version}.jar:/home/${provider.name}-${project.version}.jar + + ../${provider.name}/target/${provider.name}-${project.version}.jar:/home/${provider.name}-${project.version}.jar + ${project.basedir}/src/docker/rc.d:/rc.d:ro - ${project.basedir}/src/docker/adapt_storage.awk:/adapt_storage.awk - ${project.basedir}/src/docker/profile_official_analysis.oal:/profile_official_analysis.oal + + ${project.basedir}/src/docker/adapt_storage.awk:/adapt_storage.awk + + + ${project.basedir}/src/docker/profile_official_analysis.oal:/profile_official_analysis.oal + @@ -251,10 +266,16 @@ ${sw.home}:/sw - ../${provider.name}/target/${provider.name}-${project.version}.jar:/home/${provider.name}-${project.version}.jar + + ../${provider.name}/target/${provider.name}-${project.version}.jar:/home/${provider.name}-${project.version}.jar + ${project.basedir}/src/docker/rc.d:/rc.d:ro - ${project.basedir}/src/docker/adapt_storage.awk:/adapt_storage.awk - ${project.basedir}/src/docker/profile_official_analysis.oal:/profile_official_analysis.oal + + ${project.basedir}/src/docker/adapt_storage.awk:/adapt_storage.awk + + + ${project.basedir}/src/docker/profile_official_analysis.oal:/profile_official_analysis.oal + @@ -298,5 +319,4 @@ - \ No newline at end of file diff --git a/test/e2e/e2e-profile/e2e-profile-test-runner/src/docker/rc.d/rc0-prepare.sh b/test/e2e/e2e-profile/e2e-profile-test-runner/src/docker/rc.d/rc0-prepare.sh index bf7be7a2fbd1..f5039d14ac5e 100755 --- a/test/e2e/e2e-profile/e2e-profile-test-runner/src/docker/rc.d/rc0-prepare.sh +++ b/test/e2e/e2e-profile/e2e-profile-test-runner/src/docker/rc.d/rc0-prepare.sh @@ -15,11 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -apt-get update && apt-get install -y gawk - original_wd=$(pwd) - if test "${STORAGE}" = "mysql"; then MYSQL_URL="https://repo.maven.apache.org/maven2/mysql/mysql-connector-java/8.0.13/mysql-connector-java-8.0.13.jar" MYSQL_DRIVER="mysql-connector-java-8.0.13.jar" diff --git a/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/ProfileClient.java b/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/ProfileClient.java index 1e266fbae69a..29261febbfcf 100644 --- a/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/ProfileClient.java +++ b/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/ProfileClient.java @@ -19,6 +19,7 @@ package org.apache.skywalking.e2e.profile; import com.google.common.io.Resources; +import java.nio.charset.StandardCharsets; import org.apache.skywalking.e2e.GQLResponse; import org.apache.skywalking.e2e.SimpleQueryClient; import org.apache.skywalking.e2e.profile.creation.ProfileTaskCreationRequest; @@ -35,15 +36,12 @@ import java.io.IOException; import java.net.URI; import java.net.URL; -import java.nio.charset.Charset; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; /** * Profile client, use profile.graphqls, base on {@link SimpleQueryClient} - * - * @author MrPro */ public class ProfileClient extends SimpleQueryClient { public ProfileClient(String host, String port) { @@ -52,21 +50,27 @@ public ProfileClient(String host, String port) { public ProfileTaskCreationResult createProfileTask(final ProfileTaskCreationRequest creationRequest) throws Exception { final URL queryFileUrl = Resources.getResource("profileTaskCreation.gql"); - final String queryString = Resources.readLines(queryFileUrl, Charset.forName("UTF8")) - .stream() - .filter(it -> !it.startsWith("#")) - .collect(Collectors.joining()) - .replace("{serviceId}", String.valueOf(creationRequest.getServiceId())) - .replace("{endpointName}", creationRequest.getEndpointName()) - .replace("{duration}", String.valueOf(creationRequest.getDuration())) - .replace("{startTime}", String.valueOf(creationRequest.getStartTime())) - .replace("{minDurationThreshold}", String.valueOf(creationRequest.getMinDurationThreshold())) - .replace("{dumpPeriod}", String.valueOf(creationRequest.getDumpPeriod())) - .replace("{maxSamplingCount}", String.valueOf(creationRequest.getMaxSamplingCount())); + final String queryString = Resources.readLines(queryFileUrl, StandardCharsets.UTF_8) + .stream() + .filter(it -> !it.startsWith("#")) + .collect(Collectors.joining()) + .replace("{serviceId}", String.valueOf(creationRequest.getServiceId())) + .replace("{endpointName}", creationRequest.getEndpointName()) + .replace("{duration}", String.valueOf(creationRequest.getDuration())) + .replace("{startTime}", String.valueOf(creationRequest.getStartTime())) + .replace( + "{minDurationThreshold}", + String.valueOf(creationRequest.getMinDurationThreshold()) + ) + .replace("{dumpPeriod}", String.valueOf(creationRequest.getDumpPeriod())) + .replace( + "{maxSamplingCount}", + String.valueOf(creationRequest.getMaxSamplingCount()) + ); final ResponseEntity> responseEntity = restTemplate.exchange( - new RequestEntity<>(queryString, HttpMethod.POST, URI.create(endpointUrl)), - new ParameterizedTypeReference>() { - } + new RequestEntity<>(queryString, HttpMethod.POST, URI.create(endpointUrl)), + new ParameterizedTypeReference>() { + } ); if (responseEntity.getStatusCode() != HttpStatus.OK) { @@ -78,16 +82,16 @@ public ProfileTaskCreationResult createProfileTask(final ProfileTaskCreationRequ public ProfileTasks getProfileTaskList(final ProfileTaskQuery query) throws IOException { final URL queryFileUrl = Resources.getResource("getProfileTaskList.gql"); - final String queryString = Resources.readLines(queryFileUrl, Charset.forName("UTF8")) - .stream() - .filter(it -> !it.startsWith("#")) - .collect(Collectors.joining()) - .replace("{serviceId}", String.valueOf(query.serviceId())) - .replace("{endpointName}", query.endpointName()); + final String queryString = Resources.readLines(queryFileUrl, StandardCharsets.UTF_8) + .stream() + .filter(it -> !it.startsWith("#")) + .collect(Collectors.joining()) + .replace("{serviceId}", String.valueOf(query.serviceId())) + .replace("{endpointName}", query.endpointName()); final ResponseEntity> responseEntity = restTemplate.exchange( - new RequestEntity<>(queryString, HttpMethod.POST, URI.create(endpointUrl)), - new ParameterizedTypeReference>() { - } + new RequestEntity<>(queryString, HttpMethod.POST, URI.create(endpointUrl)), + new ParameterizedTypeReference>() { + } ); if (responseEntity.getStatusCode() != HttpStatus.OK) { @@ -99,15 +103,15 @@ public ProfileTasks getProfileTaskList(final ProfileTaskQuery query) throws IOEx public List getProfiledTraces(final String taskId) throws Exception { final URL queryFileUrl = Resources.getResource("getProfileTaskSegmentList.gql"); - final String queryString = Resources.readLines(queryFileUrl, Charset.forName("UTF8")) - .stream() - .filter(it -> !it.startsWith("#")) - .collect(Collectors.joining()) - .replace("{taskID}", taskId); + final String queryString = Resources.readLines(queryFileUrl, StandardCharsets.UTF_8) + .stream() + .filter(it -> !it.startsWith("#")) + .collect(Collectors.joining()) + .replace("{taskID}", taskId); final ResponseEntity> responseEntity = restTemplate.exchange( - new RequestEntity<>(queryString, HttpMethod.POST, URI.create(endpointUrl)), - new ParameterizedTypeReference>() { - } + new RequestEntity<>(queryString, HttpMethod.POST, URI.create(endpointUrl)), + new ParameterizedTypeReference>() { + } ); if (responseEntity.getStatusCode() != HttpStatus.OK) { @@ -119,17 +123,17 @@ public List getProfiledTraces(final String taskId) throws Exception { public ProfileAnalyzation getProfileAnalyzation(final String segmentId, long start, long end) throws IOException { final URL queryFileUrl = Resources.getResource("getProfileAnalyzation.gql"); - final String queryString = Resources.readLines(queryFileUrl, Charset.forName("UTF8")) - .stream() - .filter(it -> !it.startsWith("#")) - .collect(Collectors.joining()) - .replace("{segmentId}", segmentId) - .replace("{start}", String.valueOf(start)) - .replace("{end}", String.valueOf(end)); + final String queryString = Resources.readLines(queryFileUrl, StandardCharsets.UTF_8) + .stream() + .filter(it -> !it.startsWith("#")) + .collect(Collectors.joining()) + .replace("{segmentId}", segmentId) + .replace("{start}", String.valueOf(start)) + .replace("{end}", String.valueOf(end)); final ResponseEntity> responseEntity = restTemplate.exchange( - new RequestEntity<>(queryString, HttpMethod.POST, URI.create(endpointUrl)), - new ParameterizedTypeReference>() { - } + new RequestEntity<>(queryString, HttpMethod.POST, URI.create(endpointUrl)), + new ParameterizedTypeReference>() { + } ); if (responseEntity.getStatusCode() != HttpStatus.OK) { @@ -139,6 +143,4 @@ public ProfileAnalyzation getProfileAnalyzation(final String segmentId, long sta return Objects.requireNonNull(responseEntity.getBody()).getData(); } - - } diff --git a/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/creation/ProfileTaskCreationRequest.java b/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/creation/ProfileTaskCreationRequest.java index 3b82c071dee5..faf8b5358fa3 100644 --- a/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/creation/ProfileTaskCreationRequest.java +++ b/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/creation/ProfileTaskCreationRequest.java @@ -18,12 +18,14 @@ package org.apache.skywalking.e2e.profile.creation; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; /** * e2e profile, create profile task entity - * - * @author MrPro */ @Setter @Getter diff --git a/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/creation/ProfileTaskCreationResult.java b/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/creation/ProfileTaskCreationResult.java index ba111fdfe016..15ee6939d262 100644 --- a/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/creation/ProfileTaskCreationResult.java +++ b/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/creation/ProfileTaskCreationResult.java @@ -18,12 +18,12 @@ package org.apache.skywalking.e2e.profile.creation; -import lombok.*; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; /** * e2e profile, create profile task result entity - * - * @author MrPro */ @Setter @Getter diff --git a/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/creation/ProfileTaskCreationResultMatcher.java b/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/creation/ProfileTaskCreationResultMatcher.java index baa24bf34940..080169f169c0 100644 --- a/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/creation/ProfileTaskCreationResultMatcher.java +++ b/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/creation/ProfileTaskCreationResultMatcher.java @@ -22,9 +22,6 @@ import static org.assertj.core.api.Assertions.assertThat; -/** - * @author MrPro - */ public class ProfileTaskCreationResultMatcher extends AbstractMatcher { @Override diff --git a/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/creation/ProfileTaskCreationResultWrapper.java b/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/creation/ProfileTaskCreationResultWrapper.java index 9d03fd3d6ab7..65121eced15c 100644 --- a/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/creation/ProfileTaskCreationResultWrapper.java +++ b/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/creation/ProfileTaskCreationResultWrapper.java @@ -23,8 +23,6 @@ /** * wrap profile task create result, for profileTaskCreation.gql - * - * @author MrPro */ @Setter @Getter diff --git a/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/query/ProfileTask.java b/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/query/ProfileTask.java index efee714fe263..84864ec0e558 100644 --- a/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/query/ProfileTask.java +++ b/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/query/ProfileTask.java @@ -15,18 +15,16 @@ * limitations under the License. * */ + package org.apache.skywalking.e2e.profile.query; +import java.util.List; import lombok.Getter; import lombok.Setter; import lombok.ToString; -import java.util.List; - /** * Profile task bean for e2e GraphQL test result - * - * @author MrPro */ @Setter @Getter diff --git a/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/query/ProfileTaskLog.java b/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/query/ProfileTaskLog.java index 4c4b0b3360e2..61f732c53af6 100644 --- a/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/query/ProfileTaskLog.java +++ b/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/query/ProfileTaskLog.java @@ -22,9 +22,6 @@ import lombok.Setter; import lombok.ToString; -/** - * @author MrPro - */ @Setter @Getter @ToString diff --git a/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/query/ProfileTaskLogMatcher.java b/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/query/ProfileTaskLogMatcher.java index 591ffa777f24..551e609aa4c4 100644 --- a/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/query/ProfileTaskLogMatcher.java +++ b/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/query/ProfileTaskLogMatcher.java @@ -22,9 +22,6 @@ import lombok.Setter; import org.apache.skywalking.e2e.verification.AbstractMatcher; -/** - * @author MrPro - */ @Setter @Getter public class ProfileTaskLogMatcher extends AbstractMatcher { diff --git a/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/query/ProfileTaskMatcher.java b/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/query/ProfileTaskMatcher.java index 17c2c3db0961..c83ddbd07de8 100644 --- a/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/query/ProfileTaskMatcher.java +++ b/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/query/ProfileTaskMatcher.java @@ -18,16 +18,12 @@ package org.apache.skywalking.e2e.profile.query; +import java.util.List; import lombok.Getter; import lombok.Setter; import org.apache.skywalking.e2e.verification.AbstractMatcher; import org.assertj.core.api.Assertions; -import java.util.List; - -/** - * @author MrPro - */ @Setter @Getter public class ProfileTaskMatcher extends AbstractMatcher { diff --git a/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/query/ProfileTaskQuery.java b/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/query/ProfileTaskQuery.java index 606153dda0e2..39059b7bd901 100644 --- a/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/query/ProfileTaskQuery.java +++ b/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/query/ProfileTaskQuery.java @@ -22,8 +22,6 @@ /** * profile query data - * - * @author MrPro */ public class ProfileTaskQuery extends AbstractQuery { diff --git a/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/query/ProfileTasks.java b/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/query/ProfileTasks.java index da388bb4d625..5f1f0855b186 100644 --- a/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/query/ProfileTasks.java +++ b/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/query/ProfileTasks.java @@ -15,17 +15,14 @@ * limitations under the License. * */ + package org.apache.skywalking.e2e.profile.query; +import java.util.List; import lombok.Getter; import lombok.Setter; import lombok.ToString; -import java.util.List; - -/** - * @author MrPro - */ @Setter @Getter @ToString diff --git a/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/query/ProfilesTasksMatcher.java b/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/query/ProfilesTasksMatcher.java index a0cf577476ae..afc5b934e4bd 100644 --- a/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/query/ProfilesTasksMatcher.java +++ b/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/query/ProfilesTasksMatcher.java @@ -18,18 +18,12 @@ package org.apache.skywalking.e2e.profile.query; +import java.util.List; import lombok.Getter; import lombok.Setter; import org.apache.skywalking.e2e.verification.AbstractMatcher; import org.assertj.core.api.Assertions; -import java.util.List; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * @author MrPro - */ @Setter @Getter public class ProfilesTasksMatcher extends AbstractMatcher { diff --git a/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/query/Traces.java b/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/query/Traces.java index 118131ab784e..bccd2c056022 100644 --- a/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/query/Traces.java +++ b/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/query/Traces.java @@ -18,13 +18,12 @@ package org.apache.skywalking.e2e.profile.query; +import java.util.List; import lombok.Getter; import lombok.Setter; import lombok.ToString; import org.apache.skywalking.e2e.trace.Trace; -import java.util.List; - @Setter @Getter @ToString diff --git a/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/resources/expected-data/org.apache.skywalking.e2e.ProfileVerificationITCase.profileAnayzation.yml b/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/resources/expected-data/org.apache.skywalking.e2e.ProfileVerificationITCase.profileAnayzation.yml index 539754648c93..741ac9cc0023 100644 --- a/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/resources/expected-data/org.apache.skywalking.e2e.ProfileVerificationITCase.profileAnayzation.yml +++ b/test/e2e/e2e-profile/e2e-profile-test-runner/src/main/resources/expected-data/org.apache.skywalking.e2e.ProfileVerificationITCase.profileAnayzation.yml @@ -95,7 +95,7 @@ elements: count: gt 0 - id: 14 parentId: 13 - codeSignature: org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstMethodsInter.intercept:93 + codeSignature: org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstMethodsInter.intercept:86 duration: gt 0 durationChildExcluded: 0 count: gt 0 diff --git a/test/e2e/e2e-profile/e2e-profile-test-runner/src/test/java/org/apache/skywalking/e2e/ProfileVerificationITCase.java b/test/e2e/e2e-profile/e2e-profile-test-runner/src/test/java/org/apache/skywalking/e2e/ProfileVerificationITCase.java index 2cb07666ab8f..cfba209f0c4a 100644 --- a/test/e2e/e2e-profile/e2e-profile-test-runner/src/test/java/org/apache/skywalking/e2e/ProfileVerificationITCase.java +++ b/test/e2e/e2e-profile/e2e-profile-test-runner/src/test/java/org/apache/skywalking/e2e/ProfileVerificationITCase.java @@ -18,11 +18,23 @@ package org.apache.skywalking.e2e; +import java.io.IOException; +import java.io.InputStream; +import java.time.LocalDateTime; +import java.time.ZoneOffset; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; import org.apache.skywalking.e2e.profile.ProfileClient; import org.apache.skywalking.e2e.profile.creation.ProfileTaskCreationRequest; import org.apache.skywalking.e2e.profile.creation.ProfileTaskCreationResult; import org.apache.skywalking.e2e.profile.creation.ProfileTaskCreationResultMatcher; -import org.apache.skywalking.e2e.profile.query.*; +import org.apache.skywalking.e2e.profile.query.ProfileAnalyzation; +import org.apache.skywalking.e2e.profile.query.ProfileStackTreeMatcher; +import org.apache.skywalking.e2e.profile.query.ProfileTaskQuery; +import org.apache.skywalking.e2e.profile.query.ProfileTasks; +import org.apache.skywalking.e2e.profile.query.ProfilesTasksMatcher; import org.apache.skywalking.e2e.service.Service; import org.apache.skywalking.e2e.service.ServicesMatcher; import org.apache.skywalking.e2e.service.ServicesQuery; @@ -48,20 +60,8 @@ import org.springframework.web.client.RestTemplate; import org.yaml.snakeyaml.Yaml; -import java.io.IOException; -import java.io.InputStream; -import java.time.LocalDateTime; -import java.time.ZoneOffset; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.TimeUnit; - import static org.assertj.core.api.Assertions.assertThat; -/** - * @author Mrpro - */ @RunWith(SpringJUnit4ClassRunner.class) public class ProfileVerificationITCase { private static final Logger LOGGER = LoggerFactory.getLogger(ProfileVerificationITCase.class); @@ -93,11 +93,7 @@ public void verify() throws Exception { LOGGER.info("responseEntity: {}", responseEntity); assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); final List traces = profileClient.traces( - new TracesQuery() - .start(minutesAgo) - .end(LocalDateTime.now()) - .orderByDuration() - ); + new TracesQuery().start(minutesAgo).end(LocalDateTime.now()).orderByDuration()); LOGGER.info("query traces: {}", traces); if (!traces.isEmpty()) { break; @@ -124,15 +120,12 @@ private ResponseEntity sendRequest(boolean needProfiling) { final Map user = new HashMap<>(); user.put("name", "SkyWalking"); user.put("enableProfiling", String.valueOf(needProfiling)); - return restTemplate.postForEntity( - instrumentedServiceUrl + "/e2e/users", - user, - String.class - ); + return restTemplate.postForEntity(instrumentedServiceUrl + "/e2e/users", user, String.class); } /** * verify create profile task + * * @param minutesAgo * @throws Exception */ @@ -140,13 +133,14 @@ private void verifyCreateProfileTask(LocalDateTime minutesAgo) throws Exception final LocalDateTime now = LocalDateTime.now(ZoneOffset.UTC); final ProfileTaskCreationRequest creationRequest = ProfileTaskCreationRequest.builder() - .serviceId(2) - .endpointName("/e2e/users") - .duration(1) - .startTime(-1) - .minDurationThreshold(1500) - .dumpPeriod(500) - .maxSamplingCount(5).build(); + .serviceId(2) + .endpointName("/e2e/users") + .duration(1) + .startTime(-1) + .minDurationThreshold(1500) + .dumpPeriod(500) + .maxSamplingCount(5) + .build(); // verify create task final ProfileTaskCreationResult creationResult = profileClient.createProfileTask(creationRequest); @@ -156,13 +150,19 @@ private void verifyCreateProfileTask(LocalDateTime minutesAgo) throws Exception creationResultMatcher.verify(creationResult); // verify get task list and sniffer get task logs - verifyProfileTask(creationRequest.getServiceId(), "expected-data/org.apache.skywalking.e2e.ProfileVerificationITCase.profileTasks.notified.yml"); + verifyProfileTask( + creationRequest.getServiceId(), + "expected-data/org.apache.skywalking.e2e.ProfileVerificationITCase.profileTasks.notified.yml" + ); // send a profile request sendRequest(true); // verify task execution finish - verifyProfileTask(creationRequest.getServiceId(), "expected-data/org.apache.skywalking.e2e.ProfileVerificationITCase.profileTasks.finished.yml"); + verifyProfileTask( + creationRequest.getServiceId(), + "expected-data/org.apache.skywalking.e2e.ProfileVerificationITCase.profileTasks.finished.yml" + ); // verify profiled segment verifyProfiledSegment(creationResult.getId()); @@ -176,7 +176,8 @@ private void verifyProfiledSegment(String taskId) throws InterruptedException, I List traces = profileClient.getProfiledTraces(taskId); LOGGER.info("get profiled segemnt list: {}", traces); - InputStream expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.ProfileVerificationITCase.profileSegments.yml").getInputStream(); + InputStream expectedInputStream = new ClassPathResource( + "expected-data/org.apache.skywalking.e2e.ProfileVerificationITCase.profileSegments.yml").getInputStream(); final TracesMatcher tracesMatcher = new Yaml().loadAs(expectedInputStream, TracesMatcher.class); tracesMatcher.verifyLoosely(traces); foundedTrace = traces.get(0); @@ -195,11 +196,12 @@ private void verifyProfiledSegment(String taskId) throws InterruptedException, I long end = start + foundedTrace.getDuration(); ProfileAnalyzation analyzation = profileClient.getProfileAnalyzation(segmentId, start, end); LOGGER.info("get profile analyzation : {}", analyzation); - InputStream expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.ProfileVerificationITCase.profileAnayzation.yml").getInputStream(); - final ProfileStackTreeMatcher servicesMatcher = new Yaml().loadAs(expectedInputStream, ProfileStackTreeMatcher.class); + InputStream expectedInputStream = new ClassPathResource( + "expected-data/org.apache.skywalking.e2e.ProfileVerificationITCase.profileAnayzation.yml").getInputStream(); + final ProfileStackTreeMatcher servicesMatcher = new Yaml().loadAs( + expectedInputStream, ProfileStackTreeMatcher.class); servicesMatcher.verify(analyzation.getData().getTrees().get(0)); - } private void verifyProfileTask(int serviceId, String verifyResources) throws InterruptedException { @@ -207,16 +209,13 @@ private void verifyProfileTask(int serviceId, String verifyResources) throws Int for (int i = 0; i < 10; i++) { try { final ProfileTasks tasks = profileClient.getProfileTaskList( - new ProfileTaskQuery() - .serviceId(serviceId) - .endpointName("") - ); + new ProfileTaskQuery().serviceId(serviceId).endpointName("")); LOGGER.info("get profile task list: {}", tasks); - InputStream expectedInputStream = - new ClassPathResource(verifyResources).getInputStream(); + InputStream expectedInputStream = new ClassPathResource(verifyResources).getInputStream(); - final ProfilesTasksMatcher servicesMatcher = new Yaml().loadAs(expectedInputStream, ProfilesTasksMatcher.class); + final ProfilesTasksMatcher servicesMatcher = new Yaml().loadAs( + expectedInputStream, ProfilesTasksMatcher.class); servicesMatcher.verify(tasks); break; } catch (Throwable e) { @@ -232,15 +231,11 @@ private void verifyProfileTask(int serviceId, String verifyResources) throws Int private void verifyServices(LocalDateTime minutesAgo) throws Exception { final LocalDateTime now = LocalDateTime.now(ZoneOffset.UTC); - final List services = profileClient.services( - new ServicesQuery() - .start(minutesAgo) - .end(now) - ); + final List services = profileClient.services(new ServicesQuery().start(minutesAgo).end(now)); LOGGER.info("services: {}", services); - InputStream expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.ProfileVerificationITCase.services.yml").getInputStream(); + InputStream expectedInputStream = new ClassPathResource( + "expected-data/org.apache.skywalking.e2e.ProfileVerificationITCase.services.yml").getInputStream(); final ServicesMatcher servicesMatcher = new Yaml().loadAs(expectedInputStream, ServicesMatcher.class); servicesMatcher.verify(services); @@ -255,31 +250,27 @@ private void verifyServices(LocalDateTime minutesAgo) throws Exception { } } - private Instances verifyServiceInstances(LocalDateTime minutesAgo, LocalDateTime now, + private Instances verifyServiceInstances(LocalDateTime minutesAgo, + LocalDateTime now, Service service) throws Exception { InputStream expectedInputStream; Instances instances = profileClient.instances( - new InstancesQuery() - .serviceId(service.getKey()) - .start(minutesAgo) - .end(now) - ); + new InstancesQuery().serviceId(service.getKey()).start(minutesAgo).end(now)); LOGGER.info("instances: {}", instances); - expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.ProfileVerificationITCase.instances.yml").getInputStream(); + expectedInputStream = new ClassPathResource( + "expected-data/org.apache.skywalking.e2e.ProfileVerificationITCase.instances.yml").getInputStream(); final InstancesMatcher instancesMatcher = new Yaml().loadAs(expectedInputStream, InstancesMatcher.class); instancesMatcher.verify(instances); return instances; } - private Endpoints verifyServiceEndpoints(LocalDateTime minutesAgo, LocalDateTime now, + private Endpoints verifyServiceEndpoints(LocalDateTime minutesAgo, + LocalDateTime now, Service service) throws Exception { - Endpoints instances = profileClient.endpoints( - new EndpointQuery().serviceId(service.getKey()) - ); + Endpoints instances = profileClient.endpoints(new EndpointQuery().serviceId(service.getKey())); LOGGER.info("instances: {}", instances); - InputStream expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.ProfileVerificationITCase.endpoints.yml").getInputStream(); + InputStream expectedInputStream = new ClassPathResource( + "expected-data/org.apache.skywalking.e2e.ProfileVerificationITCase.endpoints.yml").getInputStream(); final EndpointsMatcher endpointsMatcher = new Yaml().loadAs(expectedInputStream, EndpointsMatcher.class); endpointsMatcher.verify(instances); return instances; diff --git a/test/e2e/e2e-protocol/src/main/proto b/test/e2e/e2e-protocol/src/main/proto index a2aaec537073..eebd016e32b0 160000 --- a/test/e2e/e2e-protocol/src/main/proto +++ b/test/e2e/e2e-protocol/src/main/proto @@ -1 +1 @@ -Subproject commit a2aaec537073cd22ac62cec1b41d03ae9cf11124 +Subproject commit eebd016e32b0808416923acf04dcd31d9eb86c09 diff --git a/test/e2e/e2e-single-service/src/main/java/org/apache/skywalking/e2e/sample/client/SampleClientApplication.java b/test/e2e/e2e-single-service/src/main/java/org/apache/skywalking/e2e/sample/client/SampleClientApplication.java index a55dbd685769..67ba54eedfd4 100644 --- a/test/e2e/e2e-single-service/src/main/java/org/apache/skywalking/e2e/sample/client/SampleClientApplication.java +++ b/test/e2e/e2e-single-service/src/main/java/org/apache/skywalking/e2e/sample/client/SampleClientApplication.java @@ -22,9 +22,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; -/** - * @author kezhenxu94 - */ @EnableJpaRepositories @SpringBootApplication public class SampleClientApplication { diff --git a/test/e2e/e2e-single-service/src/main/java/org/apache/skywalking/e2e/sample/client/TestController.java b/test/e2e/e2e-single-service/src/main/java/org/apache/skywalking/e2e/sample/client/TestController.java index 566bcdea4aa9..1a344ab45c45 100644 --- a/test/e2e/e2e-single-service/src/main/java/org/apache/skywalking/e2e/sample/client/TestController.java +++ b/test/e2e/e2e-single-service/src/main/java/org/apache/skywalking/e2e/sample/client/TestController.java @@ -24,9 +24,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -/** - * @author kezhenxu94 - */ @RestController @RequestMapping("/e2e") public class TestController { diff --git a/test/e2e/e2e-single-service/src/main/java/org/apache/skywalking/e2e/sample/client/User.java b/test/e2e/e2e-single-service/src/main/java/org/apache/skywalking/e2e/sample/client/User.java index 4589c7f2c424..3b6c317440de 100644 --- a/test/e2e/e2e-single-service/src/main/java/org/apache/skywalking/e2e/sample/client/User.java +++ b/test/e2e/e2e-single-service/src/main/java/org/apache/skywalking/e2e/sample/client/User.java @@ -23,9 +23,6 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; -/** - * @author kezhenxu94 - */ @Entity public class User { public User() { diff --git a/test/e2e/e2e-single-service/src/main/java/org/apache/skywalking/e2e/sample/client/UserRepo.java b/test/e2e/e2e-single-service/src/main/java/org/apache/skywalking/e2e/sample/client/UserRepo.java index 882af92a8211..2ee38a60dd3c 100644 --- a/test/e2e/e2e-single-service/src/main/java/org/apache/skywalking/e2e/sample/client/UserRepo.java +++ b/test/e2e/e2e-single-service/src/main/java/org/apache/skywalking/e2e/sample/client/UserRepo.java @@ -20,8 +20,5 @@ import org.springframework.data.jpa.repository.JpaRepository; -/** - * @author kezhenxu94 - */ public interface UserRepo extends JpaRepository { } diff --git a/test/e2e/e2e-single-service/src/test/java/org/apache/skywalking/e2e/SampleVerificationITCase.java b/test/e2e/e2e-single-service/src/test/java/org/apache/skywalking/e2e/SampleVerificationITCase.java index 95a5719c6593..0d290bd0a433 100644 --- a/test/e2e/e2e-single-service/src/test/java/org/apache/skywalking/e2e/SampleVerificationITCase.java +++ b/test/e2e/e2e-single-service/src/test/java/org/apache/skywalking/e2e/SampleVerificationITCase.java @@ -18,6 +18,12 @@ package org.apache.skywalking.e2e; +import java.io.InputStream; +import java.time.LocalDateTime; +import java.time.ZoneOffset; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import org.apache.skywalking.e2e.metrics.AtLeastOneOfMetricsMatcher; import org.apache.skywalking.e2e.metrics.Metrics; import org.apache.skywalking.e2e.metrics.MetricsQuery; @@ -33,7 +39,13 @@ import org.apache.skywalking.e2e.service.instance.Instances; import org.apache.skywalking.e2e.service.instance.InstancesMatcher; import org.apache.skywalking.e2e.service.instance.InstancesQuery; -import org.apache.skywalking.e2e.topo.*; +import org.apache.skywalking.e2e.topo.Call; +import org.apache.skywalking.e2e.topo.ServiceInstanceTopoData; +import org.apache.skywalking.e2e.topo.ServiceInstanceTopoMatcher; +import org.apache.skywalking.e2e.topo.ServiceInstanceTopoQuery; +import org.apache.skywalking.e2e.topo.TopoData; +import org.apache.skywalking.e2e.topo.TopoMatcher; +import org.apache.skywalking.e2e.topo.TopoQuery; import org.apache.skywalking.e2e.trace.Trace; import org.apache.skywalking.e2e.trace.TracesMatcher; import org.apache.skywalking.e2e.trace.TracesQuery; @@ -50,20 +62,16 @@ import org.springframework.web.client.RestTemplate; import org.yaml.snakeyaml.Yaml; -import java.io.InputStream; -import java.time.LocalDateTime; -import java.time.ZoneOffset; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import static org.apache.skywalking.e2e.metrics.MetricsMatcher.verifyMetrics; -import static org.apache.skywalking.e2e.metrics.MetricsQuery.*; +import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_ENDPOINT_METRICS; +import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_INSTANCE_METRICS; +import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_SERVICE_INSTANCE_RELATION_CLIENT_METRICS; +import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_SERVICE_INSTANCE_RELATION_SERVER_METRICS; +import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_SERVICE_METRICS; +import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_SERVICE_RELATION_CLIENT_METRICS; +import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_SERVICE_RELATION_SERVER_METRICS; import static org.assertj.core.api.Assertions.assertThat; -/** - * @author kezhenxu94 - */ @RunWith(SpringJUnit4ClassRunner.class) public class SampleVerificationITCase { private static final Logger LOGGER = LoggerFactory.getLogger(SampleVerificationITCase.class); @@ -93,19 +101,12 @@ public void verify() throws Exception { try { final Map user = new HashMap<>(); user.put("name", "SkyWalking"); - final ResponseEntity responseEntity = restTemplate.postForEntity( - instrumentedServiceUrl + "/e2e/users", - user, - String.class - ); + final ResponseEntity responseEntity = restTemplate.postForEntity(instrumentedServiceUrl + "/e2e/users", user, String.class); LOGGER.info("responseEntity: {}", responseEntity); assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); - final List traces = queryClient.traces( - new TracesQuery() - .start(minutesAgo) - .end(LocalDateTime.now()) - .orderByDuration() - ); + final List traces = queryClient.traces(new TracesQuery().start(minutesAgo) + .end(LocalDateTime.now()) + .orderByDuration()); if (!traces.isEmpty()) { break; } @@ -139,9 +140,9 @@ public void verify() throws Exception { }); doRetryableVerification(() -> { - try{ + try { verifyServiceInstanceTopo(minutesAgo); - }catch (Exception e) { + } catch (Exception e) { LOGGER.warn(e.getMessage(), e); } }); @@ -150,16 +151,13 @@ public void verify() throws Exception { private void verifyTopo(LocalDateTime minutesAgo) throws Exception { final LocalDateTime now = LocalDateTime.now(ZoneOffset.UTC); - final TopoData topoData = queryClient.topo( - new TopoQuery() - .stepByMinute() - .start(minutesAgo.minusDays(1)) - .end(now) - ); + final TopoData topoData = queryClient.topo(new TopoQuery().stepByMinute() + .start(minutesAgo.minusDays(1)) + .end(now)); LOGGER.info("topoData: {}", topoData); - InputStream expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.topo.yml").getInputStream(); + InputStream expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.topo.yml") + .getInputStream(); final TopoMatcher topoMatcher = new Yaml().loadAs(expectedInputStream, TopoMatcher.class); topoMatcher.verify(topoData); @@ -169,18 +167,16 @@ private void verifyTopo(LocalDateTime minutesAgo) throws Exception { private void verifyServiceInstanceTopo(LocalDateTime minutesAgo) throws Exception { final LocalDateTime now = LocalDateTime.now(ZoneOffset.UTC); - final ServiceInstanceTopoData topoData = queryClient.serviceInstanceTopo( - new ServiceInstanceTopoQuery() - .stepByMinute() - .start(minutesAgo.minusDays(1)) - .end(now) - .clientServiceId("1") - .serverServiceId("2") - ); + final ServiceInstanceTopoData topoData = queryClient.serviceInstanceTopo(new ServiceInstanceTopoQuery().stepByMinute() + .start(minutesAgo + .minusDays(1)) + .end(now) + .clientServiceId("1") + .serverServiceId("2")); LOGGER.info("instanceTopoData: {}", topoData); - InputStream expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.serviceInstanceTopo.yml").getInputStream(); + InputStream expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.serviceInstanceTopo.yml") + .getInputStream(); final ServiceInstanceTopoMatcher topoMatcher = new Yaml().loadAs(expectedInputStream, ServiceInstanceTopoMatcher.class); topoMatcher.verify(topoData); @@ -190,15 +186,11 @@ private void verifyServiceInstanceTopo(LocalDateTime minutesAgo) throws Exceptio private void verifyServices(LocalDateTime minutesAgo) throws Exception { final LocalDateTime now = LocalDateTime.now(ZoneOffset.UTC); - final List services = queryClient.services( - new ServicesQuery() - .start(minutesAgo) - .end(now) - ); + final List services = queryClient.services(new ServicesQuery().start(minutesAgo).end(now)); LOGGER.info("services: {}", services); - InputStream expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.services.yml").getInputStream(); + InputStream expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.services.yml") + .getInputStream(); final ServicesMatcher servicesMatcher = new Yaml().loadAs(expectedInputStream, ServicesMatcher.class); servicesMatcher.verify(services); @@ -221,15 +213,12 @@ private void verifyServices(LocalDateTime minutesAgo) throws Exception { private Instances verifyServiceInstances(LocalDateTime minutesAgo, LocalDateTime now, Service service) throws Exception { InputStream expectedInputStream; - Instances instances = queryClient.instances( - new InstancesQuery() - .serviceId(service.getKey()) - .start(minutesAgo) - .end(now) - ); + Instances instances = queryClient.instances(new InstancesQuery().serviceId(service.getKey()) + .start(minutesAgo) + .end(now)); LOGGER.info("instances: {}", instances); - expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.instances.yml").getInputStream(); + expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.instances.yml") + .getInputStream(); final InstancesMatcher instancesMatcher = new Yaml().loadAs(expectedInputStream, InstancesMatcher.class); instancesMatcher.verify(instances); return instances; @@ -237,12 +226,10 @@ private Instances verifyServiceInstances(LocalDateTime minutesAgo, LocalDateTime private Endpoints verifyServiceEndpoints(LocalDateTime minutesAgo, LocalDateTime now, Service service) throws Exception { - Endpoints instances = queryClient.endpoints( - new EndpointQuery().serviceId(service.getKey()) - ); + Endpoints instances = queryClient.endpoints(new EndpointQuery().serviceId(service.getKey())); LOGGER.info("instances: {}", instances); - InputStream expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.endpoints.yml").getInputStream(); + InputStream expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.endpoints.yml") + .getInputStream(); final EndpointsMatcher endpointsMatcher = new Yaml().loadAs(expectedInputStream, EndpointsMatcher.class); endpointsMatcher.verify(instances); return instances; @@ -252,12 +239,9 @@ private void verifyInstancesMetrics(Instances instances) throws Exception { for (Instance instance : instances.getInstances()) { for (String metricsName : ALL_INSTANCE_METRICS) { LOGGER.info("verifying service instance response time: {}", instance); - final Metrics instanceMetrics = queryClient.metrics( - new MetricsQuery() - .stepByMinute() - .metricsName(metricsName) - .id(instance.getKey()) - ); + final Metrics instanceMetrics = queryClient.metrics(new MetricsQuery().stepByMinute() + .metricsName(metricsName) + .id(instance.getKey())); LOGGER.info("instanceMetrics: {}", instanceMetrics); AtLeastOneOfMetricsMatcher instanceRespTimeMatcher = new AtLeastOneOfMetricsMatcher(); MetricsValueMatcher greaterThanZero = new MetricsValueMatcher(); @@ -276,12 +260,9 @@ private void verifyEndpointsMetrics(Endpoints endpoints) throws Exception { } for (String metricName : ALL_ENDPOINT_METRICS) { LOGGER.info("verifying endpoint {}, metrics: {}", endpoint, metricName); - final Metrics metrics = queryClient.metrics( - new MetricsQuery() - .stepByMinute() - .metricsName(metricName) - .id(endpoint.getKey()) - ); + final Metrics metrics = queryClient.metrics(new MetricsQuery().stepByMinute() + .metricsName(metricName) + .id(endpoint.getKey())); LOGGER.info("metrics: {}", metrics); AtLeastOneOfMetricsMatcher instanceRespTimeMatcher = new AtLeastOneOfMetricsMatcher(); MetricsValueMatcher greaterThanZero = new MetricsValueMatcher(); @@ -296,12 +277,9 @@ private void verifyEndpointsMetrics(Endpoints endpoints) throws Exception { private void verifyServiceMetrics(Service service) throws Exception { for (String metricName : ALL_SERVICE_METRICS) { LOGGER.info("verifying service {}, metrics: {}", service, metricName); - final Metrics serviceMetrics = queryClient.metrics( - new MetricsQuery() - .stepByMinute() - .metricsName(metricName) - .id(service.getKey()) - ); + final Metrics serviceMetrics = queryClient.metrics(new MetricsQuery().stepByMinute() + .metricsName(metricName) + .id(service.getKey())); LOGGER.info("serviceMetrics: {}", serviceMetrics); AtLeastOneOfMetricsMatcher instanceRespTimeMatcher = new AtLeastOneOfMetricsMatcher(); MetricsValueMatcher greaterThanZero = new MetricsValueMatcher(); @@ -315,22 +293,18 @@ private void verifyServiceMetrics(Service service) throws Exception { private void verifyTraces(LocalDateTime minutesAgo) throws Exception { final LocalDateTime now = LocalDateTime.now(ZoneOffset.UTC); - final List traces = queryClient.traces( - new TracesQuery() - .start(minutesAgo) - .end(now) - .orderByDuration() - ); + final List traces = queryClient.traces(new TracesQuery().start(minutesAgo).end(now).orderByDuration()); LOGGER.info("traces: {}", traces); - InputStream expectedInputStream = - new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.traces.yml").getInputStream(); + InputStream expectedInputStream = new ClassPathResource("expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.traces.yml") + .getInputStream(); final TracesMatcher tracesMatcher = new Yaml().loadAs(expectedInputStream, TracesMatcher.class); tracesMatcher.verifyLoosely(traces); } - private void verifyServiceInstanceRelationMetrics(List calls, final LocalDateTime minutesAgo) throws Exception { + private void verifyServiceInstanceRelationMetrics(List calls, + final LocalDateTime minutesAgo) throws Exception { verifyRelationMetrics(calls, minutesAgo, ALL_SERVICE_INSTANCE_RELATION_CLIENT_METRICS, ALL_SERVICE_INSTANCE_RELATION_SERVER_METRICS); } @@ -338,7 +312,8 @@ private void verifyServiceRelationMetrics(List calls, final LocalDateTime verifyRelationMetrics(calls, minutesAgo, ALL_SERVICE_RELATION_CLIENT_METRICS, ALL_SERVICE_RELATION_SERVER_METRICS); } - private void verifyRelationMetrics(List calls, final LocalDateTime minutesAgo, String[] relationClientMetrics, String[] relationServerMetrics) throws Exception { + private void verifyRelationMetrics(List calls, final LocalDateTime minutesAgo, String[] relationClientMetrics, + String[] relationServerMetrics) throws Exception { for (Call call : calls) { for (String detectPoint : call.getDetectPoints()) { switch (detectPoint) { diff --git a/test/e2e/e2e-ttl/e2e-ttl-es/pom.xml b/test/e2e/e2e-ttl/e2e-ttl-es/pom.xml index 6b7765d416d1..bee43a7bc362 100644 --- a/test/e2e/e2e-ttl/e2e-ttl-es/pom.xml +++ b/test/e2e/e2e-ttl/e2e-ttl-es/pom.xml @@ -105,7 +105,9 @@ ${sw.home}:/sw ${project.basedir}/src/docker/rc.d:/rc.d:ro ${project.basedir}/src/docker/es_storage.awk:/es_storage.awk - ${project.basedir}/src/docker/ttl_official_analysis.oal:/ttl_official_analysis.oal + + ${project.basedir}/src/docker/ttl_official_analysis.oal:/ttl_official_analysis.oal + diff --git a/test/e2e/e2e-ttl/e2e-ttl-es/src/test/java/org/apache/skywalking/e2e/StorageTTLITCase.java b/test/e2e/e2e-ttl/e2e-ttl-es/src/test/java/org/apache/skywalking/e2e/StorageTTLITCase.java index 4901ccc7f1ce..85b196e5ed0a 100644 --- a/test/e2e/e2e-ttl/e2e-ttl-es/src/test/java/org/apache/skywalking/e2e/StorageTTLITCase.java +++ b/test/e2e/e2e-ttl/e2e-ttl-es/src/test/java/org/apache/skywalking/e2e/StorageTTLITCase.java @@ -22,6 +22,10 @@ import io.grpc.internal.DnsNameResolverProvider; import io.grpc.netty.NettyChannelBuilder; import io.grpc.stub.StreamObserver; +import java.time.LocalDateTime; +import java.time.ZoneOffset; +import java.util.List; +import java.util.concurrent.CountDownLatch; import lombok.extern.slf4j.Slf4j; import org.apache.skywalking.apm.network.common.DetectPoint; import org.apache.skywalking.apm.network.servicemesh.MeshProbeDownstream; @@ -38,17 +42,9 @@ import org.junit.Before; import org.junit.Test; -import java.time.LocalDateTime; -import java.time.ZoneOffset; -import java.util.List; -import java.util.concurrent.CountDownLatch; - import static org.apache.skywalking.e2e.metrics.MetricsQuery.SERVICE_RESP_TIME; import static org.assertj.core.api.Assertions.assertThat; -/** - * @author kezhenxu94 - */ @Slf4j public class StorageTTLITCase { @@ -73,11 +69,10 @@ public void setUp() { final String oapPort = System.getProperty("oap.port", "32788"); queryClient = new SimpleQueryClient(swWebappHost, swWebappPort); - final ManagedChannelBuilder builder = - NettyChannelBuilder.forAddress("127.0.0.1", Integer.parseInt(oapPort)) - .nameResolverFactory(new DnsNameResolverProvider()) - .maxInboundMessageSize(MAX_INBOUND_MESSAGE_SIZE) - .usePlaintext(USE_PLAIN_TEXT); + final ManagedChannelBuilder builder = NettyChannelBuilder.forAddress("127.0.0.1", Integer.parseInt(oapPort)) + .nameResolverFactory(new DnsNameResolverProvider()) + .maxInboundMessageSize(MAX_INBOUND_MESSAGE_SIZE) + .usePlaintext(USE_PLAIN_TEXT); final ManagedChannel channel = builder.build(); @@ -87,18 +82,17 @@ public void setUp() { @Test(timeout = 360000) public void dayMetricsDataShouldBeRemovedAfterTTL() throws Exception { - final ServiceMeshMetric.Builder builder = ServiceMeshMetric - .newBuilder() - .setSourceServiceName("e2e-test-source-service") - .setSourceServiceInstance("e2e-test-source-service-instance") - .setDestServiceName("e2e-test-dest-service") - .setDestServiceInstance("e2e-test-dest-service-instance") - .setEndpoint("e2e/test") - .setLatency(2000) - .setResponseCode(200) - .setStatus(SUCCESS) - .setProtocol(Protocol.HTTP) - .setDetectPoint(DetectPoint.server); + final ServiceMeshMetric.Builder builder = ServiceMeshMetric.newBuilder() + .setSourceServiceName("e2e-test-source-service") + .setSourceServiceInstance("e2e-test-source-service-instance") + .setDestServiceName("e2e-test-dest-service") + .setDestServiceInstance("e2e-test-dest-service-instance") + .setEndpoint("e2e/test") + .setLatency(2000) + .setResponseCode(200) + .setStatus(SUCCESS) + .setProtocol(Protocol.HTTP) + .setDetectPoint(DetectPoint.server); final LocalDateTime now = LocalDateTime.now(); final LocalDateTime startTime = now.minusDays(SW_STORAGE_ES_OTHER_METRIC_DATA_TTL + 1); @@ -107,14 +101,7 @@ public void dayMetricsDataShouldBeRemovedAfterTTL() throws Exception { final LocalDateTime queryStart = startTime; final LocalDateTime queryEnd = now.minusDays(SW_STORAGE_ES_OTHER_METRIC_DATA_TTL); - ensureSendingMetricsWorks( - builder, - startTime.toEpochSecond(ZoneOffset.UTC) * 1000, - endTime.toEpochSecond(ZoneOffset.UTC) * 1000, - queryStart, - queryEnd, - "DAY" - ); + ensureSendingMetricsWorks(builder, startTime.toEpochSecond(ZoneOffset.UTC) * 1000, endTime.toEpochSecond(ZoneOffset.UTC) * 1000, queryStart, queryEnd, "DAY"); shouldBeEmptyBetweenTimeRange(queryStart, queryEnd, "DAY"); } @@ -122,18 +109,17 @@ public void dayMetricsDataShouldBeRemovedAfterTTL() throws Exception { @Test(timeout = 360000) public void monthMetricsDataShouldBeRemovedAfterTTL() throws Exception { - final ServiceMeshMetric.Builder builder = ServiceMeshMetric - .newBuilder() - .setSourceServiceName("e2e-test-source-service") - .setSourceServiceInstance("e2e-test-source-service-instance") - .setDestServiceName("e2e-test-dest-service") - .setDestServiceInstance("e2e-test-dest-service-instance") - .setEndpoint("e2e/test") - .setLatency(2000) - .setResponseCode(200) - .setStatus(SUCCESS) - .setProtocol(Protocol.HTTP) - .setDetectPoint(DetectPoint.server); + final ServiceMeshMetric.Builder builder = ServiceMeshMetric.newBuilder() + .setSourceServiceName("e2e-test-source-service") + .setSourceServiceInstance("e2e-test-source-service-instance") + .setDestServiceName("e2e-test-dest-service") + .setDestServiceInstance("e2e-test-dest-service-instance") + .setEndpoint("e2e/test") + .setLatency(2000) + .setResponseCode(200) + .setStatus(SUCCESS) + .setProtocol(Protocol.HTTP) + .setDetectPoint(DetectPoint.server); final LocalDateTime now = LocalDateTime.now(); final LocalDateTime startTime = now.minusMonths(SW_STORAGE_ES_MONTH_METRIC_DATA_TTL + 1); @@ -142,23 +128,13 @@ public void monthMetricsDataShouldBeRemovedAfterTTL() throws Exception { final LocalDateTime queryStart = startTime; final LocalDateTime queryEnd = now.minusMonths(SW_STORAGE_ES_MONTH_METRIC_DATA_TTL); - ensureSendingMetricsWorks( - builder, - startTime.toEpochSecond(ZoneOffset.UTC) * 1000, - endTime.toEpochSecond(ZoneOffset.UTC) * 1000, - queryStart, - queryEnd, - "MONTH" - ); + ensureSendingMetricsWorks(builder, startTime.toEpochSecond(ZoneOffset.UTC) * 1000, endTime.toEpochSecond(ZoneOffset.UTC) * 1000, queryStart, queryEnd, "MONTH"); shouldBeEmptyBetweenTimeRange(queryStart, queryEnd, "MONTH"); } - private void shouldBeEmptyBetweenTimeRange( - final LocalDateTime queryStart, - final LocalDateTime queryEnd, - final String step - ) throws InterruptedException { + private void shouldBeEmptyBetweenTimeRange(final LocalDateTime queryStart, final LocalDateTime queryEnd, + final String step) throws InterruptedException { boolean valid = false; for (int i = 0; i < 10 && !valid; i++) { @@ -185,22 +161,12 @@ private void shouldBeEmptyBetweenTimeRange( } } - private void ensureSendingMetricsWorks( - final ServiceMeshMetric.Builder builder, - final long startTime, - final long endTime, - final LocalDateTime queryStart, - final LocalDateTime queryEnd, - final String step - ) throws Exception { + private void ensureSendingMetricsWorks(final ServiceMeshMetric.Builder builder, final long startTime, + final long endTime, final LocalDateTime queryStart, final LocalDateTime queryEnd, + final String step) throws Exception { boolean prepared = false; while (!prepared) { - sendMetrics( - builder - .setStartTime(startTime) - .setEndTime(endTime) - .build() - ); + sendMetrics(builder.setStartTime(startTime).setEndTime(endTime).build()); final Metrics serviceMetrics = queryMetrics(queryStart, queryEnd, step); final AtLeastOneOfMetricsMatcher instanceRespTimeMatcher = new AtLeastOneOfMetricsMatcher(); final MetricsValueMatcher greaterThanZero = new MetricsValueMatcher(); @@ -210,44 +176,35 @@ private void ensureSendingMetricsWorks( instanceRespTimeMatcher.verify(serviceMetrics); prepared = true; } catch (Throwable ignored) { - sendMetrics( - builder - .setStartTime(startTime) - .setEndTime(endTime) - .build() - ); + sendMetrics(builder.setStartTime(startTime).setEndTime(endTime).build()); Thread.sleep(10000); } } } - private Metrics queryMetrics( - final LocalDateTime queryStart, - final LocalDateTime queryEnd, - final String step - ) throws Exception { + private Metrics queryMetrics(final LocalDateTime queryStart, final LocalDateTime queryEnd, + final String step) throws Exception { for (int i = 0; i < 10; i++) { try { - final List services = queryClient.services( - new ServicesQuery() - .start(LocalDateTime.now().minusDays(SW_STORAGE_ES_OTHER_METRIC_DATA_TTL)) - .end(LocalDateTime.now()) - ); + final List services = queryClient.services(new ServicesQuery().start(LocalDateTime.now() + .minusDays(SW_STORAGE_ES_OTHER_METRIC_DATA_TTL)) + .end(LocalDateTime.now())); log.info("Services: {}", services); assertThat(services).isNotEmpty(); - String serviceId = services.stream().filter(it -> "e2e-test-dest-service".equals(it.getLabel())).findFirst().get().getKey(); - - return queryClient.metrics( - new MetricsQuery() - .id(serviceId) - .metricsName(SERVICE_RESP_TIME) - .step(step) - .start(queryStart) - .end(queryEnd) - ); + String serviceId = services.stream() + .filter(it -> "e2e-test-dest-service".equals(it.getLabel())) + .findFirst() + .get() + .getKey(); + + return queryClient.metrics(new MetricsQuery().id(serviceId) + .metricsName(SERVICE_RESP_TIME) + .step(step) + .start(queryStart) + .end(queryEnd)); } catch (Throwable ignored) { Thread.sleep(10000); } diff --git a/test/plugin/archetypes/jvm/src/main/resources/META-INF/maven/archetype-metadata.xml b/test/plugin/archetypes/jvm/src/main/resources/META-INF/maven/archetype-metadata.xml index 9c42558a7271..a0f95aa2656b 100644 --- a/test/plugin/archetypes/jvm/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/test/plugin/archetypes/jvm/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -17,11 +17,11 @@ ~ --> + xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + name="archetype"> @@ -37,7 +37,7 @@ org.apache.skywalking.apm.testcase.${scenario_name} - + ${scenario_name} diff --git a/test/plugin/archetypes/jvm/src/main/resources/archetype-resources/src/main/assembly/assembly.xml b/test/plugin/archetypes/jvm/src/main/resources/archetype-resources/src/main/assembly/assembly.xml index 5431e8248029..b7c92c1419ef 100644 --- a/test/plugin/archetypes/jvm/src/main/resources/archetype-resources/src/main/assembly/assembly.xml +++ b/test/plugin/archetypes/jvm/src/main/resources/archetype-resources/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/archetypes/jvm/src/main/resources/archetype-resources/src/main/java/Application.java b/test/plugin/archetypes/jvm/src/main/resources/archetype-resources/src/main/java/Application.java index 3e144e961c83..baa8fc4eacc4 100644 --- a/test/plugin/archetypes/jvm/src/main/resources/archetype-resources/src/main/java/Application.java +++ b/test/plugin/archetypes/jvm/src/main/resources/archetype-resources/src/main/java/Application.java @@ -21,7 +21,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; - @SpringBootApplication public class Application { diff --git a/test/plugin/archetypes/jvm/src/main/resources/archetype-resources/src/main/java/controller/CaseController.java b/test/plugin/archetypes/jvm/src/main/resources/archetype-resources/src/main/java/controller/CaseController.java index 96bac07ba29b..af5bd2315b49 100644 --- a/test/plugin/archetypes/jvm/src/main/resources/archetype-resources/src/main/java/controller/CaseController.java +++ b/test/plugin/archetypes/jvm/src/main/resources/archetype-resources/src/main/java/controller/CaseController.java @@ -16,13 +16,15 @@ * */ -package ${package}.controller; +package $ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +{package}.controller; @RestController @RequestMapping("/case") diff --git a/test/plugin/archetypes/tomcat/src/main/resources/META-INF/maven/archetype-metadata.xml b/test/plugin/archetypes/tomcat/src/main/resources/META-INF/maven/archetype-metadata.xml index 751a583d9f3f..17e02da4976c 100644 --- a/test/plugin/archetypes/tomcat/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/test/plugin/archetypes/tomcat/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -17,11 +17,11 @@ ~ --> + xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + name="archetype"> @@ -37,7 +37,7 @@ org.apache.skywalking.apm.testcase.${scenario_name} - + ${scenario_name} diff --git a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/Main.java b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/Main.java index d0b02340b081..dead94497fb8 100644 --- a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/Main.java +++ b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/Main.java @@ -14,45 +14,54 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.mockcollector; import io.grpc.netty.NettyServerBuilder; import io.netty.channel.local.LocalAddress; - import java.io.IOException; import java.net.InetSocketAddress; - -import org.apache.skywalking.plugin.test.mockcollector.entity.ValidateData; -import org.apache.skywalking.plugin.test.mockcollector.service.*; -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.servlet.ServletHolder; - import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.skywalking.plugin.test.mockcollector.entity.ValidateData; +import org.apache.skywalking.plugin.test.mockcollector.service.ClearReceiveDataService; +import org.apache.skywalking.plugin.test.mockcollector.service.GrpcAddressHttpService; +import org.apache.skywalking.plugin.test.mockcollector.service.MockInstanceDiscoveryService; +import org.apache.skywalking.plugin.test.mockcollector.service.MockInstancePingService; +import org.apache.skywalking.plugin.test.mockcollector.service.MockJVMMetricReportService; +import org.apache.skywalking.plugin.test.mockcollector.service.MockNetworkAddressRegisterService; +import org.apache.skywalking.plugin.test.mockcollector.service.MockRegisterService; +import org.apache.skywalking.plugin.test.mockcollector.service.MockTraceSegmentService; +import org.apache.skywalking.plugin.test.mockcollector.service.ReceiveDataService; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.servlet.ServletContextHandler; +import org.eclipse.jetty.servlet.ServletHolder; public class Main { public static void main(String[] args) throws Exception { - NettyServerBuilder.forAddress(LocalAddress.ANY).forPort(19876) - .maxConcurrentCallsPerConnection(12).maxMessageSize(16777216) - .addService(new MockRegisterService()) - .addService(new MockInstancePingService()) - .addService(new MockInstanceDiscoveryService()) - .addService(new MockNetworkAddressRegisterService()) - .addService(new MockTraceSegmentService()) - .addService(new MockJVMMetricReportService()) - .build().start(); + NettyServerBuilder.forAddress(LocalAddress.ANY) + .forPort(19876) + .maxConcurrentCallsPerConnection(12) + .maxMessageSize(16777216) + .addService(new MockRegisterService()) + .addService(new MockInstancePingService()) + .addService(new MockInstanceDiscoveryService()) + .addService(new MockNetworkAddressRegisterService()) + .addService(new MockTraceSegmentService()) + .addService(new MockJVMMetricReportService()) + .build() + .start(); - Server jettyServer = new Server(new InetSocketAddress("0.0.0.0", - Integer.valueOf(12800))); + Server jettyServer = new Server(new InetSocketAddress("0.0.0.0", Integer.valueOf(12800))); String contextPath = "/"; ServletContextHandler servletContextHandler = new ServletContextHandler(ServletContextHandler.NO_SESSIONS); servletContextHandler.setContextPath(contextPath); servletContextHandler.addServlet(new ServletHolder(new HttpServlet() { @Override - protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + protected void doGet(HttpServletRequest req, + HttpServletResponse resp) throws ServletException, IOException { if (ValidateData.INSTANCE.getRegistryItem().getApplications().isEmpty()) { resp.setStatus(500); return; diff --git a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/RegistryItem.java b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/RegistryItem.java index eb283cea102a..668c00cc752e 100644 --- a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/RegistryItem.java +++ b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/RegistryItem.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.mockcollector.entity; import java.util.ArrayList; diff --git a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/RegistryItemSerializer.java b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/RegistryItemSerializer.java index 37fc0e86d9af..f022bbf60197 100644 --- a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/RegistryItemSerializer.java +++ b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/RegistryItemSerializer.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.mockcollector.entity; import com.google.gson.Gson; diff --git a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/Segment.java b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/Segment.java index 1a723e34d102..407f01e32459 100644 --- a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/Segment.java +++ b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/Segment.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.mockcollector.entity; import java.util.ArrayList; @@ -42,7 +43,8 @@ public SegmentBuilder addSpan(Span.SpanBuilder spanBuilder) { } public SegmentBuilder segmentId(UniqueId segmentUniqueId) { - segmentId = String.join(".", Long.toString(segmentUniqueId.getIdParts(0)), Long.toString(segmentUniqueId.getIdParts(1)), Long.toString(segmentUniqueId.getIdParts(2))); + segmentId = String.join(".", Long.toString(segmentUniqueId.getIdParts(0)), Long.toString(segmentUniqueId.getIdParts(1)), Long + .toString(segmentUniqueId.getIdParts(2))); return this; } } diff --git a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/SegmentItem.java b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/SegmentItem.java index 06d79e99fca3..8730b4613e0a 100644 --- a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/SegmentItem.java +++ b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/SegmentItem.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.mockcollector.entity; import java.util.ArrayList; diff --git a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/SegmentItems.java b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/SegmentItems.java index 020a4ce85691..60e07f14b256 100644 --- a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/SegmentItems.java +++ b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/SegmentItems.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.mockcollector.entity; import java.util.HashMap; diff --git a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/SegmentItemsSerializer.java b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/SegmentItemsSerializer.java index 0d786663ee0a..7dc66c945fbf 100644 --- a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/SegmentItemsSerializer.java +++ b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/SegmentItemsSerializer.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.mockcollector.entity; import com.google.gson.Gson; diff --git a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/Span.java b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/Span.java index ae51fdcf2b2c..b4fbb531976c 100644 --- a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/Span.java +++ b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/Span.java @@ -34,6 +34,8 @@ package org.apache.skywalking.plugin.test.mockcollector.entity; +import java.util.ArrayList; +import java.util.List; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -44,9 +46,6 @@ import org.apache.skywalking.apm.network.language.agent.UniqueId; import org.apache.skywalking.apm.network.language.agent.v2.SegmentReference; -import java.util.ArrayList; -import java.util.List; - @Builder @ToString @AllArgsConstructor @@ -161,7 +160,8 @@ public static class SegmentRef { public SegmentRef(SegmentReference ref) { UniqueId segmentUniqueId = ref.getParentTraceSegmentId(); - this.parentTraceSegmentId = String.join(".", Long.toString(segmentUniqueId.getIdParts(0)), Long.toString(segmentUniqueId.getIdParts(1)), Long.toString(segmentUniqueId.getIdParts(2))); + this.parentTraceSegmentId = String.join(".", Long.toString(segmentUniqueId.getIdParts(0)), Long.toString(segmentUniqueId + .getIdParts(1)), Long.toString(segmentUniqueId.getIdParts(2))); this.refType = ref.getRefType().toString(); this.parentSpanId = ref.getParentSpanId(); this.entryEndpointId = ref.getEntryEndpointId(); @@ -176,7 +176,8 @@ public SegmentRef(SegmentReference ref) { public SegmentRef(TraceSegmentReference ref) { UniqueId segmentUniqueId = ref.getParentTraceSegmentId(); - this.parentTraceSegmentId = String.join(".", Long.toString(segmentUniqueId.getIdParts(0)), Long.toString(segmentUniqueId.getIdParts(1)), Long.toString(segmentUniqueId.getIdParts(2))); + this.parentTraceSegmentId = String.join(".", Long.toString(segmentUniqueId.getIdParts(0)), Long.toString(segmentUniqueId + .getIdParts(1)), Long.toString(segmentUniqueId.getIdParts(2))); this.refType = ref.getRefType().toString(); this.parentSpanId = ref.getParentSpanId(); this.entryEndpointId = ref.getEntryServiceId(); diff --git a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/ValidateData.java b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/ValidateData.java index 4944ece178c6..28b78b7a2b53 100644 --- a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/ValidateData.java +++ b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/ValidateData.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.mockcollector.entity; public class ValidateData { diff --git a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/ValidateDataSerializer.java b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/ValidateDataSerializer.java index 117563c2cad9..d6fabf5df6d9 100644 --- a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/ValidateDataSerializer.java +++ b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/ValidateDataSerializer.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.mockcollector.entity; import com.google.gson.Gson; @@ -24,14 +25,12 @@ import com.google.gson.JsonSerializer; import java.lang.reflect.Type; -/** - * Created by xin on 2017/7/14. - */ public class ValidateDataSerializer implements JsonSerializer { @Override public JsonElement serialize(ValidateData src, Type typeOfSrc, JsonSerializationContext context) { Gson gson = new GsonBuilder().registerTypeAdapter(RegistryItem.class, new RegistryItemSerializer()) - .registerTypeAdapter(SegmentItems.class, new SegmentItemsSerializer()).create(); + .registerTypeAdapter(SegmentItems.class, new SegmentItemsSerializer()) + .create(); JsonObject jsonObject = new JsonObject(); jsonObject.add("registryItems", gson.toJsonTree(src.getRegistryItem())); diff --git a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/ClearReceiveDataService.java b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/ClearReceiveDataService.java index a90fc2b26487..3c4298401095 100644 --- a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/ClearReceiveDataService.java +++ b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/ClearReceiveDataService.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.mockcollector.service; import java.io.IOException; diff --git a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/GrpcAddressHttpService.java b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/GrpcAddressHttpService.java index 85374db77e22..264e148c5ce8 100644 --- a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/GrpcAddressHttpService.java +++ b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/GrpcAddressHttpService.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.mockcollector.service; import com.google.gson.JsonArray; diff --git a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/MockCLRMetricReportService.java b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/MockCLRMetricReportService.java index 55f5649356bc..dc969b7451f0 100644 --- a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/MockCLRMetricReportService.java +++ b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/MockCLRMetricReportService.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.mockcollector.service; import io.grpc.stub.StreamObserver; @@ -22,8 +23,7 @@ import org.apache.skywalking.apm.network.language.agent.v2.CLRMetricReportServiceGrpc; /** - * Author Daming - * Email zteny@foxmail.com + * Author Daming Email zteny@foxmail.com **/ public class MockCLRMetricReportService extends CLRMetricReportServiceGrpc.CLRMetricReportServiceImplBase { diff --git a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/MockInstanceDiscoveryService.java b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/MockInstanceDiscoveryService.java index 510698968bab..8ee09015b351 100644 --- a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/MockInstanceDiscoveryService.java +++ b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/MockInstanceDiscoveryService.java @@ -14,32 +14,39 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.mockcollector.service; import io.grpc.stub.StreamObserver; - -import org.apache.skywalking.apm.network.language.agent.*; +import org.apache.skywalking.apm.network.language.agent.ApplicationInstance; +import org.apache.skywalking.apm.network.language.agent.ApplicationInstanceHeartbeat; +import org.apache.skywalking.apm.network.language.agent.ApplicationInstanceMapping; +import org.apache.skywalking.apm.network.language.agent.Downstream; +import org.apache.skywalking.apm.network.language.agent.InstanceDiscoveryServiceGrpc; import org.apache.skywalking.plugin.test.mockcollector.entity.RegistryItem; import org.apache.skywalking.plugin.test.mockcollector.entity.ValidateData; public class MockInstanceDiscoveryService extends InstanceDiscoveryServiceGrpc.InstanceDiscoveryServiceImplBase { - @Override public void heartbeat(ApplicationInstanceHeartbeat request, StreamObserver responseObserver) { - ValidateData.INSTANCE.getRegistryItem().registryHeartBeat(new RegistryItem.HeartBeat(request.getApplicationInstanceId())); + ValidateData.INSTANCE.getRegistryItem() + .registryHeartBeat(new RegistryItem.HeartBeat(request.getApplicationInstanceId())); responseObserver.onNext(Downstream.getDefaultInstance()); responseObserver.onCompleted(); } @Override public void registerInstance(ApplicationInstance request, - StreamObserver responseObserver) { + StreamObserver responseObserver) { int instanceId = Sequences.INSTANCE_SEQUENCE.incrementAndGet(); - ValidateData.INSTANCE.getRegistryItem().registryInstance(new RegistryItem.Instance(request.getApplicationId(), instanceId)); + ValidateData.INSTANCE.getRegistryItem() + .registryInstance(new RegistryItem.Instance(request.getApplicationId(), instanceId)); - responseObserver.onNext(ApplicationInstanceMapping.newBuilder().setApplicationId(request.getApplicationId()) - .setApplicationInstanceId(instanceId).build()); + responseObserver.onNext(ApplicationInstanceMapping.newBuilder() + .setApplicationId(request.getApplicationId()) + .setApplicationInstanceId(instanceId) + .build()); responseObserver.onCompleted(); } } diff --git a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/MockInstancePingService.java b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/MockInstancePingService.java index 6b2f24ac514b..a58a70a91a62 100644 --- a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/MockInstancePingService.java +++ b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/MockInstancePingService.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.mockcollector.service; import io.grpc.stub.StreamObserver; @@ -27,7 +28,8 @@ public class MockInstancePingService extends ServiceInstancePingGrpc.ServiceInst @Override public void doPing(ServiceInstancePingPkg request, StreamObserver responseObserver) { - ValidateData.INSTANCE.getRegistryItem().registryHeartBeat(new RegistryItem.HeartBeat(request.getServiceInstanceId())); + ValidateData.INSTANCE.getRegistryItem() + .registryHeartBeat(new RegistryItem.HeartBeat(request.getServiceInstanceId())); responseObserver.onNext(Commands.getDefaultInstance()); responseObserver.onCompleted(); } diff --git a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/MockJVMMetricReportService.java b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/MockJVMMetricReportService.java index 64f6545e0422..1b5d1193e59c 100644 --- a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/MockJVMMetricReportService.java +++ b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/MockJVMMetricReportService.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.mockcollector.service; import io.grpc.stub.StreamObserver; @@ -22,8 +23,7 @@ import org.apache.skywalking.apm.network.language.agent.v2.JVMMetricReportServiceGrpc; /** - * Author Daming - * Email zteny@foxmail.com + * Author Daming Email zteny@foxmail.com **/ public class MockJVMMetricReportService extends JVMMetricReportServiceGrpc.JVMMetricReportServiceImplBase { diff --git a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/MockRegisterService.java b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/MockRegisterService.java index 43fbd440c68a..33df6f89e908 100644 --- a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/MockRegisterService.java +++ b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/MockRegisterService.java @@ -14,13 +14,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.mockcollector.service; import io.grpc.stub.StreamObserver; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.skywalking.apm.network.common.KeyIntValuePair; -import org.apache.skywalking.apm.network.register.v2.*; +import org.apache.skywalking.apm.network.register.v2.Endpoint; +import org.apache.skywalking.apm.network.register.v2.EndpointMapping; +import org.apache.skywalking.apm.network.register.v2.Enpoints; +import org.apache.skywalking.apm.network.register.v2.NetAddressMapping; +import org.apache.skywalking.apm.network.register.v2.NetAddresses; +import org.apache.skywalking.apm.network.register.v2.RegisterGrpc; +import org.apache.skywalking.apm.network.register.v2.Service; +import org.apache.skywalking.apm.network.register.v2.ServiceInstance; +import org.apache.skywalking.apm.network.register.v2.ServiceInstanceRegisterMapping; +import org.apache.skywalking.apm.network.register.v2.ServiceInstances; +import org.apache.skywalking.apm.network.register.v2.ServiceRegisterMapping; +import org.apache.skywalking.apm.network.register.v2.Services; import org.apache.skywalking.plugin.test.mockcollector.entity.RegistryItem; import org.apache.skywalking.plugin.test.mockcollector.entity.ValidateData; @@ -28,12 +40,12 @@ public class MockRegisterService extends RegisterGrpc.RegisterImplBase { private Logger logger = LogManager.getLogger(MockTraceSegmentService.class); - @Override public void doEndpointRegister(Enpoints request, StreamObserver responseObserver) { for (Endpoint endpoint : request.getEndpointsList()) { - ValidateData.INSTANCE.getRegistryItem().registryOperationName(new RegistryItem.OperationName(endpoint.getServiceId(), - endpoint.getEndpointName())); + ValidateData.INSTANCE.getRegistryItem() + .registryOperationName(new RegistryItem.OperationName(endpoint.getServiceId(), endpoint + .getEndpointName())); } responseObserver.onNext(EndpointMapping.getDefaultInstance()); responseObserver.onCompleted(); @@ -46,7 +58,8 @@ public void doNetworkAddressRegister(NetAddresses request, StreamObserver responseObserver) { + public void doServiceInstanceRegister(ServiceInstances request, + StreamObserver responseObserver) { if (request.getInstancesCount() <= 0) { responseObserver.onNext(ServiceInstanceRegisterMapping.getDefaultInstance()); responseObserver.onCompleted(); @@ -55,10 +68,16 @@ public void doServiceInstanceRegister(ServiceInstances request, StreamObserver collect(StreamObserver responseObserver) { return new StreamObserver() { - @Override public void onNext(UpstreamSegment value) { + @Override + public void onNext(UpstreamSegment value) { try { SegmentObject traceSegmentObject = SegmentObject.parseFrom(value.getSegment()); - Segment.SegmentBuilder segmentBuilder = Segment.builder().segmentId(traceSegmentObject.getTraceSegmentId()); - logger.debug("Receive segment: ServiceID[{}], TraceSegmentId[{}]", - traceSegmentObject.getServiceId(), - traceSegmentObject.getTraceSegmentId()); + Segment.SegmentBuilder segmentBuilder = Segment.builder() + .segmentId(traceSegmentObject.getTraceSegmentId()); + logger.debug("Receive segment: ServiceID[{}], TraceSegmentId[{}]", traceSegmentObject.getServiceId(), traceSegmentObject + .getTraceSegmentId()); for (SpanObjectV2 spanObject : traceSegmentObject.getSpansList()) { - Span.SpanBuilder spanBuilder = Span.builder().operationName(spanObject.getOperationName()).parentSpanId(spanObject.getParentSpanId()) - .spanId(spanObject.getSpanId()).componentId(spanObject.getComponentId()).componentName(spanObject.getComponent()) - .spanLayer(spanObject.getSpanLayer().toString()).endTime(spanObject.getEndTime()).isError(spanObject.getIsError()) - .startTime(spanObject.getStartTime()).spanType(spanObject.getSpanType().toString()) - .peer(spanObject.getPeer()).peerId(spanObject.getPeerId()).operationId(spanObject.getOperationNameId()); + Span.SpanBuilder spanBuilder = Span.builder() + .operationName(spanObject.getOperationName()) + .parentSpanId(spanObject.getParentSpanId()) + .spanId(spanObject.getSpanId()) + .componentId(spanObject.getComponentId()) + .componentName(spanObject.getComponent()) + .spanLayer(spanObject.getSpanLayer().toString()) + .endTime(spanObject.getEndTime()) + .isError(spanObject.getIsError()) + .startTime(spanObject.getStartTime()) + .spanType(spanObject.getSpanType().toString()) + .peer(spanObject.getPeer()) + .peerId(spanObject.getPeerId()) + .operationId(spanObject.getOperationNameId()); for (Log logMessage : spanObject.getLogsList()) { spanBuilder.logEvent(logMessage.getDataList()); @@ -65,17 +80,20 @@ public StreamObserver collect(StreamObserver response segmentBuilder.addSpan(spanBuilder); } - ValidateData.INSTANCE.getSegmentItem().addSegmentItem(traceSegmentObject.getServiceId(), segmentBuilder.build()); + ValidateData.INSTANCE.getSegmentItem() + .addSegmentItem(traceSegmentObject.getServiceId(), segmentBuilder.build()); } catch (InvalidProtocolBufferException e) { e.printStackTrace(); } } - @Override public void onError(Throwable t) { + @Override + public void onError(Throwable t) { } - @Override public void onCompleted() { + @Override + public void onCompleted() { responseObserver.onNext(Commands.newBuilder().build()); responseObserver.onCompleted(); } diff --git a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/ReceiveDataService.java b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/ReceiveDataService.java index 368e27c73fea..f9b037870a87 100644 --- a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/ReceiveDataService.java +++ b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/ReceiveDataService.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.mockcollector.service; import com.google.gson.Gson; diff --git a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/Sequences.java b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/Sequences.java index dbcca97ed873..415a52d42e10 100644 --- a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/Sequences.java +++ b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/Sequences.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.mockcollector.service; import java.util.concurrent.ConcurrentHashMap; diff --git a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/util/ConfigReader.java b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/util/ConfigReader.java index 4704e5e9b11b..89cef75590d3 100644 --- a/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/util/ConfigReader.java +++ b/test/plugin/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/util/ConfigReader.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.mockcollector.util; import java.io.IOException; @@ -34,10 +35,10 @@ public class ConfigReader { } public static String getGrpcBindHost() { - return config.getProperty("grpc_bind_host","127.0.0.1"); + return config.getProperty("grpc_bind_host", "127.0.0.1"); } public static int getGrpcBindPort() { - return Integer.parseInt(config.getProperty("grpc_bind_port","19876")); + return Integer.parseInt(config.getProperty("grpc_bind_port", "19876")); } } diff --git a/test/plugin/mock-collector/src/main/resources/config.properties b/test/plugin/mock-collector/src/main/resources/config.properties index 88fd1c8bf0ab..4f290cafb325 100644 --- a/test/plugin/mock-collector/src/main/resources/config.properties +++ b/test/plugin/mock-collector/src/main/resources/config.properties @@ -12,6 +12,5 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - grpc_bind_host=127.0.0.1 grpc_bind_port=19876 diff --git a/test/plugin/mock-collector/src/main/resources/log4j2.xml b/test/plugin/mock-collector/src/main/resources/log4j2.xml index f8cf727437f7..2d119182ef0b 100644 --- a/test/plugin/mock-collector/src/main/resources/log4j2.xml +++ b/test/plugin/mock-collector/src/main/resources/log4j2.xml @@ -19,12 +19,12 @@ - + - + diff --git a/test/plugin/runner-helper/pom.xml b/test/plugin/runner-helper/pom.xml index 748d90018ed8..a1814e017829 100644 --- a/test/plugin/runner-helper/pom.xml +++ b/test/plugin/runner-helper/pom.xml @@ -73,7 +73,8 @@ - + org.apache.skywalking.plugin.test.helper.Main diff --git a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/AbstractRunningGenerator.java b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/AbstractRunningGenerator.java index d17cc7468dfb..5a0ad9c43c35 100644 --- a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/AbstractRunningGenerator.java +++ b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/AbstractRunningGenerator.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.helper; import freemarker.template.Configuration; @@ -23,7 +24,6 @@ import java.lang.invoke.MethodHandles; import java.util.HashMap; import java.util.Map; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.skywalking.plugin.test.helper.exception.GenerateFailedException; @@ -55,8 +55,8 @@ public final void generate(IConfiguration configuration) throws GenerateFailedEx root.put("scenario_version", configuration.scenarioVersion()); try { - cfg.getTemplate("scenario.sh").process(root, - new FileWriter(new File(configuration.outputDir() + File.separator + "scenario.sh"))); + cfg.getTemplate("scenario.sh") + .process(root, new FileWriter(new File(configuration.outputDir() + File.separator + "scenario.sh"))); } catch (Exception e) { logger.error("Failed to write scenario.sh", e); } diff --git a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/ConfigurationImpl.java b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/ConfigurationImpl.java index ce9cfae851cd..b9f4429a76b1 100644 --- a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/ConfigurationImpl.java +++ b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/ConfigurationImpl.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.helper; import com.google.common.base.Strings; -import org.apache.skywalking.plugin.test.helper.exception.ConfigureFileNotFoundException; -import org.apache.skywalking.plugin.test.helper.util.StringUtils; -import org.apache.skywalking.plugin.test.helper.vo.CaseConfiguration; -import org.yaml.snakeyaml.Yaml; - import java.io.File; import java.io.FileNotFoundException; import java.io.FileReader; import java.util.Collections; import java.util.List; +import org.apache.skywalking.plugin.test.helper.exception.ConfigureFileNotFoundException; +import org.apache.skywalking.plugin.test.helper.util.StringUtils; +import org.apache.skywalking.plugin.test.helper.vo.CaseConfiguration; +import org.yaml.snakeyaml.Yaml; public class ConfigurationImpl implements IConfiguration { private CaseConfiguration configuration; @@ -53,13 +53,14 @@ public String agentHome() { return System.getProperty("agent.dir"); } - @Override public RunningType runningType() { - return (configuration.getDependencies() != null && configuration.getDependencies().size() > 0) ? - RunningType.DockerCompose : - RunningType.Container; + @Override + public RunningType runningType() { + return (configuration.getDependencies() != null && configuration.getDependencies() + .size() > 0) ? RunningType.DockerCompose : RunningType.Container; } - @Override public ScenarioRunningScriptGenerator scenarioGenerator() { + @Override + public ScenarioRunningScriptGenerator scenarioGenerator() { switch (runningType()) { case DockerCompose: return new DockerComposeRunningGenerator(); @@ -70,27 +71,33 @@ public String agentHome() { } } - @Override public CaseConfiguration caseConfiguration() { + @Override + public CaseConfiguration caseConfiguration() { return this.configuration; } - @Override public String scenarioName() { + @Override + public String scenarioName() { return System.getProperty("scenario.name"); } - @Override public String scenarioVersion() { + @Override + public String scenarioVersion() { return System.getProperty("scenario.version"); } - @Override public String testFramework() { + @Override + public String testFramework() { return this.configuration.getFramework(); } - @Override public String entryService() { + @Override + public String entryService() { return this.configuration.getEntryService(); } - @Override public String healthCheck() { + @Override + public String healthCheck() { return this.configuration.getHealthCheck(); } @@ -101,16 +108,22 @@ public String startScript() { @Override public String catalinaOpts() { - List environment = this.configuration.getEnvironment() != null ? this.configuration.getEnvironment() : Collections.emptyList(); - return environment.stream().filter(it -> it.startsWith("CATALINA_OPTS=")).findFirst().orElse("").replaceAll("^CATALINA_OPTS=", ""); + List environment = this.configuration.getEnvironment() != null ? this.configuration.getEnvironment() : Collections + .emptyList(); + return environment.stream() + .filter(it -> it.startsWith("CATALINA_OPTS=")) + .findFirst() + .orElse("") + .replaceAll("^CATALINA_OPTS=", ""); } - @Override public String dockerImageName() { + @Override + public String dockerImageName() { switch (this.configuration.getType().toLowerCase()) { - case "tomcat" : - return "skywalking/agent-test-tomcat"; - case "jvm" : - return "skywalking/agent-test-jvm"; + case "tomcat": + return "skywalking/agent-test-tomcat"; + case "jvm": + return "skywalking/agent-test-jvm"; } throw new RuntimeException("Illegal type!"); @@ -131,11 +144,13 @@ public String dockerContainerName() { return (scenarioName() + "-" + scenarioVersion() + "-" + dockerImageVersion()).toLowerCase(); } - @Override public String scenarioHome() { + @Override + public String scenarioHome() { return this.scenarioHome; } - @Override public String outputDir(){ + @Override + public String outputDir() { return System.getProperty("output.dir"); } diff --git a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/DockerComposeRunningGenerator.java b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/DockerComposeRunningGenerator.java index 39574ab771e3..229def13ff72 100644 --- a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/DockerComposeRunningGenerator.java +++ b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/DockerComposeRunningGenerator.java @@ -14,17 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.helper; import com.google.common.collect.Lists; import freemarker.template.Configuration; import freemarker.template.TemplateException; import freemarker.template.TemplateExceptionHandler; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.apache.skywalking.plugin.test.helper.vo.DependencyComponent; -import org.apache.skywalking.plugin.test.helper.vo.DockerService; - import java.io.File; import java.io.FileWriter; import java.io.IOException; @@ -34,6 +30,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.skywalking.plugin.test.helper.vo.DependencyComponent; +import org.apache.skywalking.plugin.test.helper.vo.DockerService; public class DockerComposeRunningGenerator extends AbstractRunningGenerator { private static Logger logger = LogManager.getLogger(MethodHandles.lookup().lookupClass()); @@ -70,8 +70,8 @@ public void generateAdditionFiles(IConfiguration configuration) { }); root.put("links", links); - root.put("services", convertDockerServices(configuration.scenarioVersion(), - configuration.caseConfiguration().getDependencies())); + root.put("services", convertDockerServices(configuration.scenarioVersion(), configuration.caseConfiguration() + .getDependencies())); Configuration cfg = new Configuration(Configuration.VERSION_2_3_28); try { @@ -84,20 +84,20 @@ public void generateAdditionFiles(IConfiguration configuration) { // never to do this } try { - cfg.getTemplate("docker-compose.template").process(root, new FileWriter(new File(configuration.outputDir(), - "docker-compose.yml"))); + cfg.getTemplate("docker-compose.template") + .process(root, new FileWriter(new File(configuration.outputDir(), "docker-compose.yml"))); } catch (TemplateException | IOException e) { logger.error(e); } } - protected List convertDockerServices(final String version, Map componentMap) { + protected List convertDockerServices(final String version, + Map componentMap) { ArrayList services = Lists.newArrayList(); componentMap.forEach((name, dependency) -> { DockerService service = new DockerService(); - String imageName = dependency.getImage() - .replace("${CASE_SERVER_IMAGE_VERSION}", version); + String imageName = dependency.getImage().replace("${CASE_SERVER_IMAGE_VERSION}", version); service.setName(name); service.setImageName(imageName); service.setExpose(dependency.getExpose()); diff --git a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/DockerContainerRunningGenerator.java b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/DockerContainerRunningGenerator.java index 4e1a1bfefed3..1be71c4e504a 100644 --- a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/DockerContainerRunningGenerator.java +++ b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/DockerContainerRunningGenerator.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.skywalking.plugin.test.helper; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +package org.apache.skywalking.plugin.test.helper; import java.io.StringWriter; import java.lang.invoke.MethodHandles; import java.util.HashMap; import java.util.Map; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class DockerContainerRunningGenerator extends AbstractRunningGenerator { private static Logger logger = LogManager.getLogger(MethodHandles.lookup().lookupClass()); diff --git a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/IConfiguration.java b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/IConfiguration.java index e7332d9e4efa..2f44c3f66508 100644 --- a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/IConfiguration.java +++ b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/IConfiguration.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.helper; import org.apache.skywalking.plugin.test.helper.vo.CaseConfiguration; diff --git a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/Main.java b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/Main.java index 657086407e02..9741c538ede8 100644 --- a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/Main.java +++ b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/Main.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.helper; public class Main { diff --git a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/RunningType.java b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/RunningType.java index 37e4718615a2..1e95f381d53c 100644 --- a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/RunningType.java +++ b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/RunningType.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.helper; public enum RunningType { diff --git a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/ScenarioRunningScriptGenerator.java b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/ScenarioRunningScriptGenerator.java index bd8d0a3caf01..1a87daf3179c 100644 --- a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/ScenarioRunningScriptGenerator.java +++ b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/ScenarioRunningScriptGenerator.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.helper; import org.apache.skywalking.plugin.test.helper.exception.GenerateFailedException; diff --git a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/exception/ConfigureFileNotFoundException.java b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/exception/ConfigureFileNotFoundException.java index fff6167b6b61..11d764e40b3f 100644 --- a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/exception/ConfigureFileNotFoundException.java +++ b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/exception/ConfigureFileNotFoundException.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.helper.exception; public class ConfigureFileNotFoundException extends Exception { diff --git a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/exception/GenerateAdditionFileException.java b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/exception/GenerateAdditionFileException.java index 6b2004e43be9..18b70ac25945 100644 --- a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/exception/GenerateAdditionFileException.java +++ b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/exception/GenerateAdditionFileException.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.helper.exception; public class GenerateAdditionFileException extends GenerateFailedException { diff --git a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/exception/GenerateFailedException.java b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/exception/GenerateFailedException.java index 4e91585d0bfc..31a80bb1ac7c 100644 --- a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/exception/GenerateFailedException.java +++ b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/exception/GenerateFailedException.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.helper.exception; public class GenerateFailedException extends Exception { diff --git a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/util/StringUtils.java b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/util/StringUtils.java index 3d172c979c6d..02265d769afa 100644 --- a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/util/StringUtils.java +++ b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/util/StringUtils.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.helper.util; public class StringUtils { diff --git a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/vo/CaseConfiguration.java b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/vo/CaseConfiguration.java index cd45b8823eca..cdccdf088843 100644 --- a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/vo/CaseConfiguration.java +++ b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/vo/CaseConfiguration.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.helper.vo; import java.util.List; diff --git a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/vo/DependencyComponent.java b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/vo/DependencyComponent.java index 9a61b6d58734..af704de6dc7a 100644 --- a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/vo/DependencyComponent.java +++ b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/vo/DependencyComponent.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.helper.vo; import java.util.List; diff --git a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/vo/DockerService.java b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/vo/DockerService.java index c0997fd259de..7e69033d8364 100644 --- a/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/vo/DockerService.java +++ b/test/plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/vo/DockerService.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.helper.vo; import java.util.List; diff --git a/test/plugin/runner-helper/src/main/resources/log4j2.xml b/test/plugin/runner-helper/src/main/resources/log4j2.xml index 78634ba31c0e..c3814a66f684 100644 --- a/test/plugin/runner-helper/src/main/resources/log4j2.xml +++ b/test/plugin/runner-helper/src/main/resources/log4j2.xml @@ -20,18 +20,18 @@ - + - + - - + + \ No newline at end of file diff --git a/test/plugin/runner-helper/src/test/java/org/apache/skywalking/plugin/test/helper/DockerComposeV2RunningGeneratorTest.java b/test/plugin/runner-helper/src/test/java/org/apache/skywalking/plugin/test/helper/DockerComposeV2RunningGeneratorTest.java index 00754394edb1..a6fa582f1436 100644 --- a/test/plugin/runner-helper/src/test/java/org/apache/skywalking/plugin/test/helper/DockerComposeV2RunningGeneratorTest.java +++ b/test/plugin/runner-helper/src/test/java/org/apache/skywalking/plugin/test/helper/DockerComposeV2RunningGeneratorTest.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.helper; +import java.io.File; +import java.io.FileNotFoundException; import org.apache.skywalking.plugin.test.helper.exception.ConfigureFileNotFoundException; import org.apache.skywalking.plugin.test.helper.exception.GenerateFailedException; import org.junit.After; import org.junit.Before; import org.junit.Test; -import java.io.File; -import java.io.FileNotFoundException; - import static org.junit.Assert.assertTrue; public class DockerComposeV2RunningGeneratorTest { @@ -51,7 +51,7 @@ public void setUp() throws FileNotFoundException, ConfigureFileNotFoundException @Test public void testGenerateDockerCompose() { String runningScript = dockerComposeRunningGenerator.runningScript(configuration); -// assertEquals(String.format("docker-compose -f %s/docker-compose.yml up", TARGET_DIR), runningScript); + // assertEquals(String.format("docker-compose -f %s/docker-compose.yml up", TARGET_DIR), runningScript); } @Test diff --git a/test/plugin/runner-helper/src/test/java/org/apache/skywalking/plugin/test/helper/DockerContainerRunningGeneratorTest.java b/test/plugin/runner-helper/src/test/java/org/apache/skywalking/plugin/test/helper/DockerContainerRunningGeneratorTest.java index 11db24472bb6..dacfdf3b56ea 100644 --- a/test/plugin/runner-helper/src/test/java/org/apache/skywalking/plugin/test/helper/DockerContainerRunningGeneratorTest.java +++ b/test/plugin/runner-helper/src/test/java/org/apache/skywalking/plugin/test/helper/DockerContainerRunningGeneratorTest.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.helper; import org.junit.Before; diff --git a/test/plugin/runner-helper/src/test/java/org/apache/skywalking/plugin/test/helper/vo/CaseIConfigurationTest.java b/test/plugin/runner-helper/src/test/java/org/apache/skywalking/plugin/test/helper/vo/CaseIConfigurationTest.java index 31014f0165ef..cf0e8a1db55b 100644 --- a/test/plugin/runner-helper/src/test/java/org/apache/skywalking/plugin/test/helper/vo/CaseIConfigurationTest.java +++ b/test/plugin/runner-helper/src/test/java/org/apache/skywalking/plugin/test/helper/vo/CaseIConfigurationTest.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.helper.vo; import java.io.FileNotFoundException; diff --git a/test/plugin/scenarios/activemq-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/activemq-scenario/src/main/assembly/assembly.xml index a69dea3ddf07..8a9be07e9639 100644 --- a/test/plugin/scenarios/activemq-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/activemq-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/activemq-scenario/src/main/java/org/apache/skywalking/apm/testcase/activemq/Application.java b/test/plugin/scenarios/activemq-scenario/src/main/java/org/apache/skywalking/apm/testcase/activemq/Application.java index 34dd60c55be4..1f1f1f02cc1f 100644 --- a/test/plugin/scenarios/activemq-scenario/src/main/java/org/apache/skywalking/apm/testcase/activemq/Application.java +++ b/test/plugin/scenarios/activemq-scenario/src/main/java/org/apache/skywalking/apm/testcase/activemq/Application.java @@ -21,7 +21,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; - @SpringBootApplication public class Application { diff --git a/test/plugin/scenarios/activemq-scenario/src/main/java/org/apache/skywalking/apm/testcase/activemq/controller/CaseController.java b/test/plugin/scenarios/activemq-scenario/src/main/java/org/apache/skywalking/apm/testcase/activemq/controller/CaseController.java index 306beba9a931..a4a154596d60 100644 --- a/test/plugin/scenarios/activemq-scenario/src/main/java/org/apache/skywalking/apm/testcase/activemq/controller/CaseController.java +++ b/test/plugin/scenarios/activemq-scenario/src/main/java/org/apache/skywalking/apm/testcase/activemq/controller/CaseController.java @@ -31,9 +31,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/case") @@ -55,7 +55,7 @@ public class CaseController { public String testcase() { Session session = null; Connection connection = null; - try{ + try { ConnectionFactory factory = new ActiveMQConnectionFactory(USER_NAME, PASSWORD, brokenUrl); connection = factory.createConnection(); connection.start(); @@ -67,7 +67,7 @@ public String testcase() { session.commit(); session.close(); connection.close(); - }catch (Exception ex){ + } catch (Exception ex) { logger.error(ex); try { session.close(); @@ -91,7 +91,7 @@ public String healthCheck() { connection.start(); connection.getMetaData().getJMSVersion(); connection.close(); - }catch (Exception ex){ + } catch (Exception ex) { logger.error(ex); try { session.close(); @@ -105,10 +105,11 @@ public String healthCheck() { } public class ConsumerThread extends Thread { - @Override public void run() { + @Override + public void run() { Session session = null; Connection connection = null; - try{ + try { ConnectionFactory factory = new ActiveMQConnectionFactory(USER_NAME, PASSWORD, brokenUrl); connection = factory.createConnection(); connection.start(); @@ -118,7 +119,7 @@ public class ConsumerThread extends Thread { messageConsumer.receive(); session.close(); connection.close(); - }catch (Exception ex){ + } catch (Exception ex) { logger.error(ex); try { session.close(); diff --git a/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/assembly/assembly.xml index 746b4837c09a..d55b52d8a995 100644 --- a/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/org/apache/skywalking/apm/toolkit/trace/ActiveSpan.java b/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/org/apache/skywalking/apm/toolkit/trace/ActiveSpan.java index c9ec93536138..2878905d3c38 100644 --- a/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/org/apache/skywalking/apm/toolkit/trace/ActiveSpan.java +++ b/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/org/apache/skywalking/apm/toolkit/trace/ActiveSpan.java @@ -20,8 +20,6 @@ /** * provide custom api that set tag for current active span. - * - * @author zhangxin */ public class ActiveSpan { /** diff --git a/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/org/apache/skywalking/apm/toolkit/trace/CallableWrapper.java b/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/org/apache/skywalking/apm/toolkit/trace/CallableWrapper.java index 32c8f31c96f4..57b66fd37461 100644 --- a/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/org/apache/skywalking/apm/toolkit/trace/CallableWrapper.java +++ b/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/org/apache/skywalking/apm/toolkit/trace/CallableWrapper.java @@ -15,13 +15,11 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.toolkit.trace; import java.util.concurrent.Callable; -/** - * @author carlvine500 - */ @TraceCrossThread public class CallableWrapper implements Callable { final Callable callable; diff --git a/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/org/apache/skywalking/apm/toolkit/trace/RunnableWrapper.java b/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/org/apache/skywalking/apm/toolkit/trace/RunnableWrapper.java index 60cd912dcc61..25e204c64408 100644 --- a/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/org/apache/skywalking/apm/toolkit/trace/RunnableWrapper.java +++ b/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/org/apache/skywalking/apm/toolkit/trace/RunnableWrapper.java @@ -14,11 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.apm.toolkit.trace; -/** - * @author lican - */ @TraceCrossThread public class RunnableWrapper implements Runnable { final Runnable runnable; @@ -31,7 +29,6 @@ public static RunnableWrapper of(Runnable r) { return new RunnableWrapper(r); } - @Override public void run() { this.runnable.run(); diff --git a/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/org/apache/skywalking/apm/toolkit/trace/SupplierWrapper.java b/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/org/apache/skywalking/apm/toolkit/trace/SupplierWrapper.java index 31eda0996f4f..1595772cf061 100644 --- a/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/org/apache/skywalking/apm/toolkit/trace/SupplierWrapper.java +++ b/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/org/apache/skywalking/apm/toolkit/trace/SupplierWrapper.java @@ -15,13 +15,11 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.toolkit.trace; import java.util.function.Supplier; -/** - * @author sxzaihua - */ @TraceCrossThread public class SupplierWrapper implements Supplier { final Supplier supplier; diff --git a/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/org/apache/skywalking/apm/toolkit/trace/Tag.java b/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/org/apache/skywalking/apm/toolkit/trace/Tag.java index e019029040f8..22917d42fe62 100644 --- a/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/org/apache/skywalking/apm/toolkit/trace/Tag.java +++ b/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/org/apache/skywalking/apm/toolkit/trace/Tag.java @@ -25,10 +25,9 @@ import java.lang.annotation.Target; /** - * Tag the current active span with key {@link #key()} and value {@link #value()}, - * if there is no active span, this annotation takes no effect. + * Tag the current active span with key {@link #key()} and value {@link #value()}, if there is no active span, this + * annotation takes no effect. * - * @author kezhenxu94 * @see Tags */ @Target(ElementType.METHOD) @@ -41,9 +40,8 @@ String key(); /** - * @return the value of the tag to be injected into the current active span, - * in the form of the customized enhancement rules, for more information, - * refer to https://github.com/apache/skywalking/blob/master/docs/en/setup/service-agent/java-agent/Customize-enhance-trace.md#how-to-configure + * @return the value of the tag to be injected into the current active span, in the form of the customized + * enhancement rules, for more information, refer to https://github.com/apache/skywalking/blob/master/docs/en/setup/service-agent/java-agent/Customize-enhance-trace.md#how-to-configure */ String value(); } diff --git a/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/org/apache/skywalking/apm/toolkit/trace/Tags.java b/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/org/apache/skywalking/apm/toolkit/trace/Tags.java index 4b763f08e5b6..b5970715808d 100644 --- a/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/org/apache/skywalking/apm/toolkit/trace/Tags.java +++ b/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/org/apache/skywalking/apm/toolkit/trace/Tags.java @@ -24,8 +24,7 @@ import java.lang.annotation.Target; /** - * A wrapper annotation for {@link Tag} that allows to - * apply multiple tags to a single method span, + * A wrapper annotation for {@link Tag} that allows to apply multiple tags to a single method span, * * 

  * @Tag(key = "tag1", value = "arg[0]")
@@ -35,7 +34,6 @@
  * }
  *
* - * @author kezhenxu94 * @see Tag */ @Target(ElementType.METHOD) diff --git a/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/org/apache/skywalking/apm/toolkit/trace/Trace.java b/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/org/apache/skywalking/apm/toolkit/trace/Trace.java index b76236db90bc..a06bdab29311 100644 --- a/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/org/apache/skywalking/apm/toolkit/trace/Trace.java +++ b/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/org/apache/skywalking/apm/toolkit/trace/Trace.java @@ -16,7 +16,6 @@ * */ - package org.apache.skywalking.apm.toolkit.trace; import java.lang.annotation.ElementType; @@ -28,8 +27,6 @@ * The agent create local span if the method that annotation with {@link Trace}. The value of span operation name will * fetch by {@link #operationName()}. if the value of {@link #operationName()} is blank string. the operation name will * be set the class name + method name. - * - * @author zhangxin */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) diff --git a/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/org/apache/skywalking/apm/toolkit/trace/TraceContext.java b/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/org/apache/skywalking/apm/toolkit/trace/TraceContext.java index a890b6fa8f12..fb9a66ed46e4 100644 --- a/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/org/apache/skywalking/apm/toolkit/trace/TraceContext.java +++ b/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/org/apache/skywalking/apm/toolkit/trace/TraceContext.java @@ -16,16 +16,12 @@ * */ - package org.apache.skywalking.apm.toolkit.trace; /** - * Try to access the sky-walking tracer context. - * The context is not existed, always. - * only the middleware, component, or rpc-framework are supported in the current invoke stack, in the same thread, - * the context will be available. + * Try to access the sky-walking tracer context. The context is not existed, always. only the middleware, component, or + * rpc-framework are supported in the current invoke stack, in the same thread, the context will be available. *

- * Created by xin on 2016/12/15. */ public class TraceContext { diff --git a/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/org/apache/skywalking/apm/toolkit/trace/TraceCrossThread.java b/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/org/apache/skywalking/apm/toolkit/trace/TraceCrossThread.java index 1eaf87a3a57b..e6049c61b85a 100644 --- a/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/org/apache/skywalking/apm/toolkit/trace/TraceCrossThread.java +++ b/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/org/apache/skywalking/apm/toolkit/trace/TraceCrossThread.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.toolkit.trace; import java.lang.annotation.ElementType; @@ -22,9 +23,6 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -/** - * @author carlvine500 - */ @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) public @interface TraceCrossThread { diff --git a/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/toolkit/controller/TestController.java b/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/toolkit/controller/TestController.java index 200f86d46752..3b9af9e9c576 100644 --- a/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/toolkit/controller/TestController.java +++ b/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/toolkit/controller/TestController.java @@ -19,7 +19,6 @@ package test.org.apache.skywalking.apm.testcase.toolkit.controller; import java.io.IOException; - import org.apache.http.HttpEntity; import org.apache.http.client.ResponseHandler; import org.apache.http.client.methods.HttpGet; @@ -30,9 +29,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -/** - * @author caoyixiong - */ @RestController @RequestMapping("/case") public class TestController { @@ -93,7 +89,6 @@ public String asyncVisitSupplier() { return SUCCESS; } - private static void visit(String url) throws IOException { CloseableHttpClient httpclient = HttpClients.createDefault(); try { diff --git a/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/toolkit/controller/TestService.java b/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/toolkit/controller/TestService.java index acdfb1383304..a193bf1d8214 100644 --- a/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/toolkit/controller/TestService.java +++ b/test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/toolkit/controller/TestService.java @@ -18,24 +18,19 @@ package test.org.apache.skywalking.apm.testcase.toolkit.controller; +import java.util.concurrent.Callable; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.function.Supplier; import org.apache.skywalking.apm.toolkit.trace.ActiveSpan; import org.apache.skywalking.apm.toolkit.trace.CallableWrapper; import org.apache.skywalking.apm.toolkit.trace.RunnableWrapper; import org.apache.skywalking.apm.toolkit.trace.SupplierWrapper; import org.apache.skywalking.apm.toolkit.trace.Tag; -import org.apache.skywalking.apm.toolkit.trace.Tags; import org.apache.skywalking.apm.toolkit.trace.Trace; import org.springframework.stereotype.Component; -import java.util.concurrent.Callable; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.function.Supplier; - -/** - * @author caoyixiong - */ @Component public class TestService { @@ -83,7 +78,6 @@ public void testInfo(final String testInfoParam) { ActiveSpan.info("TestInfoMsg"); } - public void asyncRunnable(Runnable runnable) { SERVICE.submit(RunnableWrapper.of(runnable)); } @@ -93,7 +87,7 @@ public void asyncCallable(Callable callable) { } public void asyncSupplier(Supplier supplier) { - CompletableFuture.supplyAsync(SupplierWrapper.of(supplier)); + CompletableFuture.supplyAsync(SupplierWrapper.of(supplier)); } } diff --git a/test/plugin/scenarios/armeria-0.96minus-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/armeria-0.96minus-scenario/src/main/assembly/assembly.xml index 58751569c6d3..5d8d0433919e 100644 --- a/test/plugin/scenarios/armeria-0.96minus-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/armeria-0.96minus-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/armeria-0.96minus-scenario/src/main/java/org/apache/skywalking/apm/testcase/armeria/Application.java b/test/plugin/scenarios/armeria-0.96minus-scenario/src/main/java/org/apache/skywalking/apm/testcase/armeria/Application.java index 0dbf7f818e5a..8b51273dd1cb 100644 --- a/test/plugin/scenarios/armeria-0.96minus-scenario/src/main/java/org/apache/skywalking/apm/testcase/armeria/Application.java +++ b/test/plugin/scenarios/armeria-0.96minus-scenario/src/main/java/org/apache/skywalking/apm/testcase/armeria/Application.java @@ -20,9 +20,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -/** - * @author kezhenxu94 - */ @SpringBootApplication public class Application { public static void main(String[] args) { diff --git a/test/plugin/scenarios/armeria-0.96minus-scenario/src/main/java/org/apache/skywalking/apm/testcase/armeria/ClientApplication.java b/test/plugin/scenarios/armeria-0.96minus-scenario/src/main/java/org/apache/skywalking/apm/testcase/armeria/ClientApplication.java index 90b9f89bce94..f5d43a4d3859 100644 --- a/test/plugin/scenarios/armeria-0.96minus-scenario/src/main/java/org/apache/skywalking/apm/testcase/armeria/ClientApplication.java +++ b/test/plugin/scenarios/armeria-0.96minus-scenario/src/main/java/org/apache/skywalking/apm/testcase/armeria/ClientApplication.java @@ -17,16 +17,12 @@ package org.apache.skywalking.apm.testcase.armeria; -import java.nio.charset.StandardCharsets; - import com.linecorp.armeria.client.HttpClient; +import java.nio.charset.StandardCharsets; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -/** - * @author kezhenxu94 - */ @RestController public class ClientApplication { diff --git a/test/plugin/scenarios/armeria-0.96minus-scenario/src/main/java/org/apache/skywalking/apm/testcase/armeria/ServerApplication.java b/test/plugin/scenarios/armeria-0.96minus-scenario/src/main/java/org/apache/skywalking/apm/testcase/armeria/ServerApplication.java index 2c97c5453efa..93b7bfbe3a81 100644 --- a/test/plugin/scenarios/armeria-0.96minus-scenario/src/main/java/org/apache/skywalking/apm/testcase/armeria/ServerApplication.java +++ b/test/plugin/scenarios/armeria-0.96minus-scenario/src/main/java/org/apache/skywalking/apm/testcase/armeria/ServerApplication.java @@ -17,28 +17,22 @@ package org.apache.skywalking.apm.testcase.armeria; -import javax.annotation.PostConstruct; -import java.util.concurrent.CompletableFuture; - import com.linecorp.armeria.common.HttpResponse; import com.linecorp.armeria.server.Server; import com.linecorp.armeria.server.ServerBuilder; +import java.util.concurrent.CompletableFuture; +import javax.annotation.PostConstruct; import org.springframework.stereotype.Component; -/** - * @author kezhenxu94 - */ @Component public class ServerApplication { private static final String SUCCESS = "Success"; @PostConstruct public void init() { - ServerBuilder sb = - new ServerBuilder() - .http(8085) - .service("/healthCheck", (ctx, res) -> HttpResponse.of(SUCCESS)) - .service("/greet/{name}", (ctx, res) -> HttpResponse.of("Hello %s~", ctx.pathParam("name"))); + ServerBuilder sb = new ServerBuilder().http(8085) + .service("/healthCheck", (ctx, res) -> HttpResponse.of(SUCCESS)) + .service("/greet/{name}", (ctx, res) -> HttpResponse.of("Hello %s~", ctx.pathParam("name"))); Server server = sb.build(); CompletableFuture future = server.start(); diff --git a/test/plugin/scenarios/armeria-0.96plus-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/armeria-0.96plus-scenario/src/main/assembly/assembly.xml index 2d75f7339fd0..2bd70690ed3f 100644 --- a/test/plugin/scenarios/armeria-0.96plus-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/armeria-0.96plus-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/armeria-0.96plus-scenario/src/main/java/org/apache/skywalking/apm/testcase/armeria/Application.java b/test/plugin/scenarios/armeria-0.96plus-scenario/src/main/java/org/apache/skywalking/apm/testcase/armeria/Application.java index 0dbf7f818e5a..8b51273dd1cb 100644 --- a/test/plugin/scenarios/armeria-0.96plus-scenario/src/main/java/org/apache/skywalking/apm/testcase/armeria/Application.java +++ b/test/plugin/scenarios/armeria-0.96plus-scenario/src/main/java/org/apache/skywalking/apm/testcase/armeria/Application.java @@ -20,9 +20,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -/** - * @author kezhenxu94 - */ @SpringBootApplication public class Application { public static void main(String[] args) { diff --git a/test/plugin/scenarios/armeria-0.96plus-scenario/src/main/java/org/apache/skywalking/apm/testcase/armeria/ClientApplication.java b/test/plugin/scenarios/armeria-0.96plus-scenario/src/main/java/org/apache/skywalking/apm/testcase/armeria/ClientApplication.java index a88f3b44a6ce..db411ed13a7f 100644 --- a/test/plugin/scenarios/armeria-0.96plus-scenario/src/main/java/org/apache/skywalking/apm/testcase/armeria/ClientApplication.java +++ b/test/plugin/scenarios/armeria-0.96plus-scenario/src/main/java/org/apache/skywalking/apm/testcase/armeria/ClientApplication.java @@ -17,16 +17,12 @@ package org.apache.skywalking.apm.testcase.armeria; -import java.nio.charset.StandardCharsets; - import com.linecorp.armeria.client.WebClient; +import java.nio.charset.StandardCharsets; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -/** - * @author kezhenxu94 - */ @RestController public class ClientApplication { diff --git a/test/plugin/scenarios/armeria-0.96plus-scenario/src/main/java/org/apache/skywalking/apm/testcase/armeria/ServerApplication.java b/test/plugin/scenarios/armeria-0.96plus-scenario/src/main/java/org/apache/skywalking/apm/testcase/armeria/ServerApplication.java index 2c97c5453efa..93b7bfbe3a81 100644 --- a/test/plugin/scenarios/armeria-0.96plus-scenario/src/main/java/org/apache/skywalking/apm/testcase/armeria/ServerApplication.java +++ b/test/plugin/scenarios/armeria-0.96plus-scenario/src/main/java/org/apache/skywalking/apm/testcase/armeria/ServerApplication.java @@ -17,28 +17,22 @@ package org.apache.skywalking.apm.testcase.armeria; -import javax.annotation.PostConstruct; -import java.util.concurrent.CompletableFuture; - import com.linecorp.armeria.common.HttpResponse; import com.linecorp.armeria.server.Server; import com.linecorp.armeria.server.ServerBuilder; +import java.util.concurrent.CompletableFuture; +import javax.annotation.PostConstruct; import org.springframework.stereotype.Component; -/** - * @author kezhenxu94 - */ @Component public class ServerApplication { private static final String SUCCESS = "Success"; @PostConstruct public void init() { - ServerBuilder sb = - new ServerBuilder() - .http(8085) - .service("/healthCheck", (ctx, res) -> HttpResponse.of(SUCCESS)) - .service("/greet/{name}", (ctx, res) -> HttpResponse.of("Hello %s~", ctx.pathParam("name"))); + ServerBuilder sb = new ServerBuilder().http(8085) + .service("/healthCheck", (ctx, res) -> HttpResponse.of(SUCCESS)) + .service("/greet/{name}", (ctx, res) -> HttpResponse.of("Hello %s~", ctx.pathParam("name"))); Server server = sb.build(); CompletableFuture future = server.start(); diff --git a/test/plugin/scenarios/avro-scenario/avro-client/src/main/java/org/apache/skywalking/apm/testcase/avro/Application.java b/test/plugin/scenarios/avro-scenario/avro-client/src/main/java/org/apache/skywalking/apm/testcase/avro/Application.java index ced27892507f..00f712197e83 100644 --- a/test/plugin/scenarios/avro-scenario/avro-client/src/main/java/org/apache/skywalking/apm/testcase/avro/Application.java +++ b/test/plugin/scenarios/avro-scenario/avro-client/src/main/java/org/apache/skywalking/apm/testcase/avro/Application.java @@ -21,7 +21,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; - @SpringBootApplication public class Application { diff --git a/test/plugin/scenarios/avro-scenario/avro-dist/src/main/assembly/assembly.xml b/test/plugin/scenarios/avro-scenario/avro-dist/src/main/assembly/assembly.xml index 16fc499b941f..4936f1cc95cd 100644 --- a/test/plugin/scenarios/avro-scenario/avro-dist/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/avro-scenario/avro-dist/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/avro-scenario/avro-server/pom.xml b/test/plugin/scenarios/avro-scenario/avro-server/pom.xml index ef666b29f464..3539f21efae1 100644 --- a/test/plugin/scenarios/avro-scenario/avro-server/pom.xml +++ b/test/plugin/scenarios/avro-scenario/avro-server/pom.xml @@ -67,7 +67,8 @@ - + org.apache.skywalking.apm.testcase.avro.Application diff --git a/test/plugin/scenarios/avro-scenario/avro-server/src/main/java/org/apache/skywalking/apm/testcase/avro/Application.java b/test/plugin/scenarios/avro-scenario/avro-server/src/main/java/org/apache/skywalking/apm/testcase/avro/Application.java index d6a60267c2cb..f9ba901d8fd1 100644 --- a/test/plugin/scenarios/avro-scenario/avro-server/src/main/java/org/apache/skywalking/apm/testcase/avro/Application.java +++ b/test/plugin/scenarios/avro-scenario/avro-server/src/main/java/org/apache/skywalking/apm/testcase/avro/Application.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.testcase.avro; import example.proto.Greeter; @@ -32,7 +33,8 @@ public class Application { private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); public static class GreeterImpl implements Greeter { - @Override public CharSequence hello(Message message) throws AvroRemoteException { + @Override + public CharSequence hello(Message message) throws AvroRemoteException { return new Utf8("success"); } } diff --git a/test/plugin/scenarios/canal-scenario/pom.xml b/test/plugin/scenarios/canal-scenario/pom.xml index 3c2118ce5df1..b48175764638 100644 --- a/test/plugin/scenarios/canal-scenario/pom.xml +++ b/test/plugin/scenarios/canal-scenario/pom.xml @@ -26,7 +26,7 @@ 5.0.0 skywalking-canal-scenario - + UTF-8 1.1.2 diff --git a/test/plugin/scenarios/canal-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/canal-scenario/src/main/assembly/assembly.xml index 7227ba192589..72de802b85bf 100644 --- a/test/plugin/scenarios/canal-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/canal-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/canal-scenario/src/main/java/org/apache/skywalking/apm/testcase/canal/Application.java b/test/plugin/scenarios/canal-scenario/src/main/java/org/apache/skywalking/apm/testcase/canal/Application.java index a13d976e0b4a..2a0732c1360a 100644 --- a/test/plugin/scenarios/canal-scenario/src/main/java/org/apache/skywalking/apm/testcase/canal/Application.java +++ b/test/plugin/scenarios/canal-scenario/src/main/java/org/apache/skywalking/apm/testcase/canal/Application.java @@ -21,7 +21,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; - @SpringBootApplication public class Application { diff --git a/test/plugin/scenarios/canal-scenario/src/main/java/org/apache/skywalking/apm/testcase/canal/controller/CaseController.java b/test/plugin/scenarios/canal-scenario/src/main/java/org/apache/skywalking/apm/testcase/canal/controller/CaseController.java index 3fb82dd13d0b..4a3f495de3ed 100644 --- a/test/plugin/scenarios/canal-scenario/src/main/java/org/apache/skywalking/apm/testcase/canal/controller/CaseController.java +++ b/test/plugin/scenarios/canal-scenario/src/main/java/org/apache/skywalking/apm/testcase/canal/controller/CaseController.java @@ -18,10 +18,11 @@ package org.apache.skywalking.apm.testcase.canal.controller; - import com.alibaba.otter.canal.client.CanalConnector; import com.alibaba.otter.canal.client.CanalConnectors; import com.alibaba.otter.canal.protocol.Message; +import java.net.InetSocketAddress; +import java.util.function.Consumer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -30,10 +31,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import java.net.InetSocketAddress; -import java.util.function.Consumer; - - @Controller @RequestMapping("/case") @PropertySource("classpath:application.properties") @@ -49,7 +46,6 @@ public class CaseController { @Value(value = "${canal.port}") private int port; - @RequestMapping("/canal-case") @ResponseBody public String canalCase() { diff --git a/test/plugin/scenarios/canal-scenario/src/main/resources/application.properties b/test/plugin/scenarios/canal-scenario/src/main/resources/application.properties index f55449911dea..57047ba75487 100644 --- a/test/plugin/scenarios/canal-scenario/src/main/resources/application.properties +++ b/test/plugin/scenarios/canal-scenario/src/main/resources/application.properties @@ -15,6 +15,5 @@ # limitations under the License. # # - server.port=8080 server.contextPath=/canal-scenario \ No newline at end of file diff --git a/test/plugin/scenarios/cassandra-java-driver-3.x-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/cassandra-java-driver-3.x-scenario/src/main/assembly/assembly.xml index 5389b84a1836..74be28169118 100644 --- a/test/plugin/scenarios/cassandra-java-driver-3.x-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/cassandra-java-driver-3.x-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/cassandra-java-driver-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/cassandra/Application.java b/test/plugin/scenarios/cassandra-java-driver-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/cassandra/Application.java index e305aee79587..ce5b1f05d462 100644 --- a/test/plugin/scenarios/cassandra-java-driver-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/cassandra/Application.java +++ b/test/plugin/scenarios/cassandra-java-driver-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/cassandra/Application.java @@ -21,9 +21,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -/** - * @author aderm - */ @SpringBootApplication public class Application { diff --git a/test/plugin/scenarios/cassandra-java-driver-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/cassandra/controller/CaseController.java b/test/plugin/scenarios/cassandra-java-driver-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/cassandra/controller/CaseController.java index 48150a4742c3..89c0e8ce046d 100644 --- a/test/plugin/scenarios/cassandra-java-driver-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/cassandra/controller/CaseController.java +++ b/test/plugin/scenarios/cassandra-java-driver-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/cassandra/controller/CaseController.java @@ -42,8 +42,7 @@ public class CaseController { private int port; private static final String TEST_EXIST_SQL = "SELECT now() FROM system.local"; - private static final String CREATE_KEYSPACE_SQL = "CREATE KEYSPACE IF NOT EXISTS demo WITH replication = " + - "{'class': 'SimpleStrategy', 'replication_factor': 1}"; + private static final String CREATE_KEYSPACE_SQL = "CREATE KEYSPACE IF NOT EXISTS demo WITH replication = " + "{'class': 'SimpleStrategy', 'replication_factor': 1}"; private static final String CREATE_TABLE_SQL = "CREATE TABLE IF NOT EXISTS demo.test(id TEXT PRIMARY KEY, value TEXT)"; private static final String INSERT_DATA_SQL = "INSERT INTO demo.test(id, value) VALUES(?,?)"; private static final String SELECT_DATA_SQL = "SELECT * FROM demo.test WHERE id = ?"; diff --git a/test/plugin/scenarios/customize-scenario/config/customize_enhance.xml b/test/plugin/scenarios/customize-scenario/config/customize_enhance.xml index 21c14f966ae9..ef6fee4000f3 100644 --- a/test/plugin/scenarios/customize-scenario/config/customize_enhance.xml +++ b/test/plugin/scenarios/customize-scenario/config/customize_enhance.xml @@ -19,7 +19,8 @@ - + arg[0] arg[1] arg[3].[0] @@ -33,7 +34,9 @@ arg[0] arg[1] - + arg[0].id arg[0].model1.name arg[0].model1.getId() diff --git a/test/plugin/scenarios/customize-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/customize-scenario/src/main/assembly/assembly.xml index 3981fc2f5b88..57710d94241f 100644 --- a/test/plugin/scenarios/customize-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/customize-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/Application.java b/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/Application.java index 71ce9cdbc0fb..a3a9e6e314e1 100644 --- a/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/Application.java +++ b/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/Application.java @@ -21,7 +21,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; - @SpringBootApplication public class Application { diff --git a/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/controller/CustomizeController.java b/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/controller/CustomizeController.java index 9709ca8634de..212431c4e055 100644 --- a/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/controller/CustomizeController.java +++ b/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/controller/CustomizeController.java @@ -18,6 +18,8 @@ package test.org.apache.skywalking.apm.testcase.customize.controller; +import java.util.ArrayList; +import java.util.HashMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.RequestMapping; @@ -28,10 +30,6 @@ import test.org.apache.skywalking.apm.testcase.customize.service.TestService1; import test.org.apache.skywalking.apm.testcase.customize.service.TestService2; -import java.util.ArrayList; -import java.util.HashMap; - - @RestController @RequestMapping("/case") public class CustomizeController { @@ -50,25 +48,36 @@ public String customizeCase() { put("k1", "v1"); }}, new ArrayList() {{ add("a"); - }}, new Object[] {'1', 2, "3"}); + }}, new Object[] { + '1', + 2, + "3" + }); TestService1.staticMethod(); TestService1.staticMethod("id", 123, new HashMap() {{ put("k1", "v1"); }}, new ArrayList() {{ add("a"); - }}, new Object[] {'1', 2, "3"}); + }}, new Object[] { + '1', + 2, + "3" + }); testService1.method(); testService1.method("str0", 123); testService1.method(m0, "def_str_0", 123); TestService2.staticMethod("s", 123); - testService2.method(new Object[] {'1', 2, "3"}); + testService2.method(new Object[] { + '1', + 2, + "3" + }); testService2.method(new ArrayList() {{ add("a2"); }}, 123); - logger.info(SUCCESS); return SUCCESS; } diff --git a/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/model/Model0.java b/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/model/Model0.java index 3374b6203df1..b18f5d7c9dd1 100644 --- a/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/model/Model0.java +++ b/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/model/Model0.java @@ -21,10 +21,6 @@ import java.util.List; import java.util.Map; -/** - * @author zhaoyuguang - */ - public class Model0 { public Model0(String id, int num, Model1 model1, Map m, List l, Object[] os) { diff --git a/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/model/Model1.java b/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/model/Model1.java index 712dbbd330c1..3b51247c779b 100644 --- a/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/model/Model1.java +++ b/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/model/Model1.java @@ -18,10 +18,6 @@ package test.org.apache.skywalking.apm.testcase.customize.model; -/** - * @author zhaoyuguang - */ - public class Model1 { public Model1(int id, String name) { diff --git a/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/service/TestService1.java b/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/service/TestService1.java index 63d1c032fccf..867cf9d08de1 100644 --- a/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/service/TestService1.java +++ b/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/service/TestService1.java @@ -18,14 +18,9 @@ package test.org.apache.skywalking.apm.testcase.customize.service; -import test.org.apache.skywalking.apm.testcase.customize.model.Model0; - import java.util.List; import java.util.Map; - -/** - * @author zhaoyuguang - */ +import test.org.apache.skywalking.apm.testcase.customize.model.Model0; public class TestService1 { diff --git a/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/service/TestService2.java b/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/service/TestService2.java index 8ddc8d0ad9df..67bde167401e 100644 --- a/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/service/TestService2.java +++ b/test/plugin/scenarios/customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/service/TestService2.java @@ -20,12 +20,8 @@ import java.util.List; -/** - * @author zhaoyuguang - */ public class TestService2 { - public static void staticMethod(String str0, int count) { } diff --git a/test/plugin/scenarios/dubbo-2.5.x-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/dubbo-2.5.x-scenario/src/main/assembly/assembly.xml index 5c4cfc8c6fc8..3e45d6da5394 100644 --- a/test/plugin/scenarios/dubbo-2.5.x-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/dubbo-2.5.x-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/dubbo-2.5.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/Application.java b/test/plugin/scenarios/dubbo-2.5.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/Application.java index e60ad74888a2..1918964ce933 100644 --- a/test/plugin/scenarios/dubbo-2.5.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/Application.java +++ b/test/plugin/scenarios/dubbo-2.5.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/Application.java @@ -30,10 +30,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -/** - * @author zhangwei - */ -@SpringBootApplication public class Application { +@SpringBootApplication +public class Application { public static void main(String[] args) { SpringApplication.run(Application.class, args); diff --git a/test/plugin/scenarios/dubbo-2.5.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/controller/CaseController.java b/test/plugin/scenarios/dubbo-2.5.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/controller/CaseController.java index b045bbd3f491..7b471ea27541 100644 --- a/test/plugin/scenarios/dubbo-2.5.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/controller/CaseController.java +++ b/test/plugin/scenarios/dubbo-2.5.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/controller/CaseController.java @@ -25,9 +25,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -/** - * @author zhangwei - */ @RestController @RequestMapping("/case") public class CaseController { diff --git a/test/plugin/scenarios/dubbo-2.5.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/services/GreetService.java b/test/plugin/scenarios/dubbo-2.5.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/services/GreetService.java index 4b50c7187bd0..843884fff84b 100644 --- a/test/plugin/scenarios/dubbo-2.5.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/services/GreetService.java +++ b/test/plugin/scenarios/dubbo-2.5.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/services/GreetService.java @@ -18,9 +18,6 @@ package org.apache.skywalking.apm.testcase.dubbo.services; -/** - * @author ascrutae - */ public interface GreetService { String doBusiness(); } diff --git a/test/plugin/scenarios/dubbo-2.5.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/services/impl/GreetServiceImpl.java b/test/plugin/scenarios/dubbo-2.5.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/services/impl/GreetServiceImpl.java index eeeabe458cdc..4e4cebebcb0c 100644 --- a/test/plugin/scenarios/dubbo-2.5.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/services/impl/GreetServiceImpl.java +++ b/test/plugin/scenarios/dubbo-2.5.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/services/impl/GreetServiceImpl.java @@ -20,12 +20,10 @@ import org.apache.skywalking.apm.testcase.dubbo.services.GreetService; -/** - * @author ascrutae - */ public class GreetServiceImpl implements GreetService { - @Override public String doBusiness() { + @Override + public String doBusiness() { return "{name:'helloWorld'}"; } } diff --git a/test/plugin/scenarios/dubbo-2.7.x-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/dubbo-2.7.x-scenario/src/main/assembly/assembly.xml index c8cf4a59c0c5..6c38459973dc 100644 --- a/test/plugin/scenarios/dubbo-2.7.x-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/dubbo-2.7.x-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/dubbo-2.7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/Application.java b/test/plugin/scenarios/dubbo-2.7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/Application.java index 0b8c60eeb854..933fee49e7b9 100644 --- a/test/plugin/scenarios/dubbo-2.7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/Application.java +++ b/test/plugin/scenarios/dubbo-2.7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/Application.java @@ -30,10 +30,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -/** - * @author zhangwei - */ -@SpringBootApplication public class Application { +@SpringBootApplication +public class Application { public static void main(String[] args) { SpringApplication.run(Application.class, args); diff --git a/test/plugin/scenarios/dubbo-2.7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/controller/CaseController.java b/test/plugin/scenarios/dubbo-2.7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/controller/CaseController.java index 0186f36f5775..886ccb704fd0 100644 --- a/test/plugin/scenarios/dubbo-2.7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/controller/CaseController.java +++ b/test/plugin/scenarios/dubbo-2.7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/controller/CaseController.java @@ -25,9 +25,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -/** - * @author zhangwei - */ @RestController @RequestMapping("/case") public class CaseController { diff --git a/test/plugin/scenarios/dubbo-2.7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/services/GreetService.java b/test/plugin/scenarios/dubbo-2.7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/services/GreetService.java index 4b50c7187bd0..843884fff84b 100644 --- a/test/plugin/scenarios/dubbo-2.7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/services/GreetService.java +++ b/test/plugin/scenarios/dubbo-2.7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/services/GreetService.java @@ -18,9 +18,6 @@ package org.apache.skywalking.apm.testcase.dubbo.services; -/** - * @author ascrutae - */ public interface GreetService { String doBusiness(); } diff --git a/test/plugin/scenarios/dubbo-2.7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/services/impl/GreetServiceImpl.java b/test/plugin/scenarios/dubbo-2.7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/services/impl/GreetServiceImpl.java index eeeabe458cdc..4e4cebebcb0c 100644 --- a/test/plugin/scenarios/dubbo-2.7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/services/impl/GreetServiceImpl.java +++ b/test/plugin/scenarios/dubbo-2.7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/dubbo/services/impl/GreetServiceImpl.java @@ -20,12 +20,10 @@ import org.apache.skywalking.apm.testcase.dubbo.services.GreetService; -/** - * @author ascrutae - */ public class GreetServiceImpl implements GreetService { - @Override public String doBusiness() { + @Override + public String doBusiness() { return "{name:'helloWorld'}"; } } diff --git a/test/plugin/scenarios/ehcache-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/ehcache/v2/CaseServlet.java b/test/plugin/scenarios/ehcache-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/ehcache/v2/CaseServlet.java index 3dfc50891c07..d29fd9054613 100644 --- a/test/plugin/scenarios/ehcache-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/ehcache/v2/CaseServlet.java +++ b/test/plugin/scenarios/ehcache-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/ehcache/v2/CaseServlet.java @@ -18,17 +18,16 @@ package org.apache.skywalking.apm.testcase.ehcache.v2; -import net.sf.ehcache.Cache; -import net.sf.ehcache.CacheManager; -import net.sf.ehcache.Element; - +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Arrays; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.PrintWriter; -import java.util.Arrays; +import net.sf.ehcache.Cache; +import net.sf.ehcache.CacheManager; +import net.sf.ehcache.Element; public class CaseServlet extends HttpServlet { diff --git a/test/plugin/scenarios/ehcache-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/ehcache/v2/HealthCheckServlet.java b/test/plugin/scenarios/ehcache-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/ehcache/v2/HealthCheckServlet.java index 51bb5102a76b..59b212919d6c 100644 --- a/test/plugin/scenarios/ehcache-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/ehcache/v2/HealthCheckServlet.java +++ b/test/plugin/scenarios/ehcache-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/ehcache/v2/HealthCheckServlet.java @@ -17,12 +17,12 @@ package org.apache.skywalking.apm.testcase.ehcache.v2; +import java.io.IOException; +import java.io.PrintWriter; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.PrintWriter; public class HealthCheckServlet extends HttpServlet { diff --git a/test/plugin/scenarios/ehcache-2.x-scenario/src/main/resources/cache.xml b/test/plugin/scenarios/ehcache-2.x-scenario/src/main/resources/cache.xml index 8725b6f7d3d4..7a6e8373d108 100644 --- a/test/plugin/scenarios/ehcache-2.x-scenario/src/main/resources/cache.xml +++ b/test/plugin/scenarios/ehcache-2.x-scenario/src/main/resources/cache.xml @@ -16,11 +16,14 @@ ~ limitations under the License. ~ --> - +     -    +     + -    -        -    +         + +     + ​ diff --git a/test/plugin/scenarios/ehcache-2.x-scenario/src/main/webapp/WEB-INF/web.xml b/test/plugin/scenarios/ehcache-2.x-scenario/src/main/webapp/WEB-INF/web.xml index 1dde5b37e3b4..00ea13a9cf82 100644 --- a/test/plugin/scenarios/ehcache-2.x-scenario/src/main/webapp/WEB-INF/web.xml +++ b/test/plugin/scenarios/ehcache-2.x-scenario/src/main/webapp/WEB-INF/web.xml @@ -41,5 +41,4 @@ - diff --git a/test/plugin/scenarios/elasticsearch-5.x-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/elasticsearch-5.x-scenario/src/main/assembly/assembly.xml index b514127697de..fac703422a11 100644 --- a/test/plugin/scenarios/elasticsearch-5.x-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/elasticsearch-5.x-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/elasticsearch-5.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/elasticsearch/controller/CaseController.java b/test/plugin/scenarios/elasticsearch-5.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/elasticsearch/controller/CaseController.java index ae40a01ce48e..0c7e04a6ed20 100644 --- a/test/plugin/scenarios/elasticsearch-5.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/elasticsearch/controller/CaseController.java +++ b/test/plugin/scenarios/elasticsearch-5.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/elasticsearch/controller/CaseController.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package test.apache.skywalking.apm.testcase.elasticsearch.controller; import java.io.IOException; @@ -47,9 +48,7 @@ public class CaseController { @GetMapping("/healthcheck") public String healthcheck() throws Exception { Client client = initTransportClient(); - ClusterHealthResponse response = client.admin().cluster().prepareHealth() - .setWaitForYellowStatus() - .get(); + ClusterHealthResponse response = client.admin().cluster().prepareHealth().setWaitForYellowStatus().get(); if (response.isTimedOut()) { String message = "elastic search node start fail!"; logger.error(message); @@ -87,13 +86,13 @@ public String elasticsearch() throws Exception { private void index(Client client, String indexName) throws IOException { try { client.prepareIndex(indexName, "test", "1") - .setSource(XContentFactory.jsonBuilder() - .startObject() - .field("name", "mysql innodb") - .field("price", "0") - .field("language", "chinese") - .endObject()) - .get(); + .setSource(XContentFactory.jsonBuilder() + .startObject() + .field("name", "mysql innodb") + .field("price", "0") + .field("language", "chinese") + .endObject()) + .get(); } catch (IOException e) { logger.error("index document error.", e); throw e; @@ -107,8 +106,8 @@ private void get(Client client, String indexName) { private void update(Client client, String indexName) throws IOException { try { client.prepareUpdate(indexName, "test", "1") - .setDoc(XContentFactory.jsonBuilder().startObject().field("price", "9.9").endObject()) - .execute(); + .setDoc(XContentFactory.jsonBuilder().startObject().field("price", "9.9").endObject()) + .execute(); } catch (IOException e) { logger.error("update document error.", e); throw e; @@ -127,12 +126,12 @@ private Client initTransportClient() throws UnknownHostException { TransportClient client = null; try { Settings settings = Settings.builder() - .put("cluster.name", "docker-node") - .put("client.transport.sniff", false) - .build(); + .put("cluster.name", "docker-node") + .put("client.transport.sniff", false) + .build(); - client = new PreBuiltTransportClient(settings) - .addTransportAddress(new InetSocketTransportAddress(InetAddress.getByName(host), 9300)); + client = new PreBuiltTransportClient(settings).addTransportAddress(new InetSocketTransportAddress(InetAddress + .getByName(host), 9300)); } catch (UnknownHostException e) { logger.error("create client error", e); throw e; diff --git a/test/plugin/scenarios/elasticsearch-6.x-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/elasticsearch-6.x-scenario/src/main/assembly/assembly.xml index 916b9888a023..14cfcb616e0c 100644 --- a/test/plugin/scenarios/elasticsearch-6.x-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/elasticsearch-6.x-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/elasticsearch-6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/config/ElasticsearchConfig.java b/test/plugin/scenarios/elasticsearch-6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/config/ElasticsearchConfig.java index 46edcefdb043..4a8dcc40c0d0 100644 --- a/test/plugin/scenarios/elasticsearch-6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/config/ElasticsearchConfig.java +++ b/test/plugin/scenarios/elasticsearch-6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/config/ElasticsearchConfig.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.testcase.elasticsearch.config; import org.apache.http.HttpHost; @@ -24,9 +25,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -/** - * @author aderm - */ @Configuration public class ElasticsearchConfig { diff --git a/test/plugin/scenarios/elasticsearch-6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/controller/CaseController.java b/test/plugin/scenarios/elasticsearch-6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/controller/CaseController.java index 3cd0d7d871d2..d015a07f153d 100644 --- a/test/plugin/scenarios/elasticsearch-6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/controller/CaseController.java +++ b/test/plugin/scenarios/elasticsearch-6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/controller/CaseController.java @@ -15,9 +15,8 @@ * limitations under the License. * */ -package org.apache.skywalking.apm.testcase.elasticsearch.controller; -import static java.util.Collections.singletonMap; +package org.apache.skywalking.apm.testcase.elasticsearch.controller; import java.io.IOException; import java.util.Map; @@ -55,6 +54,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import static java.util.Collections.singletonMap; + @RestController @RequestMapping("/elasticsearch-case/case") public class CaseController { @@ -90,7 +91,7 @@ public String elasticsearch() throws Exception { client.indices().refresh(new RefreshRequest(indexName), RequestOptions.DEFAULT); - //get + //get get(client, indexName); // search search(client, indexName); @@ -130,10 +131,7 @@ private void createIndex(RestHighLevelClient client, String indexName) throws IO builder.endObject(); request.mapping(builder); - request.settings(Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - ); + request.settings(Settings.builder().put("index.number_of_shards", 1).put("index.number_of_replicas", 0)); CreateIndexResponse createIndexResponse = client.indices().create(request, RequestOptions.DEFAULT); if (createIndexResponse.isAcknowledged() == false) { @@ -151,7 +149,7 @@ private void index(RestHighLevelClient client, String indexName) throws IOExcept builder.field("title", "Java programing."); } builder.endObject(); - IndexRequest indexRequest = new IndexRequest(indexName,"_doc", "1").source(builder); + IndexRequest indexRequest = new IndexRequest(indexName, "_doc", "1").source(builder); IndexResponse indexResponse = client.index(indexRequest, RequestOptions.DEFAULT); if (indexResponse.status().getStatus() >= 400) { diff --git a/test/plugin/scenarios/elasticsearch-7.x-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/elasticsearch-7.x-scenario/src/main/assembly/assembly.xml index 52790912f5fa..b14d4bf9d6f1 100644 --- a/test/plugin/scenarios/elasticsearch-7.x-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/elasticsearch-7.x-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/elasticsearch-7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/Application.java b/test/plugin/scenarios/elasticsearch-7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/Application.java index 57e75377c564..de75da6e9393 100644 --- a/test/plugin/scenarios/elasticsearch-7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/Application.java +++ b/test/plugin/scenarios/elasticsearch-7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/Application.java @@ -21,9 +21,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -/** - * @author aderm - */ @SpringBootApplication public class Application { diff --git a/test/plugin/scenarios/elasticsearch-7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/config/ElasticsearchConfig.java b/test/plugin/scenarios/elasticsearch-7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/config/ElasticsearchConfig.java index 46edcefdb043..4a8dcc40c0d0 100644 --- a/test/plugin/scenarios/elasticsearch-7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/config/ElasticsearchConfig.java +++ b/test/plugin/scenarios/elasticsearch-7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/config/ElasticsearchConfig.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.testcase.elasticsearch.config; import org.apache.http.HttpHost; @@ -24,9 +25,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -/** - * @author aderm - */ @Configuration public class ElasticsearchConfig { diff --git a/test/plugin/scenarios/elasticsearch-7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/controller/CaseController.java b/test/plugin/scenarios/elasticsearch-7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/controller/CaseController.java index dce7ee27b918..0237cb9170f4 100644 --- a/test/plugin/scenarios/elasticsearch-7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/controller/CaseController.java +++ b/test/plugin/scenarios/elasticsearch-7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/controller/CaseController.java @@ -18,8 +18,6 @@ package org.apache.skywalking.apm.testcase.elasticsearch.controller; -import static java.util.Collections.singletonMap; - import java.io.IOException; import java.util.Map; import java.util.UUID; @@ -53,12 +51,11 @@ import org.elasticsearch.search.builder.SearchSourceBuilder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import static java.util.Collections.singletonMap; -/** - * @author aderm - */ @RestController @RequestMapping("/case") public class CaseController { @@ -134,10 +131,7 @@ private void createIndex(RestHighLevelClient client, String indexName) throws IO builder.endObject(); request.mapping(builder); - request.settings(Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - ); + request.settings(Settings.builder().put("index.number_of_shards", 1).put("index.number_of_replicas", 0)); CreateIndexResponse createIndexResponse = client.indices().create(request, RequestOptions.DEFAULT); if (createIndexResponse.isAcknowledged() == false) { @@ -220,4 +214,3 @@ private void search(RestHighLevelClient client, String indexName) throws IOExcep } } - diff --git a/test/plugin/scenarios/feign-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/feign-scenario/src/main/assembly/assembly.xml index b47d121d91f7..c2e24d3e539c 100644 --- a/test/plugin/scenarios/feign-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/feign-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/feign-scenario/src/main/java/org/apache/skywalking/apm/testcase/feign/controller/RestRequest.java b/test/plugin/scenarios/feign-scenario/src/main/java/org/apache/skywalking/apm/testcase/feign/controller/RestRequest.java index 918c7394b45a..04596f778652 100644 --- a/test/plugin/scenarios/feign-scenario/src/main/java/org/apache/skywalking/apm/testcase/feign/controller/RestRequest.java +++ b/test/plugin/scenarios/feign-scenario/src/main/java/org/apache/skywalking/apm/testcase/feign/controller/RestRequest.java @@ -49,9 +49,9 @@ public interface RestRequest { static RestRequest connect() { Decoder decoder = new GsonDecoder(); return Feign.builder() - .decoder(decoder) - .logger(new Logger.ErrorLogger()) - .logLevel(Logger.Level.BASIC) - .target(RestRequest.class, "http://localhost:8080/feign-scenario"); + .decoder(decoder) + .logger(new Logger.ErrorLogger()) + .logLevel(Logger.Level.BASIC) + .target(RestRequest.class, "http://localhost:8080/feign-scenario"); } } diff --git a/test/plugin/scenarios/gateway-scenario/gateway-dist/src/main/assembly/assembly.xml b/test/plugin/scenarios/gateway-scenario/gateway-dist/src/main/assembly/assembly.xml index 5f6c494fea31..00d04e28e04b 100644 --- a/test/plugin/scenarios/gateway-scenario/gateway-dist/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/gateway-scenario/gateway-dist/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/gateway-scenario/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/ApiKeyResolver.java b/test/plugin/scenarios/gateway-scenario/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/ApiKeyResolver.java index 785d73b9bfcb..f39c0456402f 100644 --- a/test/plugin/scenarios/gateway-scenario/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/ApiKeyResolver.java +++ b/test/plugin/scenarios/gateway-scenario/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/ApiKeyResolver.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.testcase.sc.gateway.projectA; import org.springframework.cloud.gateway.filter.ratelimit.KeyResolver; @@ -22,11 +23,8 @@ import org.springframework.web.server.ServerWebExchange; import reactor.core.publisher.Mono; -/** - * @author songxiaoyue - */ @Component -public class ApiKeyResolver implements KeyResolver{ +public class ApiKeyResolver implements KeyResolver { public Mono resolve(ServerWebExchange exchange) { return Mono.just(exchange.getRequest().getPath().value()); diff --git a/test/plugin/scenarios/gateway-scenario/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/Test1Filter.java b/test/plugin/scenarios/gateway-scenario/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/Test1Filter.java index 36028ef19cfb..ee7a1bf3e23e 100644 --- a/test/plugin/scenarios/gateway-scenario/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/Test1Filter.java +++ b/test/plugin/scenarios/gateway-scenario/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/Test1Filter.java @@ -27,9 +27,10 @@ public class Test1Filter implements GlobalFilter, Ordered { @Override public Mono filter(ServerWebExchange exchange, GatewayFilterChain chain) { - ServerHttpRequest buildRequest = exchange.getRequest().mutate().build(); + ServerHttpRequest buildRequest = exchange.getRequest().mutate().build(); return chain.filter(exchange.mutate().request(buildRequest).build()); } + @Override public int getOrder() { return 0; diff --git a/test/plugin/scenarios/gateway-scenario/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/Test2Filter.java b/test/plugin/scenarios/gateway-scenario/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/Test2Filter.java index 081fa7c526be..62f060411666 100644 --- a/test/plugin/scenarios/gateway-scenario/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/Test2Filter.java +++ b/test/plugin/scenarios/gateway-scenario/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/Test2Filter.java @@ -28,7 +28,7 @@ public class Test2Filter implements GlobalFilter, Ordered { @Override public Mono filter(ServerWebExchange exchange, GatewayFilterChain chain) { - ServerHttpRequest buildRequest = exchange.getRequest().mutate().build(); + ServerHttpRequest buildRequest = exchange.getRequest().mutate().build(); return chain.filter(exchange.mutate().request(buildRequest).build()); } diff --git a/test/plugin/scenarios/gateway-scenario/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/TestFilterConfig.java b/test/plugin/scenarios/gateway-scenario/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/TestFilterConfig.java index 1e46378d4d55..b625393535f7 100644 --- a/test/plugin/scenarios/gateway-scenario/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/TestFilterConfig.java +++ b/test/plugin/scenarios/gateway-scenario/gateway-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/TestFilterConfig.java @@ -24,12 +24,12 @@ public class TestFilterConfig { @Bean - public Test1Filter test1Filter(){ + public Test1Filter test1Filter() { return new Test1Filter(); } @Bean - public Test2Filter test2Filter(){ + public Test2Filter test2Filter() { return new Test2Filter(); } } diff --git a/test/plugin/scenarios/gateway-scenario/gateway-projectB-scenario/src/main/resources/application.properties b/test/plugin/scenarios/gateway-scenario/gateway-projectB-scenario/src/main/resources/application.properties index 9285bb48d849..cac2c4d5a11a 100644 --- a/test/plugin/scenarios/gateway-scenario/gateway-projectB-scenario/src/main/resources/application.properties +++ b/test/plugin/scenarios/gateway-scenario/gateway-projectB-scenario/src/main/resources/application.properties @@ -14,5 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # - server.port=18070 \ No newline at end of file diff --git a/test/plugin/scenarios/grpc-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/grpc-scenario/src/main/assembly/assembly.xml index 8707aeebdaa2..59bb39f39b68 100644 --- a/test/plugin/scenarios/grpc-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/grpc-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/Application.java b/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/Application.java index fc5ec90039ed..052e0f7e3b55 100644 --- a/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/Application.java +++ b/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/Application.java @@ -21,7 +21,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; - @SpringBootApplication public class Application { diff --git a/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/consumr/ConsumerInterceptor.java b/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/consumr/ConsumerInterceptor.java index 68ddbb105139..58851a210888 100644 --- a/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/consumr/ConsumerInterceptor.java +++ b/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/consumr/ConsumerInterceptor.java @@ -27,21 +27,22 @@ import io.grpc.Metadata; import io.grpc.MethodDescriptor; import io.grpc.Status; +import javax.annotation.Nullable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import javax.annotation.Nullable; - public class ConsumerInterceptor implements ClientInterceptor { private Logger logger = LogManager.getLogger(ConsumerInterceptor.class); - @Override public ClientCall interceptCall(MethodDescriptor descriptor, + @Override + public ClientCall interceptCall(MethodDescriptor descriptor, CallOptions options, Channel channel) { logger.info("start interceptor!"); logger.info("method type: {}", descriptor.getType()); return new ForwardingClientCall.SimpleForwardingClientCall(channel.newCall(descriptor, options)) { - @Override public void start(Listener responseListener, Metadata headers) { + @Override + public void start(Listener responseListener, Metadata headers) { logger.info("Peer: {}", channel.authority()); logger.info("Operation Name : {}", descriptor.getFullMethodName()); Interceptor tracingResponseListener = new Interceptor(responseListener); @@ -49,17 +50,20 @@ public class ConsumerInterceptor implements ClientInterceptor { delegate().start(tracingResponseListener, headers); } - @Override public void cancel(@Nullable String message, @Nullable Throwable cause) { + @Override + public void cancel(@Nullable String message, @Nullable Throwable cause) { logger.info("cancel"); super.cancel(message, cause); } - @Override public void halfClose() { + @Override + public void halfClose() { logger.info("halfClose"); super.halfClose(); } - @Override public void sendMessage(ReqT message) { + @Override + public void sendMessage(ReqT message) { logger.info("sendMessage ...."); super.sendMessage(message); } @@ -96,7 +100,8 @@ public void onClose(Status status, Metadata trailers) { delegate().onClose(status, trailers); } - @Override public void onReady() { + @Override + public void onReady() { logger.info("on Ready"); super.onReady(); } diff --git a/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/controller/CaseController.java b/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/controller/CaseController.java index 708770a9d2b2..d0a3a6096b4e 100644 --- a/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/controller/CaseController.java +++ b/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/controller/CaseController.java @@ -23,6 +23,10 @@ import io.grpc.ManagedChannelBuilder; import io.grpc.stub.ClientCallStreamObserver; import io.grpc.stub.ClientResponseObserver; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import javax.annotation.PostConstruct; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.skywalking.apm.testcase.grpc.consumr.ConsumerInterceptor; @@ -31,11 +35,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.PostConstruct; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; - @RestController @RequestMapping("/case") public class CaseController { @@ -75,11 +74,8 @@ public String healthCheck() { return SUCCESS; } - private static List names() { - return Arrays.asList( - "Sophia", - "Jackson"); + return Arrays.asList("Sophia", "Jackson"); } private void greetService() { diff --git a/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/provider/ProviderConfiguration.java b/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/provider/ProviderConfiguration.java index 672876f8f4d8..8541c403b179 100644 --- a/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/provider/ProviderConfiguration.java +++ b/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/provider/ProviderConfiguration.java @@ -29,9 +29,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Component; -/** - * @author zhangwei - */ @Configurable @Component public class ProviderConfiguration { @@ -39,9 +36,9 @@ public class ProviderConfiguration { @Bean(initMethod = "start", destroyMethod = "shutdown") public Server server() { return ServerBuilder.forPort(18080) - .addService(ServerInterceptors.intercept(new GreeterServiceImpl(), new ProviderInterceptor())) - .addService(ServerInterceptors.intercept(new GreeterBlockingServiceImpl(), new ProviderInterceptor())) - .addService(ServerInterceptors.intercept(new GreeterBlockingErrorServiceImpl(), new ProviderInterceptor())) - .build(); + .addService(ServerInterceptors.intercept(new GreeterServiceImpl(), new ProviderInterceptor())) + .addService(ServerInterceptors.intercept(new GreeterBlockingServiceImpl(), new ProviderInterceptor())) + .addService(ServerInterceptors.intercept(new GreeterBlockingErrorServiceImpl(), new ProviderInterceptor())) + .build(); } } diff --git a/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/provider/interceptor/ProviderInterceptor.java b/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/provider/interceptor/ProviderInterceptor.java index 1ccd0bdbac23..8559c4c8bb2d 100644 --- a/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/provider/interceptor/ProviderInterceptor.java +++ b/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/provider/interceptor/ProviderInterceptor.java @@ -24,11 +24,10 @@ import io.grpc.ServerCall; import io.grpc.ServerCallHandler; import io.grpc.ServerInterceptor; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - import java.util.HashMap; import java.util.Map; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class ProviderInterceptor implements ServerInterceptor { private Logger logger = LogManager.getLogger(ProviderInterceptor.class); @@ -55,32 +54,38 @@ public void sendHeaders(Metadata responseHeaders) { delegate().sendHeaders(responseHeaders); } - @Override public void sendMessage(RespT message) { + @Override + public void sendMessage(RespT message) { delegate().sendMessage(message); } }, metadata)) { - @Override public void onReady() { + @Override + public void onReady() { logger.info("onReady...."); delegate().onReady(); } - @Override public void onCancel() { + @Override + public void onCancel() { logger.info("onCancel...."); delegate().onCancel(); } - @Override public void onComplete() { + @Override + public void onComplete() { logger.info("onComplete...."); delegate().onComplete(); } - @Override public void onHalfClose() { + @Override + public void onHalfClose() { logger.info("onHalfClose...."); delegate().onHalfClose(); } - @Override public void onMessage(ReqT message) { + @Override + public void onMessage(ReqT message) { logger.info("onMessage...."); delegate().onMessage(message); } diff --git a/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/provider/service/GreeterBlockingErrorServiceImpl.java b/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/provider/service/GreeterBlockingErrorServiceImpl.java index 7b1af584bef1..3cd6394a48a7 100644 --- a/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/provider/service/GreeterBlockingErrorServiceImpl.java +++ b/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/provider/service/GreeterBlockingErrorServiceImpl.java @@ -15,11 +15,11 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.testcase.grpc.provider.service; import io.grpc.stub.StreamObserver; import org.apache.skywalking.apm.testcase.grpc.proto.GreeterBlockingErrorGrpc; -import org.apache.skywalking.apm.testcase.grpc.proto.GreeterBlockingGrpc; import org.apache.skywalking.apm.testcase.grpc.proto.HelloReply; import org.apache.skywalking.apm.testcase.grpc.proto.HelloRequest; diff --git a/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/provider/service/GreeterBlockingServiceImpl.java b/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/provider/service/GreeterBlockingServiceImpl.java index 520f4011be31..2f156bc62f89 100644 --- a/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/provider/service/GreeterBlockingServiceImpl.java +++ b/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/provider/service/GreeterBlockingServiceImpl.java @@ -24,7 +24,8 @@ import org.apache.skywalking.apm.testcase.grpc.proto.HelloRequest; public class GreeterBlockingServiceImpl extends GreeterBlockingGrpc.GreeterBlockingImplBase { - @Override public void sayHello(HelloRequest request, StreamObserver responseObserver) { + @Override + public void sayHello(HelloRequest request, StreamObserver responseObserver) { responseObserver.onNext(HelloReply.newBuilder().setMessage("Hi," + request.getName()).build()); responseObserver.onCompleted(); } diff --git a/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/provider/service/GreeterServiceImpl.java b/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/provider/service/GreeterServiceImpl.java index 1116c477a40c..ee021af75cfe 100644 --- a/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/provider/service/GreeterServiceImpl.java +++ b/test/plugin/scenarios/grpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/grpc/provider/service/GreeterServiceImpl.java @@ -19,12 +19,11 @@ package org.apache.skywalking.apm.testcase.grpc.provider.service; import io.grpc.stub.StreamObserver; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.skywalking.apm.testcase.grpc.proto.GreeterGrpc; import org.apache.skywalking.apm.testcase.grpc.proto.HelloReply; import org.apache.skywalking.apm.testcase.grpc.proto.HelloRequest; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - public class GreeterServiceImpl extends GreeterGrpc.GreeterImplBase { diff --git a/test/plugin/scenarios/gson-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/gson-scenario/src/main/assembly/assembly.xml index 1bc15065b430..d8b26a18fe8f 100644 --- a/test/plugin/scenarios/gson-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/gson-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/gson-scenario/src/main/java/org/apache/skywalking/apm/testcase/gson/Application.java b/test/plugin/scenarios/gson-scenario/src/main/java/org/apache/skywalking/apm/testcase/gson/Application.java index ebca5766fe6c..752e0bcb8bcf 100644 --- a/test/plugin/scenarios/gson-scenario/src/main/java/org/apache/skywalking/apm/testcase/gson/Application.java +++ b/test/plugin/scenarios/gson-scenario/src/main/java/org/apache/skywalking/apm/testcase/gson/Application.java @@ -21,7 +21,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; - @SpringBootApplication public class Application { diff --git a/test/plugin/scenarios/httpasyncclient-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/httpasyncclient-scenario/src/main/assembly/assembly.xml index 59529c740916..82f521e1f586 100644 --- a/test/plugin/scenarios/httpasyncclient-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/httpasyncclient-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/httpasyncclient-scenario/src/main/java/org/apache/skywalking/testcase/httpasyncclient/BackController.java b/test/plugin/scenarios/httpasyncclient-scenario/src/main/java/org/apache/skywalking/testcase/httpasyncclient/BackController.java index 318286506cae..1d6cfbc97c94 100644 --- a/test/plugin/scenarios/httpasyncclient-scenario/src/main/java/org/apache/skywalking/testcase/httpasyncclient/BackController.java +++ b/test/plugin/scenarios/httpasyncclient-scenario/src/main/java/org/apache/skywalking/testcase/httpasyncclient/BackController.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.testcase.httpasyncclient; import org.springframework.web.bind.annotation.GetMapping; diff --git a/test/plugin/scenarios/httpasyncclient-scenario/src/main/java/org/apache/skywalking/testcase/httpasyncclient/FrontController.java b/test/plugin/scenarios/httpasyncclient-scenario/src/main/java/org/apache/skywalking/testcase/httpasyncclient/FrontController.java index 4ed5e48ac275..f04c212e6235 100644 --- a/test/plugin/scenarios/httpasyncclient-scenario/src/main/java/org/apache/skywalking/testcase/httpasyncclient/FrontController.java +++ b/test/plugin/scenarios/httpasyncclient-scenario/src/main/java/org/apache/skywalking/testcase/httpasyncclient/FrontController.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.testcase.httpasyncclient; import java.io.IOException; diff --git a/test/plugin/scenarios/httpasyncclient-scenario/src/main/java/org/apache/skywalking/testcase/httpasyncclient/HttpasyncclientApplication.java b/test/plugin/scenarios/httpasyncclient-scenario/src/main/java/org/apache/skywalking/testcase/httpasyncclient/HttpasyncclientApplication.java index 8d65eedbea96..2f25f6e1d567 100644 --- a/test/plugin/scenarios/httpasyncclient-scenario/src/main/java/org/apache/skywalking/testcase/httpasyncclient/HttpasyncclientApplication.java +++ b/test/plugin/scenarios/httpasyncclient-scenario/src/main/java/org/apache/skywalking/testcase/httpasyncclient/HttpasyncclientApplication.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.testcase.httpasyncclient; import org.springframework.boot.SpringApplication; diff --git a/test/plugin/scenarios/httpclient-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/httpclient/CaseServlet.java b/test/plugin/scenarios/httpclient-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/httpclient/CaseServlet.java index 0a0d3e94c279..c903c7a93817 100644 --- a/test/plugin/scenarios/httpclient-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/httpclient/CaseServlet.java +++ b/test/plugin/scenarios/httpclient-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/httpclient/CaseServlet.java @@ -18,20 +18,16 @@ package org.apache.skywalking.apm.testcase.httpclient; +import java.io.IOException; +import java.io.PrintWriter; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.PrintWriter; - import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpMethod; import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager; import org.apache.commons.httpclient.methods.GetMethod; -/** - * @author kezhenxu94 - */ public class CaseServlet extends HttpServlet { @Override diff --git a/test/plugin/scenarios/httpclient-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/httpclient/HealthCheckServlet.java b/test/plugin/scenarios/httpclient-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/httpclient/HealthCheckServlet.java index 03ebd4376c46..389796c19474 100644 --- a/test/plugin/scenarios/httpclient-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/httpclient/HealthCheckServlet.java +++ b/test/plugin/scenarios/httpclient-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/httpclient/HealthCheckServlet.java @@ -17,15 +17,12 @@ package org.apache.skywalking.apm.testcase.httpclient; +import java.io.IOException; +import java.io.PrintWriter; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.PrintWriter; -/** - * @author kezhenxu94 - */ public class HealthCheckServlet extends HttpServlet { @Override diff --git a/test/plugin/scenarios/httpclient-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/httpclient/ServletForContextPropagate.java b/test/plugin/scenarios/httpclient-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/httpclient/ServletForContextPropagate.java index b8ace2b3cd4c..20b699552f82 100644 --- a/test/plugin/scenarios/httpclient-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/httpclient/ServletForContextPropagate.java +++ b/test/plugin/scenarios/httpclient-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/httpclient/ServletForContextPropagate.java @@ -18,15 +18,12 @@ package org.apache.skywalking.apm.testcase.httpclient; +import java.io.IOException; +import java.io.PrintWriter; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.PrintWriter; -/** - * @author kezhenxu94 - */ public class ServletForContextPropagate extends HttpServlet { @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException { diff --git a/test/plugin/scenarios/hystrix-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/hystrix-scenario/src/main/assembly/assembly.xml index 1549c13d5c14..3249003ce9ad 100644 --- a/test/plugin/scenarios/hystrix-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/hystrix-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/hystrix-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/hystrix/Application.java b/test/plugin/scenarios/hystrix-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/hystrix/Application.java index 9525e9c36b75..ce0343492d29 100644 --- a/test/plugin/scenarios/hystrix-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/hystrix/Application.java +++ b/test/plugin/scenarios/hystrix-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/hystrix/Application.java @@ -21,7 +21,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; - @SpringBootApplication public class Application { diff --git a/test/plugin/scenarios/hystrix-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/hystrix/controller/CaseController.java b/test/plugin/scenarios/hystrix-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/hystrix/controller/CaseController.java index 0ba67165b233..2ae74e1bbe69 100644 --- a/test/plugin/scenarios/hystrix-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/hystrix/controller/CaseController.java +++ b/test/plugin/scenarios/hystrix-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/hystrix/controller/CaseController.java @@ -44,27 +44,32 @@ public class CaseController { @PostConstruct public void setUp() { HystrixPlugins.getInstance().registerCommandExecutionHook(new HystrixCommandExecutionHook() { - @Override public void onStart(HystrixInvokable commandInstance) { + @Override + public void onStart(HystrixInvokable commandInstance) { logger.info("[hookA] onStart: " + Thread.currentThread().getId()); super.onStart(commandInstance); } - @Override public void onExecutionStart(HystrixInvokable commandInstance) { + @Override + public void onExecutionStart(HystrixInvokable commandInstance) { logger.info("[hookA] onExecutionStart: " + Thread.currentThread().getId()); super.onExecutionStart(commandInstance); } - @Override public void onExecutionSuccess(HystrixInvokable commandInstance) { + @Override + public void onExecutionSuccess(HystrixInvokable commandInstance) { logger.info("[hookA] onExecutionSuccess: " + Thread.currentThread().getId()); super.onExecutionSuccess(commandInstance); } - @Override public Exception onExecutionError(HystrixInvokable commandInstance, Exception e) { + @Override + public Exception onExecutionError(HystrixInvokable commandInstance, Exception e) { logger.info("[hookA] onExecutionError: " + Thread.currentThread().getId()); return super.onExecutionError(commandInstance, e); } - @Override public Exception onRunError(HystrixCommand commandInstance, Exception e) { + @Override + public Exception onRunError(HystrixCommand commandInstance, Exception e) { logger.info("[hookA] onRunError: " + Thread.currentThread().getId()); return super.onRunError(commandInstance, e); } diff --git a/test/plugin/scenarios/hystrix-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/hystrix/controller/TestACommand.java b/test/plugin/scenarios/hystrix-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/hystrix/controller/TestACommand.java index 035de811222c..8efab6c47253 100644 --- a/test/plugin/scenarios/hystrix-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/hystrix/controller/TestACommand.java +++ b/test/plugin/scenarios/hystrix-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/hystrix/controller/TestACommand.java @@ -30,11 +30,8 @@ public class TestACommand extends HystrixCommand { protected TestACommand(String name) { super(Setter.withGroupKey(HystrixCommandGroupKey.Factory.asKey("TestACommand")) - .andCommandPropertiesDefaults( - HystrixCommandProperties.Setter() - .withExecutionTimeoutInMilliseconds(1000) - ) - ); + .andCommandPropertiesDefaults(HystrixCommandProperties.Setter() + .withExecutionTimeoutInMilliseconds(1000))); this.name = name; } diff --git a/test/plugin/scenarios/hystrix-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/hystrix/controller/TestBCommand.java b/test/plugin/scenarios/hystrix-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/hystrix/controller/TestBCommand.java index 0166df7beb33..a59f93a4e1d3 100644 --- a/test/plugin/scenarios/hystrix-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/hystrix/controller/TestBCommand.java +++ b/test/plugin/scenarios/hystrix-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/hystrix/controller/TestBCommand.java @@ -31,14 +31,10 @@ public class TestBCommand extends HystrixCommand { protected TestBCommand(String name) { super(Setter.withGroupKey(HystrixCommandGroupKey.Factory.asKey("TestBCommand")) - .andCommandPropertiesDefaults( - HystrixCommandProperties.Setter() - .withExecutionTimeoutInMilliseconds(1000) - ).andCommandPropertiesDefaults( - HystrixCommandProperties.Setter() - .withExecutionIsolationStrategy(ExecutionIsolationStrategy.SEMAPHORE) - ) - ); + .andCommandPropertiesDefaults(HystrixCommandProperties.Setter() + .withExecutionTimeoutInMilliseconds(1000)) + .andCommandPropertiesDefaults(HystrixCommandProperties.Setter() + .withExecutionIsolationStrategy(ExecutionIsolationStrategy.SEMAPHORE))); this.name = name; } diff --git a/test/plugin/scenarios/jdk-http-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/jdk-http-scenario/src/main/assembly/assembly.xml index c5430475949d..b74db79d31c4 100644 --- a/test/plugin/scenarios/jdk-http-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/jdk-http-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/jdk-http-scenario/src/main/java/org/apache/skywalking/apm/testcase/jdkhttp/Application.java b/test/plugin/scenarios/jdk-http-scenario/src/main/java/org/apache/skywalking/apm/testcase/jdkhttp/Application.java index 315fd0be489d..3c91bcf25b98 100644 --- a/test/plugin/scenarios/jdk-http-scenario/src/main/java/org/apache/skywalking/apm/testcase/jdkhttp/Application.java +++ b/test/plugin/scenarios/jdk-http-scenario/src/main/java/org/apache/skywalking/apm/testcase/jdkhttp/Application.java @@ -21,7 +21,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; - @SpringBootApplication public class Application { diff --git a/test/plugin/scenarios/jdk-http-scenario/src/main/java/org/apache/skywalking/apm/testcase/jdkhttp/controller/CaseController.java b/test/plugin/scenarios/jdk-http-scenario/src/main/java/org/apache/skywalking/apm/testcase/jdkhttp/controller/CaseController.java index 6b1ffaf27329..4ff00b633373 100644 --- a/test/plugin/scenarios/jdk-http-scenario/src/main/java/org/apache/skywalking/apm/testcase/jdkhttp/controller/CaseController.java +++ b/test/plugin/scenarios/jdk-http-scenario/src/main/java/org/apache/skywalking/apm/testcase/jdkhttp/controller/CaseController.java @@ -18,16 +18,15 @@ package org.apache.skywalking.apm.testcase.jdkhttp.controller; +import java.io.IOException; +import java.net.HttpURLConnection; +import java.net.URL; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import java.io.IOException; -import java.net.HttpURLConnection; -import java.net.URL; - @RestController @RequestMapping("/case") public class CaseController { @@ -41,7 +40,7 @@ public class CaseController { public String testcase() throws IOException { URL url = new URL("http://localhost:8080/jdk-http-scenario/case/receiveContext-0"); HttpURLConnection connection = (HttpURLConnection) url.openConnection(); - connection.addRequestProperty("key","value"); + connection.addRequestProperty("key", "value"); int responseCode = connection.getResponseCode(); return "Success:" + responseCode; } diff --git a/test/plugin/scenarios/jdk-threading-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/jdk-threading-scenario/src/main/assembly/assembly.xml index a73328614cdf..d3315b95edf0 100644 --- a/test/plugin/scenarios/jdk-threading-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/jdk-threading-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/jdk-threading-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/jdk/threading/Application.java b/test/plugin/scenarios/jdk-threading-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/jdk/threading/Application.java index 1cbdedbb545d..42c7593cdb5b 100644 --- a/test/plugin/scenarios/jdk-threading-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/jdk/threading/Application.java +++ b/test/plugin/scenarios/jdk-threading-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/jdk/threading/Application.java @@ -21,7 +21,6 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; - import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; @@ -30,9 +29,6 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.RestTemplate; -/** - * @author kezhenxu94 - */ @SpringBootApplication public class Application { diff --git a/test/plugin/scenarios/jedis-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/jedis-scenario/src/main/assembly/assembly.xml index 8259d6da91a7..5ffcbdb63ee6 100644 --- a/test/plugin/scenarios/jedis-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/jedis-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/jedis-scenario/src/main/java/org/apache/skywalking/apm/testcase/jedis/Application.java b/test/plugin/scenarios/jedis-scenario/src/main/java/org/apache/skywalking/apm/testcase/jedis/Application.java index a5284fd8fef2..6cfc49b3a865 100644 --- a/test/plugin/scenarios/jedis-scenario/src/main/java/org/apache/skywalking/apm/testcase/jedis/Application.java +++ b/test/plugin/scenarios/jedis-scenario/src/main/java/org/apache/skywalking/apm/testcase/jedis/Application.java @@ -21,7 +21,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; - @SpringBootApplication public class Application { diff --git a/test/plugin/scenarios/jedis-scenario/src/main/java/org/apache/skywalking/apm/testcase/jedis/controller/RedisCommandExecutor.java b/test/plugin/scenarios/jedis-scenario/src/main/java/org/apache/skywalking/apm/testcase/jedis/controller/RedisCommandExecutor.java index dad68f1d0cdd..0901c7057f25 100644 --- a/test/plugin/scenarios/jedis-scenario/src/main/java/org/apache/skywalking/apm/testcase/jedis/controller/RedisCommandExecutor.java +++ b/test/plugin/scenarios/jedis-scenario/src/main/java/org/apache/skywalking/apm/testcase/jedis/controller/RedisCommandExecutor.java @@ -20,7 +20,7 @@ import redis.clients.jedis.Jedis; -public class RedisCommandExecutor implements AutoCloseable{ +public class RedisCommandExecutor implements AutoCloseable { private Jedis jedis; public RedisCommandExecutor(String host, Integer port) { diff --git a/test/plugin/scenarios/jetty-scenario/jetty-dist/src/main/assembly/assembly.xml b/test/plugin/scenarios/jetty-scenario/jetty-dist/src/main/assembly/assembly.xml index 6c159e3a7dfc..ee6b5b49c01f 100644 --- a/test/plugin/scenarios/jetty-scenario/jetty-dist/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/jetty-scenario/jetty-dist/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/jetty-scenario/jettyclient-scenario/src/main/java/org/apache/skywalking/apm/testcase/jettyclient/Application.java b/test/plugin/scenarios/jetty-scenario/jettyclient-scenario/src/main/java/org/apache/skywalking/apm/testcase/jettyclient/Application.java index 9cd73210662a..be61c67f3326 100644 --- a/test/plugin/scenarios/jetty-scenario/jettyclient-scenario/src/main/java/org/apache/skywalking/apm/testcase/jettyclient/Application.java +++ b/test/plugin/scenarios/jetty-scenario/jettyclient-scenario/src/main/java/org/apache/skywalking/apm/testcase/jettyclient/Application.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.testcase.jettyclient; import org.springframework.boot.SpringApplication; diff --git a/test/plugin/scenarios/jetty-scenario/jettyclient-scenario/src/main/java/org/apache/skywalking/apm/testcase/jettyclient/controller/CaseController.java b/test/plugin/scenarios/jetty-scenario/jettyclient-scenario/src/main/java/org/apache/skywalking/apm/testcase/jettyclient/controller/CaseController.java index fea948a28e45..2b6977875003 100644 --- a/test/plugin/scenarios/jetty-scenario/jettyclient-scenario/src/main/java/org/apache/skywalking/apm/testcase/jettyclient/controller/CaseController.java +++ b/test/plugin/scenarios/jetty-scenario/jettyclient-scenario/src/main/java/org/apache/skywalking/apm/testcase/jettyclient/controller/CaseController.java @@ -15,12 +15,11 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.testcase.jettyclient.controller; import javax.annotation.PostConstruct; import org.eclipse.jetty.client.HttpClient; -import org.eclipse.jetty.client.api.Response; -import org.eclipse.jetty.client.api.Result; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.PropertySource; import org.springframework.stereotype.Controller; diff --git a/test/plugin/scenarios/jetty-scenario/jettyclient-scenario/src/main/resources/application.properties b/test/plugin/scenarios/jetty-scenario/jettyclient-scenario/src/main/resources/application.properties index bf20bf2a45de..4bfbc0d2ac22 100644 --- a/test/plugin/scenarios/jetty-scenario/jettyclient-scenario/src/main/resources/application.properties +++ b/test/plugin/scenarios/jetty-scenario/jettyclient-scenario/src/main/resources/application.properties @@ -13,6 +13,5 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - server.port=8080 server.contextPath=/jettyclient-case \ No newline at end of file diff --git a/test/plugin/scenarios/jetty-scenario/jettyserver-scenario/pom.xml b/test/plugin/scenarios/jetty-scenario/jettyserver-scenario/pom.xml index e443811a2bbb..73b07079770d 100644 --- a/test/plugin/scenarios/jetty-scenario/jettyserver-scenario/pom.xml +++ b/test/plugin/scenarios/jetty-scenario/jettyserver-scenario/pom.xml @@ -66,7 +66,8 @@ - + org.apache.skywalking.apm.testcase.jettyserver.Application diff --git a/test/plugin/scenarios/jetty-scenario/jettyserver-scenario/src/main/java/org/apache/skywalking/apm/testcase/jettyserver/Application.java b/test/plugin/scenarios/jetty-scenario/jettyserver-scenario/src/main/java/org/apache/skywalking/apm/testcase/jettyserver/Application.java index 8fb2622e8c48..6af8c860c8dd 100644 --- a/test/plugin/scenarios/jetty-scenario/jettyserver-scenario/src/main/java/org/apache/skywalking/apm/testcase/jettyserver/Application.java +++ b/test/plugin/scenarios/jetty-scenario/jettyserver-scenario/src/main/java/org/apache/skywalking/apm/testcase/jettyserver/Application.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.testcase.jettyserver; import java.net.InetSocketAddress; @@ -25,8 +26,7 @@ public class Application { public static void main(String[] args) throws Exception { - Server jettyServer = new Server(new InetSocketAddress("0.0.0.0", - Integer.valueOf(18080))); + Server jettyServer = new Server(new InetSocketAddress("0.0.0.0", Integer.valueOf(18080))); String contextPath = "/jettyserver-case"; ServletContextHandler servletContextHandler = new ServletContextHandler(ServletContextHandler.NO_SESSIONS); servletContextHandler.setContextPath(contextPath); diff --git a/test/plugin/scenarios/jetty-scenario/jettyserver-scenario/src/main/java/org/apache/skywalking/apm/testcase/jettyserver/servlet/CaseServlet.java b/test/plugin/scenarios/jetty-scenario/jettyserver-scenario/src/main/java/org/apache/skywalking/apm/testcase/jettyserver/servlet/CaseServlet.java index f44bad279702..9dfae15f6469 100644 --- a/test/plugin/scenarios/jetty-scenario/jettyserver-scenario/src/main/java/org/apache/skywalking/apm/testcase/jettyserver/servlet/CaseServlet.java +++ b/test/plugin/scenarios/jetty-scenario/jettyserver-scenario/src/main/java/org/apache/skywalking/apm/testcase/jettyserver/servlet/CaseServlet.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.testcase.jettyserver.servlet; import java.io.IOException; @@ -23,7 +24,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -public class CaseServlet extends HttpServlet{ +public class CaseServlet extends HttpServlet { public static String SERVLET_PATH = "/case/receiveContext-0"; @Override diff --git a/test/plugin/scenarios/kafka-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/kafka-scenario/src/main/assembly/assembly.xml index 4eca70aabb33..446c6dbee4db 100644 --- a/test/plugin/scenarios/kafka-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/kafka-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/kafka-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/kafka/Application.java b/test/plugin/scenarios/kafka-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/kafka/Application.java index 46646d365b06..47b8d78aabaa 100644 --- a/test/plugin/scenarios/kafka-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/kafka/Application.java +++ b/test/plugin/scenarios/kafka-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/kafka/Application.java @@ -21,9 +21,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -/** - * @author zhangwei - */ @SpringBootApplication public class Application { diff --git a/test/plugin/scenarios/kafka-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/kafka/controller/CaseController.java b/test/plugin/scenarios/kafka-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/kafka/controller/CaseController.java index 55b51dd84b40..fa68d3a8b611 100644 --- a/test/plugin/scenarios/kafka-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/kafka/controller/CaseController.java +++ b/test/plugin/scenarios/kafka-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/kafka/controller/CaseController.java @@ -18,6 +18,10 @@ package test.org.apache.skywalking.apm.testcase.kafka.controller; +import java.util.Arrays; +import java.util.Properties; +import java.util.function.Consumer; +import javax.annotation.PostConstruct; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; import org.apache.kafka.clients.consumer.KafkaConsumer; @@ -34,11 +38,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import javax.annotation.PostConstruct; -import java.util.Arrays; -import java.util.Properties; -import java.util.function.Consumer; - import static java.util.Objects.isNull; @Controller @@ -132,7 +131,8 @@ public void run() { return; } wrapProducer(producer -> { - ProducerRecord record = new ProducerRecord("check", "checkKey", Integer.toString(1)); + ProducerRecord record = new ProducerRecord("check", "checkKey", Integer + .toString(1)); record.headers().add("CHECK", "CHECK".getBytes()); producer.send(record, new Callback() { @Override @@ -179,7 +179,11 @@ public void run() { if (!records.isEmpty()) { for (ConsumerRecord record : records) { - logger.info("header: {}", new String(record.headers().headers("TEST").iterator().next().value())); + logger.info("header: {}", new String(record.headers() + .headers("TEST") + .iterator() + .next() + .value())); logger.info("offset = {}, key = {}, value = {}", record.offset(), record.key(), record.value()); } break; diff --git a/test/plugin/scenarios/kafka-scenario/src/main/resources/application.properties b/test/plugin/scenarios/kafka-scenario/src/main/resources/application.properties index d7b9a3aeabc0..11415c534e83 100644 --- a/test/plugin/scenarios/kafka-scenario/src/main/resources/application.properties +++ b/test/plugin/scenarios/kafka-scenario/src/main/resources/application.properties @@ -15,6 +15,5 @@ # limitations under the License. # # - server.port=8080 server.contextPath=/kafka-scenario \ No newline at end of file diff --git a/test/plugin/scenarios/kotlin-coroutine-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/kotlin-coroutine-scenario/src/main/assembly/assembly.xml index 5024a751c0ea..c7918513b05c 100644 --- a/test/plugin/scenarios/kotlin-coroutine-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/kotlin-coroutine-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> zip diff --git a/test/plugin/scenarios/lettuce-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/lettuce-scenario/src/main/assembly/assembly.xml index d8d225bdf52a..c721ad5ff58d 100644 --- a/test/plugin/scenarios/lettuce-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/lettuce-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/lettuce-scenario/src/main/java/org/apache/skywalking/apm/testcase/lettuce/Application.java b/test/plugin/scenarios/lettuce-scenario/src/main/java/org/apache/skywalking/apm/testcase/lettuce/Application.java index 7fccbab24ddc..dae1948397ad 100644 --- a/test/plugin/scenarios/lettuce-scenario/src/main/java/org/apache/skywalking/apm/testcase/lettuce/Application.java +++ b/test/plugin/scenarios/lettuce-scenario/src/main/java/org/apache/skywalking/apm/testcase/lettuce/Application.java @@ -19,7 +19,6 @@ package org.apache.skywalking.apm.testcase.lettuce; import org.springframework.boot.SpringApplication; - import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication diff --git a/test/plugin/scenarios/lettuce-scenario/src/main/java/org/apache/skywalking/apm/testcase/lettuce/controller/LettuceController.java b/test/plugin/scenarios/lettuce-scenario/src/main/java/org/apache/skywalking/apm/testcase/lettuce/controller/LettuceController.java index 2f6e97a5d05e..c2f391b07cb9 100644 --- a/test/plugin/scenarios/lettuce-scenario/src/main/java/org/apache/skywalking/apm/testcase/lettuce/controller/LettuceController.java +++ b/test/plugin/scenarios/lettuce-scenario/src/main/java/org/apache/skywalking/apm/testcase/lettuce/controller/LettuceController.java @@ -24,16 +24,15 @@ import io.lettuce.core.api.StatefulRedisConnection; import io.lettuce.core.api.async.RedisAsyncCommands; import io.lettuce.core.api.sync.RedisCommands; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.TimeUnit; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.PropertySource; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.TimeUnit; - @Controller @RequestMapping("/case") @PropertySource("classpath:application.properties") diff --git a/test/plugin/scenarios/lettuce-scenario/src/main/resources/application.properties b/test/plugin/scenarios/lettuce-scenario/src/main/resources/application.properties index ac84e54de5fe..ef7839c9284b 100644 --- a/test/plugin/scenarios/lettuce-scenario/src/main/resources/application.properties +++ b/test/plugin/scenarios/lettuce-scenario/src/main/resources/application.properties @@ -15,6 +15,5 @@ # limitations under the License. # # - server.port=8080 server.contextPath=/lettuce-scenario diff --git a/test/plugin/scenarios/mongodb-3.x-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/mongodb-3.x-scenario/src/main/assembly/assembly.xml index 1436caea38a6..158a32cdad1b 100644 --- a/test/plugin/scenarios/mongodb-3.x-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/mongodb-3.x-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/mongodb-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/mongodb/controller/CaseController.java b/test/plugin/scenarios/mongodb-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/mongodb/controller/CaseController.java index b6fadb83da88..dad835c02ab6 100644 --- a/test/plugin/scenarios/mongodb-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/mongodb/controller/CaseController.java +++ b/test/plugin/scenarios/mongodb-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/mongodb/controller/CaseController.java @@ -51,7 +51,7 @@ public String health() { @RequestMapping("/mongodb") public String mongoDBCase() { - try ( MongoClient mongoClient = new MongoClient(host, port)) { + try (MongoClient mongoClient = new MongoClient(host, port)) { MongoDatabase db = mongoClient.getDatabase("test-database"); // CreateCollectionOperation db.createCollection("testCollection"); diff --git a/test/plugin/scenarios/mongodb-3.x-scenario/src/main/resources/application.properties b/test/plugin/scenarios/mongodb-3.x-scenario/src/main/resources/application.properties index abd9561b6f3a..20c3ef368d81 100644 --- a/test/plugin/scenarios/mongodb-3.x-scenario/src/main/resources/application.properties +++ b/test/plugin/scenarios/mongodb-3.x-scenario/src/main/resources/application.properties @@ -13,9 +13,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - server.port=8080 -server.context-path= /mongodb-case - -mongodb.host= mongodb-server -mongodb.port= 27017 \ No newline at end of file +server.context-path=/mongodb-case +mongodb.host=mongodb-server +mongodb.port=27017 \ No newline at end of file diff --git a/test/plugin/scenarios/mysql-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/mysql-scenario/src/main/assembly/assembly.xml index 39d1eb34095d..ead1fe8e7cf9 100644 --- a/test/plugin/scenarios/mysql-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/mysql-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/mysql-scenario/src/main/java/org/apache/skywalking/apm/testcase/mysql/Application.java b/test/plugin/scenarios/mysql-scenario/src/main/java/org/apache/skywalking/apm/testcase/mysql/Application.java index 4bceb3a0aa23..b7d42e6fc24b 100644 --- a/test/plugin/scenarios/mysql-scenario/src/main/java/org/apache/skywalking/apm/testcase/mysql/Application.java +++ b/test/plugin/scenarios/mysql-scenario/src/main/java/org/apache/skywalking/apm/testcase/mysql/Application.java @@ -21,7 +21,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; - @SpringBootApplication public class Application { diff --git a/test/plugin/scenarios/mysql-scenario/src/main/java/org/apache/skywalking/apm/testcase/mysql/controller/CaseController.java b/test/plugin/scenarios/mysql-scenario/src/main/java/org/apache/skywalking/apm/testcase/mysql/controller/CaseController.java index d1f5e4697fb4..d0121b729b37 100644 --- a/test/plugin/scenarios/mysql-scenario/src/main/java/org/apache/skywalking/apm/testcase/mysql/controller/CaseController.java +++ b/test/plugin/scenarios/mysql-scenario/src/main/java/org/apache/skywalking/apm/testcase/mysql/controller/CaseController.java @@ -34,9 +34,7 @@ public class CaseController { private static final String SUCCESS = "Success"; - private static final String CREATE_TABLE_SQL = "CREATE TABLE test_007(\n" + - "id VARCHAR(1) PRIMARY KEY, \n" + - "value VARCHAR(1) NOT NULL)"; + private static final String CREATE_TABLE_SQL = "CREATE TABLE test_007(\n" + "id VARCHAR(1) PRIMARY KEY, \n" + "value VARCHAR(1) NOT NULL)"; private static final String INSERT_DATA_SQL = "INSERT INTO test_007(id, value) VALUES(?,?)"; private static final String QUERY_DATA_SQL = "SELECT id, value FROM test_007 WHERE id=?"; private static final String DELETE_DATA_SQL = "DELETE FROM test_007 WHERE id=?"; diff --git a/test/plugin/scenarios/mysql-scenario/src/main/resources/jdbc.properties b/test/plugin/scenarios/mysql-scenario/src/main/resources/jdbc.properties index 7d458082538d..aad3ac13a4cd 100644 --- a/test/plugin/scenarios/mysql-scenario/src/main/resources/jdbc.properties +++ b/test/plugin/scenarios/mysql-scenario/src/main/resources/jdbc.properties @@ -13,7 +13,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - mysql.url=jdbc:mysql://mysql-server:3306/test?serverTimezone=CST mysql.username=root mysql.password=root diff --git a/test/plugin/scenarios/netty-socketio-scenario/src/main/java/org/apache/skywalking/apm/testcase/netty/socketio/CaseServlet.java b/test/plugin/scenarios/netty-socketio-scenario/src/main/java/org/apache/skywalking/apm/testcase/netty/socketio/CaseServlet.java index 133fa6c97e6d..36704c976293 100644 --- a/test/plugin/scenarios/netty-socketio-scenario/src/main/java/org/apache/skywalking/apm/testcase/netty/socketio/CaseServlet.java +++ b/test/plugin/scenarios/netty-socketio-scenario/src/main/java/org/apache/skywalking/apm/testcase/netty/socketio/CaseServlet.java @@ -21,15 +21,14 @@ import io.socket.client.IO; import io.socket.client.Socket; import io.socket.emitter.Emitter; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; public class CaseServlet extends HttpServlet { diff --git a/test/plugin/scenarios/netty-socketio-scenario/src/main/java/org/apache/skywalking/apm/testcase/netty/socketio/HealthCheckServlet.java b/test/plugin/scenarios/netty-socketio-scenario/src/main/java/org/apache/skywalking/apm/testcase/netty/socketio/HealthCheckServlet.java index b158ffd0d653..fa6463fcd7c7 100644 --- a/test/plugin/scenarios/netty-socketio-scenario/src/main/java/org/apache/skywalking/apm/testcase/netty/socketio/HealthCheckServlet.java +++ b/test/plugin/scenarios/netty-socketio-scenario/src/main/java/org/apache/skywalking/apm/testcase/netty/socketio/HealthCheckServlet.java @@ -17,12 +17,12 @@ package org.apache.skywalking.apm.testcase.netty.socketio; +import java.io.IOException; +import java.io.PrintWriter; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.PrintWriter; public class HealthCheckServlet extends HttpServlet { diff --git a/test/plugin/scenarios/netty-socketio-scenario/src/main/java/org/apache/skywalking/apm/testcase/netty/socketio/SocketIOStarter.java b/test/plugin/scenarios/netty-socketio-scenario/src/main/java/org/apache/skywalking/apm/testcase/netty/socketio/SocketIOStarter.java index 912b3f6c1414..05baabd5c7a1 100644 --- a/test/plugin/scenarios/netty-socketio-scenario/src/main/java/org/apache/skywalking/apm/testcase/netty/socketio/SocketIOStarter.java +++ b/test/plugin/scenarios/netty-socketio-scenario/src/main/java/org/apache/skywalking/apm/testcase/netty/socketio/SocketIOStarter.java @@ -20,12 +20,8 @@ import com.corundumstudio.socketio.Configuration; import com.corundumstudio.socketio.SocketIOServer; import io.netty.util.concurrent.Future; - import java.util.concurrent.TimeUnit; -/** - * @author MrPro - */ public class SocketIOStarter { public static final Integer SERVER_PORT = 9092; diff --git a/test/plugin/scenarios/okhttp-scenario/src/main/java/test/apache/skywalking/testcase/okhttp/controller/CaseController.java b/test/plugin/scenarios/okhttp-scenario/src/main/java/test/apache/skywalking/testcase/okhttp/controller/CaseController.java index fa70392cf91e..ace50a9fc80f 100644 --- a/test/plugin/scenarios/okhttp-scenario/src/main/java/test/apache/skywalking/testcase/okhttp/controller/CaseController.java +++ b/test/plugin/scenarios/okhttp-scenario/src/main/java/test/apache/skywalking/testcase/okhttp/controller/CaseController.java @@ -47,20 +47,18 @@ public String receiveContextService0() throws InterruptedException { @RequestMapping("/okhttp-case") @ResponseBody public String okHttpScenario() { - Request request = new Request.Builder() - .url("http://127.0.0.1:8080/okhttp-case/case/receiveContext-0") - .build(); + Request request = new Request.Builder().url("http://127.0.0.1:8080/okhttp-case/case/receiveContext-0").build(); new OkHttpClient().newCall(request).enqueue(new Callback() { - @Override public void onFailure(Call call, IOException e) { + @Override + public void onFailure(Call call, IOException e) { //Never do this } @Override public void onResponse(Call call, Response response) throws IOException { - Request request = new Request.Builder() - .url("http://127.0.0.1:8080/okhttp-case/case/receiveContext-1") - .build(); + Request request = new Request.Builder().url("http://127.0.0.1:8080/okhttp-case/case/receiveContext-1") + .build(); new OkHttpClient().newCall(request).execute(); } }); diff --git a/test/plugin/scenarios/okhttp-scenario/src/main/resources/application.properties b/test/plugin/scenarios/okhttp-scenario/src/main/resources/application.properties index b75d49c49db5..e022421151e8 100644 --- a/test/plugin/scenarios/okhttp-scenario/src/main/resources/application.properties +++ b/test/plugin/scenarios/okhttp-scenario/src/main/resources/application.properties @@ -13,6 +13,5 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - server.port=8080 server.contextPath=/okhttp-case \ No newline at end of file diff --git a/test/plugin/scenarios/oracle-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/oracle-scenario/src/main/assembly/assembly.xml index 694ee49bc334..9e4db94d75b7 100644 --- a/test/plugin/scenarios/oracle-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/oracle-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/oracle-scenario/src/main/java/org/apache/skywalking/apm/testcase/oracle/controller/CaseController.java b/test/plugin/scenarios/oracle-scenario/src/main/java/org/apache/skywalking/apm/testcase/oracle/controller/CaseController.java index feb1c030e464..bf9d326541f4 100644 --- a/test/plugin/scenarios/oracle-scenario/src/main/java/org/apache/skywalking/apm/testcase/oracle/controller/CaseController.java +++ b/test/plugin/scenarios/oracle-scenario/src/main/java/org/apache/skywalking/apm/testcase/oracle/controller/CaseController.java @@ -28,9 +28,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/case") @@ -49,9 +49,7 @@ public class CaseController { private String connectURL; private static final String TEST_EXIST_SQL = "SELECT * FROM dual"; - private static final String CREATE_TABLE_SQL = "CREATE TABLE test_007(\n" + - "id VARCHAR(1) PRIMARY KEY, \n" + - "value VARCHAR(1) NOT NULL)"; + private static final String CREATE_TABLE_SQL = "CREATE TABLE test_007(\n" + "id VARCHAR(1) PRIMARY KEY, \n" + "value VARCHAR(1) NOT NULL)"; private static final String INSERT_DATA_SQL = "INSERT INTO test_007(id, value) VALUES(?,?)"; private static final String QUERY_DATA_SQL = "SELECT id, value FROM test_007 WHERE id=?"; private static final String DROP_TABLE_SQL = "DROP table test_007"; diff --git a/test/plugin/scenarios/play-scenario/conf/logback.xml b/test/plugin/scenarios/play-scenario/conf/logback.xml index 96ec52ddf18c..248521117e72 100644 --- a/test/plugin/scenarios/play-scenario/conf/logback.xml +++ b/test/plugin/scenarios/play-scenario/conf/logback.xml @@ -19,23 +19,23 @@ - + - - - %coloredLevel %logger{15} - %message%n%xException{10} - - + + + %coloredLevel %logger{15} - %message%n%xException{10} + + - - - + + + - - + + - - - + + + diff --git a/test/plugin/scenarios/play-scenario/project/build.properties b/test/plugin/scenarios/play-scenario/project/build.properties index a6a751a2b8c7..9f56b570f863 100644 --- a/test/plugin/scenarios/play-scenario/project/build.properties +++ b/test/plugin/scenarios/play-scenario/project/build.properties @@ -13,5 +13,4 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - sbt.version=1.3.5 diff --git a/test/plugin/scenarios/play-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/play-scenario/src/main/assembly/assembly.xml index 630e18bd1471..5d9d61fd65e1 100644 --- a/test/plugin/scenarios/play-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/play-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/postgresql-above9.4.1207-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/postgresql-above9.4.1207-scenario/src/main/assembly/assembly.xml index 3e7d698c3fab..9bb3ff9542b2 100644 --- a/test/plugin/scenarios/postgresql-above9.4.1207-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/postgresql-above9.4.1207-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/postgresql-above9.4.1207-scenario/src/main/java/org/apache/skywalking/apm/testcase/postgresql/controller/CaseController.java b/test/plugin/scenarios/postgresql-above9.4.1207-scenario/src/main/java/org/apache/skywalking/apm/testcase/postgresql/controller/CaseController.java index f3566c40cdc2..60e1f481065f 100644 --- a/test/plugin/scenarios/postgresql-above9.4.1207-scenario/src/main/java/org/apache/skywalking/apm/testcase/postgresql/controller/CaseController.java +++ b/test/plugin/scenarios/postgresql-above9.4.1207-scenario/src/main/java/org/apache/skywalking/apm/testcase/postgresql/controller/CaseController.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.testcase.postgresql.controller; import java.sql.SQLException; diff --git a/test/plugin/scenarios/postgresql-above9.4.1207-scenario/src/main/java/org/apache/skywalking/apm/testcase/postgresql/controller/ConstSql.java b/test/plugin/scenarios/postgresql-above9.4.1207-scenario/src/main/java/org/apache/skywalking/apm/testcase/postgresql/controller/ConstSql.java index a0a487b07349..496a04ba60c2 100644 --- a/test/plugin/scenarios/postgresql-above9.4.1207-scenario/src/main/java/org/apache/skywalking/apm/testcase/postgresql/controller/ConstSql.java +++ b/test/plugin/scenarios/postgresql-above9.4.1207-scenario/src/main/java/org/apache/skywalking/apm/testcase/postgresql/controller/ConstSql.java @@ -15,13 +15,12 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.testcase.postgresql.controller; public class ConstSql { public static final String TEST_SQL = "SELECT 1"; - public static final String CREATE_TABLE_SQL = "CREATE TABLE test_007(\n" + - "id VARCHAR(1) PRIMARY KEY, \n" + - "value VARCHAR(1) NOT NULL)"; + public static final String CREATE_TABLE_SQL = "CREATE TABLE test_007(\n" + "id VARCHAR(1) PRIMARY KEY, \n" + "value VARCHAR(1) NOT NULL)"; public static final String INSERT_DATA_SQL = "INSERT INTO test_007(id, value) VALUES(?,?)"; public static final String DROP_TABLE_SQL = "DROP table test_007"; } diff --git a/test/plugin/scenarios/postgresql-above9.4.1207-scenario/src/main/java/org/apache/skywalking/apm/testcase/postgresql/controller/PostgresqlConfig.java b/test/plugin/scenarios/postgresql-above9.4.1207-scenario/src/main/java/org/apache/skywalking/apm/testcase/postgresql/controller/PostgresqlConfig.java index ba7fa48c0ef2..15800a345add 100644 --- a/test/plugin/scenarios/postgresql-above9.4.1207-scenario/src/main/java/org/apache/skywalking/apm/testcase/postgresql/controller/PostgresqlConfig.java +++ b/test/plugin/scenarios/postgresql-above9.4.1207-scenario/src/main/java/org/apache/skywalking/apm/testcase/postgresql/controller/PostgresqlConfig.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.testcase.postgresql.controller; import org.springframework.beans.factory.annotation.Value; diff --git a/test/plugin/scenarios/postgresql-above9.4.1207-scenario/src/main/java/org/apache/skywalking/apm/testcase/postgresql/controller/SQLExecutor.java b/test/plugin/scenarios/postgresql-above9.4.1207-scenario/src/main/java/org/apache/skywalking/apm/testcase/postgresql/controller/SQLExecutor.java index fa1f73a7502a..dece3ae288ce 100644 --- a/test/plugin/scenarios/postgresql-above9.4.1207-scenario/src/main/java/org/apache/skywalking/apm/testcase/postgresql/controller/SQLExecutor.java +++ b/test/plugin/scenarios/postgresql-above9.4.1207-scenario/src/main/java/org/apache/skywalking/apm/testcase/postgresql/controller/SQLExecutor.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.testcase.postgresql.controller; import java.sql.CallableStatement; @@ -34,7 +35,8 @@ public SQLExecutor(PostgresqlConfig postgresqlConfig) throws SQLException { } catch (ClassNotFoundException e) { // } - connection = DriverManager.getConnection(postgresqlConfig.getUrl(), postgresqlConfig.getUserName(), postgresqlConfig.getPassword()); + connection = DriverManager.getConnection(postgresqlConfig.getUrl(), postgresqlConfig.getUserName(), postgresqlConfig + .getPassword()); } public void checkPG(String sql) throws SQLException { diff --git a/test/plugin/scenarios/postgresql-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/postgresql-scenario/src/main/assembly/assembly.xml index 195ec651ee62..2681a8547e90 100644 --- a/test/plugin/scenarios/postgresql-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/postgresql-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/postgresql-scenario/src/main/java/org/apache/skywalking/apm/testcase/postgresql/controller/ConstSql.java b/test/plugin/scenarios/postgresql-scenario/src/main/java/org/apache/skywalking/apm/testcase/postgresql/controller/ConstSql.java index a0a487b07349..496a04ba60c2 100644 --- a/test/plugin/scenarios/postgresql-scenario/src/main/java/org/apache/skywalking/apm/testcase/postgresql/controller/ConstSql.java +++ b/test/plugin/scenarios/postgresql-scenario/src/main/java/org/apache/skywalking/apm/testcase/postgresql/controller/ConstSql.java @@ -15,13 +15,12 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.testcase.postgresql.controller; public class ConstSql { public static final String TEST_SQL = "SELECT 1"; - public static final String CREATE_TABLE_SQL = "CREATE TABLE test_007(\n" + - "id VARCHAR(1) PRIMARY KEY, \n" + - "value VARCHAR(1) NOT NULL)"; + public static final String CREATE_TABLE_SQL = "CREATE TABLE test_007(\n" + "id VARCHAR(1) PRIMARY KEY, \n" + "value VARCHAR(1) NOT NULL)"; public static final String INSERT_DATA_SQL = "INSERT INTO test_007(id, value) VALUES(?,?)"; public static final String DROP_TABLE_SQL = "DROP table test_007"; } diff --git a/test/plugin/scenarios/postgresql-scenario/src/main/java/org/apache/skywalking/apm/testcase/postgresql/controller/PostgresqlConfig.java b/test/plugin/scenarios/postgresql-scenario/src/main/java/org/apache/skywalking/apm/testcase/postgresql/controller/PostgresqlConfig.java index ba7fa48c0ef2..15800a345add 100644 --- a/test/plugin/scenarios/postgresql-scenario/src/main/java/org/apache/skywalking/apm/testcase/postgresql/controller/PostgresqlConfig.java +++ b/test/plugin/scenarios/postgresql-scenario/src/main/java/org/apache/skywalking/apm/testcase/postgresql/controller/PostgresqlConfig.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.testcase.postgresql.controller; import org.springframework.beans.factory.annotation.Value; diff --git a/test/plugin/scenarios/postgresql-scenario/src/main/java/org/apache/skywalking/apm/testcase/postgresql/controller/SQLExecutor.java b/test/plugin/scenarios/postgresql-scenario/src/main/java/org/apache/skywalking/apm/testcase/postgresql/controller/SQLExecutor.java index fa1f73a7502a..dece3ae288ce 100644 --- a/test/plugin/scenarios/postgresql-scenario/src/main/java/org/apache/skywalking/apm/testcase/postgresql/controller/SQLExecutor.java +++ b/test/plugin/scenarios/postgresql-scenario/src/main/java/org/apache/skywalking/apm/testcase/postgresql/controller/SQLExecutor.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package org.apache.skywalking.apm.testcase.postgresql.controller; import java.sql.CallableStatement; @@ -34,7 +35,8 @@ public SQLExecutor(PostgresqlConfig postgresqlConfig) throws SQLException { } catch (ClassNotFoundException e) { // } - connection = DriverManager.getConnection(postgresqlConfig.getUrl(), postgresqlConfig.getUserName(), postgresqlConfig.getPassword()); + connection = DriverManager.getConnection(postgresqlConfig.getUrl(), postgresqlConfig.getUserName(), postgresqlConfig + .getPassword()); } public void checkPG(String sql) throws SQLException { diff --git a/test/plugin/scenarios/pulsar-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/pulsar-scenario/src/main/assembly/assembly.xml index 9c6f49988343..f35fcd859051 100644 --- a/test/plugin/scenarios/pulsar-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/pulsar-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/pulsar-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/pulsar/controller/CaseController.java b/test/plugin/scenarios/pulsar-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/pulsar/controller/CaseController.java index 2f24868d32d0..2aa8ba7521dc 100644 --- a/test/plugin/scenarios/pulsar-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/pulsar/controller/CaseController.java +++ b/test/plugin/scenarios/pulsar-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/pulsar/controller/CaseController.java @@ -20,7 +20,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.pulsar.client.api.Consumer; @@ -28,7 +27,6 @@ import org.apache.pulsar.client.api.Producer; import org.apache.pulsar.client.api.PulsarClient; import org.apache.pulsar.client.api.PulsarClientException; - import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.PropertySource; import org.springframework.stereotype.Controller; @@ -53,24 +51,13 @@ public String pulsarCase() throws PulsarClientException, InterruptedException { String topic = "test"; - PulsarClient pulsarClient = PulsarClient.builder() - .serviceUrl(PULSAR_DOMAIN + serviceUrl) - .build(); + PulsarClient pulsarClient = PulsarClient.builder().serviceUrl(PULSAR_DOMAIN + serviceUrl).build(); - Producer producer = pulsarClient.newProducer() - .topic(topic) - .create(); + Producer producer = pulsarClient.newProducer().topic(topic).create(); - Consumer consumer = pulsarClient.newConsumer() - .topic(topic) - .subscriptionName("test") - .subscribe(); + Consumer consumer = pulsarClient.newConsumer().topic(topic).subscriptionName("test").subscribe(); - producer.newMessage() - .key("testKey") - .value(Integer.toString(1).getBytes()) - .property("TEST", "TEST") - .send(); + producer.newMessage().key("testKey").value(Integer.toString(1).getBytes()).property("TEST", "TEST").send(); CountDownLatch latch = new CountDownLatch(1); @@ -80,9 +67,10 @@ public String pulsarCase() throws PulsarClientException, InterruptedException { if (msg != null) { String propertiesFormat = "key = %s, value = %s"; StringBuilder builder = new StringBuilder(); - msg.getProperties().forEach((k, v) -> builder.append(String.format(propertiesFormat, k, v)).append(", ")); - logger.info("Received message with messageId = {}, key = {}, value = {}, properties = {}", - msg.getMessageId(), msg.getKey(), new String(msg.getValue()), builder.toString()); + msg.getProperties() + .forEach((k, v) -> builder.append(String.format(propertiesFormat, k, v)).append(", ")); + logger.info("Received message with messageId = {}, key = {}, value = {}, properties = {}", msg.getMessageId(), msg + .getKey(), new String(msg.getValue()), builder.toString()); } consumer.acknowledge(msg); @@ -112,12 +100,11 @@ public String pulsarCase() throws PulsarClientException, InterruptedException { @RequestMapping("/healthCheck") @ResponseBody public String healthCheck() throws InterruptedException { - try(PulsarClient pulsarClient = PulsarClient.builder() - .serviceUrl(PULSAR_DOMAIN + serviceUrl) - .build(); - Producer producer = pulsarClient.newProducer() - .topic("healthCheck") - .create()) { + try (PulsarClient pulsarClient = PulsarClient.builder() + .serviceUrl(PULSAR_DOMAIN + serviceUrl) + .build(); Producer producer = pulsarClient.newProducer() + .topic("healthCheck") + .create()) { if (producer.isConnected()) { return "Success"; } else { diff --git a/test/plugin/scenarios/pulsar-scenario/src/main/resources/application.properties b/test/plugin/scenarios/pulsar-scenario/src/main/resources/application.properties index 3a5649644760..72472122be24 100644 --- a/test/plugin/scenarios/pulsar-scenario/src/main/resources/application.properties +++ b/test/plugin/scenarios/pulsar-scenario/src/main/resources/application.properties @@ -15,6 +15,5 @@ # limitations under the License. # # - server.port=8080 server.contextPath=/pulsar-scenario \ No newline at end of file diff --git a/test/plugin/scenarios/rabbitmq-scenario/src/main/java/org/apache/skywalking/apm/testcase/rabbitmq/Application.java b/test/plugin/scenarios/rabbitmq-scenario/src/main/java/org/apache/skywalking/apm/testcase/rabbitmq/Application.java index 0cbf8daedb6b..6e9b22317149 100644 --- a/test/plugin/scenarios/rabbitmq-scenario/src/main/java/org/apache/skywalking/apm/testcase/rabbitmq/Application.java +++ b/test/plugin/scenarios/rabbitmq-scenario/src/main/java/org/apache/skywalking/apm/testcase/rabbitmq/Application.java @@ -19,10 +19,8 @@ package org.apache.skywalking.apm.testcase.rabbitmq; import org.springframework.boot.SpringApplication; - import org.springframework.boot.autoconfigure.SpringBootApplication; - @SpringBootApplication public class Application { diff --git a/test/plugin/scenarios/rabbitmq-scenario/src/main/java/org/apache/skywalking/apm/testcase/rabbitmq/controller/CaseController.java b/test/plugin/scenarios/rabbitmq-scenario/src/main/java/org/apache/skywalking/apm/testcase/rabbitmq/controller/CaseController.java index 29566ad533bb..e6e00cd7d982 100644 --- a/test/plugin/scenarios/rabbitmq-scenario/src/main/java/org/apache/skywalking/apm/testcase/rabbitmq/controller/CaseController.java +++ b/test/plugin/scenarios/rabbitmq-scenario/src/main/java/org/apache/skywalking/apm/testcase/rabbitmq/controller/CaseController.java @@ -18,10 +18,14 @@ package org.apache.skywalking.apm.testcase.rabbitmq.controller; +import com.rabbitmq.client.AMQP; +import com.rabbitmq.client.Channel; +import com.rabbitmq.client.Connection; +import com.rabbitmq.client.ConnectionFactory; +import com.rabbitmq.client.DeliverCallback; +import java.nio.charset.StandardCharsets; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; - -import com.rabbitmq.client.*; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Value; @@ -30,9 +34,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; - -import java.io.IOException; - @RestController @RequestMapping("/case") @PropertySource("classpath:application.properties") @@ -40,7 +41,6 @@ public class CaseController { private Logger logger = LogManager.getLogger(CaseController.class); - private static final String USERNAME = "admin"; private static final String PASSWORD = "admin"; @@ -50,17 +50,17 @@ public class CaseController { private static final int PORT = 5672; - private static final String QUEUE_NAME = "test"; + private static final String QUEUE_NAME = "test"; - private static final String MESSAGE = "rabbitmq-testcase"; + private static final String MESSAGE = "rabbitmq-testcase"; @RequestMapping("/rabbitmq") @ResponseBody - public String rabbitmqCase() throws Exception { + public String rabbitmqCase() { Channel channel = null; Connection connection = null; - try{ + try { ConnectionFactory factory = new ConnectionFactory(); logger.info("Using brokerUrl = " + brokerUrl); factory.setHost(brokerUrl); @@ -73,35 +73,35 @@ public String rabbitmqCase() throws Exception { channel = connection.createChannel(); channel.queueDeclare(QUEUE_NAME, false, false, false, null); AMQP.BasicProperties.Builder propsBuilder = new AMQP.BasicProperties.Builder(); - logger.info("Message being published -------------->"+MESSAGE); - channel.basicPublish("", QUEUE_NAME, propsBuilder.build(), MESSAGE.getBytes("UTF-8")); - logger.info("Message has been published-------------->"+MESSAGE); + logger.info("Message being published -------------->" + MESSAGE); + channel.basicPublish("", QUEUE_NAME, propsBuilder.build(), MESSAGE.getBytes(StandardCharsets.UTF_8)); + logger.info("Message has been published-------------->" + MESSAGE); final CountDownLatch waitForConsume = new CountDownLatch(1); DeliverCallback deliverCallback = (consumerTag, delivery) -> { - String message = new String(delivery.getBody(), "UTF-8"); - logger.info("Message received-------------->"+message); + String message = new String(delivery.getBody(), StandardCharsets.UTF_8); + logger.info("Message received-------------->" + message); waitForConsume.countDown(); }; - channel.basicConsume(QUEUE_NAME, true, deliverCallback, consumerTag -> { }); + channel.basicConsume(QUEUE_NAME, true, deliverCallback, consumerTag -> { + }); waitForConsume.await(5000L, TimeUnit.MILLISECONDS); logger.info("Message Consumed-------------->"); - }catch (Exception ex){ + } catch (Exception ex) { logger.error(ex.toString()); - } - finally { + } finally { if (channel != null) { try { channel.close(); - }catch (Exception e){ + } catch (Exception e) { // ignore } } if (connection != null) { try { connection.close(); - }catch (Exception e){ + } catch (Exception e) { // ignore } } @@ -114,7 +114,7 @@ public String healthCheck() throws Exception { Channel channel = null; Connection connection = null; - try{ + try { ConnectionFactory factory = new ConnectionFactory(); logger.info("Using brokerUrl = " + brokerUrl); factory.setHost(brokerUrl); @@ -127,22 +127,21 @@ public String healthCheck() throws Exception { channel = connection.createChannel(); channel.queueDeclare(QUEUE_NAME, false, false, false, null); logger.info("Completed Health Check. Able to connect to RabbitMQ and create queue-------------->"); - }catch (Exception ex){ + } catch (Exception ex) { logger.error(ex.toString()); throw ex; - } - finally { + } finally { if (channel != null) { try { channel.close(); - }catch (Exception e){ + } catch (Exception e) { // ignore } } if (connection != null) { try { connection.close(); - }catch (Exception e){ + } catch (Exception e) { // ignore } } diff --git a/test/plugin/scenarios/rabbitmq-scenario/src/main/resources/application.properties b/test/plugin/scenarios/rabbitmq-scenario/src/main/resources/application.properties index 17ee2d47c05c..579ccb81d99c 100644 --- a/test/plugin/scenarios/rabbitmq-scenario/src/main/resources/application.properties +++ b/test/plugin/scenarios/rabbitmq-scenario/src/main/resources/application.properties @@ -15,6 +15,5 @@ # limitations under the License. # # - server.port=8080 server.servlet.context-path=/rabbitmq-scenario diff --git a/test/plugin/scenarios/redisson-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/redisson-scenario/src/main/assembly/assembly.xml index 817235368623..285a5d41044e 100644 --- a/test/plugin/scenarios/redisson-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/redisson-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/redisson-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/redisson/Application.java b/test/plugin/scenarios/redisson-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/redisson/Application.java index c6d641e05ce2..3a1feec4a976 100644 --- a/test/plugin/scenarios/redisson-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/redisson/Application.java +++ b/test/plugin/scenarios/redisson-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/redisson/Application.java @@ -21,9 +21,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -/** - * @author zhaoyuguang - */ @SpringBootApplication public class Application { diff --git a/test/plugin/scenarios/redisson-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/redisson/controller/CaseController.java b/test/plugin/scenarios/redisson-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/redisson/controller/CaseController.java index 657776f455a4..10825aa6aad2 100644 --- a/test/plugin/scenarios/redisson-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/redisson/controller/CaseController.java +++ b/test/plugin/scenarios/redisson-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/redisson/controller/CaseController.java @@ -18,6 +18,8 @@ package test.org.apache.skywalking.apm.testcase.redisson.controller; +import java.util.concurrent.TimeUnit; +import javax.annotation.PostConstruct; import org.redisson.Redisson; import org.redisson.api.RBatch; import org.redisson.api.RBucket; @@ -29,12 +31,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import javax.annotation.PostConstruct; -import java.util.concurrent.TimeUnit; - -/** - * @author zhaoyuguang - */ @Controller @RequestMapping("/case") @PropertySource("classpath:application.properties") diff --git a/test/plugin/scenarios/redisson-scenario/src/main/resources/application.properties b/test/plugin/scenarios/redisson-scenario/src/main/resources/application.properties index 79530757de27..15a50d87527a 100644 --- a/test/plugin/scenarios/redisson-scenario/src/main/resources/application.properties +++ b/test/plugin/scenarios/redisson-scenario/src/main/resources/application.properties @@ -15,6 +15,5 @@ # limitations under the License. # # - server.port=8080 server.contextPath=/redisson-scenario \ No newline at end of file diff --git a/test/plugin/scenarios/servicecomb-0.x-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/servicecomb-0.x-scenario/src/main/assembly/assembly.xml index 01765310004f..2bbbc82bafaa 100644 --- a/test/plugin/scenarios/servicecomb-0.x-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/servicecomb-0.x-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/servicecomb-0.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/provider/CodeFirstJaxrsHelloImpl.java b/test/plugin/scenarios/servicecomb-0.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/provider/CodeFirstJaxrsHelloImpl.java index d7198fb063e6..cb25a7b91a20 100644 --- a/test/plugin/scenarios/servicecomb-0.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/provider/CodeFirstJaxrsHelloImpl.java +++ b/test/plugin/scenarios/servicecomb-0.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/provider/CodeFirstJaxrsHelloImpl.java @@ -18,16 +18,13 @@ package org.apache.skywalking.apm.testcase.servicecomb.provider; - import io.servicecomb.provider.pojo.RpcSchema; - -import org.apache.skywalking.apm.testcase.servicecomb.schema.Hello; -import org.apache.skywalking.apm.testcase.servicecomb.schema.models.Person; - import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; +import org.apache.skywalking.apm.testcase.servicecomb.schema.Hello; +import org.apache.skywalking.apm.testcase.servicecomb.schema.models.Person; @RpcSchema(schemaId = "codeFirstJaxrsHello") @Path("/codefirstjaxrshello") diff --git a/test/plugin/scenarios/servicecomb-0.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/provider/CodeFirstSpringmvcHelloImpl.java b/test/plugin/scenarios/servicecomb-0.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/provider/CodeFirstSpringmvcHelloImpl.java index 46ed53d219e6..5006dbc90590 100644 --- a/test/plugin/scenarios/servicecomb-0.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/provider/CodeFirstSpringmvcHelloImpl.java +++ b/test/plugin/scenarios/servicecomb-0.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/provider/CodeFirstSpringmvcHelloImpl.java @@ -18,8 +18,8 @@ package org.apache.skywalking.apm.testcase.servicecomb.provider; - import io.servicecomb.provider.pojo.RpcSchema; +import javax.ws.rs.core.MediaType; import org.apache.skywalking.apm.testcase.servicecomb.schema.Hello; import org.apache.skywalking.apm.testcase.servicecomb.schema.models.Person; import org.springframework.web.bind.annotation.RequestBody; @@ -27,8 +27,6 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; -import javax.ws.rs.core.MediaType; - @RpcSchema(schemaId = "codeFirstSpringmvcHello") @RequestMapping(path = "/springmvchello", produces = MediaType.APPLICATION_JSON) public class CodeFirstSpringmvcHelloImpl implements Hello { diff --git a/test/plugin/scenarios/servicecomb-0.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/schema/Hello.java b/test/plugin/scenarios/servicecomb-0.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/schema/Hello.java index 71b40dc096a4..0e4ccccace55 100644 --- a/test/plugin/scenarios/servicecomb-0.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/schema/Hello.java +++ b/test/plugin/scenarios/servicecomb-0.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/schema/Hello.java @@ -18,7 +18,6 @@ package org.apache.skywalking.apm.testcase.servicecomb.schema; - import org.apache.skywalking.apm.testcase.servicecomb.schema.models.Person; public interface Hello { diff --git a/test/plugin/scenarios/servicecomb-0.x-scenario/src/main/resources/META-INF/spring/pojo.bean.xml b/test/plugin/scenarios/servicecomb-0.x-scenario/src/main/resources/META-INF/spring/pojo.bean.xml index 8820aa670639..ecb2f9b238f5 100644 --- a/test/plugin/scenarios/servicecomb-0.x-scenario/src/main/resources/META-INF/spring/pojo.bean.xml +++ b/test/plugin/scenarios/servicecomb-0.x-scenario/src/main/resources/META-INF/spring/pojo.bean.xml @@ -25,5 +25,5 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd "> - + diff --git a/test/plugin/scenarios/servicecomb-0.x-scenario/src/main/resources/config/log4j.demo.properties b/test/plugin/scenarios/servicecomb-0.x-scenario/src/main/resources/config/log4j.demo.properties index cb28ac9e1f97..6366f0e2610c 100644 --- a/test/plugin/scenarios/servicecomb-0.x-scenario/src/main/resources/config/log4j.demo.properties +++ b/test/plugin/scenarios/servicecomb-0.x-scenario/src/main/resources/config/log4j.demo.properties @@ -15,5 +15,4 @@ # limitations under the License. # # - log4j.rootLogger=WARN,stderr diff --git a/test/plugin/scenarios/servicecomb-1.x-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/servicecomb-1.x-scenario/src/main/assembly/assembly.xml index ad999b00eac5..1878789e8345 100644 --- a/test/plugin/scenarios/servicecomb-1.x-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/servicecomb-1.x-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/servicecomb-1.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/provider/CodeFirstJaxrsHelloImpl.java b/test/plugin/scenarios/servicecomb-1.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/provider/CodeFirstJaxrsHelloImpl.java index 6159d58a7dce..175ca1fe09dd 100644 --- a/test/plugin/scenarios/servicecomb-1.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/provider/CodeFirstJaxrsHelloImpl.java +++ b/test/plugin/scenarios/servicecomb-1.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/provider/CodeFirstJaxrsHelloImpl.java @@ -18,15 +18,13 @@ package org.apache.skywalking.apm.testcase.servicecomb.provider; - -import org.apache.servicecomb.provider.pojo.RpcSchema; -import org.apache.skywalking.apm.testcase.servicecomb.schema.Hello; -import org.apache.skywalking.apm.testcase.servicecomb.schema.models.Person; - import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; +import org.apache.servicecomb.provider.pojo.RpcSchema; +import org.apache.skywalking.apm.testcase.servicecomb.schema.Hello; +import org.apache.skywalking.apm.testcase.servicecomb.schema.models.Person; @RpcSchema(schemaId = "codeFirstJaxrsHello") @Path("/codefirstjaxrshello") diff --git a/test/plugin/scenarios/servicecomb-1.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/provider/CodeFirstSpringmvcHelloImpl.java b/test/plugin/scenarios/servicecomb-1.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/provider/CodeFirstSpringmvcHelloImpl.java index b83581fc487a..f7c10247abbe 100644 --- a/test/plugin/scenarios/servicecomb-1.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/provider/CodeFirstSpringmvcHelloImpl.java +++ b/test/plugin/scenarios/servicecomb-1.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/provider/CodeFirstSpringmvcHelloImpl.java @@ -18,7 +18,7 @@ package org.apache.skywalking.apm.testcase.servicecomb.provider; - +import javax.ws.rs.core.MediaType; import org.apache.servicecomb.provider.pojo.RpcSchema; import org.apache.skywalking.apm.testcase.servicecomb.schema.Hello; import org.apache.skywalking.apm.testcase.servicecomb.schema.models.Person; @@ -27,8 +27,6 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; -import javax.ws.rs.core.MediaType; - @RpcSchema(schemaId = "codeFirstSpringmvcHello") @RequestMapping(path = "/springmvchello", produces = MediaType.APPLICATION_JSON) public class CodeFirstSpringmvcHelloImpl implements Hello { diff --git a/test/plugin/scenarios/servicecomb-1.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/schema/Hello.java b/test/plugin/scenarios/servicecomb-1.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/schema/Hello.java index 71b40dc096a4..0e4ccccace55 100644 --- a/test/plugin/scenarios/servicecomb-1.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/schema/Hello.java +++ b/test/plugin/scenarios/servicecomb-1.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/schema/Hello.java @@ -18,7 +18,6 @@ package org.apache.skywalking.apm.testcase.servicecomb.schema; - import org.apache.skywalking.apm.testcase.servicecomb.schema.models.Person; public interface Hello { diff --git a/test/plugin/scenarios/servicecomb-1.x-scenario/src/main/resources/META-INF/spring/pojo.bean.xml b/test/plugin/scenarios/servicecomb-1.x-scenario/src/main/resources/META-INF/spring/pojo.bean.xml index 8820aa670639..ecb2f9b238f5 100644 --- a/test/plugin/scenarios/servicecomb-1.x-scenario/src/main/resources/META-INF/spring/pojo.bean.xml +++ b/test/plugin/scenarios/servicecomb-1.x-scenario/src/main/resources/META-INF/spring/pojo.bean.xml @@ -25,5 +25,5 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd "> - + diff --git a/test/plugin/scenarios/servicecomb-1.x-scenario/src/main/resources/config/log4j.demo.properties b/test/plugin/scenarios/servicecomb-1.x-scenario/src/main/resources/config/log4j.demo.properties index cb28ac9e1f97..6366f0e2610c 100644 --- a/test/plugin/scenarios/servicecomb-1.x-scenario/src/main/resources/config/log4j.demo.properties +++ b/test/plugin/scenarios/servicecomb-1.x-scenario/src/main/resources/config/log4j.demo.properties @@ -15,5 +15,4 @@ # limitations under the License. # # - log4j.rootLogger=WARN,stderr diff --git a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/assembly/assembly.xml index 853d251f40b7..987bd58a43d0 100644 --- a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/Application.java b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/Application.java index ef2f54832fd7..3663ead8f626 100644 --- a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/Application.java +++ b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/Application.java @@ -18,17 +18,16 @@ package org.apache.skywalking.apm.testcase.shardingsphere; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.web.support.SpringBootServletInitializer; +import javax.sql.DataSource; import org.apache.skywalking.apm.testcase.shardingsphere.service.api.service.CommonService; import org.apache.skywalking.apm.testcase.shardingsphere.service.config.ShardingDatabasesAndTablesConfigurationPrecise; import org.apache.skywalking.apm.testcase.shardingsphere.service.repository.jdbc.JDBCOrderItemRepositoryImpl; import org.apache.skywalking.apm.testcase.shardingsphere.service.repository.jdbc.JDBCOrderRepositoryImpl; import org.apache.skywalking.apm.testcase.shardingsphere.service.repository.service.RawPojoService; import org.apache.skywalking.apm.testcase.shardingsphere.service.utility.config.DataSourceUtil; - -import javax.sql.DataSource; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.web.support.SpringBootServletInitializer; @SpringBootApplication public class Application extends SpringBootServletInitializer { diff --git a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/controller/CaseController.java b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/controller/CaseController.java index 455218adfd95..bf807de4a17f 100644 --- a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/controller/CaseController.java +++ b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/controller/CaseController.java @@ -18,18 +18,17 @@ package org.apache.skywalking.apm.testcase.shardingsphere.controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; +import java.sql.SQLException; +import javax.sql.DataSource; import org.apache.skywalking.apm.testcase.shardingsphere.service.api.service.CommonService; import org.apache.skywalking.apm.testcase.shardingsphere.service.config.ShardingDatabasesAndTablesConfigurationPrecise; import org.apache.skywalking.apm.testcase.shardingsphere.service.repository.jdbc.JDBCOrderItemRepositoryImpl; import org.apache.skywalking.apm.testcase.shardingsphere.service.repository.jdbc.JDBCOrderRepositoryImpl; import org.apache.skywalking.apm.testcase.shardingsphere.service.repository.service.RawPojoService; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import javax.sql.DataSource; -import java.sql.SQLException; - @RestController @RequestMapping("/case") public class CaseController { diff --git a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/entity/Order.java b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/entity/Order.java index 2366e1e7f03e..5d00a352ff97 100644 --- a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/entity/Order.java +++ b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/entity/Order.java @@ -21,39 +21,39 @@ import java.io.Serializable; public class Order implements Serializable { - + private static final long serialVersionUID = 661434701950670670L; - + private long orderId; - + private int userId; - + private String status; - + public long getOrderId() { return orderId; } - + public void setOrderId(final long orderId) { this.orderId = orderId; } - + public int getUserId() { return userId; } - + public void setUserId(final int userId) { this.userId = userId; } - + public String getStatus() { return status; } - + public void setStatus(final String status) { this.status = status; } - + @Override public String toString() { return String.format("order_id: %s, user_id: %s, status: %s", orderId, userId, status); diff --git a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/entity/OrderItem.java b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/entity/OrderItem.java index 42f2170b53af..8ffa5b9fa6c5 100644 --- a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/entity/OrderItem.java +++ b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/entity/OrderItem.java @@ -21,49 +21,49 @@ import java.io.Serializable; public class OrderItem implements Serializable { - + private static final long serialVersionUID = 263434701950670170L; - + private long orderItemId; - + private long orderId; - + private int userId; - + private String status; - + public long getOrderItemId() { return orderItemId; } - + public void setOrderItemId(final long orderItemId) { this.orderItemId = orderItemId; } - + public long getOrderId() { return orderId; } - + public void setOrderId(final long orderId) { this.orderId = orderId; } - + public int getUserId() { return userId; } - + public void setUserId(final int userId) { this.userId = userId; } - + public String getStatus() { return status; } - + public void setStatus(final String status) { this.status = status; } - + @Override public String toString() { return String.format("order_item_id:%s, order_id: %s, user_id: %s, status: %s", orderItemId, orderId, userId, status); diff --git a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/repository/CommonRepository.java b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/repository/CommonRepository.java index d4ac16a5739f..51da35ec94ff 100644 --- a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/repository/CommonRepository.java +++ b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/repository/CommonRepository.java @@ -21,18 +21,18 @@ import java.util.List; public interface CommonRepository { - + void createTableIfNotExists(); - + void dropTable(); - + void truncateTable(); - + Long insert(T entity); - + void delete(Long id); - + List selectAll(); - + List selectRange(); } diff --git a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/service/CommonService.java b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/service/CommonService.java index 858fc2b3e349..066f122cde8e 100644 --- a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/service/CommonService.java +++ b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/service/CommonService.java @@ -19,14 +19,14 @@ package org.apache.skywalking.apm.testcase.shardingsphere.service.api.service; public interface CommonService { - + void initEnvironment(); - + void cleanEnvironment(); - + void processSuccess(boolean isRangeSharding); - + void processFailure(); - + void printData(boolean isRangeSharding); } diff --git a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/service/CommonServiceImpl.java b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/service/CommonServiceImpl.java index 4935921cc941..a1d358bbf42e 100644 --- a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/service/CommonServiceImpl.java +++ b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/service/CommonServiceImpl.java @@ -18,15 +18,15 @@ package org.apache.skywalking.apm.testcase.shardingsphere.service.api.service; +import java.util.ArrayList; +import java.util.List; import org.apache.skywalking.apm.testcase.shardingsphere.service.api.entity.Order; import org.apache.skywalking.apm.testcase.shardingsphere.service.api.entity.OrderItem; import org.apache.skywalking.apm.testcase.shardingsphere.service.api.repository.OrderItemRepository; import org.apache.skywalking.apm.testcase.shardingsphere.service.api.repository.OrderRepository; -import java.util.ArrayList; -import java.util.List; public abstract class CommonServiceImpl implements CommonService { - + @Override public void initEnvironment() { getOrderRepository().createTableIfNotExists(); @@ -35,24 +35,24 @@ public void initEnvironment() { getOrderItemRepository().truncateTable(); insertData(); } - + @Override public void cleanEnvironment() { getOrderRepository().dropTable(); getOrderItemRepository().dropTable(); } - + @Override public void processSuccess(final boolean isRangeSharding) { printData(isRangeSharding); } - + @Override public void processFailure() { insertData(); throw new RuntimeException("Exception occur for transaction test."); } - + private List insertData() { List result = new ArrayList<>(10); for (int i = 1; i <= 10; i++) { @@ -69,14 +69,14 @@ private List insertData() { } return result; } - + private void deleteData(final List orderIds) { for (Long each : orderIds) { getOrderRepository().delete(each); getOrderItemRepository().delete(each); } } - + @Override public void printData(final boolean isRangeSharding) { if (isRangeSharding) { @@ -85,24 +85,24 @@ public void printData(final boolean isRangeSharding) { printDataAll(); } } - + private void printDataRange() { for (Object each : getOrderRepository().selectRange()) { } for (Object each : getOrderItemRepository().selectRange()) { } } - + private void printDataAll() { for (Object each : getOrderRepository().selectAll()) { } } - + protected abstract OrderRepository getOrderRepository(); - + protected abstract OrderItemRepository getOrderItemRepository(); - + protected abstract Order newOrder(); - + protected abstract OrderItem newOrderItem(); } diff --git a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java index e2d554b2d4c9..5dd465ce6151 100644 --- a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java +++ b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java @@ -22,20 +22,20 @@ import io.shardingsphere.api.config.TableRuleConfiguration; import io.shardingsphere.api.config.strategy.InlineShardingStrategyConfiguration; import io.shardingsphere.api.config.strategy.StandardShardingStrategyConfiguration; -import org.apache.skywalking.apm.testcase.shardingsphere.service.utility.algorithm.PreciseModuloShardingTableAlgorithm; -import org.apache.skywalking.apm.testcase.shardingsphere.service.utility.config.DataSourceUtil; -import org.apache.skywalking.apm.testcase.shardingsphere.service.utility.config.ExampleConfiguration; import io.shardingsphere.shardingjdbc.api.ShardingDataSourceFactory; -import javax.sql.DataSource; import java.sql.SQLException; import java.util.HashMap; import java.util.Map; import java.util.Properties; +import javax.sql.DataSource; +import org.apache.skywalking.apm.testcase.shardingsphere.service.utility.algorithm.PreciseModuloShardingTableAlgorithm; +import org.apache.skywalking.apm.testcase.shardingsphere.service.utility.config.DataSourceUtil; +import org.apache.skywalking.apm.testcase.shardingsphere.service.utility.config.ExampleConfiguration; public final class ShardingDatabasesAndTablesConfigurationPrecise implements ExampleConfiguration { - + private static DataSource dataSource; - + @Override public DataSource createDataSource() throws SQLException { ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration(); @@ -49,12 +49,12 @@ public DataSource createDataSource() throws SQLException { dataSource = ShardingDataSourceFactory.createDataSource(createDataSourceMap(), shardingRuleConfig, new HashMap(), properties); return dataSource; } - + @Override public DataSource getDataSource() { return dataSource; } - + private static TableRuleConfiguration getOrderTableRuleConfiguration() { TableRuleConfiguration result = new TableRuleConfiguration(); result.setLogicTable("t_order"); @@ -62,14 +62,14 @@ private static TableRuleConfiguration getOrderTableRuleConfiguration() { result.setKeyGeneratorColumnName("order_id"); return result; } - + private static TableRuleConfiguration getOrderItemTableRuleConfiguration() { TableRuleConfiguration result = new TableRuleConfiguration(); result.setLogicTable("t_order_item"); result.setActualDataNodes("demo_ds_${0..1}.t_order_item_${[0, 1]}"); return result; } - + private static Map createDataSourceMap() { Map result = new HashMap<>(); result.put("demo_ds_0", DataSourceUtil.getDataSource("demo_ds_0")); diff --git a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderItemRepositoryImpl.java b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderItemRepositoryImpl.java index 930c62763867..e54486f71659 100644 --- a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderItemRepositoryImpl.java +++ b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderItemRepositoryImpl.java @@ -18,9 +18,6 @@ package org.apache.skywalking.apm.testcase.shardingsphere.service.repository.jdbc; -import org.apache.skywalking.apm.testcase.shardingsphere.service.api.entity.OrderItem; -import org.apache.skywalking.apm.testcase.shardingsphere.service.api.repository.OrderItemRepository; -import javax.sql.DataSource; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -28,51 +25,49 @@ import java.sql.Statement; import java.util.LinkedList; import java.util.List; +import javax.sql.DataSource; +import org.apache.skywalking.apm.testcase.shardingsphere.service.api.entity.OrderItem; +import org.apache.skywalking.apm.testcase.shardingsphere.service.api.repository.OrderItemRepository; public final class JDBCOrderItemRepositoryImpl implements OrderItemRepository { - + private final DataSource dataSource; - + public JDBCOrderItemRepositoryImpl(final DataSource dataSource) { this.dataSource = dataSource; } - + @Override public void createTableIfNotExists() { - String sql = "CREATE TABLE IF NOT EXISTS t_order_item " - + "(order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_item_id))"; - try (Connection connection = dataSource.getConnection(); - Statement statement = connection.createStatement()) { + String sql = "CREATE TABLE IF NOT EXISTS t_order_item " + "(order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_item_id))"; + try (Connection connection = dataSource.getConnection(); Statement statement = connection.createStatement()) { statement.executeUpdate(sql); } catch (final SQLException ignored) { } } - + @Override public void dropTable() { String sql = "DROP TABLE t_order_item"; - try (Connection connection = dataSource.getConnection(); - Statement statement = connection.createStatement()) { + try (Connection connection = dataSource.getConnection(); Statement statement = connection.createStatement()) { statement.executeUpdate(sql); } catch (final SQLException ignored) { } } - + @Override public void truncateTable() { String sql = "TRUNCATE TABLE t_order_item"; - try (Connection connection = dataSource.getConnection(); - Statement statement = connection.createStatement()) { + try (Connection connection = dataSource.getConnection(); Statement statement = connection.createStatement()) { statement.executeUpdate(sql); } catch (final SQLException ignored) { } } - + @Override public Long insert(final OrderItem orderItem) { String sql = "INSERT INTO t_order_item (order_id, user_id, status) VALUES (?, ?, ?)"; - try (Connection connection = dataSource.getConnection(); - PreparedStatement preparedStatement = connection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) { + try (Connection connection = dataSource.getConnection(); PreparedStatement preparedStatement = connection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) { preparedStatement.setLong(1, orderItem.getOrderId()); preparedStatement.setInt(2, orderItem.getUserId()); preparedStatement.setString(3, orderItem.getStatus()); @@ -86,35 +81,33 @@ public Long insert(final OrderItem orderItem) { } return orderItem.getOrderItemId(); } - + @Override public void delete(final Long orderItemId) { String sql = "DELETE FROM t_order_item WHERE order_item_id=?"; - try (Connection connection = dataSource.getConnection(); - PreparedStatement preparedStatement = connection.prepareStatement(sql)) { + try (Connection connection = dataSource.getConnection(); PreparedStatement preparedStatement = connection.prepareStatement(sql)) { preparedStatement.setLong(1, orderItemId); preparedStatement.executeUpdate(sql); } catch (final SQLException ignored) { } } - + @Override public List selectAll() { String sql = "SELECT i.* FROM t_order o, t_order_item i WHERE o.order_id = i.order_id"; return getOrderItems(sql); } - + @Override public List selectRange() { String sql = "SELECT i.* FROM t_order o, t_order_item i WHERE o.order_id = i.order_id AND o.user_id BETWEEN 1 AND 5"; return getOrderItems(sql); } - + private List getOrderItems(final String sql) { List result = new LinkedList<>(); - try (Connection connection = dataSource.getConnection(); - PreparedStatement preparedStatement = connection.prepareStatement(sql); - ResultSet resultSet = preparedStatement.executeQuery()) { + try (Connection connection = dataSource.getConnection(); PreparedStatement preparedStatement = connection.prepareStatement(sql); ResultSet resultSet = preparedStatement + .executeQuery()) { while (resultSet.next()) { OrderItem orderItem = new OrderItem(); orderItem.setOrderItemId(resultSet.getLong(1)); diff --git a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderRepositoryImpl.java b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderRepositoryImpl.java index f995bd8088d1..2a66c0dc718f 100644 --- a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderRepositoryImpl.java +++ b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderRepositoryImpl.java @@ -18,9 +18,6 @@ package org.apache.skywalking.apm.testcase.shardingsphere.service.repository.jdbc; -import org.apache.skywalking.apm.testcase.shardingsphere.service.api.entity.Order; -import org.apache.skywalking.apm.testcase.shardingsphere.service.api.repository.OrderRepository; -import javax.sql.DataSource; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -28,50 +25,49 @@ import java.sql.Statement; import java.util.LinkedList; import java.util.List; +import javax.sql.DataSource; +import org.apache.skywalking.apm.testcase.shardingsphere.service.api.entity.Order; +import org.apache.skywalking.apm.testcase.shardingsphere.service.api.repository.OrderRepository; public final class JDBCOrderRepositoryImpl implements OrderRepository { - + private final DataSource dataSource; - + public JDBCOrderRepositoryImpl(final DataSource dataSource) { this.dataSource = dataSource; } - + @Override public void createTableIfNotExists() { String sql = "CREATE TABLE IF NOT EXISTS t_order (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_id))"; - try (Connection connection = dataSource.getConnection(); - Statement statement = connection.createStatement()) { + try (Connection connection = dataSource.getConnection(); Statement statement = connection.createStatement()) { statement.executeUpdate(sql); } catch (final SQLException ignored) { } } - + @Override public void dropTable() { String sql = "DROP TABLE t_order"; - try (Connection connection = dataSource.getConnection(); - Statement statement = connection.createStatement()) { + try (Connection connection = dataSource.getConnection(); Statement statement = connection.createStatement()) { statement.executeUpdate(sql); } catch (final SQLException ignored) { } } - + @Override public void truncateTable() { String sql = "TRUNCATE TABLE t_order"; - try (Connection connection = dataSource.getConnection(); - Statement statement = connection.createStatement()) { + try (Connection connection = dataSource.getConnection(); Statement statement = connection.createStatement()) { statement.executeUpdate(sql); } catch (final SQLException ignored) { } } - + @Override public Long insert(final Order order) { String sql = "INSERT INTO t_order (user_id, status) VALUES (?, ?)"; - try (Connection connection = dataSource.getConnection(); - PreparedStatement preparedStatement = connection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) { + try (Connection connection = dataSource.getConnection(); PreparedStatement preparedStatement = connection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) { preparedStatement.setInt(1, order.getUserId()); preparedStatement.setString(2, order.getStatus()); preparedStatement.executeUpdate(); @@ -84,35 +80,33 @@ public Long insert(final Order order) { } return order.getOrderId(); } - + @Override public void delete(final Long orderId) { String sql = "DELETE FROM t_order WHERE order_id=?"; - try (Connection connection = dataSource.getConnection(); - PreparedStatement preparedStatement = connection.prepareStatement(sql)) { + try (Connection connection = dataSource.getConnection(); PreparedStatement preparedStatement = connection.prepareStatement(sql)) { preparedStatement.setLong(1, orderId); preparedStatement.executeUpdate(); } catch (final SQLException ignored) { } } - + @Override public List selectAll() { String sql = "SELECT * FROM t_order"; return getOrders(sql); } - + @Override public List selectRange() { String sql = "SELECT * FROM t_order WHERE order_id BETWEEN 200000000000000000 AND 400000000000000000"; return getOrders(sql); } - + private List getOrders(final String sql) { List result = new LinkedList<>(); - try (Connection connection = dataSource.getConnection(); - PreparedStatement preparedStatement = connection.prepareStatement(sql); - ResultSet resultSet = preparedStatement.executeQuery()) { + try (Connection connection = dataSource.getConnection(); PreparedStatement preparedStatement = connection.prepareStatement(sql); ResultSet resultSet = preparedStatement + .executeQuery()) { while (resultSet.next()) { Order order = new Order(); order.setOrderId(resultSet.getLong(1)); diff --git a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/service/RawPojoService.java b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/service/RawPojoService.java index 60996688818a..796856a43a27 100644 --- a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/service/RawPojoService.java +++ b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/service/RawPojoService.java @@ -27,31 +27,32 @@ import org.apache.skywalking.apm.testcase.shardingsphere.service.repository.jdbc.JDBCOrderRepositoryImpl; public class RawPojoService extends CommonServiceImpl { - + private final OrderRepository orderRepository; - + private final OrderItemRepository orderItemRepository; - - public RawPojoService(final JDBCOrderRepositoryImpl orderRepository, final JDBCOrderItemRepositoryImpl orderItemRepository) { + + public RawPojoService(final JDBCOrderRepositoryImpl orderRepository, + final JDBCOrderItemRepositoryImpl orderItemRepository) { this.orderRepository = orderRepository; this.orderItemRepository = orderItemRepository; } - + @Override protected OrderRepository getOrderRepository() { return orderRepository; } - + @Override protected OrderItemRepository getOrderItemRepository() { return orderItemRepository; } - + @Override protected Order newOrder() { return new Order(); } - + @Override protected OrderItem newOrderItem() { return new OrderItem(); diff --git a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/PreciseModuloShardingDatabaseAlgorithm.java b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/PreciseModuloShardingDatabaseAlgorithm.java index aae1f8171074..fae63fe3c4cf 100644 --- a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/PreciseModuloShardingDatabaseAlgorithm.java +++ b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/PreciseModuloShardingDatabaseAlgorithm.java @@ -20,13 +20,13 @@ import io.shardingsphere.api.algorithm.sharding.PreciseShardingValue; import io.shardingsphere.api.algorithm.sharding.standard.PreciseShardingAlgorithm; - import java.util.Collection; public class PreciseModuloShardingDatabaseAlgorithm implements PreciseShardingAlgorithm { - + @Override - public String doSharding(final Collection databaseNames, final PreciseShardingValue shardingValue) { + public String doSharding(final Collection databaseNames, + final PreciseShardingValue shardingValue) { for (String each : databaseNames) { if (each.endsWith(shardingValue.getValue() % 2 + "")) { return each; diff --git a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/PreciseModuloShardingTableAlgorithm.java b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/PreciseModuloShardingTableAlgorithm.java index 585248a3d9bd..684d639e9e8e 100644 --- a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/PreciseModuloShardingTableAlgorithm.java +++ b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/PreciseModuloShardingTableAlgorithm.java @@ -20,11 +20,10 @@ import io.shardingsphere.api.algorithm.sharding.PreciseShardingValue; import io.shardingsphere.api.algorithm.sharding.standard.PreciseShardingAlgorithm; - import java.util.Collection; public class PreciseModuloShardingTableAlgorithm implements PreciseShardingAlgorithm { - + @Override public String doSharding(final Collection tableNames, final PreciseShardingValue shardingValue) { for (String each : tableNames) { diff --git a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/RangeModuloShardingDatabaseAlgorithm.java b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/RangeModuloShardingDatabaseAlgorithm.java index 304a86787433..57490d6c9e10 100644 --- a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/RangeModuloShardingDatabaseAlgorithm.java +++ b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/RangeModuloShardingDatabaseAlgorithm.java @@ -21,15 +21,15 @@ import com.google.common.collect.Range; import io.shardingsphere.api.algorithm.sharding.RangeShardingValue; import io.shardingsphere.api.algorithm.sharding.standard.RangeShardingAlgorithm; - import java.util.Collection; import java.util.LinkedHashSet; import java.util.Set; public class RangeModuloShardingDatabaseAlgorithm implements RangeShardingAlgorithm { - + @Override - public Collection doSharding(final Collection databaseNames, final RangeShardingValue shardingValue) { + public Collection doSharding(final Collection databaseNames, + final RangeShardingValue shardingValue) { Set result = new LinkedHashSet<>(); if (Range.closed(1, 5).encloses(shardingValue.getValueRange())) { for (String each : databaseNames) { diff --git a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/RangeModuloShardingTableAlgorithm.java b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/RangeModuloShardingTableAlgorithm.java index c3c44ee9e2fe..744e453cb85c 100644 --- a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/RangeModuloShardingTableAlgorithm.java +++ b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/RangeModuloShardingTableAlgorithm.java @@ -21,15 +21,15 @@ import com.google.common.collect.Range; import io.shardingsphere.api.algorithm.sharding.RangeShardingValue; import io.shardingsphere.api.algorithm.sharding.standard.RangeShardingAlgorithm; - import java.util.Collection; import java.util.LinkedHashSet; import java.util.Set; public class RangeModuloShardingTableAlgorithm implements RangeShardingAlgorithm { - + @Override - public Collection doSharding(final Collection tableNames, final RangeShardingValue shardingValue) { + public Collection doSharding(final Collection tableNames, + final RangeShardingValue shardingValue) { Set result = new LinkedHashSet<>(); if (Range.closed(200000000000000000L, 400000000000000000L).encloses(shardingValue.getValueRange())) { for (String each : tableNames) { diff --git a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java index 139ccfcd1220..dae97c4d6e59 100644 --- a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java +++ b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java @@ -18,17 +18,16 @@ package org.apache.skywalking.apm.testcase.shardingsphere.service.utility.config; -import org.apache.commons.dbcp.BasicDataSource; - -import javax.sql.DataSource; import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; import java.util.HashMap; import java.util.Map; +import javax.sql.DataSource; +import org.apache.commons.dbcp.BasicDataSource; public class DataSourceUtil { - + private static final String DEFAULT_SCHEMA = ""; private static final Map datasourceMap = new HashMap<>(); @@ -45,11 +44,10 @@ public static void createDataSource(final String dataSourceName) { public static DataSource getDataSource(final String dataSourceName) { return datasourceMap.get(dataSourceName); } - + public static void createSchema(final String dataSourceName) { String sql = "CREATE SCHEMA " + dataSourceName; - try (Connection connection = getDataSource(DEFAULT_SCHEMA).getConnection(); - Statement statement = connection.createStatement()) { + try (Connection connection = getDataSource(DEFAULT_SCHEMA).getConnection(); Statement statement = connection.createStatement()) { statement.execute(sql); } catch (final SQLException ignored) { } diff --git a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/ExampleConfiguration.java b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/ExampleConfiguration.java index 2b0b5ab64f0b..0935ea72f013 100644 --- a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/ExampleConfiguration.java +++ b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/ExampleConfiguration.java @@ -18,12 +18,12 @@ package org.apache.skywalking.apm.testcase.shardingsphere.service.utility.config; -import javax.sql.DataSource; import java.sql.SQLException; +import javax.sql.DataSource; public interface ExampleConfiguration { - + DataSource createDataSource() throws SQLException; - + DataSource getDataSource(); } diff --git a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/resources/application.properties b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/resources/application.properties index 66384c003a8b..c156e0184b1f 100644 --- a/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/resources/application.properties +++ b/test/plugin/scenarios/shardingsphere-3.x-scenario/src/main/resources/application.properties @@ -13,6 +13,5 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - server.port=8080 server.contextPath=/shardingsphere-3.x-scenario \ No newline at end of file diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/assembly/assembly.xml index dac60bb6d102..d86b1ba134c3 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/Application.java b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/Application.java index 0a98702776cc..3663ead8f626 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/Application.java +++ b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/Application.java @@ -18,19 +18,16 @@ package org.apache.skywalking.apm.testcase.shardingsphere; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.web.support.SpringBootServletInitializer; -import org.springframework.context.annotation.ComponentScan; +import javax.sql.DataSource; import org.apache.skywalking.apm.testcase.shardingsphere.service.api.service.CommonService; import org.apache.skywalking.apm.testcase.shardingsphere.service.config.ShardingDatabasesAndTablesConfigurationPrecise; import org.apache.skywalking.apm.testcase.shardingsphere.service.repository.jdbc.JDBCOrderItemRepositoryImpl; import org.apache.skywalking.apm.testcase.shardingsphere.service.repository.jdbc.JDBCOrderRepositoryImpl; import org.apache.skywalking.apm.testcase.shardingsphere.service.repository.service.RawPojoService; import org.apache.skywalking.apm.testcase.shardingsphere.service.utility.config.DataSourceUtil; - -import javax.sql.DataSource; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.web.support.SpringBootServletInitializer; @SpringBootApplication public class Application extends SpringBootServletInitializer { diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/controller/CaseController.java b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/controller/CaseController.java index 4feb7d5881a1..bf807de4a17f 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/controller/CaseController.java +++ b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/controller/CaseController.java @@ -18,6 +18,8 @@ package org.apache.skywalking.apm.testcase.shardingsphere.controller; +import java.sql.SQLException; +import javax.sql.DataSource; import org.apache.skywalking.apm.testcase.shardingsphere.service.api.service.CommonService; import org.apache.skywalking.apm.testcase.shardingsphere.service.config.ShardingDatabasesAndTablesConfigurationPrecise; import org.apache.skywalking.apm.testcase.shardingsphere.service.repository.jdbc.JDBCOrderItemRepositoryImpl; @@ -27,9 +29,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import javax.sql.DataSource; -import java.sql.SQLException; - @RestController @RequestMapping("/case") public class CaseController { diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/entity/Order.java b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/entity/Order.java index 2366e1e7f03e..5d00a352ff97 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/entity/Order.java +++ b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/entity/Order.java @@ -21,39 +21,39 @@ import java.io.Serializable; public class Order implements Serializable { - + private static final long serialVersionUID = 661434701950670670L; - + private long orderId; - + private int userId; - + private String status; - + public long getOrderId() { return orderId; } - + public void setOrderId(final long orderId) { this.orderId = orderId; } - + public int getUserId() { return userId; } - + public void setUserId(final int userId) { this.userId = userId; } - + public String getStatus() { return status; } - + public void setStatus(final String status) { this.status = status; } - + @Override public String toString() { return String.format("order_id: %s, user_id: %s, status: %s", orderId, userId, status); diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/entity/OrderItem.java b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/entity/OrderItem.java index 42f2170b53af..8ffa5b9fa6c5 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/entity/OrderItem.java +++ b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/entity/OrderItem.java @@ -21,49 +21,49 @@ import java.io.Serializable; public class OrderItem implements Serializable { - + private static final long serialVersionUID = 263434701950670170L; - + private long orderItemId; - + private long orderId; - + private int userId; - + private String status; - + public long getOrderItemId() { return orderItemId; } - + public void setOrderItemId(final long orderItemId) { this.orderItemId = orderItemId; } - + public long getOrderId() { return orderId; } - + public void setOrderId(final long orderId) { this.orderId = orderId; } - + public int getUserId() { return userId; } - + public void setUserId(final int userId) { this.userId = userId; } - + public String getStatus() { return status; } - + public void setStatus(final String status) { this.status = status; } - + @Override public String toString() { return String.format("order_item_id:%s, order_id: %s, user_id: %s, status: %s", orderItemId, orderId, userId, status); diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/repository/CommonRepository.java b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/repository/CommonRepository.java index d4ac16a5739f..51da35ec94ff 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/repository/CommonRepository.java +++ b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/repository/CommonRepository.java @@ -21,18 +21,18 @@ import java.util.List; public interface CommonRepository { - + void createTableIfNotExists(); - + void dropTable(); - + void truncateTable(); - + Long insert(T entity); - + void delete(Long id); - + List selectAll(); - + List selectRange(); } diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/service/CommonService.java b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/service/CommonService.java index 858fc2b3e349..066f122cde8e 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/service/CommonService.java +++ b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/service/CommonService.java @@ -19,14 +19,14 @@ package org.apache.skywalking.apm.testcase.shardingsphere.service.api.service; public interface CommonService { - + void initEnvironment(); - + void cleanEnvironment(); - + void processSuccess(boolean isRangeSharding); - + void processFailure(); - + void printData(boolean isRangeSharding); } diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/service/CommonServiceImpl.java b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/service/CommonServiceImpl.java index 4935921cc941..a1d358bbf42e 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/service/CommonServiceImpl.java +++ b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/service/CommonServiceImpl.java @@ -18,15 +18,15 @@ package org.apache.skywalking.apm.testcase.shardingsphere.service.api.service; +import java.util.ArrayList; +import java.util.List; import org.apache.skywalking.apm.testcase.shardingsphere.service.api.entity.Order; import org.apache.skywalking.apm.testcase.shardingsphere.service.api.entity.OrderItem; import org.apache.skywalking.apm.testcase.shardingsphere.service.api.repository.OrderItemRepository; import org.apache.skywalking.apm.testcase.shardingsphere.service.api.repository.OrderRepository; -import java.util.ArrayList; -import java.util.List; public abstract class CommonServiceImpl implements CommonService { - + @Override public void initEnvironment() { getOrderRepository().createTableIfNotExists(); @@ -35,24 +35,24 @@ public void initEnvironment() { getOrderItemRepository().truncateTable(); insertData(); } - + @Override public void cleanEnvironment() { getOrderRepository().dropTable(); getOrderItemRepository().dropTable(); } - + @Override public void processSuccess(final boolean isRangeSharding) { printData(isRangeSharding); } - + @Override public void processFailure() { insertData(); throw new RuntimeException("Exception occur for transaction test."); } - + private List insertData() { List result = new ArrayList<>(10); for (int i = 1; i <= 10; i++) { @@ -69,14 +69,14 @@ private List insertData() { } return result; } - + private void deleteData(final List orderIds) { for (Long each : orderIds) { getOrderRepository().delete(each); getOrderItemRepository().delete(each); } } - + @Override public void printData(final boolean isRangeSharding) { if (isRangeSharding) { @@ -85,24 +85,24 @@ public void printData(final boolean isRangeSharding) { printDataAll(); } } - + private void printDataRange() { for (Object each : getOrderRepository().selectRange()) { } for (Object each : getOrderItemRepository().selectRange()) { } } - + private void printDataAll() { for (Object each : getOrderRepository().selectAll()) { } } - + protected abstract OrderRepository getOrderRepository(); - + protected abstract OrderItemRepository getOrderItemRepository(); - + protected abstract Order newOrder(); - + protected abstract OrderItem newOrderItem(); } diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java index c083519fc838..bfcc6d8ff805 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java +++ b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java @@ -18,6 +18,11 @@ package org.apache.skywalking.apm.testcase.shardingsphere.service.config; +import java.sql.SQLException; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; +import javax.sql.DataSource; import org.apache.shardingsphere.api.config.sharding.KeyGeneratorConfiguration; import org.apache.shardingsphere.api.config.sharding.ShardingRuleConfiguration; import org.apache.shardingsphere.api.config.sharding.TableRuleConfiguration; @@ -27,16 +32,11 @@ import org.apache.skywalking.apm.testcase.shardingsphere.service.utility.algorithm.PreciseModuloShardingTableAlgorithm; import org.apache.skywalking.apm.testcase.shardingsphere.service.utility.config.DataSourceUtil; import org.apache.skywalking.apm.testcase.shardingsphere.service.utility.config.ExampleConfiguration; -import javax.sql.DataSource; -import java.sql.SQLException; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; public final class ShardingDatabasesAndTablesConfigurationPrecise implements ExampleConfiguration { - + private static DataSource dataSource; - + @Override public DataSource createDataSource() throws SQLException { ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration(); @@ -47,26 +47,26 @@ public DataSource createDataSource() throws SQLException { shardingRuleConfig.setDefaultTableShardingStrategyConfig(new StandardShardingStrategyConfiguration("order_id", new PreciseModuloShardingTableAlgorithm())); Properties properties = new Properties(); properties.setProperty("max.connections.size.per.query", "16"); - dataSource = ShardingDataSourceFactory.createDataSource(createDataSourceMap(), shardingRuleConfig, properties); + dataSource = ShardingDataSourceFactory.createDataSource(createDataSourceMap(), shardingRuleConfig, properties); return dataSource; } - + @Override public DataSource getDataSource() { return dataSource; } - + private static TableRuleConfiguration getOrderTableRuleConfiguration() { TableRuleConfiguration result = new TableRuleConfiguration("t_order", "demo_ds_${0..1}.t_order_${[0, 1]}"); result.setKeyGeneratorConfig(new KeyGeneratorConfiguration("SNOWFLAKE", "order_id")); return result; } - + private static TableRuleConfiguration getOrderItemTableRuleConfiguration() { TableRuleConfiguration result = new TableRuleConfiguration("t_order_item", "demo_ds_${0..1}.t_order_item_${[0, 1]}"); return result; } - + private static Map createDataSourceMap() { Map result = new HashMap<>(); result.put("demo_ds_0", DataSourceUtil.getDataSource("demo_ds_0")); diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderItemRepositoryImpl.java b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderItemRepositoryImpl.java index 930c62763867..e54486f71659 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderItemRepositoryImpl.java +++ b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderItemRepositoryImpl.java @@ -18,9 +18,6 @@ package org.apache.skywalking.apm.testcase.shardingsphere.service.repository.jdbc; -import org.apache.skywalking.apm.testcase.shardingsphere.service.api.entity.OrderItem; -import org.apache.skywalking.apm.testcase.shardingsphere.service.api.repository.OrderItemRepository; -import javax.sql.DataSource; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -28,51 +25,49 @@ import java.sql.Statement; import java.util.LinkedList; import java.util.List; +import javax.sql.DataSource; +import org.apache.skywalking.apm.testcase.shardingsphere.service.api.entity.OrderItem; +import org.apache.skywalking.apm.testcase.shardingsphere.service.api.repository.OrderItemRepository; public final class JDBCOrderItemRepositoryImpl implements OrderItemRepository { - + private final DataSource dataSource; - + public JDBCOrderItemRepositoryImpl(final DataSource dataSource) { this.dataSource = dataSource; } - + @Override public void createTableIfNotExists() { - String sql = "CREATE TABLE IF NOT EXISTS t_order_item " - + "(order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_item_id))"; - try (Connection connection = dataSource.getConnection(); - Statement statement = connection.createStatement()) { + String sql = "CREATE TABLE IF NOT EXISTS t_order_item " + "(order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_item_id))"; + try (Connection connection = dataSource.getConnection(); Statement statement = connection.createStatement()) { statement.executeUpdate(sql); } catch (final SQLException ignored) { } } - + @Override public void dropTable() { String sql = "DROP TABLE t_order_item"; - try (Connection connection = dataSource.getConnection(); - Statement statement = connection.createStatement()) { + try (Connection connection = dataSource.getConnection(); Statement statement = connection.createStatement()) { statement.executeUpdate(sql); } catch (final SQLException ignored) { } } - + @Override public void truncateTable() { String sql = "TRUNCATE TABLE t_order_item"; - try (Connection connection = dataSource.getConnection(); - Statement statement = connection.createStatement()) { + try (Connection connection = dataSource.getConnection(); Statement statement = connection.createStatement()) { statement.executeUpdate(sql); } catch (final SQLException ignored) { } } - + @Override public Long insert(final OrderItem orderItem) { String sql = "INSERT INTO t_order_item (order_id, user_id, status) VALUES (?, ?, ?)"; - try (Connection connection = dataSource.getConnection(); - PreparedStatement preparedStatement = connection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) { + try (Connection connection = dataSource.getConnection(); PreparedStatement preparedStatement = connection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) { preparedStatement.setLong(1, orderItem.getOrderId()); preparedStatement.setInt(2, orderItem.getUserId()); preparedStatement.setString(3, orderItem.getStatus()); @@ -86,35 +81,33 @@ public Long insert(final OrderItem orderItem) { } return orderItem.getOrderItemId(); } - + @Override public void delete(final Long orderItemId) { String sql = "DELETE FROM t_order_item WHERE order_item_id=?"; - try (Connection connection = dataSource.getConnection(); - PreparedStatement preparedStatement = connection.prepareStatement(sql)) { + try (Connection connection = dataSource.getConnection(); PreparedStatement preparedStatement = connection.prepareStatement(sql)) { preparedStatement.setLong(1, orderItemId); preparedStatement.executeUpdate(sql); } catch (final SQLException ignored) { } } - + @Override public List selectAll() { String sql = "SELECT i.* FROM t_order o, t_order_item i WHERE o.order_id = i.order_id"; return getOrderItems(sql); } - + @Override public List selectRange() { String sql = "SELECT i.* FROM t_order o, t_order_item i WHERE o.order_id = i.order_id AND o.user_id BETWEEN 1 AND 5"; return getOrderItems(sql); } - + private List getOrderItems(final String sql) { List result = new LinkedList<>(); - try (Connection connection = dataSource.getConnection(); - PreparedStatement preparedStatement = connection.prepareStatement(sql); - ResultSet resultSet = preparedStatement.executeQuery()) { + try (Connection connection = dataSource.getConnection(); PreparedStatement preparedStatement = connection.prepareStatement(sql); ResultSet resultSet = preparedStatement + .executeQuery()) { while (resultSet.next()) { OrderItem orderItem = new OrderItem(); orderItem.setOrderItemId(resultSet.getLong(1)); diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderRepositoryImpl.java b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderRepositoryImpl.java index f995bd8088d1..2a66c0dc718f 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderRepositoryImpl.java +++ b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderRepositoryImpl.java @@ -18,9 +18,6 @@ package org.apache.skywalking.apm.testcase.shardingsphere.service.repository.jdbc; -import org.apache.skywalking.apm.testcase.shardingsphere.service.api.entity.Order; -import org.apache.skywalking.apm.testcase.shardingsphere.service.api.repository.OrderRepository; -import javax.sql.DataSource; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -28,50 +25,49 @@ import java.sql.Statement; import java.util.LinkedList; import java.util.List; +import javax.sql.DataSource; +import org.apache.skywalking.apm.testcase.shardingsphere.service.api.entity.Order; +import org.apache.skywalking.apm.testcase.shardingsphere.service.api.repository.OrderRepository; public final class JDBCOrderRepositoryImpl implements OrderRepository { - + private final DataSource dataSource; - + public JDBCOrderRepositoryImpl(final DataSource dataSource) { this.dataSource = dataSource; } - + @Override public void createTableIfNotExists() { String sql = "CREATE TABLE IF NOT EXISTS t_order (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_id))"; - try (Connection connection = dataSource.getConnection(); - Statement statement = connection.createStatement()) { + try (Connection connection = dataSource.getConnection(); Statement statement = connection.createStatement()) { statement.executeUpdate(sql); } catch (final SQLException ignored) { } } - + @Override public void dropTable() { String sql = "DROP TABLE t_order"; - try (Connection connection = dataSource.getConnection(); - Statement statement = connection.createStatement()) { + try (Connection connection = dataSource.getConnection(); Statement statement = connection.createStatement()) { statement.executeUpdate(sql); } catch (final SQLException ignored) { } } - + @Override public void truncateTable() { String sql = "TRUNCATE TABLE t_order"; - try (Connection connection = dataSource.getConnection(); - Statement statement = connection.createStatement()) { + try (Connection connection = dataSource.getConnection(); Statement statement = connection.createStatement()) { statement.executeUpdate(sql); } catch (final SQLException ignored) { } } - + @Override public Long insert(final Order order) { String sql = "INSERT INTO t_order (user_id, status) VALUES (?, ?)"; - try (Connection connection = dataSource.getConnection(); - PreparedStatement preparedStatement = connection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) { + try (Connection connection = dataSource.getConnection(); PreparedStatement preparedStatement = connection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) { preparedStatement.setInt(1, order.getUserId()); preparedStatement.setString(2, order.getStatus()); preparedStatement.executeUpdate(); @@ -84,35 +80,33 @@ public Long insert(final Order order) { } return order.getOrderId(); } - + @Override public void delete(final Long orderId) { String sql = "DELETE FROM t_order WHERE order_id=?"; - try (Connection connection = dataSource.getConnection(); - PreparedStatement preparedStatement = connection.prepareStatement(sql)) { + try (Connection connection = dataSource.getConnection(); PreparedStatement preparedStatement = connection.prepareStatement(sql)) { preparedStatement.setLong(1, orderId); preparedStatement.executeUpdate(); } catch (final SQLException ignored) { } } - + @Override public List selectAll() { String sql = "SELECT * FROM t_order"; return getOrders(sql); } - + @Override public List selectRange() { String sql = "SELECT * FROM t_order WHERE order_id BETWEEN 200000000000000000 AND 400000000000000000"; return getOrders(sql); } - + private List getOrders(final String sql) { List result = new LinkedList<>(); - try (Connection connection = dataSource.getConnection(); - PreparedStatement preparedStatement = connection.prepareStatement(sql); - ResultSet resultSet = preparedStatement.executeQuery()) { + try (Connection connection = dataSource.getConnection(); PreparedStatement preparedStatement = connection.prepareStatement(sql); ResultSet resultSet = preparedStatement + .executeQuery()) { while (resultSet.next()) { Order order = new Order(); order.setOrderId(resultSet.getLong(1)); diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/service/RawPojoService.java b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/service/RawPojoService.java index 60996688818a..796856a43a27 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/service/RawPojoService.java +++ b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/service/RawPojoService.java @@ -27,31 +27,32 @@ import org.apache.skywalking.apm.testcase.shardingsphere.service.repository.jdbc.JDBCOrderRepositoryImpl; public class RawPojoService extends CommonServiceImpl { - + private final OrderRepository orderRepository; - + private final OrderItemRepository orderItemRepository; - - public RawPojoService(final JDBCOrderRepositoryImpl orderRepository, final JDBCOrderItemRepositoryImpl orderItemRepository) { + + public RawPojoService(final JDBCOrderRepositoryImpl orderRepository, + final JDBCOrderItemRepositoryImpl orderItemRepository) { this.orderRepository = orderRepository; this.orderItemRepository = orderItemRepository; } - + @Override protected OrderRepository getOrderRepository() { return orderRepository; } - + @Override protected OrderItemRepository getOrderItemRepository() { return orderItemRepository; } - + @Override protected Order newOrder() { return new Order(); } - + @Override protected OrderItem newOrderItem() { return new OrderItem(); diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/PreciseModuloShardingDatabaseAlgorithm.java b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/PreciseModuloShardingDatabaseAlgorithm.java index 826cece5d235..36898c2e12e0 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/PreciseModuloShardingDatabaseAlgorithm.java +++ b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/PreciseModuloShardingDatabaseAlgorithm.java @@ -18,15 +18,15 @@ package org.apache.skywalking.apm.testcase.shardingsphere.service.utility.algorithm; +import java.util.Collection; import org.apache.shardingsphere.api.sharding.standard.PreciseShardingAlgorithm; import org.apache.shardingsphere.api.sharding.standard.PreciseShardingValue; -import java.util.Collection; - public class PreciseModuloShardingDatabaseAlgorithm implements PreciseShardingAlgorithm { - + @Override - public String doSharding(final Collection databaseNames, final PreciseShardingValue shardingValue) { + public String doSharding(final Collection databaseNames, + final PreciseShardingValue shardingValue) { for (String each : databaseNames) { if (each.endsWith(shardingValue.getValue() % 2 + "")) { return each; diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/PreciseModuloShardingTableAlgorithm.java b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/PreciseModuloShardingTableAlgorithm.java index 66f25b38fa2a..9c40c257c461 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/PreciseModuloShardingTableAlgorithm.java +++ b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/PreciseModuloShardingTableAlgorithm.java @@ -18,13 +18,12 @@ package org.apache.skywalking.apm.testcase.shardingsphere.service.utility.algorithm; +import java.util.Collection; import org.apache.shardingsphere.api.sharding.standard.PreciseShardingAlgorithm; import org.apache.shardingsphere.api.sharding.standard.PreciseShardingValue; -import java.util.Collection; - public class PreciseModuloShardingTableAlgorithm implements PreciseShardingAlgorithm { - + @Override public String doSharding(final Collection tableNames, final PreciseShardingValue shardingValue) { for (String each : tableNames) { diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/RangeModuloShardingDatabaseAlgorithm.java b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/RangeModuloShardingDatabaseAlgorithm.java index 5b9151ab8936..2e8fde81bf2d 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/RangeModuloShardingDatabaseAlgorithm.java +++ b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/RangeModuloShardingDatabaseAlgorithm.java @@ -19,17 +19,17 @@ package org.apache.skywalking.apm.testcase.shardingsphere.service.utility.algorithm; import com.google.common.collect.Range; -import org.apache.shardingsphere.api.sharding.standard.RangeShardingAlgorithm; -import org.apache.shardingsphere.api.sharding.standard.RangeShardingValue; - import java.util.Collection; import java.util.LinkedHashSet; import java.util.Set; +import org.apache.shardingsphere.api.sharding.standard.RangeShardingAlgorithm; +import org.apache.shardingsphere.api.sharding.standard.RangeShardingValue; public class RangeModuloShardingDatabaseAlgorithm implements RangeShardingAlgorithm { - + @Override - public Collection doSharding(final Collection databaseNames, final RangeShardingValue shardingValue) { + public Collection doSharding(final Collection databaseNames, + final RangeShardingValue shardingValue) { Set result = new LinkedHashSet<>(); if (Range.closed(1, 5).encloses(shardingValue.getValueRange())) { for (String each : databaseNames) { diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/RangeModuloShardingTableAlgorithm.java b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/RangeModuloShardingTableAlgorithm.java index 7b8a9c83728a..0a6b56f85af6 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/RangeModuloShardingTableAlgorithm.java +++ b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/RangeModuloShardingTableAlgorithm.java @@ -19,17 +19,17 @@ package org.apache.skywalking.apm.testcase.shardingsphere.service.utility.algorithm; import com.google.common.collect.Range; -import org.apache.shardingsphere.api.sharding.standard.RangeShardingAlgorithm; -import org.apache.shardingsphere.api.sharding.standard.RangeShardingValue; - import java.util.Collection; import java.util.LinkedHashSet; import java.util.Set; +import org.apache.shardingsphere.api.sharding.standard.RangeShardingAlgorithm; +import org.apache.shardingsphere.api.sharding.standard.RangeShardingValue; public class RangeModuloShardingTableAlgorithm implements RangeShardingAlgorithm { - + @Override - public Collection doSharding(final Collection tableNames, final RangeShardingValue shardingValue) { + public Collection doSharding(final Collection tableNames, + final RangeShardingValue shardingValue) { Set result = new LinkedHashSet<>(); if (Range.closed(200000000000000000L, 400000000000000000L).encloses(shardingValue.getValueRange())) { for (String each : tableNames) { diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java index 139ccfcd1220..dae97c4d6e59 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java +++ b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java @@ -18,17 +18,16 @@ package org.apache.skywalking.apm.testcase.shardingsphere.service.utility.config; -import org.apache.commons.dbcp.BasicDataSource; - -import javax.sql.DataSource; import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; import java.util.HashMap; import java.util.Map; +import javax.sql.DataSource; +import org.apache.commons.dbcp.BasicDataSource; public class DataSourceUtil { - + private static final String DEFAULT_SCHEMA = ""; private static final Map datasourceMap = new HashMap<>(); @@ -45,11 +44,10 @@ public static void createDataSource(final String dataSourceName) { public static DataSource getDataSource(final String dataSourceName) { return datasourceMap.get(dataSourceName); } - + public static void createSchema(final String dataSourceName) { String sql = "CREATE SCHEMA " + dataSourceName; - try (Connection connection = getDataSource(DEFAULT_SCHEMA).getConnection(); - Statement statement = connection.createStatement()) { + try (Connection connection = getDataSource(DEFAULT_SCHEMA).getConnection(); Statement statement = connection.createStatement()) { statement.execute(sql); } catch (final SQLException ignored) { } diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/ExampleConfiguration.java b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/ExampleConfiguration.java index 2b0b5ab64f0b..0935ea72f013 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/ExampleConfiguration.java +++ b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/ExampleConfiguration.java @@ -18,12 +18,12 @@ package org.apache.skywalking.apm.testcase.shardingsphere.service.utility.config; -import javax.sql.DataSource; import java.sql.SQLException; +import javax.sql.DataSource; public interface ExampleConfiguration { - + DataSource createDataSource() throws SQLException; - + DataSource getDataSource(); } diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/resources/application.properties b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/resources/application.properties index 8bdebb853851..2ea3d51e42c5 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/resources/application.properties +++ b/test/plugin/scenarios/shardingsphere-4.x-RC1-RC2-scenario/src/main/resources/application.properties @@ -13,6 +13,5 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - server.port=8080 server.contextPath=/shardingsphere-4.x-RC1-RC2-scenario \ No newline at end of file diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/assembly/assembly.xml index d5dac58c6efe..44a42ee83191 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/Application.java b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/Application.java index 0a98702776cc..3663ead8f626 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/Application.java +++ b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/Application.java @@ -18,19 +18,16 @@ package org.apache.skywalking.apm.testcase.shardingsphere; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.web.support.SpringBootServletInitializer; -import org.springframework.context.annotation.ComponentScan; +import javax.sql.DataSource; import org.apache.skywalking.apm.testcase.shardingsphere.service.api.service.CommonService; import org.apache.skywalking.apm.testcase.shardingsphere.service.config.ShardingDatabasesAndTablesConfigurationPrecise; import org.apache.skywalking.apm.testcase.shardingsphere.service.repository.jdbc.JDBCOrderItemRepositoryImpl; import org.apache.skywalking.apm.testcase.shardingsphere.service.repository.jdbc.JDBCOrderRepositoryImpl; import org.apache.skywalking.apm.testcase.shardingsphere.service.repository.service.RawPojoService; import org.apache.skywalking.apm.testcase.shardingsphere.service.utility.config.DataSourceUtil; - -import javax.sql.DataSource; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.web.support.SpringBootServletInitializer; @SpringBootApplication public class Application extends SpringBootServletInitializer { diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/controller/CaseController.java b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/controller/CaseController.java index 4feb7d5881a1..bf807de4a17f 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/controller/CaseController.java +++ b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/controller/CaseController.java @@ -18,6 +18,8 @@ package org.apache.skywalking.apm.testcase.shardingsphere.controller; +import java.sql.SQLException; +import javax.sql.DataSource; import org.apache.skywalking.apm.testcase.shardingsphere.service.api.service.CommonService; import org.apache.skywalking.apm.testcase.shardingsphere.service.config.ShardingDatabasesAndTablesConfigurationPrecise; import org.apache.skywalking.apm.testcase.shardingsphere.service.repository.jdbc.JDBCOrderItemRepositoryImpl; @@ -27,9 +29,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import javax.sql.DataSource; -import java.sql.SQLException; - @RestController @RequestMapping("/case") public class CaseController { diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/entity/Order.java b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/entity/Order.java index 2366e1e7f03e..5d00a352ff97 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/entity/Order.java +++ b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/entity/Order.java @@ -21,39 +21,39 @@ import java.io.Serializable; public class Order implements Serializable { - + private static final long serialVersionUID = 661434701950670670L; - + private long orderId; - + private int userId; - + private String status; - + public long getOrderId() { return orderId; } - + public void setOrderId(final long orderId) { this.orderId = orderId; } - + public int getUserId() { return userId; } - + public void setUserId(final int userId) { this.userId = userId; } - + public String getStatus() { return status; } - + public void setStatus(final String status) { this.status = status; } - + @Override public String toString() { return String.format("order_id: %s, user_id: %s, status: %s", orderId, userId, status); diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/entity/OrderItem.java b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/entity/OrderItem.java index 42f2170b53af..8ffa5b9fa6c5 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/entity/OrderItem.java +++ b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/entity/OrderItem.java @@ -21,49 +21,49 @@ import java.io.Serializable; public class OrderItem implements Serializable { - + private static final long serialVersionUID = 263434701950670170L; - + private long orderItemId; - + private long orderId; - + private int userId; - + private String status; - + public long getOrderItemId() { return orderItemId; } - + public void setOrderItemId(final long orderItemId) { this.orderItemId = orderItemId; } - + public long getOrderId() { return orderId; } - + public void setOrderId(final long orderId) { this.orderId = orderId; } - + public int getUserId() { return userId; } - + public void setUserId(final int userId) { this.userId = userId; } - + public String getStatus() { return status; } - + public void setStatus(final String status) { this.status = status; } - + @Override public String toString() { return String.format("order_item_id:%s, order_id: %s, user_id: %s, status: %s", orderItemId, orderId, userId, status); diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/repository/CommonRepository.java b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/repository/CommonRepository.java index d4ac16a5739f..51da35ec94ff 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/repository/CommonRepository.java +++ b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/repository/CommonRepository.java @@ -21,18 +21,18 @@ import java.util.List; public interface CommonRepository { - + void createTableIfNotExists(); - + void dropTable(); - + void truncateTable(); - + Long insert(T entity); - + void delete(Long id); - + List selectAll(); - + List selectRange(); } diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/service/CommonService.java b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/service/CommonService.java index 858fc2b3e349..066f122cde8e 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/service/CommonService.java +++ b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/service/CommonService.java @@ -19,14 +19,14 @@ package org.apache.skywalking.apm.testcase.shardingsphere.service.api.service; public interface CommonService { - + void initEnvironment(); - + void cleanEnvironment(); - + void processSuccess(boolean isRangeSharding); - + void processFailure(); - + void printData(boolean isRangeSharding); } diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/service/CommonServiceImpl.java b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/service/CommonServiceImpl.java index 4935921cc941..a1d358bbf42e 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/service/CommonServiceImpl.java +++ b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/service/CommonServiceImpl.java @@ -18,15 +18,15 @@ package org.apache.skywalking.apm.testcase.shardingsphere.service.api.service; +import java.util.ArrayList; +import java.util.List; import org.apache.skywalking.apm.testcase.shardingsphere.service.api.entity.Order; import org.apache.skywalking.apm.testcase.shardingsphere.service.api.entity.OrderItem; import org.apache.skywalking.apm.testcase.shardingsphere.service.api.repository.OrderItemRepository; import org.apache.skywalking.apm.testcase.shardingsphere.service.api.repository.OrderRepository; -import java.util.ArrayList; -import java.util.List; public abstract class CommonServiceImpl implements CommonService { - + @Override public void initEnvironment() { getOrderRepository().createTableIfNotExists(); @@ -35,24 +35,24 @@ public void initEnvironment() { getOrderItemRepository().truncateTable(); insertData(); } - + @Override public void cleanEnvironment() { getOrderRepository().dropTable(); getOrderItemRepository().dropTable(); } - + @Override public void processSuccess(final boolean isRangeSharding) { printData(isRangeSharding); } - + @Override public void processFailure() { insertData(); throw new RuntimeException("Exception occur for transaction test."); } - + private List insertData() { List result = new ArrayList<>(10); for (int i = 1; i <= 10; i++) { @@ -69,14 +69,14 @@ private List insertData() { } return result; } - + private void deleteData(final List orderIds) { for (Long each : orderIds) { getOrderRepository().delete(each); getOrderItemRepository().delete(each); } } - + @Override public void printData(final boolean isRangeSharding) { if (isRangeSharding) { @@ -85,24 +85,24 @@ public void printData(final boolean isRangeSharding) { printDataAll(); } } - + private void printDataRange() { for (Object each : getOrderRepository().selectRange()) { } for (Object each : getOrderItemRepository().selectRange()) { } } - + private void printDataAll() { for (Object each : getOrderRepository().selectAll()) { } } - + protected abstract OrderRepository getOrderRepository(); - + protected abstract OrderItemRepository getOrderItemRepository(); - + protected abstract Order newOrder(); - + protected abstract OrderItem newOrderItem(); } diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java index c083519fc838..bfcc6d8ff805 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java +++ b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java @@ -18,6 +18,11 @@ package org.apache.skywalking.apm.testcase.shardingsphere.service.config; +import java.sql.SQLException; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; +import javax.sql.DataSource; import org.apache.shardingsphere.api.config.sharding.KeyGeneratorConfiguration; import org.apache.shardingsphere.api.config.sharding.ShardingRuleConfiguration; import org.apache.shardingsphere.api.config.sharding.TableRuleConfiguration; @@ -27,16 +32,11 @@ import org.apache.skywalking.apm.testcase.shardingsphere.service.utility.algorithm.PreciseModuloShardingTableAlgorithm; import org.apache.skywalking.apm.testcase.shardingsphere.service.utility.config.DataSourceUtil; import org.apache.skywalking.apm.testcase.shardingsphere.service.utility.config.ExampleConfiguration; -import javax.sql.DataSource; -import java.sql.SQLException; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; public final class ShardingDatabasesAndTablesConfigurationPrecise implements ExampleConfiguration { - + private static DataSource dataSource; - + @Override public DataSource createDataSource() throws SQLException { ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration(); @@ -47,26 +47,26 @@ public DataSource createDataSource() throws SQLException { shardingRuleConfig.setDefaultTableShardingStrategyConfig(new StandardShardingStrategyConfiguration("order_id", new PreciseModuloShardingTableAlgorithm())); Properties properties = new Properties(); properties.setProperty("max.connections.size.per.query", "16"); - dataSource = ShardingDataSourceFactory.createDataSource(createDataSourceMap(), shardingRuleConfig, properties); + dataSource = ShardingDataSourceFactory.createDataSource(createDataSourceMap(), shardingRuleConfig, properties); return dataSource; } - + @Override public DataSource getDataSource() { return dataSource; } - + private static TableRuleConfiguration getOrderTableRuleConfiguration() { TableRuleConfiguration result = new TableRuleConfiguration("t_order", "demo_ds_${0..1}.t_order_${[0, 1]}"); result.setKeyGeneratorConfig(new KeyGeneratorConfiguration("SNOWFLAKE", "order_id")); return result; } - + private static TableRuleConfiguration getOrderItemTableRuleConfiguration() { TableRuleConfiguration result = new TableRuleConfiguration("t_order_item", "demo_ds_${0..1}.t_order_item_${[0, 1]}"); return result; } - + private static Map createDataSourceMap() { Map result = new HashMap<>(); result.put("demo_ds_0", DataSourceUtil.getDataSource("demo_ds_0")); diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderItemRepositoryImpl.java b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderItemRepositoryImpl.java index 930c62763867..e54486f71659 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderItemRepositoryImpl.java +++ b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderItemRepositoryImpl.java @@ -18,9 +18,6 @@ package org.apache.skywalking.apm.testcase.shardingsphere.service.repository.jdbc; -import org.apache.skywalking.apm.testcase.shardingsphere.service.api.entity.OrderItem; -import org.apache.skywalking.apm.testcase.shardingsphere.service.api.repository.OrderItemRepository; -import javax.sql.DataSource; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -28,51 +25,49 @@ import java.sql.Statement; import java.util.LinkedList; import java.util.List; +import javax.sql.DataSource; +import org.apache.skywalking.apm.testcase.shardingsphere.service.api.entity.OrderItem; +import org.apache.skywalking.apm.testcase.shardingsphere.service.api.repository.OrderItemRepository; public final class JDBCOrderItemRepositoryImpl implements OrderItemRepository { - + private final DataSource dataSource; - + public JDBCOrderItemRepositoryImpl(final DataSource dataSource) { this.dataSource = dataSource; } - + @Override public void createTableIfNotExists() { - String sql = "CREATE TABLE IF NOT EXISTS t_order_item " - + "(order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_item_id))"; - try (Connection connection = dataSource.getConnection(); - Statement statement = connection.createStatement()) { + String sql = "CREATE TABLE IF NOT EXISTS t_order_item " + "(order_item_id BIGINT NOT NULL AUTO_INCREMENT, order_id BIGINT NOT NULL, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_item_id))"; + try (Connection connection = dataSource.getConnection(); Statement statement = connection.createStatement()) { statement.executeUpdate(sql); } catch (final SQLException ignored) { } } - + @Override public void dropTable() { String sql = "DROP TABLE t_order_item"; - try (Connection connection = dataSource.getConnection(); - Statement statement = connection.createStatement()) { + try (Connection connection = dataSource.getConnection(); Statement statement = connection.createStatement()) { statement.executeUpdate(sql); } catch (final SQLException ignored) { } } - + @Override public void truncateTable() { String sql = "TRUNCATE TABLE t_order_item"; - try (Connection connection = dataSource.getConnection(); - Statement statement = connection.createStatement()) { + try (Connection connection = dataSource.getConnection(); Statement statement = connection.createStatement()) { statement.executeUpdate(sql); } catch (final SQLException ignored) { } } - + @Override public Long insert(final OrderItem orderItem) { String sql = "INSERT INTO t_order_item (order_id, user_id, status) VALUES (?, ?, ?)"; - try (Connection connection = dataSource.getConnection(); - PreparedStatement preparedStatement = connection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) { + try (Connection connection = dataSource.getConnection(); PreparedStatement preparedStatement = connection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) { preparedStatement.setLong(1, orderItem.getOrderId()); preparedStatement.setInt(2, orderItem.getUserId()); preparedStatement.setString(3, orderItem.getStatus()); @@ -86,35 +81,33 @@ public Long insert(final OrderItem orderItem) { } return orderItem.getOrderItemId(); } - + @Override public void delete(final Long orderItemId) { String sql = "DELETE FROM t_order_item WHERE order_item_id=?"; - try (Connection connection = dataSource.getConnection(); - PreparedStatement preparedStatement = connection.prepareStatement(sql)) { + try (Connection connection = dataSource.getConnection(); PreparedStatement preparedStatement = connection.prepareStatement(sql)) { preparedStatement.setLong(1, orderItemId); preparedStatement.executeUpdate(sql); } catch (final SQLException ignored) { } } - + @Override public List selectAll() { String sql = "SELECT i.* FROM t_order o, t_order_item i WHERE o.order_id = i.order_id"; return getOrderItems(sql); } - + @Override public List selectRange() { String sql = "SELECT i.* FROM t_order o, t_order_item i WHERE o.order_id = i.order_id AND o.user_id BETWEEN 1 AND 5"; return getOrderItems(sql); } - + private List getOrderItems(final String sql) { List result = new LinkedList<>(); - try (Connection connection = dataSource.getConnection(); - PreparedStatement preparedStatement = connection.prepareStatement(sql); - ResultSet resultSet = preparedStatement.executeQuery()) { + try (Connection connection = dataSource.getConnection(); PreparedStatement preparedStatement = connection.prepareStatement(sql); ResultSet resultSet = preparedStatement + .executeQuery()) { while (resultSet.next()) { OrderItem orderItem = new OrderItem(); orderItem.setOrderItemId(resultSet.getLong(1)); diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderRepositoryImpl.java b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderRepositoryImpl.java index f995bd8088d1..2a66c0dc718f 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderRepositoryImpl.java +++ b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderRepositoryImpl.java @@ -18,9 +18,6 @@ package org.apache.skywalking.apm.testcase.shardingsphere.service.repository.jdbc; -import org.apache.skywalking.apm.testcase.shardingsphere.service.api.entity.Order; -import org.apache.skywalking.apm.testcase.shardingsphere.service.api.repository.OrderRepository; -import javax.sql.DataSource; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -28,50 +25,49 @@ import java.sql.Statement; import java.util.LinkedList; import java.util.List; +import javax.sql.DataSource; +import org.apache.skywalking.apm.testcase.shardingsphere.service.api.entity.Order; +import org.apache.skywalking.apm.testcase.shardingsphere.service.api.repository.OrderRepository; public final class JDBCOrderRepositoryImpl implements OrderRepository { - + private final DataSource dataSource; - + public JDBCOrderRepositoryImpl(final DataSource dataSource) { this.dataSource = dataSource; } - + @Override public void createTableIfNotExists() { String sql = "CREATE TABLE IF NOT EXISTS t_order (order_id BIGINT NOT NULL AUTO_INCREMENT, user_id INT NOT NULL, status VARCHAR(50), PRIMARY KEY (order_id))"; - try (Connection connection = dataSource.getConnection(); - Statement statement = connection.createStatement()) { + try (Connection connection = dataSource.getConnection(); Statement statement = connection.createStatement()) { statement.executeUpdate(sql); } catch (final SQLException ignored) { } } - + @Override public void dropTable() { String sql = "DROP TABLE t_order"; - try (Connection connection = dataSource.getConnection(); - Statement statement = connection.createStatement()) { + try (Connection connection = dataSource.getConnection(); Statement statement = connection.createStatement()) { statement.executeUpdate(sql); } catch (final SQLException ignored) { } } - + @Override public void truncateTable() { String sql = "TRUNCATE TABLE t_order"; - try (Connection connection = dataSource.getConnection(); - Statement statement = connection.createStatement()) { + try (Connection connection = dataSource.getConnection(); Statement statement = connection.createStatement()) { statement.executeUpdate(sql); } catch (final SQLException ignored) { } } - + @Override public Long insert(final Order order) { String sql = "INSERT INTO t_order (user_id, status) VALUES (?, ?)"; - try (Connection connection = dataSource.getConnection(); - PreparedStatement preparedStatement = connection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) { + try (Connection connection = dataSource.getConnection(); PreparedStatement preparedStatement = connection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) { preparedStatement.setInt(1, order.getUserId()); preparedStatement.setString(2, order.getStatus()); preparedStatement.executeUpdate(); @@ -84,35 +80,33 @@ public Long insert(final Order order) { } return order.getOrderId(); } - + @Override public void delete(final Long orderId) { String sql = "DELETE FROM t_order WHERE order_id=?"; - try (Connection connection = dataSource.getConnection(); - PreparedStatement preparedStatement = connection.prepareStatement(sql)) { + try (Connection connection = dataSource.getConnection(); PreparedStatement preparedStatement = connection.prepareStatement(sql)) { preparedStatement.setLong(1, orderId); preparedStatement.executeUpdate(); } catch (final SQLException ignored) { } } - + @Override public List selectAll() { String sql = "SELECT * FROM t_order"; return getOrders(sql); } - + @Override public List selectRange() { String sql = "SELECT * FROM t_order WHERE order_id BETWEEN 200000000000000000 AND 400000000000000000"; return getOrders(sql); } - + private List getOrders(final String sql) { List result = new LinkedList<>(); - try (Connection connection = dataSource.getConnection(); - PreparedStatement preparedStatement = connection.prepareStatement(sql); - ResultSet resultSet = preparedStatement.executeQuery()) { + try (Connection connection = dataSource.getConnection(); PreparedStatement preparedStatement = connection.prepareStatement(sql); ResultSet resultSet = preparedStatement + .executeQuery()) { while (resultSet.next()) { Order order = new Order(); order.setOrderId(resultSet.getLong(1)); diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/service/RawPojoService.java b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/service/RawPojoService.java index 60996688818a..796856a43a27 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/service/RawPojoService.java +++ b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/service/RawPojoService.java @@ -27,31 +27,32 @@ import org.apache.skywalking.apm.testcase.shardingsphere.service.repository.jdbc.JDBCOrderRepositoryImpl; public class RawPojoService extends CommonServiceImpl { - + private final OrderRepository orderRepository; - + private final OrderItemRepository orderItemRepository; - - public RawPojoService(final JDBCOrderRepositoryImpl orderRepository, final JDBCOrderItemRepositoryImpl orderItemRepository) { + + public RawPojoService(final JDBCOrderRepositoryImpl orderRepository, + final JDBCOrderItemRepositoryImpl orderItemRepository) { this.orderRepository = orderRepository; this.orderItemRepository = orderItemRepository; } - + @Override protected OrderRepository getOrderRepository() { return orderRepository; } - + @Override protected OrderItemRepository getOrderItemRepository() { return orderItemRepository; } - + @Override protected Order newOrder() { return new Order(); } - + @Override protected OrderItem newOrderItem() { return new OrderItem(); diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/PreciseModuloShardingDatabaseAlgorithm.java b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/PreciseModuloShardingDatabaseAlgorithm.java index 826cece5d235..36898c2e12e0 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/PreciseModuloShardingDatabaseAlgorithm.java +++ b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/PreciseModuloShardingDatabaseAlgorithm.java @@ -18,15 +18,15 @@ package org.apache.skywalking.apm.testcase.shardingsphere.service.utility.algorithm; +import java.util.Collection; import org.apache.shardingsphere.api.sharding.standard.PreciseShardingAlgorithm; import org.apache.shardingsphere.api.sharding.standard.PreciseShardingValue; -import java.util.Collection; - public class PreciseModuloShardingDatabaseAlgorithm implements PreciseShardingAlgorithm { - + @Override - public String doSharding(final Collection databaseNames, final PreciseShardingValue shardingValue) { + public String doSharding(final Collection databaseNames, + final PreciseShardingValue shardingValue) { for (String each : databaseNames) { if (each.endsWith(shardingValue.getValue() % 2 + "")) { return each; diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/PreciseModuloShardingTableAlgorithm.java b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/PreciseModuloShardingTableAlgorithm.java index 66f25b38fa2a..9c40c257c461 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/PreciseModuloShardingTableAlgorithm.java +++ b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/PreciseModuloShardingTableAlgorithm.java @@ -18,13 +18,12 @@ package org.apache.skywalking.apm.testcase.shardingsphere.service.utility.algorithm; +import java.util.Collection; import org.apache.shardingsphere.api.sharding.standard.PreciseShardingAlgorithm; import org.apache.shardingsphere.api.sharding.standard.PreciseShardingValue; -import java.util.Collection; - public class PreciseModuloShardingTableAlgorithm implements PreciseShardingAlgorithm { - + @Override public String doSharding(final Collection tableNames, final PreciseShardingValue shardingValue) { for (String each : tableNames) { diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/RangeModuloShardingDatabaseAlgorithm.java b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/RangeModuloShardingDatabaseAlgorithm.java index 5b9151ab8936..2e8fde81bf2d 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/RangeModuloShardingDatabaseAlgorithm.java +++ b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/RangeModuloShardingDatabaseAlgorithm.java @@ -19,17 +19,17 @@ package org.apache.skywalking.apm.testcase.shardingsphere.service.utility.algorithm; import com.google.common.collect.Range; -import org.apache.shardingsphere.api.sharding.standard.RangeShardingAlgorithm; -import org.apache.shardingsphere.api.sharding.standard.RangeShardingValue; - import java.util.Collection; import java.util.LinkedHashSet; import java.util.Set; +import org.apache.shardingsphere.api.sharding.standard.RangeShardingAlgorithm; +import org.apache.shardingsphere.api.sharding.standard.RangeShardingValue; public class RangeModuloShardingDatabaseAlgorithm implements RangeShardingAlgorithm { - + @Override - public Collection doSharding(final Collection databaseNames, final RangeShardingValue shardingValue) { + public Collection doSharding(final Collection databaseNames, + final RangeShardingValue shardingValue) { Set result = new LinkedHashSet<>(); if (Range.closed(1, 5).encloses(shardingValue.getValueRange())) { for (String each : databaseNames) { diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/RangeModuloShardingTableAlgorithm.java b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/RangeModuloShardingTableAlgorithm.java index 7b8a9c83728a..0a6b56f85af6 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/RangeModuloShardingTableAlgorithm.java +++ b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/algorithm/RangeModuloShardingTableAlgorithm.java @@ -19,17 +19,17 @@ package org.apache.skywalking.apm.testcase.shardingsphere.service.utility.algorithm; import com.google.common.collect.Range; -import org.apache.shardingsphere.api.sharding.standard.RangeShardingAlgorithm; -import org.apache.shardingsphere.api.sharding.standard.RangeShardingValue; - import java.util.Collection; import java.util.LinkedHashSet; import java.util.Set; +import org.apache.shardingsphere.api.sharding.standard.RangeShardingAlgorithm; +import org.apache.shardingsphere.api.sharding.standard.RangeShardingValue; public class RangeModuloShardingTableAlgorithm implements RangeShardingAlgorithm { - + @Override - public Collection doSharding(final Collection tableNames, final RangeShardingValue shardingValue) { + public Collection doSharding(final Collection tableNames, + final RangeShardingValue shardingValue) { Set result = new LinkedHashSet<>(); if (Range.closed(200000000000000000L, 400000000000000000L).encloses(shardingValue.getValueRange())) { for (String each : tableNames) { diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java index 139ccfcd1220..dae97c4d6e59 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java +++ b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java @@ -18,17 +18,16 @@ package org.apache.skywalking.apm.testcase.shardingsphere.service.utility.config; -import org.apache.commons.dbcp.BasicDataSource; - -import javax.sql.DataSource; import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; import java.util.HashMap; import java.util.Map; +import javax.sql.DataSource; +import org.apache.commons.dbcp.BasicDataSource; public class DataSourceUtil { - + private static final String DEFAULT_SCHEMA = ""; private static final Map datasourceMap = new HashMap<>(); @@ -45,11 +44,10 @@ public static void createDataSource(final String dataSourceName) { public static DataSource getDataSource(final String dataSourceName) { return datasourceMap.get(dataSourceName); } - + public static void createSchema(final String dataSourceName) { String sql = "CREATE SCHEMA " + dataSourceName; - try (Connection connection = getDataSource(DEFAULT_SCHEMA).getConnection(); - Statement statement = connection.createStatement()) { + try (Connection connection = getDataSource(DEFAULT_SCHEMA).getConnection(); Statement statement = connection.createStatement()) { statement.execute(sql); } catch (final SQLException ignored) { } diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/ExampleConfiguration.java b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/ExampleConfiguration.java index 2b0b5ab64f0b..0935ea72f013 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/ExampleConfiguration.java +++ b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/ExampleConfiguration.java @@ -18,12 +18,12 @@ package org.apache.skywalking.apm.testcase.shardingsphere.service.utility.config; -import javax.sql.DataSource; import java.sql.SQLException; +import javax.sql.DataSource; public interface ExampleConfiguration { - + DataSource createDataSource() throws SQLException; - + DataSource getDataSource(); } diff --git a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/resources/application.properties b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/resources/application.properties index 737dbf940690..ff2c4c41d860 100644 --- a/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/resources/application.properties +++ b/test/plugin/scenarios/shardingsphere-4.x-RC3-scenario/src/main/resources/application.properties @@ -13,6 +13,5 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - server.port=8080 server.contextPath=/shardingsphere-4.x-RC3-scenario \ No newline at end of file diff --git a/test/plugin/scenarios/sofarpc-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/sofarpc-scenario/src/main/assembly/assembly.xml index de1691f5cadd..5ed62dc43384 100644 --- a/test/plugin/scenarios/sofarpc-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/sofarpc-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/sofarpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/sofarpc/SofaRpcApplication.java b/test/plugin/scenarios/sofarpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/sofarpc/SofaRpcApplication.java index 9d2754948756..faa8bb8639bb 100644 --- a/test/plugin/scenarios/sofarpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/sofarpc/SofaRpcApplication.java +++ b/test/plugin/scenarios/sofarpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/sofarpc/SofaRpcApplication.java @@ -28,9 +28,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -/** - * @author zhangwei - */ @SpringBootApplication public class SofaRpcApplication { @@ -38,32 +35,25 @@ public static void main(String[] args) { SpringApplication.run(SofaRpcApplication.class, args); } - @Configuration public static class SofaRpcConfiguration { @Bean(destroyMethod = "unExport") public ProviderConfig provider() { - ServerConfig config = new ServerConfig() - .setProtocol("bolt") - .setPort(12200) - .setDaemon(true); + ServerConfig config = new ServerConfig().setProtocol("bolt").setPort(12200).setDaemon(true); - ProviderConfig providerConfig = new ProviderConfig() - .setInterfaceId(SofaRpcDemoService.class.getName()) - .setRef(new SofaRpcDemoServiceImpl()) - .setServer(config); + ProviderConfig providerConfig = new ProviderConfig().setInterfaceId(SofaRpcDemoService.class + .getName()).setRef(new SofaRpcDemoServiceImpl()).setServer(config); providerConfig.export(); return providerConfig; } @Bean - public ConsumerConfig consumer(){ - return new ConsumerConfig() - .setInterfaceId(SofaRpcDemoService.class.getName()) - .setProtocol("bolt") - .setDirectUrl("bolt://127.0.0.1:12200"); + public ConsumerConfig consumer() { + return new ConsumerConfig().setInterfaceId(SofaRpcDemoService.class.getName()) + .setProtocol("bolt") + .setDirectUrl("bolt://127.0.0.1:12200"); } } } diff --git a/test/plugin/scenarios/sofarpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/sofarpc/controller/CaseController.java b/test/plugin/scenarios/sofarpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/sofarpc/controller/CaseController.java index 0ff32987acf3..fadbe5026399 100644 --- a/test/plugin/scenarios/sofarpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/sofarpc/controller/CaseController.java +++ b/test/plugin/scenarios/sofarpc-scenario/src/main/java/org/apache/skywalking/apm/testcase/sofarpc/controller/CaseController.java @@ -25,9 +25,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -/** - * @author zhangwei - */ @RestController @RequestMapping("/case") public class CaseController { diff --git a/test/plugin/scenarios/solrj-7.x-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/solrj-7.x-scenario/src/main/assembly/assembly.xml index f2df7c7fccd7..f3ce60ffed32 100644 --- a/test/plugin/scenarios/solrj-7.x-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/solrj-7.x-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/solrj-7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/solrj/Application.java b/test/plugin/scenarios/solrj-7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/solrj/Application.java index 1a8159b0c0b2..6d2dd7f070c9 100644 --- a/test/plugin/scenarios/solrj-7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/solrj/Application.java +++ b/test/plugin/scenarios/solrj-7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/solrj/Application.java @@ -19,10 +19,8 @@ package org.apache.skywalking.apm.testcase.solrj; import org.springframework.boot.SpringApplication; - import org.springframework.boot.autoconfigure.SpringBootApplication; - @SpringBootApplication public class Application { diff --git a/test/plugin/scenarios/solrj-7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/solrj/controller/CaseController.java b/test/plugin/scenarios/solrj-7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/solrj/controller/CaseController.java index f9ac40419687..c000128e304a 100644 --- a/test/plugin/scenarios/solrj-7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/solrj/controller/CaseController.java +++ b/test/plugin/scenarios/solrj-7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/solrj/controller/CaseController.java @@ -18,7 +18,9 @@ package org.apache.skywalking.apm.testcase.solrj.controller; - +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.solr.client.solrj.SolrServerException; @@ -32,11 +34,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.TimeUnit; - @RestController @RequestMapping("/solrj-scenario/case") public class CaseController { @@ -65,7 +62,6 @@ public String healthcheck() throws Exception { } } - @GetMapping("/solrj") public String solrj() throws SolrServerException, IOException { HttpSolrClient client = getClient(); @@ -89,7 +85,7 @@ public String solrj() throws SolrServerException, IOException { public String add(HttpSolrClient client) throws SolrServerException, IOException { List docs = new ArrayList<>(); - for (int i=0; i<100; i++) { + for (int i = 0; i < 100; i++) { SolrInputDocument doc = new SolrInputDocument(); doc.addField("id", i); docs.add(doc); @@ -107,6 +103,7 @@ public String optimize(HttpSolrClient client) throws SolrServerException, IOExce client.optimize(collection); return "Success"; } + public String search(HttpSolrClient client) throws IOException, SolrServerException { ModifiableSolrParams params = new ModifiableSolrParams(); params.set(CommonParams.Q, "*:*"); diff --git a/test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/CaseController.java b/test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/CaseController.java index 728b8cceac1d..92d23062acbb 100644 --- a/test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/CaseController.java +++ b/test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/CaseController.java @@ -18,11 +18,11 @@ package test.org.apache.skywalking.apm.testcase.spring3; -import test.org.apache.skywalking.apm.testcase.spring3.service.TestServiceBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import test.org.apache.skywalking.apm.testcase.spring3.service.TestServiceBean; @Controller public class CaseController { diff --git a/test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java b/test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java index d81ee4e1b0df..1b6abac9d662 100644 --- a/test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java +++ b/test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java @@ -18,10 +18,10 @@ package test.org.apache.skywalking.apm.testcase.spring3.service; -import test.org.apache.skywalking.apm.testcase.spring3.component.TestComponentBean; -import test.org.apache.skywalking.apm.testcase.spring3.dao.TestRepositoryBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import test.org.apache.skywalking.apm.testcase.spring3.component.TestComponentBean; +import test.org.apache.skywalking.apm.testcase.spring3.dao.TestRepositoryBean; @Service public class TestServiceBean { diff --git a/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/restapi/RestCaseController.java b/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/restapi/RestCaseController.java index 63d582e92f1c..a455a18e85a7 100644 --- a/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/restapi/RestCaseController.java +++ b/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/restapi/RestCaseController.java @@ -18,6 +18,9 @@ package test.org.apache.skywalking.apm.testcase.restapi; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import javax.servlet.http.HttpServletResponse; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PathVariable; @@ -29,10 +32,6 @@ import org.springframework.web.util.UriComponentsBuilder; import test.org.apache.skywalking.apm.testcase.entity.User; -import javax.servlet.http.HttpServletResponse; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - @Controller public class RestCaseController { @@ -47,16 +46,18 @@ private User getUser(@PathVariable("id") int id) throws InterruptedException { @RequestMapping(value = "/create/", method = RequestMethod.POST) @ResponseBody @ResponseStatus(HttpStatus.CREATED) - public void createUser(@RequestBody User user, - HttpServletResponse response, UriComponentsBuilder ucBuilder) throws InterruptedException { + public void createUser(@RequestBody User user, HttpServletResponse response, + UriComponentsBuilder ucBuilder) throws InterruptedException { users.put(user.getId(), user); - response.setHeader("Location", ucBuilder.path("/get/{id}").buildAndExpand(user.getId()).toUri().toASCIIString()); + response.setHeader("Location", ucBuilder.path("/get/{id}") + .buildAndExpand(user.getId()) + .toUri() + .toASCIIString()); } @RequestMapping(value = "/update/{id}", method = RequestMethod.PUT) @ResponseBody - public User updateUser(@PathVariable("id") int id, - @RequestBody User user) throws InterruptedException { + public User updateUser(@PathVariable("id") int id, @RequestBody User user) throws InterruptedException { return new User(id, user.getUserName()); } @@ -66,7 +67,7 @@ public User updateUser(@PathVariable("id") int id, public void deleteUser(@PathVariable("id") int id) throws InterruptedException { User currentUser = users.get(id); if (currentUser == null) { - return; + return; } users.remove(id); } diff --git a/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/resttemplate/RestTemplateController.java b/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/resttemplate/RestTemplateController.java index 03e1f57781c3..a3ed980a4cca 100644 --- a/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/resttemplate/RestTemplateController.java +++ b/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/resttemplate/RestTemplateController.java @@ -18,6 +18,7 @@ package test.org.apache.skywalking.apm.testcase.resttemplate; +import java.io.IOException; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; @@ -30,8 +31,6 @@ import org.springframework.web.client.RestTemplate; import test.org.apache.skywalking.apm.testcase.entity.User; -import java.io.IOException; - @Controller public class RestTemplateController { @@ -65,12 +64,10 @@ public String restTemplate() throws IOException { return SUCCESS; } - @RequestMapping("/healthCheck") @ResponseBody public String healthCheck() { return SUCCESS; } - } diff --git a/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java b/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java index d81ee4e1b0df..1b6abac9d662 100644 --- a/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java +++ b/test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java @@ -18,10 +18,10 @@ package test.org.apache.skywalking.apm.testcase.spring3.service; -import test.org.apache.skywalking.apm.testcase.spring3.component.TestComponentBean; -import test.org.apache.skywalking.apm.testcase.spring3.dao.TestRepositoryBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import test.org.apache.skywalking.apm.testcase.spring3.component.TestComponentBean; +import test.org.apache.skywalking.apm.testcase.spring3.dao.TestRepositoryBean; @Service public class TestServiceBean { diff --git a/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/restapi/RestCaseController.java b/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/restapi/RestCaseController.java index 63d582e92f1c..a455a18e85a7 100644 --- a/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/restapi/RestCaseController.java +++ b/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/restapi/RestCaseController.java @@ -18,6 +18,9 @@ package test.org.apache.skywalking.apm.testcase.restapi; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import javax.servlet.http.HttpServletResponse; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PathVariable; @@ -29,10 +32,6 @@ import org.springframework.web.util.UriComponentsBuilder; import test.org.apache.skywalking.apm.testcase.entity.User; -import javax.servlet.http.HttpServletResponse; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - @Controller public class RestCaseController { @@ -47,16 +46,18 @@ private User getUser(@PathVariable("id") int id) throws InterruptedException { @RequestMapping(value = "/create/", method = RequestMethod.POST) @ResponseBody @ResponseStatus(HttpStatus.CREATED) - public void createUser(@RequestBody User user, - HttpServletResponse response, UriComponentsBuilder ucBuilder) throws InterruptedException { + public void createUser(@RequestBody User user, HttpServletResponse response, + UriComponentsBuilder ucBuilder) throws InterruptedException { users.put(user.getId(), user); - response.setHeader("Location", ucBuilder.path("/get/{id}").buildAndExpand(user.getId()).toUri().toASCIIString()); + response.setHeader("Location", ucBuilder.path("/get/{id}") + .buildAndExpand(user.getId()) + .toUri() + .toASCIIString()); } @RequestMapping(value = "/update/{id}", method = RequestMethod.PUT) @ResponseBody - public User updateUser(@PathVariable("id") int id, - @RequestBody User user) throws InterruptedException { + public User updateUser(@PathVariable("id") int id, @RequestBody User user) throws InterruptedException { return new User(id, user.getUserName()); } @@ -66,7 +67,7 @@ public User updateUser(@PathVariable("id") int id, public void deleteUser(@PathVariable("id") int id) throws InterruptedException { User currentUser = users.get(id); if (currentUser == null) { - return; + return; } users.remove(id); } diff --git a/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/resttemplate/RestTemplateController.java b/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/resttemplate/RestTemplateController.java index 16807ee2c918..c9f6745c3c79 100644 --- a/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/resttemplate/RestTemplateController.java +++ b/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/resttemplate/RestTemplateController.java @@ -15,8 +15,10 @@ * limitations under the License. * */ + package test.org.apache.skywalking.apm.testcase.resttemplate; +import java.io.IOException; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; @@ -29,8 +31,6 @@ import org.springframework.web.client.RestTemplate; import test.org.apache.skywalking.apm.testcase.entity.User; -import java.io.IOException; - @Controller public class RestTemplateController { @@ -64,12 +64,10 @@ public String restTemplate() throws IOException { return SUCCESS; } - @RequestMapping("/healthCheck") @ResponseBody public String healthCheck() { return SUCCESS; } - } diff --git a/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java b/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java index d81ee4e1b0df..1b6abac9d662 100644 --- a/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java +++ b/test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java @@ -18,10 +18,10 @@ package test.org.apache.skywalking.apm.testcase.spring3.service; -import test.org.apache.skywalking.apm.testcase.spring3.component.TestComponentBean; -import test.org.apache.skywalking.apm.testcase.spring3.dao.TestRepositoryBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import test.org.apache.skywalking.apm.testcase.spring3.component.TestComponentBean; +import test.org.apache.skywalking.apm.testcase.spring3.dao.TestRepositoryBean; @Service public class TestServiceBean { diff --git a/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/implinterface/TestCaseController.java b/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/implinterface/TestCaseController.java index 62e1e0881e26..ca9b709833a9 100644 --- a/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/implinterface/TestCaseController.java +++ b/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/implinterface/TestCaseController.java @@ -16,13 +16,11 @@ * limitations under the License. * */ + package test.org.apache.skywalking.apm.testcase.implinterface; import org.springframework.web.bind.annotation.RestController; -/** - * @author jialong - */ @RestController public class TestCaseController implements TestCaseInterface { diff --git a/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/implinterface/TestCaseInterface.java b/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/implinterface/TestCaseInterface.java index 3cbe84faa46e..937659a82a55 100644 --- a/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/implinterface/TestCaseInterface.java +++ b/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/implinterface/TestCaseInterface.java @@ -16,14 +16,12 @@ * limitations under the License. * */ + package test.org.apache.skywalking.apm.testcase.implinterface; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; -/** - * @author jialong - */ public interface TestCaseInterface { @RequestMapping("/impl/requestmapping") String implRequestMappingAnnotationTestCase(); diff --git a/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/restapi/RestCaseController.java b/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/restapi/RestCaseController.java index 0cd13c34b934..2c759d5f930c 100644 --- a/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/restapi/RestCaseController.java +++ b/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/restapi/RestCaseController.java @@ -18,6 +18,8 @@ package test.org.apache.skywalking.apm.testcase.restapi; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -32,9 +34,6 @@ import org.springframework.web.util.UriComponentsBuilder; import test.org.apache.skywalking.apm.testcase.entity.User; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - @RestController public class RestCaseController { @@ -50,7 +49,7 @@ private ResponseEntity getUser(@PathVariable("id") int id) throws Interrup @PostMapping(value = "/create/") @ResponseBody public ResponseEntity createUser(@RequestBody User user, - UriComponentsBuilder ucBuilder) throws InterruptedException { + UriComponentsBuilder ucBuilder) throws InterruptedException { users.put(user.getId(), user); HttpHeaders headers = new HttpHeaders(); headers.setLocation(ucBuilder.path("/get/{id}").buildAndExpand(user.getId()).toUri()); @@ -60,7 +59,7 @@ public ResponseEntity createUser(@RequestBody User user, @PutMapping(value = "/update/{id}") @ResponseBody public ResponseEntity updateUser(@PathVariable("id") int id, - @RequestBody User user) throws InterruptedException { + @RequestBody User user) throws InterruptedException { User currentUser = new User(id, user.getUserName()); return ResponseEntity.ok(currentUser); } diff --git a/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/resttemplate/RestTemplateController.java b/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/resttemplate/RestTemplateController.java index 9a830bbff651..3f5ca0038f51 100644 --- a/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/resttemplate/RestTemplateController.java +++ b/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/resttemplate/RestTemplateController.java @@ -18,6 +18,7 @@ package test.org.apache.skywalking.apm.testcase.resttemplate; +import java.io.IOException; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; @@ -30,8 +31,6 @@ import org.springframework.web.client.RestTemplate; import test.org.apache.skywalking.apm.testcase.entity.User; -import java.io.IOException; - @RestController public class RestTemplateController { @@ -77,12 +76,10 @@ public String restTemplate() throws IOException { return SUCCESS; } - @RequestMapping("/healthCheck") @ResponseBody public String healthCheck() { return SUCCESS; } - } diff --git a/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java b/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java index d81ee4e1b0df..1b6abac9d662 100644 --- a/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java +++ b/test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java @@ -18,10 +18,10 @@ package test.org.apache.skywalking.apm.testcase.spring3.service; -import test.org.apache.skywalking.apm.testcase.spring3.component.TestComponentBean; -import test.org.apache.skywalking.apm.testcase.spring3.dao.TestRepositoryBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import test.org.apache.skywalking.apm.testcase.spring3.component.TestComponentBean; +import test.org.apache.skywalking.apm.testcase.spring3.dao.TestRepositoryBean; @Service public class TestServiceBean { diff --git a/test/plugin/scenarios/spring-async-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/async/AsyncBean.java b/test/plugin/scenarios/spring-async-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/async/AsyncBean.java index 2af13c61386a..5e00ec2389f2 100644 --- a/test/plugin/scenarios/spring-async-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/async/AsyncBean.java +++ b/test/plugin/scenarios/spring-async-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/async/AsyncBean.java @@ -17,15 +17,11 @@ package org.apache.skywalking.apm.testcase.spring.async; +import java.io.IOException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; -import java.io.IOException; - -/** - * @author zhaoyuguang - */ @Component public class AsyncBean { diff --git a/test/plugin/scenarios/spring-async-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/async/AsyncConfig.java b/test/plugin/scenarios/spring-async-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/async/AsyncConfig.java index b9f42dda46b9..b2d31b5afa98 100644 --- a/test/plugin/scenarios/spring-async-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/async/AsyncConfig.java +++ b/test/plugin/scenarios/spring-async-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/async/AsyncConfig.java @@ -24,9 +24,6 @@ import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; -/** - * @author zhaoyuguang - */ @ComponentScan(basePackages = "org.apache.skywalking.apm.testcase.spring.async") @EnableAsync @Configuration diff --git a/test/plugin/scenarios/spring-async-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/async/AsyncServlet.java b/test/plugin/scenarios/spring-async-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/async/AsyncServlet.java index 33cb3caa5efb..18d030a202fa 100644 --- a/test/plugin/scenarios/spring-async-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/async/AsyncServlet.java +++ b/test/plugin/scenarios/spring-async-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/async/AsyncServlet.java @@ -17,16 +17,13 @@ package org.apache.skywalking.apm.testcase.spring.async; +import java.io.IOException; +import java.io.PrintWriter; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.PrintWriter; -/** - * @author zhangwei - */ public class AsyncServlet extends HttpServlet { private static final long serialVersionUID = 4644954650555106445L; diff --git a/test/plugin/scenarios/spring-async-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/async/CaseServlet.java b/test/plugin/scenarios/spring-async-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/async/CaseServlet.java index 403058d40d97..cf9db68fcc76 100644 --- a/test/plugin/scenarios/spring-async-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/async/CaseServlet.java +++ b/test/plugin/scenarios/spring-async-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/async/CaseServlet.java @@ -17,25 +17,21 @@ package org.apache.skywalking.apm.testcase.spring.async; -import org.springframework.context.ApplicationContext; -import org.springframework.context.annotation.AnnotationConfigApplicationContext; - +import java.io.IOException; +import java.io.PrintWriter; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.PrintWriter; +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.AnnotationConfigApplicationContext; -/** - * @author zhangwei - */ public class CaseServlet extends HttpServlet { private static final long serialVersionUID = -5173829093752900411L; @Override - protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException { ApplicationContext applicationContext = new AnnotationConfigApplicationContext(AsyncConfig.class); AsyncBean async = applicationContext.getBean(AsyncBean.class); diff --git a/test/plugin/scenarios/spring-async-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/async/HealthCheckServlet.java b/test/plugin/scenarios/spring-async-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/async/HealthCheckServlet.java index 036ec44511c1..2dafe03c3610 100644 --- a/test/plugin/scenarios/spring-async-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/async/HealthCheckServlet.java +++ b/test/plugin/scenarios/spring-async-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/async/HealthCheckServlet.java @@ -17,22 +17,19 @@ package org.apache.skywalking.apm.testcase.spring.async; +import java.io.IOException; +import java.io.PrintWriter; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.PrintWriter; -/** - * @author zhangwei - */ public class HealthCheckServlet extends HttpServlet { private static final long serialVersionUID = 6730792920833279196L; @Override - protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException { PrintWriter writer = resp.getWriter(); writer.write("Success"); writer.flush(); diff --git a/test/plugin/scenarios/spring-async-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/async/HttpBean.java b/test/plugin/scenarios/spring-async-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/async/HttpBean.java index b8b4a405caa4..4ada9184acbc 100644 --- a/test/plugin/scenarios/spring-async-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/async/HttpBean.java +++ b/test/plugin/scenarios/spring-async-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/async/HttpBean.java @@ -17,6 +17,7 @@ package org.apache.skywalking.apm.testcase.spring.async; +import java.io.IOException; import org.apache.http.HttpEntity; import org.apache.http.client.ResponseHandler; import org.apache.http.client.methods.HttpGet; @@ -25,29 +26,17 @@ import org.apache.http.util.EntityUtils; import org.springframework.stereotype.Component; -import java.io.IOException; - -/** - * @author zhaoyuguang - */ @Component public class HttpBean { public String visit(String url) throws IOException { - CloseableHttpClient httpclient = HttpClients.createDefault(); - try { + try (final CloseableHttpClient httpclient = HttpClients.createDefault()) { HttpGet httpget = new HttpGet(url); - ResponseHandler responseHandler = new ResponseHandler() { - @Override - public String handleResponse(org.apache.http.HttpResponse response) throws IOException { - HttpEntity entity = response.getEntity(); - return entity != null ? EntityUtils.toString(entity) : null; - } - + ResponseHandler responseHandler = response -> { + HttpEntity entity = response.getEntity(); + return entity != null ? EntityUtils.toString(entity) : null; }; return httpclient.execute(httpget, responseHandler); - } finally { - httpclient.close(); } } } diff --git a/test/plugin/scenarios/spring-tx-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/spring-tx-scenario/src/main/assembly/assembly.xml index f3feb135aee7..bbba397a3b81 100644 --- a/test/plugin/scenarios/spring-tx-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/spring-tx-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/Application.java b/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/Application.java index 406530bcdcb0..3d424d83d3c3 100644 --- a/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/Application.java +++ b/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/Application.java @@ -15,15 +15,13 @@ * limitations under the License. * */ + package test.org.apache.skywalking.apm.testcase.spring.transaction; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.transaction.annotation.EnableTransactionManagement; -/** - * @author zhaoyuguang - */ @SpringBootApplication @EnableTransactionManagement public class Application { diff --git a/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/config/JdbcConfig.java b/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/config/JdbcConfig.java index 2f91fc1811dc..a9c8ba4dccf0 100644 --- a/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/config/JdbcConfig.java +++ b/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/config/JdbcConfig.java @@ -15,20 +15,16 @@ * limitations under the License. * */ + package test.org.apache.skywalking.apm.testcase.spring.transaction.config; +import javax.sql.DataSource; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.DriverManagerDataSource; -import javax.sql.DataSource; - - -/** - * @author zhaoyuguang - */ @Configuration public class JdbcConfig { diff --git a/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/config/TransactionConfig.java b/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/config/TransactionConfig.java index cbd421fe4e67..e7e3bdb88e3d 100644 --- a/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/config/TransactionConfig.java +++ b/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/config/TransactionConfig.java @@ -15,23 +15,20 @@ * limitations under the License. * */ + package test.org.apache.skywalking.apm.testcase.spring.transaction.config; +import javax.sql.DataSource; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.jdbc.datasource.DataSourceTransactionManager; import org.springframework.transaction.PlatformTransactionManager; -import javax.sql.DataSource; - -/** - * @author zhaoyuguang - */ @Configuration public class TransactionConfig { @Bean - public PlatformTransactionManager transactionManager(DataSource dataSource){ + public PlatformTransactionManager transactionManager(DataSource dataSource) { return new DataSourceTransactionManager(dataSource); } diff --git a/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/controller/CaseController.java b/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/controller/CaseController.java index 92d652462f03..f4d9932c3d1a 100644 --- a/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/controller/CaseController.java +++ b/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/controller/CaseController.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package test.org.apache.skywalking.apm.testcase.spring.transaction.controller; import org.springframework.beans.factory.annotation.Autowired; @@ -26,9 +27,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import test.org.apache.skywalking.apm.testcase.spring.transaction.service.DemoService; -/** - * @author zhaoyuguang - */ @Controller @RequestMapping("/case") @PropertySource("classpath:application.properties") @@ -42,7 +40,6 @@ public class CaseController { @Autowired private DemoService demoService; - @RequestMapping("/spring-tx-case") @ResponseBody public String springTransactionCase() { @@ -55,12 +52,7 @@ public String springTransactionCase() { public String healthCheck() { try { jdbcTemplate.execute("create database if not exists test default charset = utf8"); - jdbcTemplate.execute("" + - "CREATE TABLE IF NOT EXISTS `test`.`table_demo` (\n" + - " `id` bigint(20) NOT NULL AUTO_INCREMENT,\n" + - " `name` varchar(60),\n" + - " PRIMARY KEY (`id`)\n" + - ") ENGINE=InnoDB"); + jdbcTemplate.execute("" + "CREATE TABLE IF NOT EXISTS `test`.`table_demo` (\n" + " `id` bigint(20) NOT NULL AUTO_INCREMENT,\n" + " `name` varchar(60),\n" + " PRIMARY KEY (`id`)\n" + ") ENGINE=InnoDB"); } catch (Exception e) { e.printStackTrace(); throw e; diff --git a/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/dao/DemoDao.java b/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/dao/DemoDao.java index 7d5459eeac10..2fb6c5ee2269 100644 --- a/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/dao/DemoDao.java +++ b/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/dao/DemoDao.java @@ -15,11 +15,8 @@ * limitations under the License. * */ -package test.org.apache.skywalking.apm.testcase.spring.transaction.dao; -/** - * @author zhaoyuguang - */ +package test.org.apache.skywalking.apm.testcase.spring.transaction.dao; public interface DemoDao { diff --git a/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/dao/impl/DemoDaoImpl.java b/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/dao/impl/DemoDaoImpl.java index 806ebc9c5d41..d368c545da5b 100644 --- a/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/dao/impl/DemoDaoImpl.java +++ b/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/dao/impl/DemoDaoImpl.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package test.org.apache.skywalking.apm.testcase.spring.transaction.dao.impl; import org.springframework.beans.factory.annotation.Autowired; @@ -22,9 +23,6 @@ import org.springframework.stereotype.Repository; import test.org.apache.skywalking.apm.testcase.spring.transaction.dao.DemoDao; -/** - * @author zhaoyuguang - */ @Repository public class DemoDaoImpl implements DemoDao { diff --git a/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/service/DemoService.java b/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/service/DemoService.java index a4ad4eb16eef..98fb78abf3d7 100644 --- a/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/service/DemoService.java +++ b/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/service/DemoService.java @@ -15,11 +15,8 @@ * limitations under the License. * */ -package test.org.apache.skywalking.apm.testcase.spring.transaction.service; -/** - * @author zhaoyuguang - */ +package test.org.apache.skywalking.apm.testcase.spring.transaction.service; public interface DemoService { diff --git a/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/service/impl/DemoServiceImpl.java b/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/service/impl/DemoServiceImpl.java index 19b42868cb56..6421e2ca6ff5 100644 --- a/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/service/impl/DemoServiceImpl.java +++ b/test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/service/impl/DemoServiceImpl.java @@ -15,6 +15,7 @@ * limitations under the License. * */ + package test.org.apache.skywalking.apm.testcase.spring.transaction.service.impl; import org.springframework.beans.factory.annotation.Autowired; @@ -23,9 +24,6 @@ import test.org.apache.skywalking.apm.testcase.spring.transaction.dao.DemoDao; import test.org.apache.skywalking.apm.testcase.spring.transaction.service.DemoService; -/** - * @author zhaoyuguang - */ @Service public class DemoServiceImpl implements DemoService { diff --git a/test/plugin/scenarios/spring-tx-scenario/src/main/resources/application.properties b/test/plugin/scenarios/spring-tx-scenario/src/main/resources/application.properties index e9aaf725ef9a..98b379bbd2e4 100644 --- a/test/plugin/scenarios/spring-tx-scenario/src/main/resources/application.properties +++ b/test/plugin/scenarios/spring-tx-scenario/src/main/resources/application.properties @@ -15,7 +15,6 @@ # limitations under the License. # # - server.port=8080 server.contextPath=/spring-tx-scenario server.servlet.contextPath=/spring-tx-scenario \ No newline at end of file diff --git a/test/plugin/scenarios/undertow-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/undertow-scenario/src/main/assembly/assembly.xml index 1455d1de9f9b..3246afc8ec3c 100644 --- a/test/plugin/scenarios/undertow-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/undertow-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/undertow-scenario/src/main/java/org/apache/skywalking/amp/testcase/undertow/Application.java b/test/plugin/scenarios/undertow-scenario/src/main/java/org/apache/skywalking/amp/testcase/undertow/Application.java index 3617bcfc3430..fd45a07d0159 100644 --- a/test/plugin/scenarios/undertow-scenario/src/main/java/org/apache/skywalking/amp/testcase/undertow/Application.java +++ b/test/plugin/scenarios/undertow-scenario/src/main/java/org/apache/skywalking/amp/testcase/undertow/Application.java @@ -23,6 +23,7 @@ import io.undertow.server.RoutingHandler; import io.undertow.util.Headers; import io.undertow.util.Methods; +import java.io.IOException; import org.apache.http.HttpEntity; import org.apache.http.client.ResponseHandler; import org.apache.http.client.methods.HttpGet; @@ -30,8 +31,6 @@ import org.apache.http.impl.client.HttpClients; import org.apache.http.util.EntityUtils; -import java.io.IOException; - public class Application { private static final String CASE_URL = "/undertow-scenario/case/undertow"; @@ -46,21 +45,19 @@ public static void main(String[] args) throws InterruptedException { } private static void undertow() { - Undertow server = Undertow.builder() - .addHttpListener(8080, "0.0.0.0") - .setHandler(exchange -> { - if (CASE_URL.equals(exchange.getRequestPath())) { - exchange.dispatch(() -> { - try { - visit("http://localhost:8081/undertow-routing-scenario/case/undertow?send=httpHandler"); - } catch (IOException e) { - e.printStackTrace(); - } - }); - } - exchange.getResponseHeaders().put(Headers.CONTENT_TYPE, "text/plain"); - exchange.getResponseSender().send("Success"); - }).build(); + Undertow server = Undertow.builder().addHttpListener(8080, "0.0.0.0").setHandler(exchange -> { + if (CASE_URL.equals(exchange.getRequestPath())) { + exchange.dispatch(() -> { + try { + visit("http://localhost:8081/undertow-routing-scenario/case/undertow?send=httpHandler"); + } catch (IOException e) { + e.printStackTrace(); + } + }); + } + exchange.getResponseHeaders().put(Headers.CONTENT_TYPE, "text/plain"); + exchange.getResponseSender().send("Success"); + }).build(); Runtime.getRuntime().addShutdownHook(new Thread(server::stop)); server.start(); } @@ -76,9 +73,7 @@ private static void undertowRouting() { RoutingHandler handler = new RoutingHandler(); handler.add(Methods.GET, TEMPLATE, httpHandler); handler.add(Methods.HEAD, TEMPLATE, httpHandler); - Undertow server = Undertow.builder() - .addHttpListener(8081, "0.0.0.0") - .setHandler(handler).build(); + Undertow server = Undertow.builder().addHttpListener(8081, "0.0.0.0").setHandler(handler).build(); Runtime.getRuntime().addShutdownHook(new Thread(server::stop)); server.start(); } diff --git a/test/plugin/scenarios/webflux-scenario/webflux-dist/src/main/assembly/assembly.xml b/test/plugin/scenarios/webflux-scenario/webflux-dist/src/main/assembly/assembly.xml index 7bc3d1092b72..38a478c4d8f1 100644 --- a/test/plugin/scenarios/webflux-scenario/webflux-dist/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/webflux-scenario/webflux-dist/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/webflux-scenario/webflux-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/webflux/projectA/controller/TestController.java b/test/plugin/scenarios/webflux-scenario/webflux-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/webflux/projectA/controller/TestController.java index eff3593ad77d..4205145ce916 100644 --- a/test/plugin/scenarios/webflux-scenario/webflux-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/webflux/projectA/controller/TestController.java +++ b/test/plugin/scenarios/webflux-scenario/webflux-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/webflux/projectA/controller/TestController.java @@ -17,14 +17,13 @@ package org.apache.skywalking.apm.testcase.sc.webflux.projectA.controller; +import java.io.IOException; import org.apache.skywalking.apm.testcase.sc.webflux.projectA.utils.HttpUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.io.IOException; - @RestController public class TestController { @@ -53,7 +52,7 @@ public String healthCheck() throws IOException { return "test"; } - private void visit(String path){ + private void visit(String path) { try { httpUtils.visit(path); } catch (Exception i) { diff --git a/test/plugin/scenarios/webflux-scenario/webflux-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/webflux/projectA/utils/HttpUtils.java b/test/plugin/scenarios/webflux-scenario/webflux-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/webflux/projectA/utils/HttpUtils.java index f9c3878aca98..203a89b4c5db 100644 --- a/test/plugin/scenarios/webflux-scenario/webflux-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/webflux/projectA/utils/HttpUtils.java +++ b/test/plugin/scenarios/webflux-scenario/webflux-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/webflux/projectA/utils/HttpUtils.java @@ -17,6 +17,7 @@ package org.apache.skywalking.apm.testcase.sc.webflux.projectA.utils; +import java.io.IOException; import org.apache.http.HttpEntity; import org.apache.http.client.ClientProtocolException; import org.apache.http.client.ResponseHandler; @@ -26,8 +27,6 @@ import org.apache.http.util.EntityUtils; import org.springframework.stereotype.Component; -import java.io.IOException; - @Component public class HttpUtils { diff --git a/test/plugin/scenarios/webflux-scenario/webflux-projectB-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/webflux/projectB/config/CustomFilter.java b/test/plugin/scenarios/webflux-scenario/webflux-projectB-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/webflux/projectB/config/CustomFilter.java index 12abaea2a9d5..5d850df8fe5c 100644 --- a/test/plugin/scenarios/webflux-scenario/webflux-projectB-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/webflux/projectB/config/CustomFilter.java +++ b/test/plugin/scenarios/webflux-scenario/webflux-projectB-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/webflux/projectB/config/CustomFilter.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.apm.testcase.sc.webflux.projectB.config; import org.springframework.stereotype.Component; @@ -23,10 +24,6 @@ import org.springframework.web.server.WebFilterChain; import reactor.core.publisher.Mono; -/** - * @author zhaoyuguang - */ - @Component public class CustomFilter implements WebFilter { diff --git a/test/plugin/scenarios/webflux-scenario/webflux-projectB-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/webflux/projectB/route/RoutingConfiguration.java b/test/plugin/scenarios/webflux-scenario/webflux-projectB-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/webflux/projectB/route/RoutingConfiguration.java index f18545404afd..43bc5b9a5653 100644 --- a/test/plugin/scenarios/webflux-scenario/webflux-projectB-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/webflux/projectB/route/RoutingConfiguration.java +++ b/test/plugin/scenarios/webflux-scenario/webflux-projectB-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/webflux/projectB/route/RoutingConfiguration.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.apm.testcase.sc.webflux.projectB.route; import org.springframework.context.annotation.Bean; @@ -24,9 +25,6 @@ import static org.springframework.web.reactive.function.server.RequestPredicates.GET; -/** - * @author zhaoyuguang - */ @Configuration public class RoutingConfiguration { @Bean diff --git a/test/plugin/scenarios/webflux-scenario/webflux-projectB-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/webflux/projectB/route/TestHandler.java b/test/plugin/scenarios/webflux-scenario/webflux-projectB-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/webflux/projectB/route/TestHandler.java index fb58d2bf1c49..c7e6afa13918 100644 --- a/test/plugin/scenarios/webflux-scenario/webflux-projectB-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/webflux/projectB/route/TestHandler.java +++ b/test/plugin/scenarios/webflux-scenario/webflux-projectB-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/webflux/projectB/route/TestHandler.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.apm.testcase.sc.webflux.projectB.route; import org.springframework.http.MediaType; @@ -23,9 +24,6 @@ import org.springframework.web.reactive.function.server.ServerResponse; import reactor.core.publisher.Mono; -/** - * @author zhaoyuguang - */ @Component public class TestHandler { diff --git a/test/plugin/scenarios/zookeeper-scenario/src/main/assembly/assembly.xml b/test/plugin/scenarios/zookeeper-scenario/src/main/assembly/assembly.xml index efdd1b97810c..9ac7bb7eeb34 100644 --- a/test/plugin/scenarios/zookeeper-scenario/src/main/assembly/assembly.xml +++ b/test/plugin/scenarios/zookeeper-scenario/src/main/assembly/assembly.xml @@ -17,9 +17,9 @@ ~ --> + 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"> zip diff --git a/test/plugin/scenarios/zookeeper-scenario/src/main/java/org/apache/skywalking/apm/testcase/zookeeper/Application.java b/test/plugin/scenarios/zookeeper-scenario/src/main/java/org/apache/skywalking/apm/testcase/zookeeper/Application.java index 3c23131f797c..dd0a66a7d69c 100644 --- a/test/plugin/scenarios/zookeeper-scenario/src/main/java/org/apache/skywalking/apm/testcase/zookeeper/Application.java +++ b/test/plugin/scenarios/zookeeper-scenario/src/main/java/org/apache/skywalking/apm/testcase/zookeeper/Application.java @@ -19,7 +19,6 @@ package org.apache.skywalking.apm.testcase.zookeeper; import org.springframework.boot.SpringApplication; - import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication diff --git a/test/plugin/scenarios/zookeeper-scenario/src/main/java/org/apache/skywalking/apm/testcase/zookeeper/controller/Zookeeper.java b/test/plugin/scenarios/zookeeper-scenario/src/main/java/org/apache/skywalking/apm/testcase/zookeeper/controller/Zookeeper.java index 23e05ea03595..2958d51623ac 100644 --- a/test/plugin/scenarios/zookeeper-scenario/src/main/java/org/apache/skywalking/apm/testcase/zookeeper/controller/Zookeeper.java +++ b/test/plugin/scenarios/zookeeper-scenario/src/main/java/org/apache/skywalking/apm/testcase/zookeeper/controller/Zookeeper.java @@ -18,6 +18,7 @@ package org.apache.skywalking.apm.testcase.zookeeper.controller; +import java.io.IOException; import org.apache.zookeeper.ZooKeeper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -26,9 +27,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import java.io.IOException; - - @Configuration @PropertySource("classpath:application.properties") public class Zookeeper { diff --git a/test/plugin/scenarios/zookeeper-scenario/src/main/java/org/apache/skywalking/apm/testcase/zookeeper/controller/ZookeeperController.java b/test/plugin/scenarios/zookeeper-scenario/src/main/java/org/apache/skywalking/apm/testcase/zookeeper/controller/ZookeeperController.java index c4cf47085bb0..dafbb8309d64 100644 --- a/test/plugin/scenarios/zookeeper-scenario/src/main/java/org/apache/skywalking/apm/testcase/zookeeper/controller/ZookeeperController.java +++ b/test/plugin/scenarios/zookeeper-scenario/src/main/java/org/apache/skywalking/apm/testcase/zookeeper/controller/ZookeeperController.java @@ -18,7 +18,12 @@ package org.apache.skywalking.apm.testcase.zookeeper.controller; -import org.apache.zookeeper.*; +import org.apache.zookeeper.CreateMode; +import org.apache.zookeeper.KeeperException; +import org.apache.zookeeper.WatchedEvent; +import org.apache.zookeeper.Watcher; +import org.apache.zookeeper.ZooDefs; +import org.apache.zookeeper.ZooKeeper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/test/plugin/scenarios/zookeeper-scenario/src/main/resources/application.properties b/test/plugin/scenarios/zookeeper-scenario/src/main/resources/application.properties index ef8724c4d91a..72657a637b89 100644 --- a/test/plugin/scenarios/zookeeper-scenario/src/main/resources/application.properties +++ b/test/plugin/scenarios/zookeeper-scenario/src/main/resources/application.properties @@ -15,6 +15,5 @@ # limitations under the License. # # - server.port=8080 server.contextPath=/zookeeper-scenario diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/Main.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/Main.java index 96db5f6615b1..2f3101539057 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/Main.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/Main.java @@ -45,17 +45,14 @@ static boolean verify() { if (actualData.exists() && expectedData.exists()) { try { - DataAssert.assertEquals(Data.Loader.loadData("expectedData.yaml", expectedData), - Data.Loader.loadData("actualData.yaml", actualData)); + DataAssert.assertEquals(Data.Loader.loadData("expectedData.yaml", expectedData), Data.Loader.loadData("actualData.yaml", actualData)); return true; } catch (AssertFailedException e) { logger.error("\nassert failed.\n{}\n", e.getCauseMessage()); } } else { - logger.error("assert failed. because actual data {} and expected data {}", - actualData.exists() ? "founded" : "not founded", - expectedData.exists() ? "founded" : "not founded" - ); + logger.error("assert failed. because actual data {} and expected data {}", actualData.exists() ? "founded" : "not founded", expectedData + .exists() ? "founded" : "not founded"); } } catch (Exception e) { logger.error("assert test case {} failed.", ConfigHelper.caseName(), e); diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/ApplicationAssert.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/ApplicationAssert.java index 31e68e73e84e..c59bd6cec692 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/ApplicationAssert.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/ApplicationAssert.java @@ -14,18 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.agent.tool.validator.assertor; import java.util.List; - import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.exception.RegistryApplicationNotFoundException; import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.exception.RegistryApplicationSizeNotEqualsException; import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.exception.ValueAssertFailedException; import org.apache.skywalking.plugin.test.agent.tool.validator.entity.RegistryApplication; public class ApplicationAssert { - public static void assertEquals(List expected, - List actual) { + public static void assertEquals(List expected, List actual) { if (expected == null) { return; @@ -34,7 +33,8 @@ public static void assertEquals(List expected, for (RegistryApplication application : expected) { RegistryApplication actualApplication = getMatchApplication(actual, application); try { - ExpressParser.parse(application.expressValue()).assertValue("registry application", actualApplication.expressValue()); + ExpressParser.parse(application.expressValue()) + .assertValue("registry application", actualApplication.expressValue()); } catch (ValueAssertFailedException e) { throw new RegistryApplicationSizeNotEqualsException(application.applicationCode(), e); } diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/DataAssert.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/DataAssert.java index 8933c255a534..59a412467f88 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/DataAssert.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/DataAssert.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.agent.tool.validator.assertor; import com.google.gson.GsonBuilder; diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/ExpressParser.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/ExpressParser.java index 5eb78236d1ec..84ff2d054ad3 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/ExpressParser.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/ExpressParser.java @@ -14,9 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.agent.tool.validator.assertor; -import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.element.*; +import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.element.ElementAssertor; +import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.element.EqualsAssertor; +import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.element.GreatThanAssertor; +import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.element.GreetEqualAssertor; +import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.element.NoopAssertor; +import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.element.NotEqualsAssertor; +import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.element.NotNullAssertor; +import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.element.NullAssertor; public class ExpressParser { public static ElementAssertor parse(String express) { diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/InstanceAssert.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/InstanceAssert.java index ca0357632c1a..c4af5e6fa349 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/InstanceAssert.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/InstanceAssert.java @@ -14,18 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.agent.tool.validator.assertor; import java.util.List; - import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.exception.RegistryInstanceOfApplicationNotFoundException; import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.exception.RegistryInstanceSizeNotEqualsException; import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.exception.ValueAssertFailedException; import org.apache.skywalking.plugin.test.agent.tool.validator.entity.RegistryInstance; -/** - * Created by xin on 2017/7/15. - */ public class InstanceAssert { public static void assertEquals(List expected, List actual) { @@ -36,16 +33,16 @@ public static void assertEquals(List expected, List actual, - RegistryInstance application) { + private static RegistryInstance getMatchApplication(List actual, RegistryInstance application) { for (RegistryInstance registryApplication : actual) { if (registryApplication.applicationCode().equals(application.applicationCode())) { return registryApplication; diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/OperationNameAssert.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/OperationNameAssert.java index 138626bd67bc..cb21391925f3 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/OperationNameAssert.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/OperationNameAssert.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.agent.tool.validator.assertor; import java.util.List; - import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.exception.ActualRegistryOperationNameEmptyException; import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.exception.RegistryOperationNameNotFoundException; import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.exception.RegistryOperationNamesOfApplicationNotFoundException; @@ -31,8 +31,8 @@ public static void assertEquals(List expected, List e } } - private static RegistryOperationName findActualRegistryOperationName( - List actual, RegistryOperationName registryOperationName) { + private static RegistryOperationName findActualRegistryOperationName(List actual, + RegistryOperationName registryOperationName) { if (actual == null) { throw new ActualRegistryOperationNameEmptyException(registryOperationName); } diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/ParentSegmentIdExpressParser.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/ParentSegmentIdExpressParser.java index 01a5833bf766..d6a71cbbe108 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/ParentSegmentIdExpressParser.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/ParentSegmentIdExpressParser.java @@ -14,16 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.agent.tool.validator.assertor; import java.util.List; - import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.exception.ParentSegmentNotFoundException; import org.apache.skywalking.plugin.test.agent.tool.validator.entity.SegmentItem; -/** - * Created by xin on 2017/7/16. - */ public class ParentSegmentIdExpressParser { public static String parse(String express, List actual) { if (!express.trim().startsWith("${") && !express.trim().endsWith("}")) { diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/RegistryItemsAssert.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/RegistryItemsAssert.java index 434fad26efbe..5c5e7912f979 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/RegistryItemsAssert.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/RegistryItemsAssert.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.agent.tool.validator.assertor; import org.apache.logging.log4j.LogManager; diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/SegmentAssert.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/SegmentAssert.java index 8baaf370c531..1c50b589adf6 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/SegmentAssert.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/SegmentAssert.java @@ -14,15 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.agent.tool.validator.assertor; import java.util.ArrayList; import java.util.List; - import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.exception.ActualSegmentRefIsEmptyException; -import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.exception.SegmentRefAssertFailedException; -import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.exception.SegmentRefNotFoundException; -import org.apache.skywalking.plugin.test.agent.tool.validator.exception.AssertFailedException; import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.exception.KeyValueNotEqualsException; import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.exception.LogEventKeyNotEqualsException; import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.exception.LogEventSizeNotEqualsException; @@ -30,6 +27,8 @@ import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.exception.LogSizeNotEqualsException; import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.exception.RefSizeNotEqualsException; import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.exception.SegmentNotFoundException; +import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.exception.SegmentRefAssertFailedException; +import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.exception.SegmentRefNotFoundException; import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.exception.SpanAssertFailedException; import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.exception.SpanSizeNotEqualsException; import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.exception.TagKeyNotEqualsException; @@ -42,6 +41,7 @@ import org.apache.skywalking.plugin.test.agent.tool.validator.entity.SegmentItem; import org.apache.skywalking.plugin.test.agent.tool.validator.entity.SegmentRef; import org.apache.skywalking.plugin.test.agent.tool.validator.entity.Span; +import org.apache.skywalking.plugin.test.agent.tool.validator.exception.AssertFailedException; public class SegmentAssert { public static void assertEquals(SegmentItem expected, SegmentItem actual) { @@ -211,8 +211,10 @@ private static SegmentRef findSegmentRef(List actual, SegmentRef exp private static boolean simpleSegmentRefEquals(SegmentRef expected, SegmentRef actual) { try { - ExpressParser.parse(expected.entryEndpointName()).assertValue("entry service name", actual.entryEndpointName()); - ExpressParser.parse(expected.parentEndpointName()).assertValue("parent service name", actual.parentEndpointName()); + ExpressParser.parse(expected.entryEndpointName()) + .assertValue("entry service name", actual.entryEndpointName()); + ExpressParser.parse(expected.parentEndpointName()) + .assertValue("parent service name", actual.parentEndpointName()); ExpressParser.parse(expected.refType()).assertValue("ref type", actual.refType()); return true; } catch (ValueAssertFailedException e) { diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/SegmentItemsAssert.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/SegmentItemsAssert.java index bd33038e7443..2a32b3e78057 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/SegmentItemsAssert.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/SegmentItemsAssert.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.agent.tool.validator.assertor; import java.util.List; @@ -28,9 +29,6 @@ import org.apache.skywalking.plugin.test.agent.tool.validator.entity.SegmentRef; import org.apache.skywalking.plugin.test.agent.tool.validator.entity.Span; -/** - * Created by xin on 2017/7/15. - */ public class SegmentItemsAssert { private static Logger logger = LogManager.getLogger(SegmentItemsAssert.class); diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/SegmentRefAssert.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/SegmentRefAssert.java index fffc10a1740b..7e6b2d6f6d05 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/SegmentRefAssert.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/SegmentRefAssert.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.agent.tool.validator.assertor; import java.util.ArrayList; import java.util.List; - -import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.exception.SegmentRefSizeNotEqualsException; import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.exception.SegmentRefAssertFailedException; import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.exception.SegmentRefNotFoundException; +import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.exception.SegmentRefSizeNotEqualsException; import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.exception.ValueAssertFailedException; import org.apache.skywalking.plugin.test.agent.tool.validator.entity.SegmentRef; @@ -57,17 +57,24 @@ private static SegmentRef findSegmentRef(List actual, SegmentRef exp private static boolean segmentRefEquals(SegmentRef expected, SegmentRef actual) { try { - ExpressParser.parse(expected.entryEndpointName()).assertValue("entry endpoint name", actual.entryEndpointName()); + ExpressParser.parse(expected.entryEndpointName()) + .assertValue("entry endpoint name", actual.entryEndpointName()); ExpressParser.parse(expected.networkAddress()).assertValue("network address", actual.networkAddress()); - ExpressParser.parse(expected.parentTraceSegmentId()).assertValue("parent segment id", actual.parentTraceSegmentId()); + ExpressParser.parse(expected.parentTraceSegmentId()) + .assertValue("parent segment id", actual.parentTraceSegmentId()); ExpressParser.parse(expected.parentSpanId()).assertValue("span id", actual.parentSpanId()); ExpressParser.parse(expected.entryEndpointId()).assertValue("entry endpoint id", actual.entryEndpointId()); - ExpressParser.parse(expected.networkAddressId()).assertValue("network address id", actual.networkAddressId()); - ExpressParser.parse(expected.parentServiceInstanceId()).assertValue("parent application instance id", actual.parentServiceInstanceId()); - ExpressParser.parse(expected.parentEndpointId()).assertValue("parent endpoint id", actual.parentEndpointId()); - ExpressParser.parse(expected.parentEndpointName()).assertValue("parent endpoint name", actual.parentEndpointName()); + ExpressParser.parse(expected.networkAddressId()) + .assertValue("network address id", actual.networkAddressId()); + ExpressParser.parse(expected.parentServiceInstanceId()) + .assertValue("parent application instance id", actual.parentServiceInstanceId()); + ExpressParser.parse(expected.parentEndpointId()) + .assertValue("parent endpoint id", actual.parentEndpointId()); + ExpressParser.parse(expected.parentEndpointName()) + .assertValue("parent endpoint name", actual.parentEndpointName()); ExpressParser.parse(expected.refType()).assertValue("ref type", actual.refType()); - ExpressParser.parse(expected.entryServiceInstanceId()).assertValue("entry application instance id", actual.entryServiceInstanceId()); + ExpressParser.parse(expected.entryServiceInstanceId()) + .assertValue("entry application instance id", actual.entryServiceInstanceId()); return true; } catch (ValueAssertFailedException e) { throw new SegmentRefAssertFailedException(e, expected, actual); diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/element/ElementAssertor.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/element/ElementAssertor.java index f433effee0d2..452fe8f1fc68 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/element/ElementAssertor.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/element/ElementAssertor.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.agent.tool.validator.assertor.element; public abstract class ElementAssertor { diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/element/EqualsAssertor.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/element/EqualsAssertor.java index 3d6f1c3deb2a..c7cd56816904 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/element/EqualsAssertor.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/element/EqualsAssertor.java @@ -14,13 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.agent.tool.validator.assertor.element; import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.exception.ValueAssertFailedException; -/** - * Created by xin on 2017/7/15. - */ public class EqualsAssertor extends ElementAssertor { public EqualsAssertor(String exceptedValue) { diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/element/GreatThanAssertor.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/element/GreatThanAssertor.java index e7c714653713..ca2fecde3d92 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/element/GreatThanAssertor.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/element/GreatThanAssertor.java @@ -14,13 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.agent.tool.validator.assertor.element; import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.exception.ValueAssertFailedException; -/** - * Created by xin on 2017/7/16. - */ public class GreatThanAssertor extends ElementAssertor { public GreatThanAssertor(String exceptedValue) { @@ -30,7 +28,7 @@ public GreatThanAssertor(String exceptedValue) { @Override public void assertValue(String desc, String actualValue) { if (Long.parseLong(actualValue) <= Long.parseLong(exceptedValue)) { - throw new ValueAssertFailedException(desc," gt " + exceptedValue, actualValue); + throw new ValueAssertFailedException(desc, " gt " + exceptedValue, actualValue); } } } diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/element/GreetEqualAssertor.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/element/GreetEqualAssertor.java index 140e368da2cb..8c97fd62b27f 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/element/GreetEqualAssertor.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/element/GreetEqualAssertor.java @@ -25,7 +25,8 @@ public GreetEqualAssertor(String exceptedValue) { super(exceptedValue); } - @Override public void assertValue(String desc, String actualValue) { + @Override + public void assertValue(String desc, String actualValue) { if (Long.parseLong(actualValue) < Long.parseLong(exceptedValue)) { throw new ValueAssertFailedException(desc, " ge " + exceptedValue, actualValue); } diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/element/NoopAssertor.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/element/NoopAssertor.java index 7ea49b1c8c59..bcec8f68f469 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/element/NoopAssertor.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/element/NoopAssertor.java @@ -14,11 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.agent.tool.validator.assertor.element; -/** - * Created by xin on 2017/7/15. - */ public class NoopAssertor extends ElementAssertor { public NoopAssertor() { super(null); diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/element/NotEqualsAssertor.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/element/NotEqualsAssertor.java index 8e8144a5e98d..9f85d76edaa1 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/element/NotEqualsAssertor.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/element/NotEqualsAssertor.java @@ -14,13 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.agent.tool.validator.assertor.element; import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.exception.ValueAssertFailedException; -/** - * Created by xin on 2017/7/15. - */ public class NotEqualsAssertor extends ElementAssertor { public NotEqualsAssertor(String exceptedValue) { diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/element/NotNullAssertor.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/element/NotNullAssertor.java index 2beea95b0caa..dcc5f2d1dfa2 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/element/NotNullAssertor.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/element/NotNullAssertor.java @@ -14,13 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.agent.tool.validator.assertor.element; import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.exception.ValueAssertFailedException; -/** - * Created by xin on 2017/7/15. - */ public class NotNullAssertor extends ElementAssertor { public NotNullAssertor() { super(null); diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/element/NullAssertor.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/element/NullAssertor.java index cf3f20b2b3cb..b30c3fa9e3cb 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/element/NullAssertor.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/element/NullAssertor.java @@ -14,13 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.agent.tool.validator.assertor.element; import org.apache.skywalking.plugin.test.agent.tool.validator.assertor.exception.ValueAssertFailedException; -/** - * Created by xin on 2017/7/18. - */ public class NullAssertor extends ElementAssertor { public NullAssertor() { super(null); diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/ActualRegistryOperationNameEmptyException.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/ActualRegistryOperationNameEmptyException.java index c58886a48fd6..6600b63223fb 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/ActualRegistryOperationNameEmptyException.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/ActualRegistryOperationNameEmptyException.java @@ -28,8 +28,9 @@ public ActualRegistryOperationNameEmptyException(RegistryOperationName registryO this.registryOperationName = registryOperationName; } - @Override public String getCauseMessage() { - return String.format("ActualRegistryOperationNameEmptyException\nexpected:%s\nactual:%s\n", - registryOperationName.operationName(), "Empty"); + @Override + public String getCauseMessage() { + return String.format("ActualRegistryOperationNameEmptyException\nexpected:%s\nactual:%s\n", registryOperationName + .operationName(), "Empty"); } } diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/ActualSegmentItemEmptyException.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/ActualSegmentItemEmptyException.java index da75a62e3239..4ce4c53abaac 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/ActualSegmentItemEmptyException.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/ActualSegmentItemEmptyException.java @@ -28,7 +28,8 @@ public ActualSegmentItemEmptyException(SegmentItem expected) { this.expected = expected; } - @Override public String getCauseMessage() { + @Override + public String getCauseMessage() { return String.format("ActualSegmentItemEmptyException\nexpected: %s\nactual: %s", expected, "Empty"); } } diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/ActualSegmentRefIsEmptyException.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/ActualSegmentRefIsEmptyException.java index e6cba981ee6e..23a55667b073 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/ActualSegmentRefIsEmptyException.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/ActualSegmentRefIsEmptyException.java @@ -26,7 +26,8 @@ public ActualSegmentRefIsEmptyException(int expectedSize) { this.expectedSize = expectedSize; } - @Override public String getCauseMessage() { + @Override + public String getCauseMessage() { return String.format("ActualSegmentRefIsEmptyException\nexpected: %d\nactual: %s\n", expectedSize, "Not found"); } } diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/LogEventKeyNotEqualsException.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/LogEventKeyNotEqualsException.java index a56dda0026a3..c649c9674e34 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/LogEventKeyNotEqualsException.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/LogEventKeyNotEqualsException.java @@ -28,7 +28,8 @@ public LogEventKeyNotEqualsException(String expected, String actual) { this.actual = actual; } - @Override public String getCauseMessage() { + @Override + public String getCauseMessage() { return String.format("[log event key]: expected=>{%s}, actual=>{%s}\n", expected, actual); } } diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/LogEventSizeNotEqualsException.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/LogEventSizeNotEqualsException.java index faf4905da443..e79bb89382c9 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/LogEventSizeNotEqualsException.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/LogEventSizeNotEqualsException.java @@ -28,7 +28,8 @@ public LogEventSizeNotEqualsException(int expected, int actual) { this.actual = actual; } - @Override public String getCauseMessage() { + @Override + public String getCauseMessage() { return String.format("[log event size]: expected=>{%d}, actual=>{%d}\n", expected, actual); } } diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/LogEventValueNotEqualsException.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/LogEventValueNotEqualsException.java index c2986090abe9..407b27cb9fde 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/LogEventValueNotEqualsException.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/LogEventValueNotEqualsException.java @@ -30,8 +30,8 @@ public LogEventValueNotEqualsException(String eventKey, String expected, String this.actual = actual; } - @Override public String getCauseMessage() { - return String.format("[log(%s} value]: expected=>{%s}, actual=>{%s}\n", eventKey, - expected, actual); + @Override + public String getCauseMessage() { + return String.format("[log(%s} value]: expected=>{%s}, actual=>{%s}\n", eventKey, expected, actual); } } diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/LogSizeNotEqualsException.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/LogSizeNotEqualsException.java index 299a72e9d523..73f15734a3a7 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/LogSizeNotEqualsException.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/LogSizeNotEqualsException.java @@ -28,7 +28,8 @@ public LogSizeNotEqualsException(int expected, int actual) { this.actual = actual; } - @Override public String getCauseMessage() { + @Override + public String getCauseMessage() { return String.format("[log size]: expected=>{%d}, actual=>{%d}", expected, actual); } } diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/ParentSegmentNotFoundException.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/ParentSegmentNotFoundException.java index d0fd6478b9ed..dc59c1319034 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/ParentSegmentNotFoundException.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/ParentSegmentNotFoundException.java @@ -27,7 +27,8 @@ public ParentSegmentNotFoundException(String express) { this.express = express; } - @Override public String getCauseMessage() { + @Override + public String getCauseMessage() { return String.format("ParentSegmentNotFoundException\nexpected: %s\nactual: %s\n", express, "NOT FOUND"); } } diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/RefSizeNotEqualsException.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/RefSizeNotEqualsException.java index 907fc25ce5db..c7a2c7b3d0b9 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/RefSizeNotEqualsException.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/RefSizeNotEqualsException.java @@ -29,7 +29,8 @@ public RefSizeNotEqualsException(int expected, int actual) { this.actual = actual; } - @Override public String getCauseMessage() { + @Override + public String getCauseMessage() { return String.format("[segment ref size]: expected=>{%s}, actual=>{%s}", expected, actual); } } diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/RegistryApplicationNotFoundException.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/RegistryApplicationNotFoundException.java index e7685d804d63..449207ccc424 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/RegistryApplicationNotFoundException.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/RegistryApplicationNotFoundException.java @@ -26,8 +26,8 @@ public RegistryApplicationNotFoundException(String applicationCode) { this.applicationCode = applicationCode; } - @Override public String getCauseMessage() { - return String.format("RegistryApplicationNotFoundException\nexpected: %s\nactual: %s\n", applicationCode, - "Not Found"); + @Override + public String getCauseMessage() { + return String.format("RegistryApplicationNotFoundException\nexpected: %s\nactual: %s\n", applicationCode, "Not Found"); } } diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/RegistryApplicationSizeNotEqualsException.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/RegistryApplicationSizeNotEqualsException.java index 237dbb66a938..b6e17eef04af 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/RegistryApplicationSizeNotEqualsException.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/RegistryApplicationSizeNotEqualsException.java @@ -28,8 +28,9 @@ public RegistryApplicationSizeNotEqualsException(String applicationCode, ValueAs this.cause = cause; } - @Override public String getCauseMessage() { - return String.format("RegistryApplicationSizeNotEqualsException: %s\nexpected: %s\nactual: %s\n", - applicationCode, cause.getExpected(), cause.getActual()); + @Override + public String getCauseMessage() { + return String.format("RegistryApplicationSizeNotEqualsException: %s\nexpected: %s\nactual: %s\n", applicationCode, cause + .getExpected(), cause.getActual()); } } diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/RegistryInstanceOfApplicationNotFoundException.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/RegistryInstanceOfApplicationNotFoundException.java index e25f46b46f1f..ba41bd1641da 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/RegistryInstanceOfApplicationNotFoundException.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/RegistryInstanceOfApplicationNotFoundException.java @@ -27,9 +27,8 @@ public RegistryInstanceOfApplicationNotFoundException(String applicationCode) { this.applicationCode = applicationCode; } - @Override public String getCauseMessage() { - return String.format("RegistryInstanceOfApplicationNotFoundException\nexpected: Instances of Service(%s)" + - "\nactual: %s\n", - applicationCode, "NOT FOUND"); + @Override + public String getCauseMessage() { + return String.format("RegistryInstanceOfApplicationNotFoundException\nexpected: Instances of Service(%s)" + "\nactual: %s\n", applicationCode, "NOT FOUND"); } } diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/RegistryInstanceSizeNotEqualsException.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/RegistryInstanceSizeNotEqualsException.java index 66ad38b429be..283e72a3f1e5 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/RegistryInstanceSizeNotEqualsException.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/RegistryInstanceSizeNotEqualsException.java @@ -29,8 +29,9 @@ public RegistryInstanceSizeNotEqualsException(String applicationCode, ValueAsser this.cause = cause; } - @Override public String getCauseMessage() { - return String.format("RegistryInstanceSizeNotEqualsException %s\nexpected: %s\nactual: %s\n", - applicationCode, cause.getExpected(), cause.getActual()); + @Override + public String getCauseMessage() { + return String.format("RegistryInstanceSizeNotEqualsException %s\nexpected: %s\nactual: %s\n", applicationCode, cause + .getExpected(), cause.getActual()); } } diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/RegistryOperationNameNotFoundException.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/RegistryOperationNameNotFoundException.java index fe5a2863a557..1cf2ec7a7bf3 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/RegistryOperationNameNotFoundException.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/RegistryOperationNameNotFoundException.java @@ -28,8 +28,8 @@ public RegistryOperationNameNotFoundException(String applicationCode, String ope this.operationName = operationName; } - @Override public String getCauseMessage() { - return String.format("RegistryOperationNameNotFoundException %s\nexpected: %s\nactual: %s\n", applicationCode - , operationName, "NOT FOUND"); + @Override + public String getCauseMessage() { + return String.format("RegistryOperationNameNotFoundException %s\nexpected: %s\nactual: %s\n", applicationCode, operationName, "NOT FOUND"); } } diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/RegistryOperationNamesOfApplicationNotFoundException.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/RegistryOperationNamesOfApplicationNotFoundException.java index 31e0867a8b95..98f6c8286d5f 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/RegistryOperationNamesOfApplicationNotFoundException.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/RegistryOperationNamesOfApplicationNotFoundException.java @@ -27,8 +27,9 @@ public RegistryOperationNamesOfApplicationNotFoundException(RegistryOperationNam this.applicationCode = applicationCode; } - @Override public String getCauseMessage() { - return String.format("RegistryOperationNamesOfApplicationNotFoundException %s\nexpected: %s\nactual: %s\n", - applicationCode.applicationCode(), applicationCode.operationName(), "NOT FOUND"); + @Override + public String getCauseMessage() { + return String.format("RegistryOperationNamesOfApplicationNotFoundException %s\nexpected: %s\nactual: %s\n", applicationCode + .applicationCode(), applicationCode.operationName(), "NOT FOUND"); } } diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/SegmentItemNotFoundException.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/SegmentItemNotFoundException.java index 6e98e2cb2158..038fd41d5689 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/SegmentItemNotFoundException.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/SegmentItemNotFoundException.java @@ -26,7 +26,8 @@ public SegmentItemNotFoundException(String applicationCode) { this.applicationCode = applicationCode; } - @Override public String getCauseMessage() { + @Override + public String getCauseMessage() { return String.format("SegmentItemNotFoundException\nexpected: %s\nactual: %s", applicationCode, "Not Found"); } } diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/SegmentNotFoundException.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/SegmentNotFoundException.java index ad8a52eede57..28ba9db23c74 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/SegmentNotFoundException.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/SegmentNotFoundException.java @@ -36,8 +36,7 @@ public SegmentNotFoundException(Segment expectedSegment, List{%s}, actual=>{%s}\n", expected, actual); } } diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/TagSizeNotEqualsException.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/TagSizeNotEqualsException.java index 6869ae7cb182..b09e6bf04826 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/TagSizeNotEqualsException.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/TagSizeNotEqualsException.java @@ -28,7 +28,8 @@ public TagSizeNotEqualsException(int expected, int actual) { this.actual = actual; } - @Override public String getCauseMessage() { + @Override + public String getCauseMessage() { return String.format("[tag size]: expected=>{%s}, actual=>{%s}\n", expected, actual); } } diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/TagValueNotEqualsException.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/TagValueNotEqualsException.java index 2fd9ca06f9f0..6c8d41fffda2 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/TagValueNotEqualsException.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/TagValueNotEqualsException.java @@ -30,8 +30,8 @@ public TagValueNotEqualsException(String tagKey, String expected, String actual) this.actual = actual; } - @Override public String getCauseMessage() { - return String.format("[tag(%s) value]: expected=>{}, actual=>{%s}\n", tagKey, expected, - actual); + @Override + public String getCauseMessage() { + return String.format("[tag(%s) value]: expected=>{}, actual=>{%s}\n", tagKey, expected, actual); } } diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/ValueAssertFailedException.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/ValueAssertFailedException.java index a413ea948239..7f7d1203a252 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/ValueAssertFailedException.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/exception/ValueAssertFailedException.java @@ -42,7 +42,8 @@ public String getActual() { return actual; } - @Override public String getCauseMessage() { + @Override + public String getCauseMessage() { return String.format("[%s]: expected=>{%s}, actual=>{%s}", desc, expected, actual); } } diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/Data.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/Data.java index e19df0191635..c43f71ad07f7 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/Data.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/Data.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.agent.tool.validator.entity; import java.io.File; @@ -51,7 +52,7 @@ public static Data loadData(InputStream inputStream) { Data result = yaml.loadAs(inputStream, DataForRead.class); if (result == null) { throw new RuntimeException(); - } else{ + } else { return result; } } diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/DataForRead.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/DataForRead.java index a72e0c09fcea..b2352796e898 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/DataForRead.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/DataForRead.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.agent.tool.validator.entity; import java.util.ArrayList; diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/KeyValuePair.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/KeyValuePair.java index 4c110f37c95a..8032baafc133 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/KeyValuePair.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/KeyValuePair.java @@ -14,11 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.agent.tool.validator.entity; -/** - * Created by xin on 2017/7/15. - */ public interface KeyValuePair { String key(); diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/LogEvent.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/LogEvent.java index 3cb32b34bd69..f4158f7697e1 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/LogEvent.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/LogEvent.java @@ -14,14 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.agent.tool.validator.entity; import java.util.ArrayList; import java.util.List; -/** - * Created by xin on 2017/7/15. - */ public interface LogEvent { List events(); diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/RegistryApplication.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/RegistryApplication.java index 259afbd712c2..760fa7089da3 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/RegistryApplication.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/RegistryApplication.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.agent.tool.validator.entity; public interface RegistryApplication { @@ -35,7 +36,8 @@ public String applicationCode() { return applicationCode; } - @Override public String expressValue() { + @Override + public String expressValue() { return express; } } diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/RegistryInstance.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/RegistryInstance.java index d3fca2e37948..766fdf0c1453 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/RegistryInstance.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/RegistryInstance.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.agent.tool.validator.entity; public interface RegistryInstance { @@ -32,11 +33,13 @@ class Impl implements RegistryInstance { this.express = express; } - @Override public String applicationCode() { + @Override + public String applicationCode() { return code; } - @Override public String expressValue() { + @Override + public String expressValue() { return express; } } diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/RegistryItems.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/RegistryItems.java index 743835af042c..279f41a389a8 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/RegistryItems.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/RegistryItems.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.agent.tool.validator.entity; import java.util.List; diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/RegistryItemsForRead.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/RegistryItemsForRead.java index c512a4b5283c..ccc906dde0ea 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/RegistryItemsForRead.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/RegistryItemsForRead.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.agent.tool.validator.entity; import java.util.ArrayList; @@ -45,8 +46,7 @@ public List>> getOperationNames() { return operationNames; } - public void setOperationNames( - List>> operationNames) { + public void setOperationNames(List>> operationNames) { this.operationNames = operationNames; } diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/RegistryOperationName.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/RegistryOperationName.java index 930f7d9d3252..3f0955794425 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/RegistryOperationName.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/RegistryOperationName.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.agent.tool.validator.entity; import java.util.List; @@ -32,11 +33,13 @@ class Impl implements RegistryOperationName { this.express = express; } - @Override public String applicationCode() { + @Override + public String applicationCode() { return code; } - @Override public List operationName() { + @Override + public List operationName() { return express; } } diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/Segment.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/Segment.java index 5a36c0f0d826..6f42e22a28f9 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/Segment.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/Segment.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.agent.tool.validator.entity; import java.util.List; diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/SegmentForRead.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/SegmentForRead.java index b5c6dc5b7a62..3fb768158f78 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/SegmentForRead.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/SegmentForRead.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.agent.tool.validator.entity; import java.util.ArrayList; @@ -29,7 +30,8 @@ public String segmentId() { return segmentId; } - @Override public List spans() { + @Override + public List spans() { if (spans == null) { return null; } @@ -63,7 +65,8 @@ public SegmentRefForRead(Map ref) { this.entryEndpointId = ref.get("entryEndpointId") == null ? null : ref.get("entryEndpointId").toString(); this.parentEndpointId = ref.get("parentEndpointId") == null ? null : ref.get("parentEndpointId").toString(); this.networkAddressId = ref.get("networkAddressId") == null ? null : ref.get("networkAddressId").toString(); - this.parentServiceInstanceId = ref.get("parentServiceInstanceId") == null ? null : ref.get("parentServiceInstanceId").toString(); + this.parentServiceInstanceId = ref.get("parentServiceInstanceId") == null ? null : ref.get("parentServiceInstanceId") + .toString(); } public void setParentEndpointId(String parentEndpointId) { @@ -110,62 +113,76 @@ public void setEntryServiceInstanceId(String entryServiceInstanceId) { this.entryServiceInstanceId = entryServiceInstanceId; } - @Override public String parentEndpointId() { + @Override + public String parentEndpointId() { return parentEndpointId; } - @Override public String parentEndpointName() { + @Override + public String parentEndpointName() { return parentEndpoint; } - @Override public String networkAddressId() { + @Override + public String networkAddressId() { return networkAddressId; } - @Override public String entryEndpointId() { + @Override + public String entryEndpointId() { return entryEndpointId; } - @Override public String refType() { + @Override + public String refType() { return refType; } - @Override public String parentSpanId() { + @Override + public String parentSpanId() { return parentSpanId; } - @Override public String parentTraceSegmentId() { + @Override + public String parentTraceSegmentId() { return parentTraceSegmentId; } - @Override public String parentServiceInstanceId() { + @Override + public String parentServiceInstanceId() { return parentServiceInstanceId; } - @Override public String networkAddress() { + @Override + public String networkAddress() { return networkAddress; } - @Override public String entryEndpointName() { + @Override + public String entryEndpointName() { return entryEndpoint; } - @Override public void parentTraceSegmentId(String parentTraceSegmentId) { + @Override + public void parentTraceSegmentId(String parentTraceSegmentId) { this.parentTraceSegmentId = parentTraceSegmentId; } - @Override public String entryServiceInstanceId() { + @Override + public String entryServiceInstanceId() { return entryServiceInstanceId; } - @Override public String toString() { + @Override + public String toString() { StringBuilder actualSegmentRef = new StringBuilder("\nSegmentRef:\n"); return actualSegmentRef.append(String.format(" - entryServiceName:\t\t%s\n", entryEndpointName())) - .append(String.format(" - networkAddress:\t\t\t%s\n", networkAddress())) - .append(String.format(" - parentServiceName:\t\t%s\n", parentEndpointName())) - .append(String.format(" - parentSpanId:\t\t\t%s\n", parentSpanId())) - .append(String.format(" - parentTraceSegmentId:\t%s\n", parentTraceSegmentId())) - .append(String.format(" - refType:\t\t\t\t\t%s", refType())).toString(); + .append(String.format(" - networkAddress:\t\t\t%s\n", networkAddress())) + .append(String.format(" - parentServiceName:\t\t%s\n", parentEndpointName())) + .append(String.format(" - parentSpanId:\t\t\t%s\n", parentSpanId())) + .append(String.format(" - parentTraceSegmentId:\t%s\n", parentTraceSegmentId())) + .append(String.format(" - refType:\t\t\t\t\t%s", refType())) + .toString(); } } @@ -249,32 +266,37 @@ public void setPeerId(String peerId) { this.peerId = peerId; } - public void setRefs( - List> refs) { + public void setRefs(List> refs) { this.refs = refs; } - @Override public String operationName() { + @Override + public String operationName() { return operationName; } - @Override public String operationId() { + @Override + public String operationId() { return operationId; } - @Override public String parentSpanId() { + @Override + public String parentSpanId() { return parentSpanId; } - @Override public String spanId() { + @Override + public String spanId() { return spanId; } - @Override public String spanLayer() { + @Override + public String spanLayer() { return spanLayer; } - @Override public List tags() { + @Override + public List tags() { if (tags == null) { return new ArrayList<>(); } @@ -285,7 +307,8 @@ public void setRefs( return result; } - @Override public List logs() { + @Override + public List logs() { if (logs == null) { return new ArrayList<>(); } @@ -302,39 +325,48 @@ public void setRefs( return result; } - @Override public String startTime() { + @Override + public String startTime() { return startTime; } - @Override public String endTime() { + @Override + public String endTime() { return endTime; } - @Override public String componentId() { + @Override + public String componentId() { return componentId; } - @Override public String componentName() { + @Override + public String componentName() { return componentName; } - @Override public String error() { + @Override + public String error() { return isError; } - @Override public String spanType() { + @Override + public String spanType() { return spanType; } - @Override public String peer() { + @Override + public String peer() { return peer; } - @Override public String peerId() { + @Override + public String peerId() { return peerId; } - @Override public List refs() { + @Override + public List refs() { if (formatedRefs == null && refs != null) { List segmentRefs = new ArrayList<>(); for (Map ref : refs) { @@ -346,11 +378,13 @@ public void setRefs( return formatedRefs; } - @Override public void setActualRefs(List refs) { + @Override + public void setActualRefs(List refs) { this.actualRefs = refs; } - @Override public List actualRefs() { + @Override + public List actualRefs() { return actualRefs; } } @@ -375,7 +409,8 @@ public List getSpans() { return spans; } - @Override public void setSegmentId(String segmentId) { + @Override + public void setSegmentId(String segmentId) { this.segmentId = segmentId; } diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/SegmentItem.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/SegmentItem.java index 99490dcd01c8..8a4a4b6ef47c 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/SegmentItem.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/SegmentItem.java @@ -14,13 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.agent.tool.validator.entity; import java.util.List; -/** - * Created by xin on 2017/7/15. - */ public interface SegmentItem { String applicationCode(); diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/SegmentItemForRead.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/SegmentItemForRead.java index 63c208288087..5f1b4bf3388a 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/SegmentItemForRead.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/SegmentItemForRead.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.agent.tool.validator.entity; import java.util.ArrayList; @@ -66,7 +67,8 @@ public List segments() { return new ArrayList<>(segments); } - @Override public String toString() { + @Override + public String toString() { StringBuilder message = new StringBuilder(String.format("\nSegment Item[%s]", applicationCode)); message.append(String.format(" - segment size:\t\t%s\n", segmentSize)); return message.toString(); diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/SegmentRef.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/SegmentRef.java index c654f68e8f80..77cf0b719498 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/SegmentRef.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/SegmentRef.java @@ -14,11 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.agent.tool.validator.entity; -/** - * Created by xin on 2017/7/15. - */ public interface SegmentRef { String parentEndpointId(); diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/Span.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/Span.java index aad45581034c..ea1bc99bf400 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/Span.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/Span.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.skywalking.plugin.test.agent.tool.validator.entity; import java.util.List; diff --git a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/exception/AssertFailedException.java b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/exception/AssertFailedException.java index 506628c87397..902c346e0db5 100644 --- a/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/exception/AssertFailedException.java +++ b/test/plugin/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/exception/AssertFailedException.java @@ -17,15 +17,12 @@ package org.apache.skywalking.plugin.test.agent.tool.validator.exception; -/** - * Created by xin on 2017/7/15. - */ public abstract class AssertFailedException extends RuntimeException { protected AssertFailedException(String message) { super(message); } - protected AssertFailedException(){ + protected AssertFailedException() { } public abstract String getCauseMessage(); diff --git a/test/plugin/validator/src/main/resources/log4j2.xml b/test/plugin/validator/src/main/resources/log4j2.xml index bcce5194075d..342bd6d3a00a 100644 --- a/test/plugin/validator/src/main/resources/log4j2.xml +++ b/test/plugin/validator/src/main/resources/log4j2.xml @@ -20,18 +20,18 @@ - + - + - - + + \ No newline at end of file diff --git a/test/plugin/validator/src/test/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/DataAssertTest.java b/test/plugin/validator/src/test/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/DataAssertTest.java index c32220ad1701..3d730e6e1100 100644 --- a/test/plugin/validator/src/test/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/DataAssertTest.java +++ b/test/plugin/validator/src/test/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/DataAssertTest.java @@ -18,10 +18,9 @@ package org.apache.skywalking.plugin.test.agent.tool.validator.assertor; import java.io.File; - import org.apache.skywalking.plugin.test.agent.tool.validator.entity.Data; -import org.junit.Test; import org.apache.skywalking.plugin.test.agent.tool.validator.exception.AssertFailedException; +import org.junit.Test; public class DataAssertTest {