diff --git a/CHANGELOG.md b/CHANGELOG.md index eedad0dee6..8a79e36c97 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [1.12.2](https://www.github.com/googleapis/java-bigtable/compare/v1.12.1...v1.12.2) (2020-05-11) + + +### Bug Fixes + +* set x-goog-api-client as internal header ([#293](https://www.github.com/googleapis/java-bigtable/issues/293)) ([3b58a4f](https://www.github.com/googleapis/java-bigtable/commit/3b58a4fa82e7a1e003bf119ce3b8b52b6eb52e47)) + ### [1.12.1](https://www.github.com/googleapis/java-bigtable/compare/v1.12.0...v1.12.1) (2020-05-08) diff --git a/README.md b/README.md index 304c50117f..4cfbec85cd 100644 --- a/README.md +++ b/README.md @@ -16,16 +16,16 @@ If you are using Maven, add this to your pom.xml file com.google.cloud google-cloud-bigtable - 1.12.1 + 1.12.2 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-bigtable:1.12.1' +compile 'com.google.cloud:google-cloud-bigtable:1.12.2' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "1.12.1" +libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "1.12.2" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-bigtable-bom/pom.xml b/google-cloud-bigtable-bom/pom.xml index 960add0dd0..f345024f81 100644 --- a/google-cloud-bigtable-bom/pom.xml +++ b/google-cloud-bigtable-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-bigtable-bom - 1.12.1 + 1.12.2 pom com.google.cloud @@ -72,32 +72,32 @@ com.google.cloud google-cloud-bigtable - 1.12.1 + 1.12.2 com.google.cloud google-cloud-bigtable-emulator - 0.121.1 + 0.121.2 com.google.api.grpc grpc-google-cloud-bigtable-admin-v2 - 1.12.1 + 1.12.2 com.google.api.grpc grpc-google-cloud-bigtable-v2 - 1.12.1 + 1.12.2 com.google.api.grpc proto-google-cloud-bigtable-admin-v2 - 1.12.1 + 1.12.2 com.google.api.grpc proto-google-cloud-bigtable-v2 - 1.12.1 + 1.12.2 diff --git a/google-cloud-bigtable-deps-bom/pom.xml b/google-cloud-bigtable-deps-bom/pom.xml index 65b12c1566..e8a0eee81f 100644 --- a/google-cloud-bigtable-deps-bom/pom.xml +++ b/google-cloud-bigtable-deps-bom/pom.xml @@ -12,7 +12,7 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.12.1 + 1.12.2 pom diff --git a/google-cloud-bigtable-emulator/pom.xml b/google-cloud-bigtable-emulator/pom.xml index 751f6f7587..3576992f97 100644 --- a/google-cloud-bigtable-emulator/pom.xml +++ b/google-cloud-bigtable-emulator/pom.xml @@ -5,7 +5,7 @@ 4.0.0 google-cloud-bigtable-emulator - 0.121.1 + 0.121.2 Google Cloud Java - Bigtable Emulator https://github.com/googleapis/java-bigtable @@ -14,7 +14,7 @@ com.google.cloud google-cloud-bigtable-parent - 1.12.1 + 1.12.2 scm:git:git@github.com:googleapis/java-bigtable.git @@ -80,14 +80,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.12.1 + 1.12.2 pom import com.google.cloud google-cloud-bigtable-bom - 1.12.1 + 1.12.2 pom import diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index a1b4a4295d..c4c7609845 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-bigtable - 1.12.1 + 1.12.2 jar Google Cloud Bigtable https://github.com/googleapis/java-bigtable @@ -12,7 +12,7 @@ com.google.cloud google-cloud-bigtable-parent - 1.12.1 + 1.12.2 google-cloud-bigtable @@ -36,14 +36,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.12.1 + 1.12.2 pom import com.google.cloud google-cloud-bigtable-bom - 1.12.1 + 1.12.2 pom import diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettings.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettings.java index d653542ac9..ce8b4bb2b1 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettings.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettings.java @@ -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( diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/HeadersTest.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/HeadersTest.java index 32c7eb3530..c6c5740d8d 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/HeadersTest.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/HeadersTest.java @@ -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; @@ -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 X_GOOG_REQUEST_PARAMS_KEY = Metadata.Key.of("x-goog-request-params", Metadata.ASCII_STRING_MARSHALLER); private static final Metadata.Key API_CLIENT_HEADER_KEY = Metadata.Key.of("x-goog-api-client", Metadata.ASCII_STRING_MARSHALLER); + private static final Metadata.Key TEST_FIXED_HEADER = + Metadata.Key.of(TEST_FIXED_HEADER_STRING, Metadata.ASCII_STRING_MARSHALLER); private Server server; private BlockingQueue sentMetadata = new ArrayBlockingQueue<>(10); @@ -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 @@ -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 { diff --git a/grpc-google-cloud-bigtable-admin-v2/pom.xml b/grpc-google-cloud-bigtable-admin-v2/pom.xml index 858a94b1e3..c4fc2ee5d7 100644 --- a/grpc-google-cloud-bigtable-admin-v2/pom.xml +++ b/grpc-google-cloud-bigtable-admin-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-bigtable-admin-v2 - 1.12.1 + 1.12.2 grpc-google-cloud-bigtable-admin-v2 GRPC library for grpc-google-cloud-bigtable-admin-v2 com.google.cloud google-cloud-bigtable-parent - 1.12.1 + 1.12.2 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.12.1 + 1.12.2 pom import com.google.cloud google-cloud-bigtable-bom - 1.12.1 + 1.12.2 pom import diff --git a/grpc-google-cloud-bigtable-v2/pom.xml b/grpc-google-cloud-bigtable-v2/pom.xml index 048fcec584..b0bbacd3eb 100644 --- a/grpc-google-cloud-bigtable-v2/pom.xml +++ b/grpc-google-cloud-bigtable-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-bigtable-v2 - 1.12.1 + 1.12.2 grpc-google-cloud-bigtable-v2 GRPC library for grpc-google-cloud-bigtable-v2 com.google.cloud google-cloud-bigtable-parent - 1.12.1 + 1.12.2 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.12.1 + 1.12.2 pom import com.google.cloud google-cloud-bigtable-bom - 1.12.1 + 1.12.2 pom import diff --git a/pom.xml b/pom.xml index 732a3e38ad..97150db8fe 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ google-cloud-bigtable-parent pom - 1.12.1 + 1.12.2 Google Cloud Bigtable Parent https://github.com/googleapis/java-bigtable diff --git a/proto-google-cloud-bigtable-admin-v2/pom.xml b/proto-google-cloud-bigtable-admin-v2/pom.xml index 0a62738b2c..eafc3d6233 100644 --- a/proto-google-cloud-bigtable-admin-v2/pom.xml +++ b/proto-google-cloud-bigtable-admin-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-bigtable-admin-v2 - 1.12.1 + 1.12.2 proto-google-cloud-bigtable-admin-v2 PROTO library for proto-google-cloud-bigtable-admin-v2 com.google.cloud google-cloud-bigtable-parent - 1.12.1 + 1.12.2 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.12.1 + 1.12.2 pom import com.google.cloud google-cloud-bigtable-bom - 1.12.1 + 1.12.2 pom import diff --git a/proto-google-cloud-bigtable-v2/pom.xml b/proto-google-cloud-bigtable-v2/pom.xml index 40687f3814..8457275175 100644 --- a/proto-google-cloud-bigtable-v2/pom.xml +++ b/proto-google-cloud-bigtable-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-bigtable-v2 - 1.12.1 + 1.12.2 proto-google-cloud-bigtable-v2 PROTO library for proto-google-cloud-bigtable-v2 com.google.cloud google-cloud-bigtable-parent - 1.12.1 + 1.12.2 @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.12.1 + 1.12.2 pom import com.google.cloud google-cloud-bigtable-bom - 1.12.1 + 1.12.2 pom import diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index caaca75076..8ee0d9486b 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-bigtable - 1.12.1 + 1.12.2 diff --git a/versions.txt b/versions.txt index 98597f5770..05f38cf484 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-bigtable:1.12.1:1.12.1 -grpc-google-cloud-bigtable-admin-v2:1.12.1:1.12.1 -grpc-google-cloud-bigtable-v2:1.12.1:1.12.1 -proto-google-cloud-bigtable-admin-v2:1.12.1:1.12.1 -proto-google-cloud-bigtable-v2:1.12.1:1.12.1 -google-cloud-bigtable-emulator:0.121.1:0.121.1 +google-cloud-bigtable:1.12.2:1.12.2 +grpc-google-cloud-bigtable-admin-v2:1.12.2:1.12.2 +grpc-google-cloud-bigtable-v2:1.12.2:1.12.2 +proto-google-cloud-bigtable-admin-v2:1.12.2:1.12.2 +proto-google-cloud-bigtable-v2:1.12.2:1.12.2 +google-cloud-bigtable-emulator:0.121.2:0.121.2