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 f6662c239..3b531ffec 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 @@ -25,12 +25,11 @@ import io.opentracing.Span; import io.opentracing.SpanContext; import io.opentracing.Tracer; import io.opentracing.tag.Tags; - -import java.util.LinkedList; +import java.util.ArrayList; import java.util.List; public class SkywalkingSpanBuilder implements Tracer.SpanBuilder { - private List tags = new LinkedList(); + private List tags = new ArrayList(); private String operationName; private boolean isEntry = false; private boolean isExit = false; @@ -83,9 +82,8 @@ public class SkywalkingSpanBuilder implements Tracer.SpanBuilder { 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-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 81b4d3bcd..9a27a3534 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 @@ -20,7 +20,17 @@ package org.apache.skywalking.apm.plugin.feign.http.v9; import feign.Request; import feign.Response; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.net.URL; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; 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; @@ -31,17 +41,6 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedI 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.network.trace.component.ComponentsDefine; - -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.net.URL; -import java.util.Collection; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; import org.apache.skywalking.apm.util.StringUtil; import static feign.Util.valuesOrEmpty; @@ -64,7 +63,7 @@ public class DefaultHttpClientInterceptor implements InstanceMethodsAroundInterc */ @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { + MethodInterceptResult result) throws Throwable { Request request = (Request) allArguments[0]; URL url = new URL(request.url()); ContextCarrier contextCarrier = new ContextCarrier(); @@ -113,7 +112,7 @@ public class DefaultHttpClientInterceptor implements InstanceMethodsAroundInterc CarrierItem next = contextCarrier.items(); while (next.hasNext()) { next = next.next(); - List contextCollection = new LinkedList(); + List contextCollection = new ArrayList(1); contextCollection.add(next.getHeadValue()); headers.put(next.getHeadKey(), contextCollection); } @@ -143,7 +142,7 @@ public class DefaultHttpClientInterceptor implements InstanceMethodsAroundInterc */ @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) { + Object ret) { Response response = (Response) ret; if (response != null) { int statusCode = response.status(); @@ -162,7 +161,7 @@ public class DefaultHttpClientInterceptor implements InstanceMethodsAroundInterc @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); } 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 5dda2449e..6f042013c 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 @@ -19,9 +19,9 @@ package org.apache.skywalking.apm.plugin.spring.mvc.commons.interceptor; import java.lang.reflect.Method; +import java.util.ArrayList; import java.util.Collections; import java.util.Enumeration; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -219,7 +219,7 @@ public abstract class AbstractMethodInterceptor implements InstanceMethodsAround } private void collectHttpHeaders(RequestHolder request, AbstractSpan span) { - final List headersList = new LinkedList<>(); + final List headersList = new ArrayList<>(SpringMVCPluginConfig.Plugin.Http.INCLUDE_HTTP_HEADERS.size()); SpringMVCPluginConfig.Plugin.Http.INCLUDE_HTTP_HEADERS.stream() .filter( headerName -> request.getHeaders(headerName) != null) 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 27cf22693..b8fdb890c 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 @@ -19,13 +19,13 @@ package org.apache.skywalking.apm.plugin.vertx3; import io.vertx.core.impl.launcher.commands.VersionCommand; +import java.util.Deque; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.LinkedBlockingDeque; import org.apache.skywalking.apm.agent.core.context.ContextSnapshot; import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan; -import java.util.Map; -import java.util.Stack; -import java.util.concurrent.ConcurrentHashMap; - class VertxContext { public static final double VERTX_VERSION; @@ -41,17 +41,17 @@ class VertxContext { } public static final String STOP_SPAN_NECESSARY = "VERTX_STOP_SPAN_NECESSARY"; - private static final Map> CONTEXT_MAP = new ConcurrentHashMap<>(); + private static final Map> CONTEXT_MAP = new ConcurrentHashMap<>(); static void pushContext(String identifier, VertxContext vertxContext) { if (!CONTEXT_MAP.containsKey(identifier)) { - CONTEXT_MAP.put(identifier, new Stack<>()); + CONTEXT_MAP.put(identifier, new LinkedBlockingDeque<>()); } CONTEXT_MAP.get(identifier).push(vertxContext); } static VertxContext popContext(String identifier) { - final Stack stack = CONTEXT_MAP.get(identifier); + final Deque stack = CONTEXT_MAP.get(identifier); final VertxContext context = stack.pop(); if (stack.isEmpty()) { CONTEXT_MAP.remove(identifier); 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 0116e0dcb..3622e2cf5 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 @@ -18,8 +18,8 @@ package org.apache.skywalking.apm.agent.test.tools; +import java.util.ArrayList; import java.util.HashMap; -import java.util.LinkedList; 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.Config; @@ -40,9 +40,9 @@ public class AgentServiceRule extends ExternalResource { FieldSetter.setValue( ServiceManager.INSTANCE.getDeclaringClass(), "bootedServices", new HashMap()); FieldSetter.setValue( - IgnoredTracerContext.ListenerManager.class, "LISTENERS", new LinkedList()); + IgnoredTracerContext.ListenerManager.class, "LISTENERS", new ArrayList()); FieldSetter.setValue( - TracingContext.ListenerManager.class, "LISTENERS", new LinkedList()); + TracingContext.ListenerManager.class, "LISTENERS", new ArrayList()); ServiceManager.INSTANCE.shutdown(); } catch (Exception e) { } 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 6e28509fc..2413b8dac 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 @@ -18,18 +18,18 @@ package org.apache.skywalking.apm.agent.test.tools; -import java.util.LinkedList; +import java.util.ArrayList; import java.util.List; import org.apache.skywalking.apm.agent.core.context.IgnoredTracerContext; import org.apache.skywalking.apm.agent.core.context.trace.TraceSegment; public class SegmentStorage { - private LinkedList traceSegments; - private LinkedList ignoredTracerContexts; + private List traceSegments; + private List ignoredTracerContexts; public SegmentStorage() { - traceSegments = new LinkedList(); - ignoredTracerContexts = new LinkedList(); + traceSegments = new ArrayList(); + ignoredTracerContexts = new ArrayList(); } void addTraceSegment(TraceSegment segment) { @@ -44,7 +44,7 @@ public class SegmentStorage { this.ignoredTracerContexts.add(context); } - public LinkedList getIgnoredTracerContexts() { + public List getIgnoredTracerContexts() { return ignoredTracerContexts; } }