Merge branch 'main' into main

googleapis · Mar 6, 2024 · 578e426 · 578e426
2 parents 6ac0932 + e68777c
commit 578e426
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/.release-please-manifest-individual.json b/.release-please-manifest-individual.json
@@ -10,7 +10,7 @@
   "profiler": "0.4.0",
   "pubsub": "1.36.2",
   "pubsublite": "1.8.1",
-  "spanner": "1.57.0",
+  "spanner": "1.58.0",
   "storage": "1.39.0",
   "vertexai": "0.7.1"
 }
diff --git a/pubsub/example_test.go b/pubsub/example_test.go
@@ -303,7 +303,7 @@ func ExampleSubscription_Receive() {
 		// NOTE: May be called concurrently; synchronize access to shared memory.
 		m.Ack()
 	})
-	if err != context.Canceled {
+	if err != nil && err != context.Canceled {
 		// TODO: Handle error.
 	}
 }
@@ -324,7 +324,7 @@ func ExampleSubscription_Receive_maxExtension() {
 		// TODO: Handle message.
 		m.Ack()
 	})
-	if err != context.Canceled {
+	if err != nil && err != context.Canceled {
 		// TODO: Handle error.
 	}
 }
@@ -345,7 +345,7 @@ func ExampleSubscription_Receive_maxOutstanding() {
 		// TODO: Handle message.
 		m.Ack()
 	})
-	if err != context.Canceled {
+	if err != nil && err != context.Canceled {
 		// TODO: Handle error.
 	}
 }

diff --git a/spanner/CHANGES.md b/spanner/CHANGES.md
@@ -1,5 +1,15 @@
 # Changes
 
+## [1.58.0](https://github.com/googleapis/google-cloud-go/compare/spanner/v1.57.0...spanner/v1.58.0) (2024-03-06)
+
+
+### Features
+
+* **spanner/admin/instance:** Add instance partition support to spanner instance proto ([ae1f547](https://github.com/googleapis/google-cloud-go/commit/ae1f5472bff1b476c3fd58e590ec135185446daf))
+* **spanner:** Add field for multiplexed session in spanner.proto ([a86aa8e](https://github.com/googleapis/google-cloud-go/commit/a86aa8e962b77d152ee6cdd433ad94967150ef21))
+* **spanner:** SelectAll struct spanner tag annotation match should be case-insensitive ([#9460](https://github.com/googleapis/google-cloud-go/issues/9460)) ([6cd6a73](https://github.com/googleapis/google-cloud-go/commit/6cd6a73be87a261729d3b6b45f3d28be93c3fdb3))
+* **spanner:** Update TransactionOptions to include new option exclude_txn_from_change_streams ([0195fe9](https://github.com/googleapis/google-cloud-go/commit/0195fe9292274ff9d86c71079a8e96ed2e5f9331))
+
 ## [1.57.0](https://github.com/googleapis/google-cloud-go/compare/spanner/v1.56.0...spanner/v1.57.0) (2024-02-13)
 
 

diff --git a/spanner/internal/version.go b/spanner/internal/version.go
@@ -15,4 +15,4 @@
 package internal
 
 // Version is the current tagged release of the library.
-const Version = "1.57.0"
+const Version = "1.58.0"