fix: default to PickFirstLoadBalancerProvider (GoogleCloudPlatform#2063)

olavloite · lesv · web-flow · commit c2188a9efd2e · 2020-02-14T17:16:26.000-08:00
The services/META-INF/io.grpc.LoadBalancerProvider file included by default in the jar with dependencies did not correspond with the default pick_first policy of AutoConfiguredLoadBalancerFactory. Fixes GoogleCloudPlatform#2061 Co-authored-by: Les Vogel <lesv@users.noreply.github.com>
diff --git a/spanner/cloud-client/assembly-descriptor.xml b/spanner/cloud-client/assembly-descriptor.xml
@@ -0,0 +1,27 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+    <id>jar-with-dependencies</id>
+    <formats>
+        <format>jar</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>/</outputDirectory>
+            <useProjectArtifact>false</useProjectArtifact>
+            <unpack>true</unpack>
+            <unpackOptions>
+                <excludes>
+                    <exclude>io.grpc.LoadBalancerProvider</exclude>
+                </excludes>
+            </unpackOptions>
+        </dependencySet>
+    </dependencySets>
+    <fileSets>
+        <fileSet>
+            <directory>${project.build.outputDirectory}</directory>
+            <outputDirectory>.</outputDirectory>
+        </fileSet>
+    </fileSets>
+</assembly>
diff --git a/spanner/cloud-client/pom.xml b/spanner/cloud-client/pom.xml
@@ -146,9 +146,9 @@ limitations under the License.
         <artifactId>maven-assembly-plugin</artifactId>
         <version>3.2.0</version>
         <configuration>
-          <descriptorRefs>
-            <descriptorRef>jar-with-dependencies</descriptorRef>
-          </descriptorRefs>
+          <descriptors>
+            <descriptor>assembly-descriptor.xml</descriptor>
+          </descriptors>
           <archive>
             <manifest>
               <mainClass>com.example.spanner.SpannerSample</mainClass>
diff --git a/spanner/cloud-client/src/main/resources/META-INF/services/io.grpc.LoadBalancerProvider b/spanner/cloud-client/src/main/resources/META-INF/services/io.grpc.LoadBalancerProvider
@@ -0,0 +1 @@
+io.grpc.internal.PickFirstLoadBalancerProvider

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+io.grpc.internal.PickFirstLoadBalancerProvider`