From 377437fb4ce197133d3138acf286a72b75a85991 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
<55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 16 Sep 2024 20:32:23 +0000
Subject: [PATCH 1/6] chore(main): release 2.44.1-SNAPSHOT (#2340)
:robot: I have created a release *beep* *boop*
---
### Updating meta-information for bleeding-edge SNAPSHOT release.
---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
---
google-cloud-bigtable-bom/pom.xml | 16 ++++++++--------
google-cloud-bigtable-deps-bom/pom.xml | 2 +-
google-cloud-bigtable-emulator-core/pom.xml | 4 ++--
google-cloud-bigtable-emulator/pom.xml | 10 +++++-----
google-cloud-bigtable/pom.xml | 10 +++++-----
.../java/com/google/cloud/bigtable/Version.java | 2 +-
grpc-google-cloud-bigtable-admin-v2/pom.xml | 8 ++++----
grpc-google-cloud-bigtable-v2/pom.xml | 8 ++++----
pom.xml | 12 ++++++------
proto-google-cloud-bigtable-admin-v2/pom.xml | 8 ++++----
proto-google-cloud-bigtable-v2/pom.xml | 8 ++++----
samples/snapshot/pom.xml | 2 +-
test-proxy/pom.xml | 4 ++--
versions.txt | 14 +++++++-------
14 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/google-cloud-bigtable-bom/pom.xml b/google-cloud-bigtable-bom/pom.xml
index 683f2fe57974..b068f996eece 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
- 2.44.0
+ 2.44.1-SNAPSHOT
pom
com.google.cloud
@@ -63,37 +63,37 @@
com.google.cloud
google-cloud-bigtable
- 2.44.0
+ 2.44.1-SNAPSHOT
com.google.cloud
google-cloud-bigtable-emulator
- 0.181.0
+ 0.181.1-SNAPSHOT
com.google.cloud
google-cloud-bigtable-emulator-core
- 0.181.0
+ 0.181.1-SNAPSHOT
com.google.api.grpc
grpc-google-cloud-bigtable-admin-v2
- 2.44.0
+ 2.44.1-SNAPSHOT
com.google.api.grpc
grpc-google-cloud-bigtable-v2
- 2.44.0
+ 2.44.1-SNAPSHOT
com.google.api.grpc
proto-google-cloud-bigtable-admin-v2
- 2.44.0
+ 2.44.1-SNAPSHOT
com.google.api.grpc
proto-google-cloud-bigtable-v2
- 2.44.0
+ 2.44.1-SNAPSHOT
diff --git a/google-cloud-bigtable-deps-bom/pom.xml b/google-cloud-bigtable-deps-bom/pom.xml
index 69fa8f2af4ab..d72b98beb4b2 100644
--- a/google-cloud-bigtable-deps-bom/pom.xml
+++ b/google-cloud-bigtable-deps-bom/pom.xml
@@ -13,7 +13,7 @@
com.google.cloud
google-cloud-bigtable-deps-bom
- 2.44.0
+ 2.44.1-SNAPSHOT
pom
diff --git a/google-cloud-bigtable-emulator-core/pom.xml b/google-cloud-bigtable-emulator-core/pom.xml
index 5b6c26e38384..87a9a255e658 100644
--- a/google-cloud-bigtable-emulator-core/pom.xml
+++ b/google-cloud-bigtable-emulator-core/pom.xml
@@ -7,11 +7,11 @@
google-cloud-bigtable-parent
com.google.cloud
- 2.44.0
+ 2.44.1-SNAPSHOT
google-cloud-bigtable-emulator-core
- 0.181.0
+ 0.181.1-SNAPSHOT
A Java wrapper for the Cloud Bigtable emulator.
diff --git a/google-cloud-bigtable-emulator/pom.xml b/google-cloud-bigtable-emulator/pom.xml
index 7e18c4bab02c..5e5002b34a71 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.181.0
+ 0.181.1-SNAPSHOT
Google Cloud Java - Bigtable Emulator
https://github.com/googleapis/java-bigtable
@@ -14,7 +14,7 @@
com.google.cloud
google-cloud-bigtable-parent
- 2.44.0
+ 2.44.1-SNAPSHOT
scm:git:git@github.com:googleapis/java-bigtable.git
@@ -81,14 +81,14 @@
com.google.cloud
google-cloud-bigtable-deps-bom
- 2.44.0
+ 2.44.1-SNAPSHOT
pom
import
com.google.cloud
google-cloud-bigtable-bom
- 2.44.0
+ 2.44.1-SNAPSHOT
pom
import
@@ -99,7 +99,7 @@
com.google.cloud
google-cloud-bigtable-emulator-core
- 0.181.0
+ 0.181.1-SNAPSHOT
diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml
index d17c3631aaa7..0eb9fcce2963 100644
--- a/google-cloud-bigtable/pom.xml
+++ b/google-cloud-bigtable/pom.xml
@@ -2,7 +2,7 @@
4.0.0
google-cloud-bigtable
- 2.44.0
+ 2.44.1-SNAPSHOT
jar
Google Cloud Bigtable
https://github.com/googleapis/java-bigtable
@@ -12,11 +12,11 @@
com.google.cloud
google-cloud-bigtable-parent
- 2.44.0
+ 2.44.1-SNAPSHOT
- 2.44.0
+ 2.44.1-SNAPSHOT
google-cloud-bigtable
@@ -52,14 +52,14 @@
com.google.cloud
google-cloud-bigtable-deps-bom
- 2.44.0
+ 2.44.1-SNAPSHOT
pom
import
com.google.cloud
google-cloud-bigtable-bom
- 2.44.0
+ 2.44.1-SNAPSHOT
pom
import
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java
index 1c5d1f5c218e..8f3b4eec9fbf 100644
--- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java
+++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java
@@ -20,6 +20,6 @@
@InternalApi("For internal use only")
public final class Version {
// {x-version-update-start:google-cloud-bigtable:current}
- public static String VERSION = "2.44.0";
+ public static String VERSION = "2.44.1-SNAPSHOT";
// {x-version-update-end}
}
diff --git a/grpc-google-cloud-bigtable-admin-v2/pom.xml b/grpc-google-cloud-bigtable-admin-v2/pom.xml
index 1f3179f1ef63..29c04e90720d 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
- 2.44.0
+ 2.44.1-SNAPSHOT
grpc-google-cloud-bigtable-admin-v2
GRPC library for grpc-google-cloud-bigtable-admin-v2
com.google.cloud
google-cloud-bigtable-parent
- 2.44.0
+ 2.44.1-SNAPSHOT
@@ -18,14 +18,14 @@
com.google.cloud
google-cloud-bigtable-deps-bom
- 2.44.0
+ 2.44.1-SNAPSHOT
pom
import
com.google.cloud
google-cloud-bigtable-bom
- 2.44.0
+ 2.44.1-SNAPSHOT
pom
import
diff --git a/grpc-google-cloud-bigtable-v2/pom.xml b/grpc-google-cloud-bigtable-v2/pom.xml
index e7d0fadc33ab..80447fc8394d 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
- 2.44.0
+ 2.44.1-SNAPSHOT
grpc-google-cloud-bigtable-v2
GRPC library for grpc-google-cloud-bigtable-v2
com.google.cloud
google-cloud-bigtable-parent
- 2.44.0
+ 2.44.1-SNAPSHOT
@@ -18,14 +18,14 @@
com.google.cloud
google-cloud-bigtable-deps-bom
- 2.44.0
+ 2.44.1-SNAPSHOT
pom
import
com.google.cloud
google-cloud-bigtable-bom
- 2.44.0
+ 2.44.1-SNAPSHOT
pom
import
diff --git a/pom.xml b/pom.xml
index b2d0bc42b75e..bd088e458792 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
google-cloud-bigtable-parent
pom
- 2.44.0
+ 2.44.1-SNAPSHOT
Google Cloud Bigtable Parent
https://github.com/googleapis/java-bigtable
@@ -153,27 +153,27 @@
com.google.api.grpc
proto-google-cloud-bigtable-v2
- 2.44.0
+ 2.44.1-SNAPSHOT
com.google.api.grpc
proto-google-cloud-bigtable-admin-v2
- 2.44.0
+ 2.44.1-SNAPSHOT
com.google.api.grpc
grpc-google-cloud-bigtable-v2
- 2.44.0
+ 2.44.1-SNAPSHOT
com.google.api.grpc
grpc-google-cloud-bigtable-admin-v2
- 2.44.0
+ 2.44.1-SNAPSHOT
com.google.cloud
google-cloud-bigtable
- 2.44.0
+ 2.44.1-SNAPSHOT
diff --git a/proto-google-cloud-bigtable-admin-v2/pom.xml b/proto-google-cloud-bigtable-admin-v2/pom.xml
index 09f3cfa3ed4c..475907493e21 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
- 2.44.0
+ 2.44.1-SNAPSHOT
proto-google-cloud-bigtable-admin-v2
PROTO library for proto-google-cloud-bigtable-admin-v2
com.google.cloud
google-cloud-bigtable-parent
- 2.44.0
+ 2.44.1-SNAPSHOT
@@ -18,14 +18,14 @@
com.google.cloud
google-cloud-bigtable-deps-bom
- 2.44.0
+ 2.44.1-SNAPSHOT
pom
import
com.google.cloud
google-cloud-bigtable-bom
- 2.44.0
+ 2.44.1-SNAPSHOT
pom
import
diff --git a/proto-google-cloud-bigtable-v2/pom.xml b/proto-google-cloud-bigtable-v2/pom.xml
index 12c94d469bd8..603dc7ac8ab5 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
- 2.44.0
+ 2.44.1-SNAPSHOT
proto-google-cloud-bigtable-v2
PROTO library for proto-google-cloud-bigtable-v2
com.google.cloud
google-cloud-bigtable-parent
- 2.44.0
+ 2.44.1-SNAPSHOT
@@ -18,14 +18,14 @@
com.google.cloud
google-cloud-bigtable-deps-bom
- 2.44.0
+ 2.44.1-SNAPSHOT
pom
import
com.google.cloud
google-cloud-bigtable-bom
- 2.44.0
+ 2.44.1-SNAPSHOT
pom
import
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index e7c437ef9f24..4d7bce0f86ef 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
com.google.cloud
google-cloud-bigtable
- 2.44.0
+ 2.44.1-SNAPSHOT
diff --git a/test-proxy/pom.xml b/test-proxy/pom.xml
index 6c3bde4f5bc2..1f7d37ffebc7 100644
--- a/test-proxy/pom.xml
+++ b/test-proxy/pom.xml
@@ -12,11 +12,11 @@
google-cloud-bigtable-parent
com.google.cloud
- 2.44.0
+ 2.44.1-SNAPSHOT
- 2.44.0
+ 2.44.1-SNAPSHOT
diff --git a/versions.txt b/versions.txt
index 06b16b8fde35..ba847f941ebc 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
# Format:
# module:released-version:current-version
-google-cloud-bigtable:2.44.0:2.44.0
-grpc-google-cloud-bigtable-admin-v2:2.44.0:2.44.0
-grpc-google-cloud-bigtable-v2:2.44.0:2.44.0
-proto-google-cloud-bigtable-admin-v2:2.44.0:2.44.0
-proto-google-cloud-bigtable-v2:2.44.0:2.44.0
-google-cloud-bigtable-emulator:0.181.0:0.181.0
-google-cloud-bigtable-emulator-core:0.181.0:0.181.0
+google-cloud-bigtable:2.44.0:2.44.1-SNAPSHOT
+grpc-google-cloud-bigtable-admin-v2:2.44.0:2.44.1-SNAPSHOT
+grpc-google-cloud-bigtable-v2:2.44.0:2.44.1-SNAPSHOT
+proto-google-cloud-bigtable-admin-v2:2.44.0:2.44.1-SNAPSHOT
+proto-google-cloud-bigtable-v2:2.44.0:2.44.1-SNAPSHOT
+google-cloud-bigtable-emulator:0.181.0:0.181.1-SNAPSHOT
+google-cloud-bigtable-emulator-core:0.181.0:0.181.1-SNAPSHOT
From 0330d77ac29d47e8610ddd23c324a55d1f9912cb Mon Sep 17 00:00:00 2001
From: Mattie Fu
Date: Tue, 24 Sep 2024 08:14:22 -0400
Subject: [PATCH 2/6] fix: add RetryCallable to the callable chain (#2348)
* fix: add StreamingAttemptCallable to the callable chain
* add a test
* add a comment
---
.../data/v2/stub/EnhancedBigtableStub.java | 18 ++++--
.../v2/stub/sql/ExecuteQueryCallableTest.java | 63 +++++++++++++++++++
2 files changed, 76 insertions(+), 5 deletions(-)
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java
index d0022a1a46e9..9694384e2fa8 100644
--- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java
+++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java
@@ -1335,9 +1335,8 @@ public Map extract(ExecuteQueryRequest executeQueryRequest) {
ServerStreamingCallable withStatsHeaders =
new StatsHeadersServerStreamingCallable<>(base);
- ServerStreamingCallSettings innerSettings =
+ ServerStreamingCallSettings watchdogSettings =
ServerStreamingCallSettings.newBuilder()
- // TODO resumption strategy and retry settings
.setIdleTimeout(settings.executeQuerySettings().getIdleTimeout())
.setWaitTimeout(settings.executeQuerySettings().getWaitTimeout())
.build();
@@ -1345,7 +1344,7 @@ public Map extract(ExecuteQueryRequest executeQueryRequest) {
// Watchdog needs to stay above the metadata observer so that watchdog errors
// are passed through to the metadata future.
ServerStreamingCallable watched =
- Callables.watched(withStatsHeaders, innerSettings, clientContext);
+ Callables.watched(withStatsHeaders, watchdogSettings, clientContext);
ServerStreamingCallable withMetadataObserver =
new MetadataResolvingCallable(watched);
@@ -1356,10 +1355,19 @@ public Map extract(ExecuteQueryRequest executeQueryRequest) {
ServerStreamingCallable withBigtableTracer =
new BigtableTracerStreamingCallable<>(merging);
+ ServerStreamingCallSettings retrySettings =
+ ServerStreamingCallSettings.newBuilder()
+ // TODO resumption strategy and retry settings
+ .build();
+
+ // Adding RetryingCallable to the callable chain so that client side metrics can be
+ // measured correctly. Retries are currently disabled.
+ ServerStreamingCallable retries =
+ withRetries(withBigtableTracer, retrySettings);
+
SpanName span = getSpanName("ExecuteQuery");
ServerStreamingCallable traced =
- new TracedServerStreamingCallable<>(
- withBigtableTracer, clientContext.getTracerFactory(), span);
+ new TracedServerStreamingCallable<>(retries, clientContext.getTracerFactory(), span);
return new ExecuteQueryCallable(
traced.withDefaultCallContext(clientContext.getDefaultCallContext()), requestContext);
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/sql/ExecuteQueryCallableTest.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/sql/ExecuteQueryCallableTest.java
index 9788e5d55d88..38eb70cf1346 100644
--- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/sql/ExecuteQueryCallableTest.java
+++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/sql/ExecuteQueryCallableTest.java
@@ -20,15 +20,30 @@
import static com.google.cloud.bigtable.data.v2.stub.sql.SqlProtoFactory.stringType;
import static com.google.cloud.bigtable.data.v2.stub.sql.SqlProtoFactory.stringValue;
import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertThrows;
+import com.google.api.gax.rpc.UnavailableException;
+import com.google.bigtable.v2.BigtableGrpc;
+import com.google.bigtable.v2.ExecuteQueryRequest;
+import com.google.bigtable.v2.ExecuteQueryResponse;
+import com.google.cloud.bigtable.data.v2.BigtableDataSettings;
+import com.google.cloud.bigtable.data.v2.FakeServiceBuilder;
import com.google.cloud.bigtable.data.v2.internal.ProtoResultSetMetadata;
import com.google.cloud.bigtable.data.v2.internal.ProtoSqlRow;
import com.google.cloud.bigtable.data.v2.internal.RequestContext;
import com.google.cloud.bigtable.data.v2.internal.SqlRow;
import com.google.cloud.bigtable.data.v2.models.sql.Statement;
+import com.google.cloud.bigtable.data.v2.stub.EnhancedBigtableStub;
import com.google.cloud.bigtable.gaxx.testing.FakeStreamingApi.ServerStreamingStashCallable;
+import io.grpc.Server;
+import io.grpc.Status;
+import io.grpc.StatusRuntimeException;
+import io.grpc.stub.StreamObserver;
+import java.io.IOException;
import java.util.Collections;
import java.util.Iterator;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -39,6 +54,29 @@ public class ExecuteQueryCallableTest {
private static final RequestContext REQUEST_CONTEXT =
RequestContext.create("fake-project", "fake-instance", "fake-profile");
+ private Server server;
+ private FakeService fakeService = new FakeService();
+ private EnhancedBigtableStub stub;
+
+ @Before
+ public void setup() throws IOException {
+ server = FakeServiceBuilder.create(fakeService).start();
+
+ BigtableDataSettings settings =
+ BigtableDataSettings.newBuilderForEmulator(server.getPort())
+ .setProjectId("fake-project")
+ .setInstanceId("fake-instance")
+ .build();
+
+ stub = EnhancedBigtableStub.create(settings.getStubSettings());
+ }
+
+ @After
+ public void tearDown() {
+ stub.close();
+ server.shutdown();
+ }
+
@Test
public void testCallContextAndServerStreamSetup() {
SqlRow row =
@@ -57,4 +95,29 @@ public void testCallContextAndServerStreamSetup() {
assertThat(responseIterator.next()).isEqualTo(row);
assertThat(responseIterator.hasNext()).isFalse();
}
+
+ @Test
+ public void testExecuteQueryRequestsAreNotRetried() {
+ // TODO: retries for execute query is currently disabled. This test should be
+ // updated once resumption token is in place.
+ SqlServerStream stream = stub.executeQueryCallable().call(Statement.of("SELECT * FROM table"));
+
+ Iterator iterator = stream.rows().iterator();
+
+ assertThrows(UnavailableException.class, iterator::next).getCause();
+ assertThat(fakeService.attempts).isEqualTo(1);
+ }
+
+ private static class FakeService extends BigtableGrpc.BigtableImplBase {
+
+ private int attempts = 0;
+
+ @Override
+ public void executeQuery(
+ ExecuteQueryRequest request, StreamObserver responseObserver) {
+ attempts++;
+ responseObserver.onNext(metadata(columnMetadata("test", stringType())));
+ responseObserver.onError(new StatusRuntimeException(Status.UNAVAILABLE));
+ }
+ }
}
From 6bc98202897cebe09be8a4a78316cf5463106866 Mon Sep 17 00:00:00 2001
From: Jack Dingilian
Date: Wed, 25 Sep 2024 17:53:29 -0400
Subject: [PATCH 3/6] fix: pass deadline through ExecuteQuery RetrySettings
(#2355)
Change-Id: I47fbb6761205c8ab34ecfa490954c56cf01b5288
---
.../data/v2/stub/EnhancedBigtableStub.java | 14 +++-
.../v2/stub/sql/ExecuteQueryCallableTest.java | 67 +++++++++++++++++++
2 files changed, 79 insertions(+), 2 deletions(-)
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java
index 9694384e2fa8..17aa382f96c6 100644
--- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java
+++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java
@@ -1357,11 +1357,21 @@ public Map extract(ExecuteQueryRequest executeQueryRequest) {
ServerStreamingCallSettings retrySettings =
ServerStreamingCallSettings.newBuilder()
- // TODO resumption strategy and retry settings
+ // TODO add resumption strategy and pass through retry settings unchanged
+ // we pass through retry settings to use the deadlines now but don't
+ // support retries
+ .setRetrySettings(
+ settings
+ .executeQuerySettings()
+ .getRetrySettings()
+ .toBuilder()
+ // override maxAttempts as a safeguard against changes from user
+ .setMaxAttempts(1)
+ .build())
.build();
// Adding RetryingCallable to the callable chain so that client side metrics can be
- // measured correctly. Retries are currently disabled.
+ // measured correctly and deadlines are set. Retries are currently disabled.
ServerStreamingCallable retries =
withRetries(withBigtableTracer, retrySettings);
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/sql/ExecuteQueryCallableTest.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/sql/ExecuteQueryCallableTest.java
index 38eb70cf1346..14275d3cd80f 100644
--- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/sql/ExecuteQueryCallableTest.java
+++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/sql/ExecuteQueryCallableTest.java
@@ -22,6 +22,7 @@
import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.assertThrows;
+import com.google.api.gax.retrying.RetrySettings;
import com.google.api.gax.rpc.UnavailableException;
import com.google.bigtable.v2.BigtableGrpc;
import com.google.bigtable.v2.ExecuteQueryRequest;
@@ -35,6 +36,9 @@
import com.google.cloud.bigtable.data.v2.models.sql.Statement;
import com.google.cloud.bigtable.data.v2.stub.EnhancedBigtableStub;
import com.google.cloud.bigtable.gaxx.testing.FakeStreamingApi.ServerStreamingStashCallable;
+import com.google.common.collect.Range;
+import io.grpc.Context;
+import io.grpc.Deadline;
import io.grpc.Server;
import io.grpc.Status;
import io.grpc.StatusRuntimeException;
@@ -42,11 +46,13 @@
import java.io.IOException;
import java.util.Collections;
import java.util.Iterator;
+import java.util.concurrent.TimeUnit;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
+import org.threeten.bp.Duration;
@RunWith(JUnit4.class)
public class ExecuteQueryCallableTest {
@@ -108,13 +114,74 @@ public void testExecuteQueryRequestsAreNotRetried() {
assertThat(fakeService.attempts).isEqualTo(1);
}
+ @Test
+ public void testExecuteQueryRequestsIgnoreOverriddenMaxAttempts() throws IOException {
+ BigtableDataSettings.Builder overrideSettings =
+ BigtableDataSettings.newBuilderForEmulator(server.getPort())
+ .setProjectId("fake-project")
+ .setInstanceId("fake-instance");
+ overrideSettings
+ .stubSettings()
+ .executeQuerySettings()
+ .setRetrySettings(RetrySettings.newBuilder().setMaxAttempts(10).build());
+ EnhancedBigtableStub overrideStub =
+ EnhancedBigtableStub.create(overrideSettings.build().getStubSettings());
+ SqlServerStream stream =
+ overrideStub.executeQueryCallable().call(Statement.of("SELECT * FROM table"));
+
+ Iterator iterator = stream.rows().iterator();
+
+ assertThrows(UnavailableException.class, iterator::next).getCause();
+ assertThat(fakeService.attempts).isEqualTo(1);
+ }
+
+ @Test
+ public void testExecuteQueryRequestsSetDefaultDeadline() {
+ SqlServerStream stream = stub.executeQueryCallable().call(Statement.of("SELECT * FROM table"));
+ Iterator iterator = stream.rows().iterator();
+ // We don't care about this but are reusing the fake service that tests retries
+ assertThrows(UnavailableException.class, iterator::next).getCause();
+ // We have 30s default, we assume less than 1s has been burned when the fake service sets it
+ assertThat(fakeService.deadlineMillisRemaining).isIn(Range.closed(29000L, 30100L));
+ }
+
+ @Test
+ public void testExecuteQueryRequestsRespectOverridenDeadline() throws IOException {
+ BigtableDataSettings.Builder overrideSettings =
+ BigtableDataSettings.newBuilderForEmulator(server.getPort())
+ .setProjectId("fake-project")
+ .setInstanceId("fake-instance");
+ overrideSettings
+ .stubSettings()
+ .executeQuerySettings()
+ .setRetrySettings(
+ RetrySettings.newBuilder()
+ .setInitialRpcTimeout(Duration.ofMinutes(5))
+ .setMaxRpcTimeout(Duration.ofMinutes(5))
+ .build());
+ EnhancedBigtableStub overrideDeadline =
+ EnhancedBigtableStub.create(overrideSettings.build().getStubSettings());
+ SqlServerStream streamOverride =
+ overrideDeadline.executeQueryCallable().call(Statement.of("SELECT * FROM table"));
+ Iterator overrideIterator = streamOverride.rows().iterator();
+ // We don't care about this but are reusing the fake service that tests retries
+ assertThrows(UnavailableException.class, overrideIterator::next).getCause();
+ // We have 30s default, we assume less than 1s has been burned when the fake service sets it
+ assertThat(fakeService.deadlineMillisRemaining).isIn(Range.closed(299000L, 300100L));
+ }
+
private static class FakeService extends BigtableGrpc.BigtableImplBase {
private int attempts = 0;
+ private long deadlineMillisRemaining;
@Override
public void executeQuery(
ExecuteQueryRequest request, StreamObserver responseObserver) {
+ Deadline deadline = Context.current().getDeadline();
+ if (deadline != null) {
+ deadlineMillisRemaining = deadline.timeRemaining(TimeUnit.MILLISECONDS);
+ }
attempts++;
responseObserver.onNext(metadata(columnMetadata("test", stringType())));
responseObserver.onError(new StatusRuntimeException(Status.UNAVAILABLE));
From b474173a778cba273d2713e667000c5633de75bd Mon Sep 17 00:00:00 2001
From: Jack Dingilian
Date: Thu, 26 Sep 2024 15:27:41 -0400
Subject: [PATCH 4/6] fix: time based flakiness in execute query deadline test
(#2358)
Change-Id: I93c1c03a0c41c92dbe65b5ec4888e7df526ad457
---
.../v2/stub/sql/ExecuteQueryCallableTest.java | 26 ++++++++++++-------
1 file changed, 17 insertions(+), 9 deletions(-)
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/sql/ExecuteQueryCallableTest.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/sql/ExecuteQueryCallableTest.java
index 14275d3cd80f..deedfbaba136 100644
--- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/sql/ExecuteQueryCallableTest.java
+++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/sql/ExecuteQueryCallableTest.java
@@ -23,6 +23,7 @@
import static org.junit.Assert.assertThrows;
import com.google.api.gax.retrying.RetrySettings;
+import com.google.api.gax.rpc.DeadlineExceededException;
import com.google.api.gax.rpc.UnavailableException;
import com.google.bigtable.v2.BigtableGrpc;
import com.google.bigtable.v2.ExecuteQueryRequest;
@@ -36,7 +37,6 @@
import com.google.cloud.bigtable.data.v2.models.sql.Statement;
import com.google.cloud.bigtable.data.v2.stub.EnhancedBigtableStub;
import com.google.cloud.bigtable.gaxx.testing.FakeStreamingApi.ServerStreamingStashCallable;
-import com.google.common.collect.Range;
import io.grpc.Context;
import io.grpc.Deadline;
import io.grpc.Server;
@@ -141,12 +141,13 @@ public void testExecuteQueryRequestsSetDefaultDeadline() {
Iterator iterator = stream.rows().iterator();
// We don't care about this but are reusing the fake service that tests retries
assertThrows(UnavailableException.class, iterator::next).getCause();
- // We have 30s default, we assume less than 1s has been burned when the fake service sets it
- assertThat(fakeService.deadlineMillisRemaining).isIn(Range.closed(29000L, 30100L));
+ // We have 30s default, we give it a wide range to avoid flakiness, this is mostly just checking
+ // that some default is set
+ assertThat(fakeService.deadlineMillisRemaining).isLessThan(30001L);
}
@Test
- public void testExecuteQueryRequestsRespectOverridenDeadline() throws IOException {
+ public void testExecuteQueryRequestsRespectDeadline() throws IOException {
BigtableDataSettings.Builder overrideSettings =
BigtableDataSettings.newBuilderForEmulator(server.getPort())
.setProjectId("fake-project")
@@ -156,8 +157,8 @@ public void testExecuteQueryRequestsRespectOverridenDeadline() throws IOExceptio
.executeQuerySettings()
.setRetrySettings(
RetrySettings.newBuilder()
- .setInitialRpcTimeout(Duration.ofMinutes(5))
- .setMaxRpcTimeout(Duration.ofMinutes(5))
+ .setInitialRpcTimeout(Duration.ofMillis(10))
+ .setMaxRpcTimeout(Duration.ofMillis(10))
.build());
EnhancedBigtableStub overrideDeadline =
EnhancedBigtableStub.create(overrideSettings.build().getStubSettings());
@@ -165,9 +166,7 @@ public void testExecuteQueryRequestsRespectOverridenDeadline() throws IOExceptio
overrideDeadline.executeQueryCallable().call(Statement.of("SELECT * FROM table"));
Iterator overrideIterator = streamOverride.rows().iterator();
// We don't care about this but are reusing the fake service that tests retries
- assertThrows(UnavailableException.class, overrideIterator::next).getCause();
- // We have 30s default, we assume less than 1s has been burned when the fake service sets it
- assertThat(fakeService.deadlineMillisRemaining).isIn(Range.closed(299000L, 300100L));
+ assertThrows(DeadlineExceededException.class, overrideIterator::next).getCause();
}
private static class FakeService extends BigtableGrpc.BigtableImplBase {
@@ -181,6 +180,15 @@ public void executeQuery(
Deadline deadline = Context.current().getDeadline();
if (deadline != null) {
deadlineMillisRemaining = deadline.timeRemaining(TimeUnit.MILLISECONDS);
+ } else {
+ // set to max long when deadline isn't set
+ deadlineMillisRemaining = Long.MAX_VALUE;
+ }
+ // Sleep for 100ms to trigger deadline exceeded for tests with a shorter deadline
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
}
attempts++;
responseObserver.onNext(metadata(columnMetadata("test", stringType())));
From 40c428ec8e8cccb4dc3bb10d6674c94e9527e797 Mon Sep 17 00:00:00 2001
From: Mend Renovate
Date: Fri, 27 Sep 2024 00:11:31 +0200
Subject: [PATCH 5/6] deps: update dependency
com.google.cloud:sdk-platform-java-config to v3.36.1 (#2351)
---
.github/workflows/unmanaged_dependency_check.yaml | 2 +-
.kokoro/presubmit/graalvm-native-17.cfg | 2 +-
.kokoro/presubmit/graalvm-native.cfg | 2 +-
google-cloud-bigtable-bom/pom.xml | 2 +-
google-cloud-bigtable-deps-bom/pom.xml | 2 +-
pom.xml | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index ed4dc1af8b84..276675e75b14 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
shell: bash
run: .kokoro/build.sh
- name: Unmanaged dependency check
- uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.35.0
+ uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.36.1
with:
bom-path: google-cloud-bigtable-bom/pom.xml
diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index 564ee3184a59..b448b1374d22 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
- value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.35.0"
+ value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.36.1"
}
env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index 2ac3804d3e89..1df13c4bd6ae 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
- value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.35.0"
+ value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.36.1"
}
env_vars: {
diff --git a/google-cloud-bigtable-bom/pom.xml b/google-cloud-bigtable-bom/pom.xml
index b068f996eece..e6b9a690651f 100644
--- a/google-cloud-bigtable-bom/pom.xml
+++ b/google-cloud-bigtable-bom/pom.xml
@@ -8,7 +8,7 @@
com.google.cloud
sdk-platform-java-config
- 3.35.0
+ 3.36.1
diff --git a/google-cloud-bigtable-deps-bom/pom.xml b/google-cloud-bigtable-deps-bom/pom.xml
index d72b98beb4b2..01fceb763ba7 100644
--- a/google-cloud-bigtable-deps-bom/pom.xml
+++ b/google-cloud-bigtable-deps-bom/pom.xml
@@ -7,7 +7,7 @@
com.google.cloud
sdk-platform-java-config
- 3.35.0
+ 3.36.1
diff --git a/pom.xml b/pom.xml
index bd088e458792..12411196d363 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
com.google.cloud
sdk-platform-java-config
- 3.35.0
+ 3.36.1
From d31bcc1812da06e7b878c701cd430b69324d54f0 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
<55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 27 Sep 2024 14:28:49 -0400
Subject: [PATCH 6/6] chore(main): release 2.44.1 (#2353)
Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
CHANGELOG.md | 14 ++++++++++++++
google-cloud-bigtable-bom/pom.xml | 16 ++++++++--------
google-cloud-bigtable-deps-bom/pom.xml | 2 +-
google-cloud-bigtable-emulator-core/pom.xml | 4 ++--
google-cloud-bigtable-emulator/pom.xml | 10 +++++-----
google-cloud-bigtable/pom.xml | 10 +++++-----
.../java/com/google/cloud/bigtable/Version.java | 2 +-
grpc-google-cloud-bigtable-admin-v2/pom.xml | 8 ++++----
grpc-google-cloud-bigtable-v2/pom.xml | 8 ++++----
pom.xml | 12 ++++++------
proto-google-cloud-bigtable-admin-v2/pom.xml | 8 ++++----
proto-google-cloud-bigtable-v2/pom.xml | 8 ++++----
samples/snapshot/pom.xml | 2 +-
test-proxy/pom.xml | 4 ++--
versions.txt | 14 +++++++-------
15 files changed, 68 insertions(+), 54 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f7341fbc9c1..979e02234cc2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
# Changelog
+## [2.44.1](https://github.com/googleapis/java-bigtable/compare/v2.44.0...v2.44.1) (2024-09-26)
+
+
+### Bug Fixes
+
+* Add RetryCallable to the callable chain ([#2348](https://github.com/googleapis/java-bigtable/issues/2348)) ([0330d77](https://github.com/googleapis/java-bigtable/commit/0330d77ac29d47e8610ddd23c324a55d1f9912cb))
+* Pass deadline through ExecuteQuery RetrySettings ([#2355](https://github.com/googleapis/java-bigtable/issues/2355)) ([6bc9820](https://github.com/googleapis/java-bigtable/commit/6bc98202897cebe09be8a4a78316cf5463106866))
+* Time based flakiness in execute query deadline test ([#2358](https://github.com/googleapis/java-bigtable/issues/2358)) ([b474173](https://github.com/googleapis/java-bigtable/commit/b474173a778cba273d2713e667000c5633de75bd))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.36.1 ([#2351](https://github.com/googleapis/java-bigtable/issues/2351)) ([40c428e](https://github.com/googleapis/java-bigtable/commit/40c428ec8e8cccb4dc3bb10d6674c94e9527e797))
+
## [2.44.0](https://github.com/googleapis/java-bigtable/compare/v2.43.0...v2.44.0) (2024-09-16)
diff --git a/google-cloud-bigtable-bom/pom.xml b/google-cloud-bigtable-bom/pom.xml
index e6b9a690651f..68d695fc7e4c 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
- 2.44.1-SNAPSHOT
+ 2.44.1
pom
com.google.cloud
@@ -63,37 +63,37 @@
com.google.cloud
google-cloud-bigtable
- 2.44.1-SNAPSHOT
+ 2.44.1
com.google.cloud
google-cloud-bigtable-emulator
- 0.181.1-SNAPSHOT
+ 0.181.1
com.google.cloud
google-cloud-bigtable-emulator-core
- 0.181.1-SNAPSHOT
+ 0.181.1
com.google.api.grpc
grpc-google-cloud-bigtable-admin-v2
- 2.44.1-SNAPSHOT
+ 2.44.1
com.google.api.grpc
grpc-google-cloud-bigtable-v2
- 2.44.1-SNAPSHOT
+ 2.44.1
com.google.api.grpc
proto-google-cloud-bigtable-admin-v2
- 2.44.1-SNAPSHOT
+ 2.44.1
com.google.api.grpc
proto-google-cloud-bigtable-v2
- 2.44.1-SNAPSHOT
+ 2.44.1
diff --git a/google-cloud-bigtable-deps-bom/pom.xml b/google-cloud-bigtable-deps-bom/pom.xml
index 01fceb763ba7..602ccdcf395b 100644
--- a/google-cloud-bigtable-deps-bom/pom.xml
+++ b/google-cloud-bigtable-deps-bom/pom.xml
@@ -13,7 +13,7 @@
com.google.cloud
google-cloud-bigtable-deps-bom
- 2.44.1-SNAPSHOT
+ 2.44.1
pom
diff --git a/google-cloud-bigtable-emulator-core/pom.xml b/google-cloud-bigtable-emulator-core/pom.xml
index 87a9a255e658..fbc045c94c51 100644
--- a/google-cloud-bigtable-emulator-core/pom.xml
+++ b/google-cloud-bigtable-emulator-core/pom.xml
@@ -7,11 +7,11 @@
google-cloud-bigtable-parent
com.google.cloud
- 2.44.1-SNAPSHOT
+ 2.44.1
google-cloud-bigtable-emulator-core
- 0.181.1-SNAPSHOT
+ 0.181.1
A Java wrapper for the Cloud Bigtable emulator.
diff --git a/google-cloud-bigtable-emulator/pom.xml b/google-cloud-bigtable-emulator/pom.xml
index 5e5002b34a71..c6b4f77088dc 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.181.1-SNAPSHOT
+ 0.181.1
Google Cloud Java - Bigtable Emulator
https://github.com/googleapis/java-bigtable
@@ -14,7 +14,7 @@
com.google.cloud
google-cloud-bigtable-parent
- 2.44.1-SNAPSHOT
+ 2.44.1
scm:git:git@github.com:googleapis/java-bigtable.git
@@ -81,14 +81,14 @@
com.google.cloud
google-cloud-bigtable-deps-bom
- 2.44.1-SNAPSHOT
+ 2.44.1
pom
import
com.google.cloud
google-cloud-bigtable-bom
- 2.44.1-SNAPSHOT
+ 2.44.1
pom
import
@@ -99,7 +99,7 @@
com.google.cloud
google-cloud-bigtable-emulator-core
- 0.181.1-SNAPSHOT
+ 0.181.1
diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml
index 0eb9fcce2963..040633f4ff19 100644
--- a/google-cloud-bigtable/pom.xml
+++ b/google-cloud-bigtable/pom.xml
@@ -2,7 +2,7 @@
4.0.0
google-cloud-bigtable
- 2.44.1-SNAPSHOT
+ 2.44.1
jar
Google Cloud Bigtable
https://github.com/googleapis/java-bigtable
@@ -12,11 +12,11 @@
com.google.cloud
google-cloud-bigtable-parent
- 2.44.1-SNAPSHOT
+ 2.44.1
- 2.44.1-SNAPSHOT
+ 2.44.1
google-cloud-bigtable
@@ -52,14 +52,14 @@
com.google.cloud
google-cloud-bigtable-deps-bom
- 2.44.1-SNAPSHOT
+ 2.44.1
pom
import
com.google.cloud
google-cloud-bigtable-bom
- 2.44.1-SNAPSHOT
+ 2.44.1
pom
import
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java
index 8f3b4eec9fbf..39d49ef29625 100644
--- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java
+++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java
@@ -20,6 +20,6 @@
@InternalApi("For internal use only")
public final class Version {
// {x-version-update-start:google-cloud-bigtable:current}
- public static String VERSION = "2.44.1-SNAPSHOT";
+ public static String VERSION = "2.44.1";
// {x-version-update-end}
}
diff --git a/grpc-google-cloud-bigtable-admin-v2/pom.xml b/grpc-google-cloud-bigtable-admin-v2/pom.xml
index 29c04e90720d..e547bab0e364 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
- 2.44.1-SNAPSHOT
+ 2.44.1
grpc-google-cloud-bigtable-admin-v2
GRPC library for grpc-google-cloud-bigtable-admin-v2
com.google.cloud
google-cloud-bigtable-parent
- 2.44.1-SNAPSHOT
+ 2.44.1
@@ -18,14 +18,14 @@
com.google.cloud
google-cloud-bigtable-deps-bom
- 2.44.1-SNAPSHOT
+ 2.44.1
pom
import
com.google.cloud
google-cloud-bigtable-bom
- 2.44.1-SNAPSHOT
+ 2.44.1
pom
import
diff --git a/grpc-google-cloud-bigtable-v2/pom.xml b/grpc-google-cloud-bigtable-v2/pom.xml
index 80447fc8394d..5bdc23013c57 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
- 2.44.1-SNAPSHOT
+ 2.44.1
grpc-google-cloud-bigtable-v2
GRPC library for grpc-google-cloud-bigtable-v2
com.google.cloud
google-cloud-bigtable-parent
- 2.44.1-SNAPSHOT
+ 2.44.1
@@ -18,14 +18,14 @@
com.google.cloud
google-cloud-bigtable-deps-bom
- 2.44.1-SNAPSHOT
+ 2.44.1
pom
import
com.google.cloud
google-cloud-bigtable-bom
- 2.44.1-SNAPSHOT
+ 2.44.1
pom
import
diff --git a/pom.xml b/pom.xml
index 12411196d363..dffe573cf635 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
google-cloud-bigtable-parent
pom
- 2.44.1-SNAPSHOT
+ 2.44.1
Google Cloud Bigtable Parent
https://github.com/googleapis/java-bigtable
@@ -153,27 +153,27 @@
com.google.api.grpc
proto-google-cloud-bigtable-v2
- 2.44.1-SNAPSHOT
+ 2.44.1
com.google.api.grpc
proto-google-cloud-bigtable-admin-v2
- 2.44.1-SNAPSHOT
+ 2.44.1
com.google.api.grpc
grpc-google-cloud-bigtable-v2
- 2.44.1-SNAPSHOT
+ 2.44.1
com.google.api.grpc
grpc-google-cloud-bigtable-admin-v2
- 2.44.1-SNAPSHOT
+ 2.44.1
com.google.cloud
google-cloud-bigtable
- 2.44.1-SNAPSHOT
+ 2.44.1
diff --git a/proto-google-cloud-bigtable-admin-v2/pom.xml b/proto-google-cloud-bigtable-admin-v2/pom.xml
index 475907493e21..58278c491b59 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
- 2.44.1-SNAPSHOT
+ 2.44.1
proto-google-cloud-bigtable-admin-v2
PROTO library for proto-google-cloud-bigtable-admin-v2
com.google.cloud
google-cloud-bigtable-parent
- 2.44.1-SNAPSHOT
+ 2.44.1
@@ -18,14 +18,14 @@
com.google.cloud
google-cloud-bigtable-deps-bom
- 2.44.1-SNAPSHOT
+ 2.44.1
pom
import
com.google.cloud
google-cloud-bigtable-bom
- 2.44.1-SNAPSHOT
+ 2.44.1
pom
import
diff --git a/proto-google-cloud-bigtable-v2/pom.xml b/proto-google-cloud-bigtable-v2/pom.xml
index 603dc7ac8ab5..1fd7278b9b55 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
- 2.44.1-SNAPSHOT
+ 2.44.1
proto-google-cloud-bigtable-v2
PROTO library for proto-google-cloud-bigtable-v2
com.google.cloud
google-cloud-bigtable-parent
- 2.44.1-SNAPSHOT
+ 2.44.1
@@ -18,14 +18,14 @@
com.google.cloud
google-cloud-bigtable-deps-bom
- 2.44.1-SNAPSHOT
+ 2.44.1
pom
import
com.google.cloud
google-cloud-bigtable-bom
- 2.44.1-SNAPSHOT
+ 2.44.1
pom
import
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 4d7bce0f86ef..154d1556da0b 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
com.google.cloud
google-cloud-bigtable
- 2.44.1-SNAPSHOT
+ 2.44.1
diff --git a/test-proxy/pom.xml b/test-proxy/pom.xml
index 1f7d37ffebc7..dd9a95aa7bad 100644
--- a/test-proxy/pom.xml
+++ b/test-proxy/pom.xml
@@ -12,11 +12,11 @@
google-cloud-bigtable-parent
com.google.cloud
- 2.44.1-SNAPSHOT
+ 2.44.1
- 2.44.1-SNAPSHOT
+ 2.44.1
diff --git a/versions.txt b/versions.txt
index ba847f941ebc..c015e938e9bc 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
# Format:
# module:released-version:current-version
-google-cloud-bigtable:2.44.0:2.44.1-SNAPSHOT
-grpc-google-cloud-bigtable-admin-v2:2.44.0:2.44.1-SNAPSHOT
-grpc-google-cloud-bigtable-v2:2.44.0:2.44.1-SNAPSHOT
-proto-google-cloud-bigtable-admin-v2:2.44.0:2.44.1-SNAPSHOT
-proto-google-cloud-bigtable-v2:2.44.0:2.44.1-SNAPSHOT
-google-cloud-bigtable-emulator:0.181.0:0.181.1-SNAPSHOT
-google-cloud-bigtable-emulator-core:0.181.0:0.181.1-SNAPSHOT
+google-cloud-bigtable:2.44.1:2.44.1
+grpc-google-cloud-bigtable-admin-v2:2.44.1:2.44.1
+grpc-google-cloud-bigtable-v2:2.44.1:2.44.1
+proto-google-cloud-bigtable-admin-v2:2.44.1:2.44.1
+proto-google-cloud-bigtable-v2:2.44.1:2.44.1
+google-cloud-bigtable-emulator:0.181.1:0.181.1
+google-cloud-bigtable-emulator-core:0.181.1:0.181.1