fix(pubsub): clean up warnings for pubsub veneer (#32785)

* fix(pubsub): clean up warnings

* fix: logging-utils dependency back to existing

Author: viacheslav-rostovtsev

google-cloud-pubsub/Gemfile

@@ -28,6 +28,7 @@ gem "minitest-autotest", "~> 1.1"
 gem "minitest-focus", "~> 1.4"
 gem "minitest-reporters", "~> 1.7.0", require: false
 gem "minitest-rg", "~> 5.3"
+gem "ostruct", "~> 0.6"
 gem "pry", "~> 0.15.2"
 gem "rake"
 gem "redcarpet", "~> 3.6.1"

google-cloud-pubsub/lib/google/cloud/pubsub/message_listener.rb

@@ -14,7 +14,6 @@
 
 
 require "google/cloud/pubsub/service"
-require "google/cloud/pubsub/subscriber"
 require "google/cloud/pubsub/message_listener/stream"
 require "google/cloud/pubsub/message_listener/timed_unary_buffer"
 require "monitor"

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

@@ -145,9 +145,8 @@ def acknowledge *messages, &callback
             ack_ids = coerce_ack_ids messages
             return true if ack_ids.empty?
 
-            removed_items = {}
             synchronize do
-              removed_items = @inventory.remove ack_ids
+              @inventory.remove ack_ids
               @subscriber.buffer.acknowledge ack_ids, callback
             end
 
@@ -160,9 +159,8 @@ def modify_ack_deadline deadline, *messages, &callback
             mod_ack_ids = coerce_ack_ids messages
             return true if mod_ack_ids.empty?
 
-            removed_items = {}
             synchronize do
-              removed_items = @inventory.remove mod_ack_ids
+              @inventory.remove mod_ack_ids
               @subscriber.buffer.modify_ack_deadline deadline, mod_ack_ids, callback
             end
 

google-cloud-pubsub/samples/Gemfile

@@ -37,5 +37,5 @@ group :test do
   gem "rack-test"
   gem "rake"
   gem "toys-core"
-  gem "google-logging-utils", "~>0.3.0"
+  gem "google-logging-utils", "~> 0.2.0"
 end

google-cloud-pubsub/test/google/cloud/pubsub/async_publisher/batch_test.rb

@@ -368,7 +368,7 @@ def pubsub_message data, attributes, ordering_key
       ordering_key = ""
       batch = Google::Cloud::PubSub::AsyncPublisher::Batch.new fake_publisher, ordering_key
 
-      msg = pubsub_message "hello world", {}, ""
+      _msg = pubsub_message "hello world", {}, ""
 
       assert_equal false, batch.stopping?
       assert_equal true, batch.empty?
@@ -382,7 +382,7 @@ def pubsub_message data, attributes, ordering_key
       ordering_key = ""
       batch = Google::Cloud::PubSub::AsyncPublisher::Batch.new fake_publisher, ordering_key
 
-      msg = pubsub_message "hello world", {}, ""
+      _msg = pubsub_message "hello world", {}, ""
 
       assert_equal false, batch.canceled?
       assert_equal true, batch.empty?

google-cloud-pubsub/test/google/cloud/pubsub/async_publisher_test.rb

@@ -230,7 +230,7 @@
   it "publishes multiple batches when message count limit is reached" do
     # break messages up into batches of 10
     publisher = Google::Cloud::PubSub::AsyncPublisher.new topic_name, pubsub.service, max_messages: 10, interval: 10
-    messages = [
+    _messages = [
       Google::Cloud::PubSub::V1::PubsubMessage.new(data: msg_encoded1, message_id: "msg0")
     ]
     callback_count = 0
@@ -265,7 +265,7 @@
   it "publishes multiple batches when message size limit is reached" do
     # 250 is slightly bigger than 10 messages, and less than 11.
     publisher = Google::Cloud::PubSub::AsyncPublisher.new topic_name, pubsub.service, max_bytes: 250, interval: 10
-    messages = [
+    _messages = [
       Google::Cloud::PubSub::V1::PubsubMessage.new(data: msg_encoded1, message_id: "msg0")
     ]
     callback_count = 0

google-cloud-pubsub/test/google/cloud/pubsub/convert/duration_to_number_test.rb

@@ -29,7 +29,7 @@
   it "converts a negative integer" do
     duration = Google::Protobuf::Duration.new seconds: -42, nanos: 0
     number = Google::Cloud::PubSub::Convert.duration_to_number duration
-    _(number).must_equal -42
+    _(number).must_equal(-42)
   end
 
   it "converts a small number" do
@@ -41,7 +41,7 @@
   it "converts a negative small number" do
     duration = Google::Protobuf::Duration.new seconds: -1, nanos: -500000000
     number = Google::Cloud::PubSub::Convert.duration_to_number duration
-    _(number).must_equal -1.5
+    _(number).must_equal(-1.5)
   end
 
   it "converts a big number" do
@@ -53,7 +53,7 @@
   it "converts a negative big number" do
     duration = Google::Protobuf::Duration.new seconds: -643383279502884, nanos: -197169399
     number = Google::Cloud::PubSub::Convert.duration_to_number duration
-    _(number).must_equal -643383279502884.197169399
+    _(number).must_equal(-643383279502884.197169399)
   end
 
   it "converts pi" do
@@ -65,7 +65,7 @@
   it "converts a negative pi" do
     duration = Google::Protobuf::Duration.new seconds: -3, nanos: -141592654
     number = Google::Cloud::PubSub::Convert.duration_to_number duration
-    _(number).must_equal -3.141592654
+    _(number).must_equal(-3.141592654)
   end
 
   it "returns nil when given nil" do

google-cloud-pubsub/test/google/cloud/pubsub/convert/number_to_duration_test.rb

@@ -33,7 +33,7 @@
     number = -42
     duration = Google::Cloud::PubSub::Convert.number_to_duration number
     _(duration).must_be_kind_of Google::Protobuf::Duration
-    _(duration.seconds).must_equal -42
+    _(duration.seconds).must_equal(-42)
     _(duration.nanos).must_equal 0
   end
 
@@ -49,8 +49,8 @@
     number = -1.5
     duration = Google::Cloud::PubSub::Convert.number_to_duration number
     _(duration).must_be_kind_of Google::Protobuf::Duration
-    _(duration.seconds).must_equal -1
-    _(duration.nanos).must_equal -500000000
+    _(duration.seconds).must_equal(-1)
+    _(duration.nanos).must_equal(-500000000)
   end
 
   it "converts a BigDecimal" do
@@ -65,8 +65,8 @@
     number = BigDecimal "-643383279502884.1971693993751058209749445923078164062"
     duration = Google::Cloud::PubSub::Convert.number_to_duration number
     _(duration).must_be_kind_of Google::Protobuf::Duration
-    _(duration.seconds).must_equal -643383279502884
-    _(duration.nanos).must_equal -197169399
+    _(duration.seconds).must_equal(-643383279502884)
+    _(duration.nanos).must_equal(-197169399)
   end
 
   it "converts a Rational" do
@@ -81,8 +81,8 @@
     number = Rational "-3.14159265358979323846264338327950288419716939937510582097"
     duration = Google::Cloud::PubSub::Convert.number_to_duration number
     _(duration).must_be_kind_of Google::Protobuf::Duration
-    _(duration.seconds).must_equal -3
-    _(duration.nanos).must_equal -141592654
+    _(duration.seconds).must_equal(-3)
+    _(duration.nanos).must_equal(-141592654)
   end
 
   it "returns nil when given nil" do

google-cloud-pubsub/test/google/cloud/pubsub/flow_controller_test.rb

@@ -38,7 +38,7 @@
 
   it "raises when limit_exceeded_behavior is illegal value" do
     expect do
-      flow_controller = Google::Cloud::PubSub::FlowController.new(
+      Google::Cloud::PubSub::FlowController.new(
         message_limit: 1000,
         byte_limit: 10_000_000,
         limit_exceeded_behavior: :badvalue
@@ -226,7 +226,7 @@
 
     it "raises when a single message is > message_limit" do
       expect do
-        flow_controller = Google::Cloud::PubSub::FlowController.new(
+        Google::Cloud::PubSub::FlowController.new(
           message_limit: 0, # Non-sane setting
           byte_limit: 10_000_000,
           limit_exceeded_behavior: :block
@@ -386,7 +386,6 @@
       adding_2_done = Concurrent::Event.new
       adding_3_done = Concurrent::Event.new
       adding_4_done = Concurrent::Event.new
-      releasing_1_done = Concurrent::Event.new
 
       run_in_thread flow_controller, :acquire, 3, adding_1_done
       assert adding_1_done.wait(0.1), "Adding message 1 never unblocked."
@@ -567,7 +566,7 @@ def run_in_thread flow_controller,
           flow_controller.send action, msg
         end
         all_done_event.set
-      rescue Google::Cloud::PubSub::FlowControlLimitError => e
+      rescue Google::Cloud::PubSub::FlowControlLimitError
         error_event.set if error_event
       end
     end

google-cloud-pubsub/test/google/cloud/pubsub/publisher/publish_async_test.rb

@@ -38,7 +38,7 @@
 
     expected_messages_hash = {
       "" => [
-        Google::Cloud::PubSub::V1::PubsubMessage.new(data: "async-message".encode(Encoding::ASCII_8BIT))
+        Google::Cloud::PubSub::V1::PubsubMessage.new(data: "async-message".b)
       ]
     }
     published_messages_hash = publisher.service.mocked_topic_admin.message_hash
@@ -129,7 +129,7 @@
       assert_kind_of Google::Cloud::PubSub::PublishResult, result
       assert result.succeeded?
       assert_equal "msg0", result.msg_id
-      assert_equal "\xE3\x81\x82".force_encoding(Encoding::ASCII_8BIT), result.data
+      assert_equal "\xE3\x81\x82".b, result.data
       callback_called = true
     end
 
@@ -146,7 +146,7 @@
 
     expected_messages_hash = {
       "" => [
-        Google::Cloud::PubSub::V1::PubsubMessage.new(data: "\xE3\x81\x82".force_encoding(Encoding::ASCII_8BIT), message_id: "msg0")
+        Google::Cloud::PubSub::V1::PubsubMessage.new(data: "\xE3\x81\x82".b, message_id: "msg0")
       ]
     }
     published_messages_hash = publisher.service.mocked_topic_admin.message_hash
@@ -170,7 +170,7 @@
         assert_kind_of Google::Cloud::PubSub::PublishResult, result
         assert result.succeeded?
         assert_equal "msg0", result.msg_id
-        assert_equal "\xE3\x81\x82".force_encoding(Encoding::ASCII_8BIT), result.data
+        assert_equal "\xE3\x81\x82".b, result.data
         callback_called = true
       end
     end
@@ -188,7 +188,7 @@
 
     expected_messages_hash = {
       "" => [
-        Google::Cloud::PubSub::V1::PubsubMessage.new(data: "\xE3\x81\x82".force_encoding(Encoding::ASCII_8BIT), message_id: "msg0")
+        Google::Cloud::PubSub::V1::PubsubMessage.new(data: "\xE3\x81\x82".b, message_id: "msg0")
       ]
     }
     published_messages_hash = publisher.service.mocked_topic_admin.message_hash
@@ -207,7 +207,7 @@
       assert_kind_of Google::Cloud::PubSub::PublishResult, result
       assert result.succeeded?
       assert_equal "msg0", result.msg_id
-      assert_equal "async-message".force_encoding(Encoding::ASCII_8BIT), result.data
+      assert_equal "async-message".b, result.data
       assert_equal "text", result.attributes["format"]
       callback_called = true
     end
@@ -225,7 +225,7 @@
 
     expected_messages_hash = {
       "" => [
-        Google::Cloud::PubSub::V1::PubsubMessage.new(data: "async-message".encode(Encoding::ASCII_8BIT), attributes: {"format" => "text"}, message_id: "msg0")
+        Google::Cloud::PubSub::V1::PubsubMessage.new(data: "async-message".b, attributes: {"format" => "text"}, message_id: "msg0")
       ]
     }
     published_messages_hash = publisher.service.mocked_topic_admin.message_hash
@@ -257,7 +257,7 @@
 
       expected_messages_hash = {
         "" => [
-          Google::Cloud::PubSub::V1::PubsubMessage.new(data: "async-message".encode(Encoding::ASCII_8BIT))
+          Google::Cloud::PubSub::V1::PubsubMessage.new(data: "async-message".b)
         ]
       }
       published_messages_hash = publisher.service.mocked_topic_admin.message_hash
@@ -275,7 +275,7 @@
         assert_kind_of Google::Cloud::PubSub::PublishResult, result
         assert result.succeeded?
         assert_equal "msg0", result.msg_id
-        assert_equal "async-message".force_encoding(Encoding::ASCII_8BIT), result.data
+        assert_equal "async-message".b, result.data
         assert_equal "text", result.attributes["format"]
         callback_called = true
       end
@@ -293,7 +293,7 @@
 
       expected_messages_hash = {
         "" => [
-          Google::Cloud::PubSub::V1::PubsubMessage.new(data: "async-message".encode(Encoding::ASCII_8BIT), attributes: { "format" => "text" }, message_id: "msg0")
+          Google::Cloud::PubSub::V1::PubsubMessage.new(data: "async-message".b, attributes: { "format" => "text" }, message_id: "msg0")
         ]
       }
       published_messages_hash = publisher.service.mocked_topic_admin.message_hash