From c2188a9efd2e62667efcf168ebe2de9487ee2ab2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Knut=20Olav=20L=C3=B8ite?= <koloite@gmail.com>
Date: Sat, 15 Feb 2020 02:16:26 +0100
Subject: [PATCH] fix: default to PickFirstLoadBalancerProvider (#2063)

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 #2061

Co-authored-by: Les Vogel <lesv@users.noreply.github.com>
---
 spanner/cloud-client/assembly-descriptor.xml  | 27 +++++++++++++++++++
 spanner/cloud-client/pom.xml                  |  6 ++---
 .../services/io.grpc.LoadBalancerProvider     |  1 +
 3 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 spanner/cloud-client/assembly-descriptor.xml
 create mode 100644 spanner/cloud-client/src/main/resources/META-INF/services/io.grpc.LoadBalancerProvider

diff --git a/spanner/cloud-client/assembly-descriptor.xml b/spanner/cloud-client/assembly-descriptor.xml
new file mode 100644
index 00000000000..b8fcad2f187
--- /dev/null
+++ 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>
\ No newline at end of file
diff --git a/spanner/cloud-client/pom.xml b/spanner/cloud-client/pom.xml
index 2c2945a5f86..d5be1e5c931 100644
--- 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
new file mode 100644
index 00000000000..bbc367f8fc5
--- /dev/null
+++ b/spanner/cloud-client/src/main/resources/META-INF/services/io.grpc.LoadBalancerProvider
@@ -0,0 +1 @@
+io.grpc.internal.PickFirstLoadBalancerProvider