diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/boot/BootService.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/boot/BootService.java index d79df0fd5..0bd73f16f 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/boot/BootService.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/boot/BootService.java @@ -1,7 +1,7 @@ package org.skywalking.apm.agent.core.boot; /** - * The BootService is an interface to all services, which need to boot when plugin mechanism begins to + * The BootService is an interface to all remote, which need to boot when plugin mechanism begins to * work. * {@link #bootUp()} will be called when BootService start up. * diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/ids/DistributedTraceId.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/ids/DistributedTraceId.java index d4cb0d420..58b1f9d17 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/ids/DistributedTraceId.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/ids/DistributedTraceId.java @@ -5,7 +5,7 @@ package org.skywalking.apm.agent.core.context.ids; *

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

- * such as: Service : http://www.skywalking.com/cust/query, all the services, called behind this service, rest services, + * 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 diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/AbstractSpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/AbstractSpan.java index 917cec1c6..c38957c89 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/AbstractSpan.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/AbstractSpan.java @@ -13,11 +13,11 @@ public interface AbstractSpan { * Set the component id, which defines in {@link org.skywalking.apm.network.trace.component.ComponentsDefine} * @param component */ - void setComponent(Component component); + AbstractSpan setComponent(Component component); - void setComponent(String componentName); + AbstractSpan setComponent(String componentName); - void setLayer(SpanLayer layer); + AbstractSpan setLayer(SpanLayer layer); /** * Set a key:value tag on the Span. @@ -34,7 +34,7 @@ public interface AbstractSpan { */ AbstractSpan log(Throwable t); - void errorOccurred(); + AbstractSpan errorOccurred(); /** * @return true if the actual span is an entry span. diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/AbstractTracingSpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/AbstractTracingSpan.java index ad12e70a3..889b6ebaf 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/AbstractTracingSpan.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/AbstractTracingSpan.java @@ -108,8 +108,9 @@ public abstract class AbstractTracingSpan implements AbstractSpan { return this; } - public void errorOccurred() { + public AbstractSpan errorOccurred() { this.errorOccurred = true; + return this; } public int getSpanId() { @@ -121,17 +122,20 @@ public abstract class AbstractTracingSpan implements AbstractSpan { } @Override - public void setLayer(SpanLayer layer) { + public AbstractSpan setLayer(SpanLayer layer) { this.layer = layer; + return this; } @Override - public void setComponent(Component component) { + public AbstractSpan setComponent(Component component) { this.componentId = component.getId(); + return this; } @Override - public void setComponent(String componentName) { + public AbstractSpan setComponent(String componentName) { this.componentName = componentName; + return this; } } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/ExitSpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/ExitSpan.java index 6265917aa..63a765261 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/ExitSpan.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/ExitSpan.java @@ -3,10 +3,10 @@ package org.skywalking.apm.agent.core.context.trace; import org.skywalking.apm.agent.core.dictionary.DictionaryUtil; /** - * The ExitSpan represents a service consumer point, such as Feign, Okhttp client for a Http service. + * The ExitSpan represents a service consumer point, such as Feign, Okhttp discovery for a 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 client libs, there maybe contain multi exit point. + * In a single rpc call, because of a combination of discovery libs, there maybe contain multi exit point. * * The ExitSpan only presents the first one. * diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/NoopSpan.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/NoopSpan.java index 1967c2ae0..b4138390c 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/NoopSpan.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/trace/NoopSpan.java @@ -1,6 +1,7 @@ package org.skywalking.apm.agent.core.context.trace; import org.skywalking.apm.agent.core.context.IgnoredTracerContext; +import org.skywalking.apm.network.trace.component.Component; /** * The NoopSpan represents a span implementation without any actual operation. @@ -18,10 +19,26 @@ public class NoopSpan implements AbstractSpan { return this; } + @Override public AbstractSpan errorOccurred() { + return null; + } + public void finish(){ } + @Override public AbstractSpan setComponent(Component component) { + return this; + } + + @Override public AbstractSpan setComponent(String componentName) { + return this; + } + + @Override public AbstractSpan setLayer(SpanLayer layer) { + return this; + } + @Override public AbstractSpan tag(String key, String value) { return this; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/client/CollectorDiscoveryService.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/discovery/CollectorDiscoveryService.java similarity index 80% rename from apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/client/CollectorDiscoveryService.java rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/discovery/CollectorDiscoveryService.java index 71017a37c..eb2d5f4b1 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/client/CollectorDiscoveryService.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/discovery/CollectorDiscoveryService.java @@ -1,6 +1,7 @@ -package org.skywalking.apm.agent.core.client; +package org.skywalking.apm.agent.core.discovery; import org.skywalking.apm.agent.core.boot.StatusBootService; +import org.skywalking.apm.agent.core.remote.DiscoveryRestServiceClient; /** * The CollectorDiscoveryService is responsible for start {@link DiscoveryRestServiceClient}. diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/client/DiscoveryRestServiceClient.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/remote/DiscoveryRestServiceClient.java similarity index 98% rename from apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/client/DiscoveryRestServiceClient.java rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/remote/DiscoveryRestServiceClient.java index 1f8f32817..42c89afe1 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/client/DiscoveryRestServiceClient.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/remote/DiscoveryRestServiceClient.java @@ -1,4 +1,4 @@ -package org.skywalking.apm.agent.core.client; +package org.skywalking.apm.agent.core.remote; import com.google.gson.Gson; import com.google.gson.JsonArray; diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/remote/GRPCChannelManager.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/remote/GRPCChannelManager.java new file mode 100644 index 000000000..f9ed5a3ec --- /dev/null +++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/remote/GRPCChannelManager.java @@ -0,0 +1,55 @@ +package org.skywalking.apm.agent.core.remote; + +import io.grpc.ManagedChannel; +import io.grpc.ManagedChannelBuilder; +import io.grpc.internal.DnsNameResolverProvider; +import io.grpc.netty.NettyChannelBuilder; +import org.skywalking.apm.agent.core.boot.BootService; +import org.skywalking.apm.logging.ILog; +import org.skywalking.apm.logging.LogManager; + +/** + * @author wusheng + */ +public class GRPCChannelManager implements BootService, Runnable { + private static final ILog logger = LogManager.getLogger(DiscoveryRestServiceClient.class); + + private volatile Thread channelManagerThread = null; + private volatile ManagedChannel managedChannel = null; + + @Override + public void bootUp() throws Throwable { + this.startupInBackground(); + } + + private void startupInBackground() { + if (channelManagerThread == null || !channelManagerThread.isAlive()) { + synchronized (this) { + if (channelManagerThread == null || !channelManagerThread.isAlive()) { + if (managedChannel == null || managedChannel.isTerminated() || managedChannel.isShutdown()) { + managedChannel.shutdownNow(); + Thread channelManagerThread = new Thread(this, "ChannelManagerThread"); + channelManagerThread.setDaemon(true); + channelManagerThread.start(); + } + } + } + } + } + + @Override + public void run() { + ManagedChannelBuilder channelBuilder = + NettyChannelBuilder.forAddress("127.0.0.1", 808) + .nameResolverFactory(new DnsNameResolverProvider()) + .maxInboundMessageSize(1024 * 1024 * 50) + .usePlaintext(true); + managedChannel = channelBuilder.build(); + } + + public static void main(String[] args) throws Throwable { + new GRPCChannelManager().bootUp(); + + Thread.sleep(60 * 1000); + } +} diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/client/RESTResponseStatusError.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/remote/RESTResponseStatusError.java similarity index 76% rename from apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/client/RESTResponseStatusError.java rename to apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/remote/RESTResponseStatusError.java index 9c3ba809d..485bf5239 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/client/RESTResponseStatusError.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/remote/RESTResponseStatusError.java @@ -1,7 +1,7 @@ -package org.skywalking.apm.agent.core.client; +package org.skywalking.apm.agent.core.remote; /** - * The RESTResponseStatusError represents the REST-Service client got an unexpected response code. + * The RESTResponseStatusError represents the REST-Service discovery got an unexpected response code. * Most likely, the response code is not 200. * * @author wusheng diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/remote/TraceSegmentServiceClient.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/remote/TraceSegmentServiceClient.java new file mode 100644 index 000000000..76bc6cc58 --- /dev/null +++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/remote/TraceSegmentServiceClient.java @@ -0,0 +1,14 @@ +package org.skywalking.apm.agent.core.remote; + +/** + * @author wusheng + */ +public class TraceSegmentServiceClient { + public void start() { + + } + + public void switchChannel(){ + + } +} diff --git a/apm-sniffer/apm-agent-core/src/main/resources/META-INF/services/org.skywalking.apm.agent.core.boot.BootService b/apm-sniffer/apm-agent-core/src/main/resources/META-INF/services/org.skywalking.apm.agent.core.boot.BootService index f581a3885..1b0c29fba 100644 --- a/apm-sniffer/apm-agent-core/src/main/resources/META-INF/services/org.skywalking.apm.agent.core.boot.BootService +++ b/apm-sniffer/apm-agent-core/src/main/resources/META-INF/services/org.skywalking.apm.agent.core.boot.BootService @@ -1,4 +1,5 @@ org.skywalking.apm.agent.core.datacarrier.DataBufferService org.skywalking.apm.agent.core.context.ContextManager -org.skywalking.apm.agent.core.client.CollectorDiscoveryService +org.skywalking.apm.agent.core.discovery.CollectorDiscoveryService org.skywalking.apm.agent.core.sampling.SamplingService +org.skywalking.apm.agent.core.remote.GRPCChannelManager diff --git a/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/client/HTTPRestServiceTestApp.java b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/discovery/HTTPRestServiceTestApp.java similarity index 96% rename from apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/client/HTTPRestServiceTestApp.java rename to apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/discovery/HTTPRestServiceTestApp.java index 0391b22a9..d33115fb0 100644 --- a/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/client/HTTPRestServiceTestApp.java +++ b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/discovery/HTTPRestServiceTestApp.java @@ -1,4 +1,4 @@ -package org.skywalking.apm.agent.core.client; +package org.skywalking.apm.agent.core.discovery; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpPost; @@ -19,7 +19,7 @@ import java.io.IOException; /** * This is a small application, test for http restful service. - * Use APACHE HttpClient as client, nanohttpd as server. + * Use APACHE HttpClient as discovery, nanohttpd as server. * * @author wusheng */ diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/main/java/org/skywalking/apm/plugin/dubbox/BugFixActive.java b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/main/java/org/skywalking/apm/plugin/dubbox/BugFixActive.java index c3b5ca514..82e8dbb60 100644 --- a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/main/java/org/skywalking/apm/plugin/dubbox/BugFixActive.java +++ b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/main/java/org/skywalking/apm/plugin/dubbox/BugFixActive.java @@ -14,7 +14,7 @@ public final class BugFixActive { private static boolean ACTIVE = false; /** - * Set active status, before startup dubbo services. + * Set active status, before startup dubbo remote. */ public static void active() { BugFixActive.ACTIVE = true; diff --git a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/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/skywalking/apm/plugin/feign/http/v9/define/DefaultHttpClientInstrumentation.java index ed675756e..572d19321 100644 --- a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/main/java/org/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/skywalking/apm/plugin/feign/http/v9/define/DefaultHttpClientInstrumentation.java @@ -12,8 +12,8 @@ import static net.bytebuddy.matcher.ElementMatchers.named; /** * {@link DefaultHttpClientInstrumentation} presents that skywalking intercepts {@link * feign.Client.Default#execute(feign.Request, feign.Request.Options)} by using {@link DefaultHttpClientInterceptor}. - * If feign did't run in default mode, the instrumentation depend on the http client implementation. - * e.g. okhttp client implementation depend on okhttp-plugin. + * If feign did't run in default mode, the instrumentation depend on the http discovery implementation. + * e.g. okhttp discovery implementation depend on okhttp-plugin. * * @author pengys5 */ diff --git a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/test/java/org/skywalking/apm/plugin/feign/http/v9/DefaultHttpClientInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/test/java/org/skywalking/apm/plugin/feign/http/v9/DefaultHttpClientInterceptorTest.java index 512d7c7de..a5a322e6e 100644 --- a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/test/java/org/skywalking/apm/plugin/feign/http/v9/DefaultHttpClientInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/src/test/java/org/skywalking/apm/plugin/feign/http/v9/DefaultHttpClientInterceptorTest.java @@ -104,7 +104,7 @@ public class DefaultHttpClientInterceptorTest { Assert.assertEquals("skywalking.org", span.getPeerHost()); Assert.assertEquals(-1, span.getPort()); Assert.assertEquals("FeignDefaultHttp", StringTagReader.get(span, Tags.COMPONENT)); - Assert.assertEquals("client", StringTagReader.get(span, Tags.SPAN_KIND)); + Assert.assertEquals("discovery", StringTagReader.get(span, Tags.SPAN_KIND)); Assert.assertEquals("", StringTagReader.get(span, Tags.URL)); } diff --git a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/AbstractHttpClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/AbstractHttpClientInstrumentation.java index ce607c449..fb7a6948d 100644 --- a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/AbstractHttpClientInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/AbstractHttpClientInstrumentation.java @@ -18,7 +18,7 @@ import static net.bytebuddy.matcher.ElementMatchers.named; */ public class AbstractHttpClientInstrumentation extends HttpClientInstrumentation { - private static final String ENHANCE_CLASS = "org.apache.http.impl.client.AbstractHttpClient"; + private static final String ENHANCE_CLASS = "org.apache.http.impl.discovery.AbstractHttpClient"; @Override public String enhanceClassName() { diff --git a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/DefaultRequestDirectorInstrumentation.java b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/DefaultRequestDirectorInstrumentation.java index 902fbab72..ae882ccc8 100644 --- a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/DefaultRequestDirectorInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/DefaultRequestDirectorInstrumentation.java @@ -19,7 +19,7 @@ public class DefaultRequestDirectorInstrumentation extends HttpClientInstrumenta /** * Enhance class. */ - private static final String ENHANCE_CLASS = "org.apache.http.impl.client.DefaultRequestDirector"; + private static final String ENHANCE_CLASS = "org.apache.http.impl.discovery.DefaultRequestDirector"; /** * DefaultRequestDirector is default implement.
diff --git a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/InternalHttpClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/InternalHttpClientInstrumentation.java index 6e860d744..781dda068 100644 --- a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/InternalHttpClientInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/InternalHttpClientInstrumentation.java @@ -15,7 +15,7 @@ import static net.bytebuddy.matcher.ElementMatchers.named; */ public class InternalHttpClientInstrumentation extends HttpClientInstrumentation { - private static final String ENHANCE_CLASS = "org.apache.http.impl.client.InternalHttpClient"; + private static final String ENHANCE_CLASS = "org.apache.http.impl.discovery.InternalHttpClient"; @Override public String enhanceClassName() { diff --git a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/MinimalHttpClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/MinimalHttpClientInstrumentation.java index 19698297f..a711cbc5c 100644 --- a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/MinimalHttpClientInstrumentation.java +++ b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/apm/plugin/httpClient/v4/define/MinimalHttpClientInstrumentation.java @@ -18,7 +18,7 @@ import static net.bytebuddy.matcher.ElementMatchers.named; */ public class MinimalHttpClientInstrumentation extends HttpClientInstrumentation { - private static final String ENHANCE_CLASS = "org.apache.http.impl.client.MinimalHttpClient"; + private static final String ENHANCE_CLASS = "org.apache.http.impl.discovery.MinimalHttpClient"; @Override public String enhanceClassName() { diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/test/java/org/skywalking/apm/plugin/jdbc/SWConnectionTest.java b/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/test/java/org/skywalking/apm/plugin/jdbc/SWConnectionTest.java index 7297c58bf..13e4d0203 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/test/java/org/skywalking/apm/plugin/jdbc/SWConnectionTest.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/test/java/org/skywalking/apm/plugin/jdbc/SWConnectionTest.java @@ -327,7 +327,7 @@ public class SWConnectionTest extends AbstractStatementTest { swConnection.setHoldability(1); swConnection.getHoldability(); swConnection.setReadOnly(false); - swConnection.setClientInfo("test-client", "test-client"); + swConnection.setClientInfo("test-discovery", "test-discovery"); swConnection.getClientInfo("test"); swConnection.setSavepoint(); swConnection.getMetaData(); diff --git a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/skywalking/apm/plugin/okhttp/v3/RealCallInterceptor.java b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/skywalking/apm/plugin/okhttp/v3/RealCallInterceptor.java index 14b6d9c66..5460fb246 100644 --- a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/skywalking/apm/plugin/okhttp/v3/RealCallInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/main/java/org/skywalking/apm/plugin/okhttp/v3/RealCallInterceptor.java @@ -16,7 +16,7 @@ import org.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodsA import org.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; /** - * {@link RealCallInterceptor} intercept the synchronous http calls by the client of okhttp. + * {@link RealCallInterceptor} intercept the synchronous http calls by the discovery of okhttp. * * @author pengys5 */ diff --git a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/test/java/org/skywalking/apm/plugin/okhttp/v3/RealCallInterceptorTest.java b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/test/java/org/skywalking/apm/plugin/okhttp/v3/RealCallInterceptorTest.java index 74ec48d5e..69f8c7e2c 100644 --- a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/test/java/org/skywalking/apm/plugin/okhttp/v3/RealCallInterceptorTest.java +++ b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/src/test/java/org/skywalking/apm/plugin/okhttp/v3/RealCallInterceptorTest.java @@ -111,7 +111,7 @@ public class RealCallInterceptorTest { Assert.assertEquals("skywalking.org", span.getPeerHost()); Assert.assertEquals(80, span.getPort()); Assert.assertEquals("OKHttp", StringTagReader.get(span, Tags.COMPONENT)); - Assert.assertEquals("client", StringTagReader.get(span, Tags.SPAN_KIND)); + Assert.assertEquals("discovery", StringTagReader.get(span, Tags.SPAN_KIND)); Assert.assertEquals("/", StringTagReader.get(span, Tags.URL)); } diff --git a/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/DubboSpanGenerator.java b/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/DubboSpanGenerator.java index 617d33e56..567718934 100644 --- a/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/DubboSpanGenerator.java +++ b/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/DubboSpanGenerator.java @@ -6,7 +6,7 @@ import org.skywalking.apm.agent.core.context.trace.AbstractSpan; /** * The DubboSpanGenerator generates all possible spans, by tracing Dubbo rpc. - * Including client/server side span. + * Including discovery/server side span. * * @author wusheng */ diff --git a/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/MySQLGenerator.java b/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/MySQLGenerator.java index 7516078de..4c73e0211 100644 --- a/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/MySQLGenerator.java +++ b/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/span/MySQLGenerator.java @@ -5,7 +5,7 @@ import org.skywalking.apm.agent.core.context.tag.Tags; import org.skywalking.apm.agent.core.context.trace.AbstractSpan; /** - * The MySQLGenerator generates all possible spans, by tracing mysql client access. + * The MySQLGenerator generates all possible spans, by tracing mysql discovery access. * * @author wusheng */ diff --git a/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/trace/TomcatDubboClientTraceBuilder.java b/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/trace/TomcatDubboClientTraceBuilder.java index 2ef031df0..6fbe943f1 100644 --- a/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/trace/TomcatDubboClientTraceBuilder.java +++ b/apm-sniffer/apm-sniffer-mock/src/main/java/org/skywalking/apm/sniffer/mock/trace/builders/trace/TomcatDubboClientTraceBuilder.java @@ -9,7 +9,7 @@ import org.skywalking.apm.agent.core.context.trace.TraceSegment; /** * A Trace segment contains two spans with ChildOf relations, * the parent is a Tomcat span, - * the child is a Dubbo client span. + * the child is a Dubbo discovery span. * * @author wusheng */