google-cloud-pubsub 3.4.0 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2706c0520b9cd5aba014d233fddf25b3c5265cc35a30b65719ed91647a271bef
-  data.tar.gz: d6f9a3e8c9b74a08bd344582ce7c7e9b5a4bc03cebe0243ffb09ac17cdcc0afd
+  metadata.gz: ae1f8eddfa934835b8fc01e2a85606f9c93f7b353ca5b8d3ba328af3fc5e3cdc
+  data.tar.gz: 70d186ba6e4b8e8114ca6f2184d726acff47311f05906a51662227457c3ef6a1
 SHA512:
-  metadata.gz: 426ac33d83d07732c22854216b673def03cf2b5813718a5e57428546f0e5499178d6848e75473da2e71169b79d76246879663d94f1ce8415758737efe6f5817a
-  data.tar.gz: b5def0275205fa9bd13ea1f463ce50992903ba2c423817f22401675ecfc1eb55e1ef57f9e97178d83659ee40fdc1e87a21075aa4180dfed177526e487d043327
+  metadata.gz: 0d199c7bda57c229e349ceeb21d38311c6388047ba728caaf8967e7cec0076a17af6dd55b1e0cbaad88a8a81ffdeed4814c367c617a25a643986b4a929a12cfe
+  data.tar.gz: cbfc81b692b367245d4d9b94282833805ee706588d61d2277bbfcfb4fff74e8b17c4aeae246f50e7d0f26f3f07b1862be088c42e92baf8b25ec7a47eb9302b73

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Release History
 
