replace nameResolverFactory with NameResolverRegistry

laglangyue · Apr 14, 2024 · 2edf768 · 2edf768
1 parent 7f4b94c
commit 2edf768
Showing 1 changed file with 10 additions and 13 deletions.
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/NettyClientUtils.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/NettyClientUtils.scala
@@ -14,21 +14,19 @@
 package org.apache.pekko.grpc.internal
 
 import java.util.concurrent.TimeUnit
-
 import javax.net.ssl.SSLContext
 import org.apache.pekko
 import pekko.{ Done, NotUsed }
 import pekko.annotation.InternalApi
 import pekko.event.LoggingAdapter
 import pekko.grpc.{ GrpcClientSettings, GrpcResponseMetadata, GrpcSingleResponse }
 import pekko.stream.scaladsl.{ Flow, Keep, Source }
-import io.grpc.{ CallOptions, MethodDescriptor }
+import io.grpc.{ CallOptions, MethodDescriptor, NameResolverRegistry }
 import io.grpc.netty.shaded.io.grpc.netty.GrpcSslContexts
 import io.grpc.netty.shaded.io.grpc.netty.NegotiationType
 import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder
 import io.grpc.netty.shaded.io.netty.handler.ssl.{ SslContext, SslContextBuilder }
 
-import scala.annotation.nowarn
 import scala.concurrent.duration.FiniteDuration
 import scala.concurrent.{ ExecutionContext, Future, Promise }
 import scala.util.{ Failure, Success }
@@ -46,22 +44,21 @@ object NettyClientUtils {
   def createChannel(settings: GrpcClientSettings, log: LoggingAdapter)(
       implicit ec: ExecutionContext): InternalChannel = {
 
-    @nowarn("cat=deprecation")
     var builder =
       NettyChannelBuilder
         // Not sure why netty wants to be able to shoe-horn the target into a URI... but ok,
         // we follow their lead and encode the service name as the 'authority' of the URI.
         .forTarget("//" + settings.serviceName)
         .flowControlWindow(NettyChannelBuilder.DEFAULT_FLOW_CONTROL_WINDOW)
-        // TODO avoid nameResolverFactory #1092, then 'nowarn' can be removed above
-        .nameResolverFactory(
-          new PekkoDiscoveryNameResolverProvider(
-            settings.serviceDiscovery,
-            settings.defaultPort,
-            settings.serviceName,
-            settings.servicePortName,
-            settings.serviceProtocol,
-            settings.resolveTimeout))
+
+    NameResolverRegistry.getDefaultRegistry.register(
+      new PekkoDiscoveryNameResolverProvider(
+        settings.serviceDiscovery,
+        settings.defaultPort,
+        settings.serviceName,
+        settings.servicePortName,
+        settings.serviceProtocol,
+        settings.resolveTimeout))
 
     if (!settings.useTls)
       builder = builder.usePlaintext()