You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2021/06/18 09:10:33 UTC
[skywalking] branch remove-deprecated created (now 11583f3)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch remove-deprecated
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
at 11583f3 Remove deprecated nameResolverFactory method.
This branch includes the following new commits:
new 11583f3 Remove deprecated nameResolverFactory method.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[skywalking] 01/01: Remove deprecated nameResolverFactory method.
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch remove-deprecated
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 11583f3f6215c68d00e9f9dcf5070d86edf10a4d
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Fri Jun 18 17:10:17 2021 +0800
Remove deprecated nameResolverFactory method.
---
CHANGES.md | 1 +
.../org/apache/skywalking/apm/agent/core/remote/GRPCChannel.java | 6 +++++-
.../skywalking/apm/agent/core/remote/StandardChannelBuilder.java | 3 +--
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index b656961..b1b389d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,7 @@ Release Notes.
* Supports modifying span attributes in async mode.
* Agent supports the collection of JVM arguments and jar dependency information.
* [Temporary] Support authentication for log report channel. This feature and grpc channel is going to be removed after Satellite 0.2.0 release.
+* Remove deprecated gRPC method, `io.grpc.ManagedChannelBuilder#nameResolverFactory`. See [gRPC-java 7133](https://github.com/grpc/grpc-java/issues/7133) for more details.
#### OAP-Backend
* Disable Spring sleuth meter analyzer by default.
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 52fa36c..d7806ad 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
@@ -22,6 +22,8 @@ import io.grpc.Channel;
import io.grpc.ConnectivityState;
import io.grpc.ManagedChannel;
import io.grpc.ManagedChannelBuilder;
+import io.grpc.NameResolverRegistry;
+import io.grpc.internal.DnsNameResolverProvider;
import io.grpc.netty.NettyChannelBuilder;
import java.util.LinkedList;
import java.util.List;
@@ -34,9 +36,11 @@ public class GRPCChannel {
private final Channel channelWithDecorators;
private GRPCChannel(String host, int port, List<ChannelBuilder> channelBuilders,
- List<ChannelDecorator> decorators) throws Exception {
+ List<ChannelDecorator> decorators) throws Exception {
ManagedChannelBuilder channelBuilder = NettyChannelBuilder.forAddress(host, port);
+ NameResolverRegistry.getDefaultRegistry().register(new DnsNameResolverProvider());
+
for (ChannelBuilder builder : channelBuilders) {
channelBuilder = builder.build(channelBuilder);
}
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 fc0f268..c8d4efb 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
@@ -26,8 +26,7 @@ public class StandardChannelBuilder implements ChannelBuilder {
@Override
public ManagedChannelBuilder build(ManagedChannelBuilder managedChannelBuilder) {
- return managedChannelBuilder.nameResolverFactory(new DnsNameResolverProvider())
- .maxInboundMessageSize(MAX_INBOUND_MESSAGE_SIZE)
+ return managedChannelBuilder.maxInboundMessageSize(MAX_INBOUND_MESSAGE_SIZE)
.usePlaintext();
}
}