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 12:15:06 UTC
[skywalking] branch master updated: Remove deprecated
nameResolverFactory method. (#7132)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new e21cb19 Remove deprecated nameResolverFactory method. (#7132)
e21cb19 is described below
commit e21cb196fc93f1c5efb993c733f43c69b130379b
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Fri Jun 18 20:14:51 2021 +0800
Remove deprecated nameResolverFactory method. (#7132)
---
CHANGES.md | 1 +
.../org/apache/skywalking/apm/agent/core/remote/GRPCChannel.java | 6 +++++-
.../skywalking/apm/agent/core/remote/StandardChannelBuilder.java | 4 +---
3 files changed, 7 insertions(+), 4 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..78b6991 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
@@ -19,15 +19,13 @@
package org.apache.skywalking.apm.agent.core.remote;
import io.grpc.ManagedChannelBuilder;
-import io.grpc.internal.DnsNameResolverProvider;
public class StandardChannelBuilder implements ChannelBuilder {
private final static int MAX_INBOUND_MESSAGE_SIZE = 1024 * 1024 * 50;
@Override
public ManagedChannelBuilder build(ManagedChannelBuilder managedChannelBuilder) {
- return managedChannelBuilder.nameResolverFactory(new DnsNameResolverProvider())
- .maxInboundMessageSize(MAX_INBOUND_MESSAGE_SIZE)
+ return managedChannelBuilder.maxInboundMessageSize(MAX_INBOUND_MESSAGE_SIZE)
.usePlaintext();
}
}