google-cloud-spanner 2.34.0 → 2.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1c4886322cdaa07eb1c80b4a50e92d7e6abda79ac5eacb959680406637aea82
-  data.tar.gz: b1c62c5fcc2ad7ab9f91e948d6c08a6831eddf0560b35e986a4ac9d7bc208976
+  metadata.gz: 7f2092db61c2ca6c7797176db72845ee4889255ed94d641d27ea8b5ac42f62b7
+  data.tar.gz: 3430361284c44739652f9ca1785a902cfccafc813e9b7833df854f0836df98c4
 SHA512:
-  metadata.gz: aa9eb6272e353e42377b18c610bb143b1f2cea9d5c94313e1748d7bc401260932e9cc8546791d86d0819843350a9e1546cd648aa6df52b2f533d8949c2659fae
-  data.tar.gz: 87a0c66ec2881cea201af2e716c08714bd5b7abeaa44d16efee8f1d25a33cda0773fff894f6075583dd6416dfe9c1233a5fccb9e6f7329734941fa997cb878f2
+  metadata.gz: 4edac28e59ec12727331f7810325de889c71154d28a3fb1dc155ec8d92f2f3b0a5a3e1168cc7a7949befd72bb13da25194107041021872778486ea8744a49c00
+  data.tar.gz: '018fba01b2d4dd8b16483a4a752c7768e8f512637973bdaf080cf7da8e14e20db8cae51ca0843de1b51dffdadfc4c0e5867bbbd94402d12cc8ecb9373416e1fa'

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Release History
 
