Titus: use shaded grpc netty

spinnaker · Mar 26, 2018 · 57faf1d · 57faf1d
1 parent d8c906c
commit 57faf1d
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 17 deletions.
diff --git a/clouddriver-titus.gradle b/clouddriver-titus.gradle
@@ -8,7 +8,7 @@ buildscript {
 
 ext {
   protobufVersion = '3.2.+'
-  grpcVersion = '1.4.+'
+  grpcVersion = '1.9.+'
 }
 
 dependencies {
@@ -17,7 +17,7 @@ dependencies {
   compile "com.google.protobuf:protobuf-java:$protobufVersion"
   compile "io.grpc:grpc-protobuf:$grpcVersion"
   compile "io.grpc:grpc-stub:$grpcVersion"
-  compile "io.grpc:grpc-netty:$grpcVersion"
+  compile "io.grpc:grpc-netty-shaded:$grpcVersion"
   compile 'netflix:eureka2-grpc-client-guice:latest.release'
   compile "netflix:metatron-ipc-common:latest.release"
   compile "netflix:netty-handler-jettyalpn:latest.release"

diff --git a/...vy/com/netflix/spinnaker/clouddriver/titus/client/RegionScopedTitusAutoscalingClient.java b/...vy/com/netflix/spinnaker/clouddriver/titus/client/RegionScopedTitusAutoscalingClient.java
@@ -25,8 +25,8 @@
 import com.netflix.spinnaker.clouddriver.titus.v3client.GrpcRetryInterceptor;
 import com.netflix.titus.grpc.protogen.*;
 import io.grpc.ManagedChannel;
-import io.grpc.netty.NegotiationType;
-import io.grpc.netty.NettyChannelBuilder;
+import io.grpc.netty.shaded.io.grpc.netty.NegotiationType;
+import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder;
 import io.grpc.util.RoundRobinLoadBalancerFactory;
 
 import java.util.List;

diff --git a/src/main/groovy/com/netflix/spinnaker/clouddriver/titus/client/RegionScopedTitusClient.java b/src/main/groovy/com/netflix/spinnaker/clouddriver/titus/client/RegionScopedTitusClient.java
@@ -23,9 +23,7 @@
 import com.netflix.spinnaker.clouddriver.helpers.OperationPoller;
 import com.netflix.spinnaker.clouddriver.titus.client.model.*;
 import com.netflix.spinnaker.clouddriver.titus.model.TitusError;
-import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
-import okhttp3.RequestBody;
 import okhttp3.logging.HttpLoggingInterceptor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...y/com/netflix/spinnaker/clouddriver/titus/client/RegionScopedTitusLoadBalancerClient.java b/...y/com/netflix/spinnaker/clouddriver/titus/client/RegionScopedTitusLoadBalancerClient.java
@@ -16,7 +16,6 @@
 
 package com.netflix.spinnaker.clouddriver.titus.client;
 
-import com.google.protobuf.Empty;
 import com.netflix.eureka2.grpc.nameresolver.Eureka2NameResolverFactory;
 import com.netflix.grpc.interceptor.spectator.SpectatorMetricsClientInterceptor;
 import com.netflix.spectator.api.Registry;
@@ -25,8 +24,8 @@
 import com.netflix.spinnaker.clouddriver.titus.v3client.GrpcRetryInterceptor;
 import com.netflix.titus.grpc.protogen.*;
 import io.grpc.ManagedChannel;
-import io.grpc.netty.NegotiationType;
-import io.grpc.netty.NettyChannelBuilder;
+import io.grpc.netty.shaded.io.grpc.netty.NegotiationType;
+import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder;
 import io.grpc.util.RoundRobinLoadBalancerFactory;
 
 import java.util.List;

diff --git a/...in/groovy/com/netflix/spinnaker/clouddriver/titus/v3client/ClientAuthenticationUtils.java b/...in/groovy/com/netflix/spinnaker/clouddriver/titus/v3client/ClientAuthenticationUtils.java
@@ -2,11 +2,12 @@
 
 import com.netflix.metatron.ipc.security.MetatronKeyManagerFactory;
 import com.netflix.metatron.ipc.security.MetatronTrustManagerFactory;
-import com.netflix.netty.jettyalpn.JettyAlpnSslContext;
+
+import com.netflix.netty.jettyalpn.ShadedJettyAlpnSslContext;
 import io.grpc.Metadata;
+import io.grpc.netty.shaded.io.netty.handler.ssl.SslContext;
 import io.grpc.stub.AbstractStub;
 import io.grpc.stub.MetadataUtils;
-import io.netty.handler.ssl.SslContext;
 
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.TrustManagerFactory;
@@ -26,7 +27,7 @@ public static SslContext newSslContext(String applicationName) {
       kmf.init(MetatronKeyManagerFactory.clientParameters());
       TrustManagerFactory tmf = new MetatronTrustManagerFactory();
       tmf.init(MetatronTrustManagerFactory.clientParameters(applicationName));
-      return new JettyAlpnSslContext(kmf, tmf, true, null);
+      return new ShadedJettyAlpnSslContext(kmf, tmf, true, null);
     } catch (InvalidAlgorithmParameterException e) {
       throw new RuntimeException(e);
     }

diff --git a/src/main/groovy/com/netflix/spinnaker/clouddriver/titus/v3client/GrpcRetryInterceptor.java b/src/main/groovy/com/netflix/spinnaker/clouddriver/titus/v3client/GrpcRetryInterceptor.java
@@ -129,8 +129,8 @@ private void maybeRetry(AttemptListener attempt) {
       }
 
       // retries all methods that start with find but nothing else
-      if (!extractSimpleMethodName(method.getFullMethodName()).startsWith("find") &&
-        !extractSimpleMethodName(method.getFullMethodName()).startsWith("get")) {
+      if (!extractSimpleMethodName(method.getFullMethodName()).startsWith("Find") &&
+        !extractSimpleMethodName(method.getFullMethodName()).startsWith("Get")) {
         AttemptListener latest = latestResponse;
         if (latest != null) {
           useResponse(latest);

diff --git a/...in/groovy/com/netflix/spinnaker/clouddriver/titus/v3client/RegionScopedV3TitusClient.java b/...in/groovy/com/netflix/spinnaker/clouddriver/titus/v3client/RegionScopedV3TitusClient.java
@@ -30,9 +30,8 @@
 import com.netflix.titus.grpc.protogen.*;
 import groovy.util.logging.Log;
 import io.grpc.ManagedChannel;
-import io.grpc.ManagedChannelBuilder;
-import io.grpc.netty.NegotiationType;
-import io.grpc.netty.NettyChannelBuilder;
+import io.grpc.netty.shaded.io.grpc.netty.NegotiationType;
+import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder;
 import io.grpc.util.RoundRobinLoadBalancerFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;