+### 3.4.1 (2026-08-24)
+
+#### Bug Fixes
+
+* Propagate logger to v1 admin and schema clients ([#32440](https://github.com/googleapis/google-cloud-ruby/issues/32440)) ([#36298](https://github.com/googleapis/google-cloud-ruby/issues/36298)) 
+
 ### 3.4.0 (2026-07-29)
 
 #### Features

data/lib/google/cloud/pubsub/async_publisher.rb

@@ -379,7 +379,7 @@ module Google
               grpc = @service.publish topic_name,
                                       items.map(&:msg),
                                       compress: compress && batch.total_message_bytes >= compression_bytes_threshold
-              service.logger.log_batch "publish-batch", reason, "publish", items.count, items.sum(&:bytesize)
+              service.internal_logger.log_batch "publish-batch", reason, "publish", items.count, items.sum(&:bytesize)
               items.zip Array(grpc.message_ids) do |item, id|
                 @flow_controller.release item.bytesize
                 next unless item.callback

data/lib/google/cloud/pubsub/batch_publisher.rb

@@ -122,7 +122,7 @@ module Google
           grpc = service.publish topic_name,
                                  messages,
                                  compress: compress && total_message_bytes >= compression_bytes_threshold
-          service.logger.log_batch "publish-batch", reason, "publish", messages.count, @total_message_bytes
+          service.internal_logger.log_batch "publish-batch", reason, "publish", messages.count, @total_message_bytes
           to_gcloud_messages Array(grpc.message_ids)
         end
       end

data/lib/google/cloud/pubsub/internal_logger.rb

@@ -31,7 +31,7 @@ module Google
         def log level, subtag, &message_block
           return unless VALID_LOG_LEVELS.include?(level) && block_given?
           # Only log if the logger is explicitly tagged for 'pubsub'.
-          return unless @logger && @logger.progname == LOG_NAME
+          return unless @logger.respond_to?(:progname) && @logger.progname == LOG_NAME
 
           @logger.public_send(level, "#{LOG_NAME}:#{subtag}", &message_block)
         end

data/lib/google/cloud/pubsub/message_listener/inventory.rb

@@ -86,7 +86,7 @@ module Google
               extension_time = Time.new - extension
               expired, keep = @inventory.partition { |_ack_id, item| item.pulled_at < extension_time }
               @inventory = keep.to_h
-              stream.subscriber.service.logger.log_expiry expired
+              stream.subscriber.service.internal_logger.log_expiry expired
               @wait_cond.broadcast
             end
           end

data/lib/google/cloud/pubsub/message_listener/stream.rb

@@ -115,7 +115,7 @@ module Google
             synchronize do
               break if @stopped
 
-              subscriber.service.logger.log :info, "subscriber-streams" do
+              subscriber.service.internal_logger.log :info, "subscriber-streams" do
                 "stopping stream for subscription #{@subscriber.subscription_name}"
               end
               # Close the stream by pushing the sentinel value.
@@ -185,13 +185,13 @@ module Google
           end
 
           def log_info msg
-            subscriber.service.logger.log :info, "subscriber-streams" do
+            subscriber.service.internal_logger.log :info, "subscriber-streams" do
               msg
             end
           end
 
           def log_error msg
-            subscriber.service.logger.log :error, "subscriber-streams" do
+            subscriber.service.internal_logger.log :error, "subscriber-streams" do
               msg
             end
           end
@@ -289,7 +289,7 @@ module Google
             synchronize do
               # Don't allow a stream to restart if already stopped
               if @stopped
-                subscriber.service.logger.log :debug, "subscriber-streams" do
+                subscriber.service.internal_logger.log :debug, "subscriber-streams" do
                   "not filling stream for subscription #{@subscriber.subscription_name} because stream is already" \
                   " stopped"
                 end
@@ -319,7 +319,7 @@ module Google
               @stream_open = false
             end
             enum = @subscriber.service.streaming_pull @request_queue.each, options
-            subscriber.service.logger.log :info, "subscriber-streams" do
+            subscriber.service.internal_logger.log :info, "subscriber-streams" do
               "rpc: streamingPull, subscription: #{@subscriber.subscription_name}, stream opened"
             end
 
@@ -396,7 +396,7 @@ module Google
                  GRPC::ResourceExhausted, GRPC::Unauthenticated,
                  GRPC::Unavailable => e
             status_code = e.respond_to?(:code) ? e.code : e.class.name
-            subscriber.service.logger.log :error, "subscriber-streams" do
+            subscriber.service.internal_logger.log :error, "subscriber-streams" do
               "Subscriber stream for subscription #{@subscriber.subscription_name} has ended with status " \
               "#{status_code}; will be retried."
             end
@@ -404,13 +404,13 @@ module Google
             backoff_and_wait!
             retry
           rescue RestartStream
-            subscriber.service.logger.log :info, "subscriber-streams" do
+            subscriber.service.internal_logger.log :info, "subscriber-streams" do
               "Subscriber stream for subscription #{@subscriber.subscription_name} has ended; will be retried."
             end
             backoff_and_wait!
             retry
           rescue StandardError => e
-            subscriber.service.logger.log :error, "subscriber-streams" do
+            subscriber.service.internal_logger.log :error, "subscriber-streams" do
               "error on stream for subscription #{@subscriber.subscription_name}: #{e.inspect}"
             end
             @subscriber.error! e
@@ -463,12 +463,12 @@ module Google
           end
 
           def perform_callback_sync rec_msg
-            subscriber.service.logger.log :info, "callback-delivery" do
+            subscriber.service.internal_logger.log :info, "callback-delivery" do
               "message (ID #{rec_msg.message_id}, ackID #{rec_msg.ack_id}) delivery to user callbacks"
             end
             @subscriber.callback.call rec_msg unless stopped?
           rescue StandardError => e
-            subscriber.service.logger.log :info, "callback-exceptions" do
+            subscriber.service.internal_logger.log :info, "callback-exceptions" do
               "message (ID #{rec_msg.message_id}, ackID #{rec_msg.ack_id}) caused a user callback exception: " \
                 "#{e.inspect}"
             end
@@ -498,7 +498,7 @@ module Google
             return unless pause_streaming?
 
             @paused = true
-            subscriber.service.logger.log :info, "subscriber-flow-control" do
+            subscriber.service.internal_logger.log :info, "subscriber-flow-control" do
               "subscriber for #{@subscriber.subscription_name} is client-side flow control blocked"
             end
           end
@@ -519,7 +519,7 @@ module Google
               # leaving last_pong_at stale. Updating timestamp guarantees the monitor thread will not trigger an immediate
               # false-positive restart while the reader thread wakes up to drain buffered frames.
               @keepalive_monitor.record_pong!
-              subscriber.service.logger.log :info, "subscriber-flow-control" do
+              subscriber.service.internal_logger.log :info, "subscriber-flow-control" do
                 "subscriber for #{@subscriber.subscription_name} is unblocking client-side flow control"
               end
               # Signal to the background thread that we are unpaused

data/lib/google/cloud/pubsub/message_listener/timed_unary_buffer.rb

@@ -320,7 +320,9 @@ module Google
                              reason
                            end
               requests[:acknowledge].each do |req|
-                @subscriber.service.logger.log_batch "ack-batch", new_reason, "ack", req.ack_ids.length, req.to_proto.bytesize
+                @subscriber.service.internal_logger.log_batch(
+                  "ack-batch", new_reason, "ack", req.ack_ids.length, req.to_proto.bytesize
+                )
               end
             end
             requests[:modify_ack_deadline] =
@@ -329,7 +331,9 @@ module Google
                 type = mod_deadline.zero? ? "nack" : "modack"
                 new_reason = mod_ack_reqs.length > 1 ? "#{reason} and partitioned for exceeding max bytes" : reason
                 mod_ack_reqs.each do |req|
-                  @subscriber.service.logger.log_batch "ack-batch", new_reason, type, req.ack_ids.length, req.to_proto.bytesize
+                  @subscriber.service.internal_logger.log_batch(
+                    "ack-batch", new_reason, type, req.ack_ids.length, req.to_proto.bytesize
+                  )
                 end
                 mod_ack_reqs
               end.flatten

data/lib/google/cloud/pubsub/service.rb

@@ -43,7 +43,7 @@ module Google
 
         ##
         # @private The InternalLogger object.
-        attr_reader :logger
+        attr_reader :internal_logger
 
         ##
         # Creates a new Service instance.
@@ -55,6 +55,7 @@ module Google
           @client_id = SecureRandom.uuid.freeze
           @universe_domain = universe_domain || ENV["GOOGLE_CLOUD_UNIVERSE_DOMAIN"] || "googleapis.com"
           @logger = logger
+          @internal_logger = InternalLogger.new logger
         end
 
         def subscription_admin
@@ -67,6 +68,7 @@ module Google
             config.lib_name = "gccl"
             config.lib_version = Google::Cloud::PubSub::VERSION
             config.metadata = { "google-cloud-resource-prefix": "projects/#{@project}" }
+            config.logger = @logger if @logger
           end
         end
         attr_accessor :mocked_subscription_admin
@@ -81,6 +83,7 @@ module Google
             config.lib_name = "gccl"
             config.lib_version = Google::Cloud::PubSub::VERSION
             config.metadata = { "google-cloud-resource-prefix": "projects/#{@project}" }
+            config.logger = @logger if @logger
           end
         end
         attr_accessor :mocked_topic_admin
@@ -94,6 +97,7 @@ module Google
               config.lib_name = "gccl"
               config.lib_version = Google::Cloud::PubSub::VERSION
               config.metadata = { "google-cloud-resource-prefix": "projects/#{@project}" }
+              config.logger = @logger if @logger
             end
             iam
           end
@@ -110,6 +114,7 @@ module Google
             config.lib_name = "gccl"
             config.lib_version = Google::Cloud::PubSub::VERSION
             config.metadata = { "google-cloud-resource-prefix": "projects/#{@project}" }
+            config.logger = @logger if @logger
           end
         end
         attr_accessor :mocked_schemas
@@ -147,7 +152,7 @@ module Google
         ##
         # Acknowledges receipt of a message.
         def acknowledge subscription, *ack_ids
-          logger.log_ack_nack ack_ids, "ack"
+          internal_logger.log_ack_nack ack_ids, "ack"
           subscription_admin.acknowledge_internal subscription: subscription_path(subscription),
                                                   ack_ids: ack_ids
         end
@@ -156,7 +161,7 @@ module Google
         # Modifies the ack deadline for a specific message.
         def modify_ack_deadline subscription, ids, deadline
           if deadline.zero?
-            logger.log_ack_nack Array(ids), "nack"
+            internal_logger.log_ack_nack Array(ids), "nack"
           end
           subscription_admin.modify_ack_deadline_internal subscription: subscription_path(subscription),
                                                           ack_ids: Array(ids),
@@ -203,7 +208,6 @@ module Google
             rpc.timeout = timeout if rpc.respond_to? :timeout=
           end
         end
-
       end
     end
     Pubsub = PubSub unless const_defined? :Pubsub

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

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module PubSub
-      VERSION = "3.4.0".freeze
+      VERSION = "3.4.1".freeze
     end
 
     Pubsub = PubSub unless const_defined? :Pubsub

data/lib/google/cloud/pubsub.rb

@@ -122,7 +122,6 @@ module Google
         project_id = project_id.to_s # Always cast to a string
         raise ArgumentError, "project_id is missing" if project_id.empty?
 
-        logger = Google::Cloud::PubSub::InternalLogger.new logger
         service = PubSub::Service.new project_id, credentials,
                                       host: endpoint,
                                       timeout: timeout,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-pubsub
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.1
 platform: ruby
 authors:
 - Mike Moore