+### 2.35.0 (2026-02-23)
+
+#### Features
+
+* propagate transaction tag correctly in all scenarios ([#219](https://github.com/googleapis/ruby-spanner/issues/219)) 
+
 ### 2.34.0 (2026-01-30)
 
 #### Features

data/lib/google/cloud/spanner/client.rb

@@ -2227,11 +2227,11 @@ module Google
             request_options, tag_type: :transaction_tag
 
           @pool.with_session do |session|
+            transaction_tag = request_options[:transaction_tag] if request_options
             tx = session.create_empty_transaction \
-              exclude_txn_from_change_streams: exclude_txn_from_change_streams, read_lock_mode: read_lock_mode
-            if request_options
-              tx.transaction_tag = request_options[:transaction_tag]
-            end
+              exclude_txn_from_change_streams: exclude_txn_from_change_streams,
+              read_lock_mode: read_lock_mode,
+              transaction_tag: transaction_tag
 
             begin
               Thread.current[IS_TRANSACTION_RUNNING_KEY] = true
@@ -2289,11 +2289,9 @@ module Google
               tx = session.create_empty_transaction(
                 exclude_txn_from_change_streams: exclude_txn_from_change_streams,
                 previous_transaction_id: previous_transaction_id,
-                read_lock_mode: read_lock_mode
+                read_lock_mode: read_lock_mode,
+                transaction_tag: transaction_tag
               )
-              if request_options
-                tx.transaction_tag = request_options[:transaction_tag]
-              end
               retry
             rescue StandardError => e
               # Rollback transaction when handling unexpected error

data/lib/google/cloud/spanner/session.rb

@@ -1488,17 +1488,24 @@ module Google
         # @param exclude_txn_from_change_streams [::Boolean] Optional. Defaults to `false`.
         #   When `exclude_txn_from_change_streams` is set to `true`, it prevents read
         #   or write transactions from being tracked in change streams.
+        # @param request_options [::Hash, nil] Optional. Common request options.
+        #   Example option: `:priority`.
         # @private
         # @return [::Google::Cloud::Spanner::Transaction]
-        def create_transaction exclude_txn_from_change_streams: false, read_lock_mode: nil
+        def create_transaction exclude_txn_from_change_streams: false, read_lock_mode: nil,
+                               request_options: nil
           route_to_leader = LARHeaders.begin_transaction true
+          request_options = Convert.to_request_options request_options, tag_type: :transaction_tag
+          transaction_tag = request_options[:transaction_tag] if request_options
           tx_grpc = service.begin_transaction path,
                                               route_to_leader: route_to_leader,
                                               exclude_txn_from_change_streams: exclude_txn_from_change_streams,
+                                              request_options: request_options,
                                               read_lock_mode: read_lock_mode
           Transaction.from_grpc \
             tx_grpc, self,
-            exclude_txn_from_change_streams: exclude_txn_from_change_streams, read_lock_mode: read_lock_mode
+            exclude_txn_from_change_streams: exclude_txn_from_change_streams, read_lock_mode: read_lock_mode,
+            transaction_tag: transaction_tag
         end
 
         # Creates a new empty transaction wrapper without a server-side object.
@@ -1512,12 +1519,15 @@ module Google
         #   An id of the previous transaction, if this new transaction wrapper is being created
         #   as a part of a retry. Previous transaction id should be added to TransactionOptions
         #   of a new ReadWrite transaction when retry is attempted.
+        # @param transaction_tag [::String, nil] Optional.
+        #   A tag used for statistics collection about this transaction.
         # @private
         # @return [::Google::Cloud::Spanner::Transaction] The new *empty-wrapper* transaction object.
         def create_empty_transaction exclude_txn_from_change_streams: false, previous_transaction_id: nil,
-                                     read_lock_mode: nil
+                                     read_lock_mode: nil, transaction_tag: nil
           Transaction.from_grpc nil, self, exclude_txn_from_change_streams: exclude_txn_from_change_streams,
-previous_transaction_id: previous_transaction_id, read_lock_mode: read_lock_mode
+                                previous_transaction_id: previous_transaction_id, read_lock_mode: read_lock_mode,
+                                transaction_tag: transaction_tag
         end
 
         # If the session is non-multiplexed, keeps the session alive by executing `"SELECT 1"`.

data/lib/google/cloud/spanner/transaction.rb

@@ -124,13 +124,17 @@ module Google
         #   An id of the previous transaction, if this new transaction wrapper is being created
         #   as a part of a retry. Previous transaction id should be added to TransactionOptions
         #   of a new ReadWrite transaction when retry is attempted.
+        # @param transaction_tag [::String, nil] Optional.
+        #   A tag used for statistics collection about this transaction.
         # @private
         # @return [::Google::Cloud::Spanner::Transaction]
-        def initialize grpc, session, exclude_txn_from_change_streams, previous_transaction_id: nil, read_lock_mode: nil
+        def initialize grpc, session, exclude_txn_from_change_streams, previous_transaction_id: nil,
+                       read_lock_mode: nil, transaction_tag: nil
           @grpc = grpc
           @session = session
           @exclude_txn_from_change_streams = exclude_txn_from_change_streams
           @read_lock_mode = read_lock_mode
+          @transaction_tag = transaction_tag
 
           # throwing away empty strings for simplicity
           unless previous_transaction_id.nil? || previous_transaction_id.empty?
@@ -1253,12 +1257,14 @@ module Google
         #   An id of the previous transaction, if this new transaction wrapper is being created
         #   as a part of a retry. Previous transaction id should be added to TransactionOptions
         #   of a new ReadWrite transaction when retry is attempted.
+        # @param transaction_tag [::String, nil] Optional.
+        #   A tag used for statistics collection about this transaction.
         # @private
         # @return [::Google::Cloud::Spanner::Transaction]
         def self.from_grpc grpc, session, exclude_txn_from_change_streams: false, previous_transaction_id: nil,
-                           read_lock_mode: nil
+                           read_lock_mode: nil, transaction_tag: nil
           new grpc, session, exclude_txn_from_change_streams, previous_transaction_id: previous_transaction_id,
-read_lock_mode: read_lock_mode
+              read_lock_mode: read_lock_mode, transaction_tag: transaction_tag
         end
 
         ##
@@ -1297,6 +1303,7 @@ read_lock_mode: read_lock_mode
             return if existing_transaction?
             ensure_session!
             route_to_leader = LARHeaders.begin_transaction true
+            request_options = build_request_options request_options
 
             # TODO: [virost@, 2025-10] fix this so it uses tx_selector
             # instead of re-creating it within `Service#begin_transaction`
@@ -1377,7 +1384,7 @@ read_lock_mode: read_lock_mode
 
         ##
         # @private Build request options. If transaction tag is set
-        #   then add into request options.
+        #   then add it to the request options.
         def build_request_options options
           options = Convert.to_request_options options, tag_type: :request_tag
 

data/lib/google/cloud/spanner/version.rb

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Spanner
-      VERSION = "2.34.0".freeze
+      VERSION = "2.35.0".freeze
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-spanner
 version: !ruby/object:Gem::Version
-  version: 2.34.0
+  version: 2.35.0
 platform: ruby
 authors:
 - Mike Moore