Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: set x-goog-api-client as internal header #293

Merged
merged 2 commits into from May 8, 2020
Merged

fix: set x-goog-api-client as internal header #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee3fd42
fix: set x-goog-api-client as internal header
kolea2 May 8, 2020
2e68125
review feedback
kolea2 May 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...le/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettings.java
View file
Open in desktop
Expand Up @@ -519,7 +519,8 @@ private Builder() {
setTransportChannelProvider(defaultTransportChannelProvider());
setStreamWatchdogCheckInterval(baseDefaults.getStreamWatchdogCheckInterval());
setStreamWatchdogProvider(baseDefaults.getStreamWatchdogProvider());
setHeaderProvider(BigtableStubSettings.defaultApiClientHeaderProviderBuilder().build());
setInternalHeaderProvider(
BigtableStubSettings.defaultApiClientHeaderProviderBuilder().build());

setTracerFactory(
new OpencensusTracerFactory(
Expand Down
12 changes: 12 additions & 0 deletions google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/HeadersTest.java
View file
Open in desktop
Expand Up @@ -18,6 +18,8 @@
import static com.google.common.truth.Truth.assertThat;

import com.google.api.gax.batching.Batcher;
import com.google.api.gax.rpc.FixedHeaderProvider;
import com.google.api.gax.rpc.HeaderProvider;
import com.google.bigtable.v2.BigtableGrpc;
import com.google.bigtable.v2.CheckAndMutateRowRequest;
import com.google.bigtable.v2.CheckAndMutateRowResponse;
Expand Down Expand Up @@ -61,11 +63,14 @@ public class HeadersTest {
private static final String TABLE_NAME =
NameUtil.formatTableName(PROJECT_ID, INSTANCE_ID, TABLE_ID);
private static final String APP_PROFILE_ID = "fake-profile";
private static final String TEST_FIXED_HEADER_STRING = "test_fixed_header";

private static final Metadata.Key<String> X_GOOG_REQUEST_PARAMS_KEY =
Metadata.Key.of("x-goog-request-params", Metadata.ASCII_STRING_MARSHALLER);
private static final Metadata.Key<String> API_CLIENT_HEADER_KEY =
Metadata.Key.of("x-goog-api-client", Metadata.ASCII_STRING_MARSHALLER);
private static final Metadata.Key<String> TEST_FIXED_HEADER =
Metadata.Key.of(TEST_FIXED_HEADER_STRING, Metadata.ASCII_STRING_MARSHALLER);

private Server server;
private BlockingQueue<Metadata> sentMetadata = new ArrayBlockingQueue<>(10);
Expand All @@ -91,9 +96,13 @@ public void setUp() throws Exception {
.setInstanceId(INSTANCE_ID)
.setAppProfileId(APP_PROFILE_ID);

HeaderProvider headerProvider =
FixedHeaderProvider.create(TEST_FIXED_HEADER_STRING, "test_header_value");

// Force immediate flush
settings
.stubSettings()
.setHeaderProvider(headerProvider)
.bulkMutateRowsSettings()
.setBatchingSettings(
settings
Expand Down Expand Up @@ -172,6 +181,9 @@ private void verifyHeaderSent() {
assertThat(apiClientValue).containsMatch("gl-java/[.\\d_]+");
assertThat(apiClientValue).containsMatch("gax/[.\\d_]+");
assertThat(apiClientValue).containsMatch("grpc/[.\\d_]+");

String fixedHeader = metadata.get(TEST_FIXED_HEADER);
assertThat(fixedHeader).isEqualTo("test_header_value");
}

private class MetadataInterceptor implements ServerInterceptor {
Expand Down