---

rahulKQL · sduskis · commit 26b20498db0a · 2019-02-14T18:05:27.000-05:00
yaml --- r: 21563 b: refs/heads/autosynth-container c: 228192e h: refs/heads/master i: 21561: ceede8f 21559: daf8c3e
diff --git a/[refs] b/[refs]
@@ -112,7 +112,7 @@ refs/tags/v0.65.0: 10939381ffe0b8da32db4fe3087c86e3aa7f3e55
 refs/tags/v0.66.0: ed6a3f57cbdaa20339a1995f7d7d53b172a5b8ef
 refs/tags/v0.67.0: 30b56f02092efc6f3c3667650ea8b8825003e0b7
 refs/heads/autosynth-compute: 026cea73fde22ec0b40866ac5a7dc144dc465b9b
-refs/heads/autosynth-container: e195b5f60b793a1d85f3cdc679cfb2fc58128887
+refs/heads/autosynth-container: 228192ee97d6968acbc8fe9becfed23159f80720
 refs/heads/autosynth-monitoring: 832528c131ac32b115fd7a369701d9e6e4ec62e5
 refs/heads/autosynth-pubsub: 7a327eaed5fb2a5d6c1691feb73c3e0194dd805e
 refs/heads/autosynth-video-intelligence: 53ca56e5d077bf67065b730f3fe621f40689fb4c
diff --git a/branches/autosynth-container/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java b/branches/autosynth-container/google-cloud-clients/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java
@@ -90,6 +90,7 @@ public static EnhancedBigtableStub create(EnhancedBigtableStubSettings settings)
             .setTransportChannelProvider(settings.getTransportChannelProvider())
             .setEndpoint(settings.getEndpoint())
             .setCredentialsProvider(settings.getCredentialsProvider())
+            .setHeaderProvider(settings.getHeaderProvider())
             .setStreamWatchdogProvider(settings.getStreamWatchdogProvider())
             .setStreamWatchdogCheckInterval(settings.getStreamWatchdogCheckInterval());
 
diff --git a/branches/autosynth-container/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/ResourceHeaderTest.java b/branches/autosynth-container/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/ResourceHeaderTest.java
@@ -20,6 +20,8 @@
 import com.google.api.gax.core.NoCredentialsProvider;
 import com.google.api.gax.grpc.testing.InProcessServer;
 import com.google.api.gax.grpc.testing.LocalChannelProvider;
+import com.google.api.gax.rpc.FixedHeaderProvider;
+import com.google.api.gax.rpc.HeaderProvider;
 import com.google.bigtable.v2.BigtableGrpc;
 import com.google.cloud.bigtable.data.v2.BigtableDataClient;
 import com.google.cloud.bigtable.data.v2.BigtableDataSettings;
@@ -48,6 +50,9 @@ public class ResourceHeaderTest {
   private static final Pattern EXPECTED_HEADER_PATTERN =
       Pattern.compile(".*" + NameUtil.formatTableName(PROJECT_ID, INSTANCE_ID, TABLE_ID) + ".*");
   private static final String HEADER_NAME = "x-goog-request-params";
+  private static final String TEST_HEADER_NAME = "simple-header-name";
+  private static final String TEST_HEADER_VALUE = "simple-header-value";
+  private static final Pattern TEST_PATTERN = Pattern.compile(".*" + TEST_HEADER_VALUE + ".*");
 
   private InProcessServer<?> server;
   private LocalChannelProvider channelProvider;
@@ -59,11 +64,13 @@ public void setUp() throws Exception {
     server.start();
     channelProvider = LocalChannelProvider.create(NAME);
 
+    HeaderProvider headerProvider = FixedHeaderProvider.create(TEST_HEADER_NAME, TEST_HEADER_VALUE);
     BigtableDataSettings.Builder settings =
         BigtableDataSettings.newBuilder()
             .setProjectId(PROJECT_ID)
             .setInstanceId(INSTANCE_ID)
             .setTransportChannelProvider(channelProvider)
+            .setHeaderProvider(headerProvider)
             .setCredentialsProvider(NoCredentialsProvider.create());
 
     // Force immediate flush
@@ -132,5 +139,7 @@ public void readModifyWriteTest() {
   private void verifyHeaderSent() {
     boolean headerSent = channelProvider.isHeaderSent(HEADER_NAME, EXPECTED_HEADER_PATTERN);
     assertWithMessage("Header was sent").that(headerSent).isTrue();
+    boolean testHeader = channelProvider.isHeaderSent(TEST_HEADER_NAME, TEST_PATTERN);
+    assertWithMessage("HeaderProvider's header received in Channel").that(testHeader).isTrue();
   }
 }
