fluent-plugin-google-cloud 0.10.9 → 0.13.1

data/test/plugin/constants.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 # Copyright 2017 Google Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,20 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'google/rpc/error_details_pb'
+
 # Add some helper methods to standard classes.
-module Google
-  module Protobuf
-    Any.class_eval do
-      # TODO(igorpeshansky): Remove this once
-      # https://github.com/google/protobuf/pull/4719 gets released.
-      def self.pack(msg, type_url_prefix = 'type.googleapis.com/')
-        any = Google::Protobuf::Any.new
-        any.pack(msg, type_url_prefix)
-        any
-      end
-    end
-  end
-end
 String.class_eval do
   def inspect_octal
     specials = {
@@ -228,13 +216,11 @@ module Constants
     detect_json true
   ).freeze
 
-  # rubocop:disable Metrics/LineLength
   PRIVATE_KEY_CONFIG = %(
      auth_method private_key
      private_key_email 271661262351-ft99kc9kjro9rrihq3k2n3s2inbplu0q@developer.gserviceaccount.com
      private_key_path test/plugin/data/c31e573fd7f62ed495c9ca3821a5a85cb036dee1-privatekey.p12
   ).freeze
-  # rubocop:enable Metrics/LineLength
 
   REQUIRE_VALID_TAGS_CONFIG = %(
     require_valid_tags true
@@ -433,7 +419,6 @@ module Constants
     monitoring_type    not_prometheus
   ).freeze
 
-  # rubocop:disable Metrics/LineLength
   CONFIG_METRICS_RESOURCE_JSON = %(
     enable_monitoring  true
     monitoring_type    opencensus
@@ -481,7 +466,6 @@ module Constants
     monitoring_type    opencensus
     metrics_resource   {"type":"custom_resource","labels.label1":"123","random":"x"}
   ).freeze
-  # rubocop:enable Metrics/LineLength
 
   # For statusz.
   CONFIG_STATUSZ = %(
@@ -1023,34 +1007,41 @@ module Constants
   }.freeze
 
   PARTIAL_SUCCESS_GRPC_METADATA = begin
-    partial_errors = Google::Logging::V2::WriteLogEntriesPartialErrors.new(
+    partial_errors = Google::Cloud::Logging::V2::WriteLogEntriesPartialErrors.new(
       log_entry_errors: {
         0 => Google::Rpc::Status.new(
           code: GRPC::Core::StatusCodes::PERMISSION_DENIED,
           message: 'User not authorized.',
-          details: []),
+          details: []
+        ),
         1 => Google::Rpc::Status.new(
           code: GRPC::Core::StatusCodes::INVALID_ARGUMENT,
           message: 'Log name contains illegal character :',
-          details: []),
+          details: []
+        ),
         3 => Google::Rpc::Status.new(
           code: GRPC::Core::StatusCodes::INVALID_ARGUMENT,
           message: 'Log name contains illegal character :',
-          details: [])
-      })
+          details: []
+        )
+      }
+    )
     status = Google::Rpc::Status.new(
       message: 'User not authorized.',
-      details: [Google::Protobuf::Any.pack(partial_errors)])
+      details: [Google::Protobuf::Any.pack(partial_errors)]
+    )
     debug_info = Google::Rpc::DebugInfo.new(
       detail: '[ORIGINAL ERROR] generic::permission_denied: User not' \
         ' authorized. [google.rpc.error_details_ext] { message:' \
         " #{status.message.inspect} details { type_url:" \
         " #{status.details[0].type_url.inspect} value:" \
-        " #{status.details[0].value.inspect_octal} } }")
+        " #{status.details[0].value.inspect_octal} } }"
+    )
     status_details = Google::Rpc::Status.new(
       code: 7, message: 'User not authorized.',
       details: [Google::Protobuf::Any.pack(partial_errors),
-                Google::Protobuf::Any.pack(debug_info)])
+                Google::Protobuf::Any.pack(debug_info)]
+    )
     {
       'google.logging.v2.writelogentriespartialerrors-bin' =>
         partial_errors.to_proto,
@@ -1078,10 +1069,12 @@ module Constants
   PARSE_ERROR_GRPC_METADATA = begin
     debug_info = Google::Rpc::DebugInfo.new(
       detail: '[ORIGINAL ERROR] RPC::CLIENT_ERROR: server could not parse' \
-        " request sent by client; initialization error is: ''")
+        " request sent by client; initialization error is: ''"
+    )
     status_details = Google::Rpc::Status.new(
       code: 3, message: 'internal client error',
-      details: [Google::Protobuf::Any.pack(debug_info)])
+      details: [Google::Protobuf::Any.pack(debug_info)]
+    )
     {
       'google.rpc.debuginfo-bin' => debug_info.to_proto,
       'grpc-status-details-bin' => status_details.to_proto

data/test/plugin/test_driver.rb

@@ -37,7 +37,8 @@ module Fluent
         result = nil
         super(num_waits) do
           chunk = @instance.buffer.generate_chunk(
-            @instance.metadata(nil, nil, nil)).staged!
+            @instance.metadata(nil, nil, nil)
+          ).staged!
           @entries.each do |entry|
             chunk.concat(entry, 1)
           end

data/test/plugin/test_filter_add_insert_ids.rb

@@ -70,7 +70,7 @@ class FilterAddInsertIdsTest < Test::Unit::TestCase
       assert_equal TEST_MESSAGE, record['message'], "Index #{index} failed."
 
       # Get the first insertID.
-      expected_insert_id = record[DEFAULT_INSERT_ID_KEY] if index == 0
+      expected_insert_id = record[DEFAULT_INSERT_ID_KEY] if index.zero?
       insert_id = record[DEFAULT_INSERT_ID_KEY]
       assert_equal expected_insert_id, insert_id, "Index #{index} failed."
       expected_insert_id = expected_insert_id.next
@@ -86,7 +86,8 @@ class FilterAddInsertIdsTest < Test::Unit::TestCase
 
   def test_insert_ids_not_added_if_present
     log_entry_with_empty_insert_id = log_entry(0).merge(
-      DEFAULT_INSERT_ID_KEY => '')
+      DEFAULT_INSERT_ID_KEY => ''
+    )
     {
       log_entry(0).merge(DEFAULT_INSERT_ID_KEY => INSERT_ID) => true,
       # Still generate insertId if it's an empty string
@@ -123,7 +124,8 @@ class FilterAddInsertIdsTest < Test::Unit::TestCase
 
   def create_driver(conf = APPLICATION_DEFAULT_CONFIG)
     Fluent::Test::FilterTestDriver.new(
-      Fluent::AddInsertIdsFilter).configure(conf, true)
+      Fluent::AddInsertIdsFilter
+    ).configure(conf, true)
   end
 
   def log_entry(index)

data/test/plugin/test_filter_analyze_config.rb

@@ -63,7 +63,8 @@ class FilterAnalyzeConfigTest < Test::Unit::TestCase
         plugin_name: 'source/syslog/tcp',
         is_default_plugin: true,
         has_default_config: true,
-        has_ruby_snippet: false)
+        has_ruby_snippet: false
+      )
       assert_metric_value.call(
         :enabled_plugins,
         1,
@@ -73,7 +74,8 @@ class FilterAnalyzeConfigTest < Test::Unit::TestCase
         plugin_name: 'source/tail/apache-access',
         is_default_plugin: true,
         has_default_config: true,
-        has_ruby_snippet: false)
+        has_ruby_snippet: false
+      )
       assert_metric_value.call(
         :enabled_plugins,
         1,
@@ -83,7 +85,8 @@ class FilterAnalyzeConfigTest < Test::Unit::TestCase
         plugin_name: 'filter/add_insert_ids',
         is_default_plugin: true,
         has_default_config: true,
-        has_ruby_snippet: false)
+        has_ruby_snippet: false
+      )
 
       # Default plugins, with custom config.
       assert_metric_value.call(
@@ -95,7 +98,8 @@ class FilterAnalyzeConfigTest < Test::Unit::TestCase
         plugin_name: 'match/google_cloud',
         is_default_plugin: true,
         has_default_config: false,
-        has_ruby_snippet: false)
+        has_ruby_snippet: false
+      )
 
       # Custom plugins, some with embedded Ruby.
       assert_metric_value.call(
@@ -107,7 +111,8 @@ class FilterAnalyzeConfigTest < Test::Unit::TestCase
         plugin_name: 'filter',
         is_default_plugin: false,
         has_default_config: false,
-        has_ruby_snippet: false)
+        has_ruby_snippet: false
+      )
       assert_metric_value.call(
         :enabled_plugins,
         1,
@@ -117,7 +122,8 @@ class FilterAnalyzeConfigTest < Test::Unit::TestCase
         plugin_name: 'filter/record_transformer',
         is_default_plugin: false,
         has_default_config: false,
-        has_ruby_snippet: true)
+        has_ruby_snippet: true
+      )
       assert_metric_value.call(
         :enabled_plugins,
         1,
@@ -127,7 +133,8 @@ class FilterAnalyzeConfigTest < Test::Unit::TestCase
         plugin_name: 'match/stdout',
         is_default_plugin: false,
         has_default_config: false,
-        has_ruby_snippet: true)
+        has_ruby_snippet: true
+      )
 
       # For out_google_cloud, 3 params are present.
       assert_metric_value.call(
@@ -139,7 +146,8 @@ class FilterAnalyzeConfigTest < Test::Unit::TestCase
         plugin_name: 'google_cloud',
         param: 'adjust_invalid_timestamps',
         is_present: true,
-        has_default_config: true)
+        has_default_config: true
+      )
       assert_metric_value.call(
         :plugin_config,
         1,
@@ -149,7 +157,8 @@ class FilterAnalyzeConfigTest < Test::Unit::TestCase
         plugin_name: 'google_cloud',
         param: 'autoformat_stackdriver_trace',
         is_present: true,
-        has_default_config: false)
+        has_default_config: false
+      )
       assert_metric_value.call(
         :plugin_config,
         1,
@@ -159,10 +168,11 @@ class FilterAnalyzeConfigTest < Test::Unit::TestCase
         plugin_name: 'google_cloud',
         param: 'coerce_to_utf8',
         is_present: true,
-        has_default_config: false)
+        has_default_config: false
+      )
       # The remaining "google_cloud" params are not present.
       # The are no params for "detect_exceptions".
-      %w(
+      %w[
         auth_method
         detect_json
         enable_monitoring
@@ -191,7 +201,7 @@ class FilterAnalyzeConfigTest < Test::Unit::TestCase
         vm_id
         vm_name
         zone
-      ).each do |p|
+      ].each do |p|
         assert_metric_value.call(
           :plugin_config,
           1,
@@ -201,7 +211,8 @@ class FilterAnalyzeConfigTest < Test::Unit::TestCase
           plugin_name: 'google_cloud',
           param: p,
           is_present: false,
-          has_default_config: false)
+          has_default_config: false
+        )
       end
 
       # We also export values for the bools.
@@ -213,7 +224,8 @@ class FilterAnalyzeConfigTest < Test::Unit::TestCase
         d,
         plugin_name: 'google_cloud',
         param: 'adjust_invalid_timestamps',
-        value: true)
+        value: true
+      )
       assert_metric_value.call(
         :config_bool_values,
         1,
@@ -222,7 +234,8 @@ class FilterAnalyzeConfigTest < Test::Unit::TestCase
         d,
         plugin_name: 'google_cloud',
         param: 'autoformat_stackdriver_trace',
-        value: false)
+        value: false
+      )
       assert_metric_value.call(
         :config_bool_values,
         1,
@@ -231,12 +244,14 @@ class FilterAnalyzeConfigTest < Test::Unit::TestCase
         d,
         plugin_name: 'google_cloud',
         param: 'coerce_to_utf8',
-        value: true)
+        value: true
+      )
     end
   end
 
   def create_driver(conf = APPLICATION_DEFAULT_CONFIG)
     Fluent::Test::FilterTestDriver.new(
-      Fluent::AnalyzeConfigFilter).configure(conf, true)
+      Fluent::AnalyzeConfigFilter
+    ).configure(conf, true)
   end
 end

data/test/plugin/test_out_google_cloud.rb

@@ -44,7 +44,7 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
                  user_agent
   end
 
-  def test_client_400
+  def test_client_status400
     setup_gce_metadata_stubs
     # The API Client should not retry this and the plugin should consume
     # the exception.
@@ -57,7 +57,7 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
   end
 
   # All credentials errors resolve to a 401.
-  def test_client_401
+  def test_client_status401
     setup_gce_metadata_stubs
     stub_request(:post, WRITE_LOG_ENTRIES_URI)
       .to_return(status: 401, body: 'Unauthorized')
@@ -65,8 +65,8 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     d.emit('message' => log_entry(0))
     begin
       d.run
-    rescue Google::Apis::AuthorizationError => error
-      assert_equal 'Unauthorized', error.message
+    rescue Google::Apis::AuthorizationError => e
+      assert_equal 'Unauthorized', e.message
     end
     assert_requested(:post, WRITE_LOG_ENTRIES_URI, times: 2)
   end
@@ -88,19 +88,23 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     assert_prometheus_metric_value(
       :stackdriver_successful_requests_count, 1,
       'agent.googleapis.com/agent', OpenCensus::Stats::Aggregation::Sum, d,
-      grpc: false, code: 200)
+      grpc: false, code: 200
+    )
     assert_prometheus_metric_value(
       :stackdriver_ingested_entries_count, 1,
       'agent.googleapis.com/agent', OpenCensus::Stats::Aggregation::Sum, d,
-      grpc: false, code: 200)
+      grpc: false, code: 200
+    )
     assert_prometheus_metric_value(
       :stackdriver_dropped_entries_count, 2,
       'agent.googleapis.com/agent', OpenCensus::Stats::Aggregation::Sum, d,
-      grpc: false, code: 3)
+      grpc: false, code: 3
+    )
     assert_prometheus_metric_value(
       :stackdriver_dropped_entries_count, 1,
       'agent.googleapis.com/agent', OpenCensus::Stats::Aggregation::Sum, d,
-      grpc: false, code: 7)
+      grpc: false, code: 7
+    )
     assert_requested(:post, WRITE_LOG_ENTRIES_URI, times: 1)
   end
 
@@ -119,19 +123,23 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     assert_prometheus_metric_value(
       :stackdriver_successful_requests_count, 0,
       'agent.googleapis.com/agent', OpenCensus::Stats::Aggregation::Sum, d,
-      grpc: false, code: 200)
+      grpc: false, code: 200
+    )
     assert_prometheus_metric_value(
       :stackdriver_failed_requests_count, 1,
       'agent.googleapis.com/agent', OpenCensus::Stats::Aggregation::Sum, d,
-      grpc: false, code: 400)
+      grpc: false, code: 400
+    )
     assert_prometheus_metric_value(
       :stackdriver_ingested_entries_count, 0,
       'agent.googleapis.com/agent', OpenCensus::Stats::Aggregation::Sum, d,
-      grpc: false, code: 200)
+      grpc: false, code: 200
+    )
     assert_prometheus_metric_value(
       :stackdriver_dropped_entries_count, 1,
       'agent.googleapis.com/agent', OpenCensus::Stats::Aggregation::Sum, d,
-      grpc: false, code: 400)
+      grpc: false, code: 400
+    )
     assert_requested(:post, WRITE_LOG_ENTRIES_URI, times: 1)
   end
 
@@ -146,8 +154,8 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     exception_count = 0
     begin
       d.run
-    rescue Google::Apis::ServerError => error
-      assert_equal 'Server error', error.message
+    rescue Google::Apis::ServerError => e
+      assert_equal 'Server error', e.message
       exception_count += 1
     end
     assert_requested(:post, WRITE_LOG_ENTRIES_URI, times: 1)
@@ -168,7 +176,7 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     setup_logging_stubs do
       d = create_driver
       # Array of pairs of [parsed_severity, expected_severity]
-      [%w(INFO INFO), %w(warn WARNING), %w(E ERROR), %w(BLAH DEFAULT),
+      [%w[INFO INFO], %w[warn WARNING], %w[E ERROR], %w[BLAH DEFAULT],
        ['105', 100], ['', 'DEFAULT']].each do |sev|
         d.emit('message' => log_entry(emit_index), 'severity' => sev[0])
         expected_severity.push(sev[1])
@@ -188,12 +196,12 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     test_obj = Fluent::GoogleCloudOutput.new
 
     # known severities should translate to themselves, regardless of case
-    %w(DEFAULT DEBUG INFO NOTICE WARNING ERROR CRITICAL ALERT EMERGENCY).each \
+    %w[DEFAULT DEBUG INFO NOTICE WARNING ERROR CRITICAL ALERT EMERGENCY].each \
       do |severity|
-      assert_equal(severity, test_obj.parse_severity(severity))
-      assert_equal(severity, test_obj.parse_severity(severity.downcase))
-      assert_equal(severity, test_obj.parse_severity(severity.capitalize))
-    end
+        assert_equal(severity, test_obj.parse_severity(severity))
+        assert_equal(severity, test_obj.parse_severity(severity.downcase))
+        assert_equal(severity, test_obj.parse_severity(severity.capitalize))
+      end
 
     # numeric levels
     assert_equal(0, test_obj.parse_severity('0'))
@@ -298,6 +306,8 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
       resp = Net::HTTP.get('127.0.0.1', '/statusz', 5678)
       must_match = [
         '<h1>Status for .*</h1>.*',
+        '\bStarted: .*<br>',
+        '\bUp \d+ hr \d{2} min \d{2} sec<br>',
 
         '\badjust_invalid_timestamps\b.*\bfalse\b',
         '\bautoformat_stackdriver_trace\b.*\bfalse\b',
@@ -411,20 +421,22 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
                     multi_tags = false)
     driver = if multi_tags
                Fluent::Test::MultiTagBufferedOutputTestDriver.new(
-                 Fluent::GoogleCloudOutput)
+                 Fluent::GoogleCloudOutput
+               )
              else
                Fluent::Test::BufferedOutputTestDriver.new(
-                 Fluent::GoogleCloudOutput, tag)
+                 Fluent::GoogleCloudOutput, tag
+               )
              end
     driver.configure(conf, true)
   end
 
   # Verify the number and the content of the log entries match the expectation.
   # The caller can optionally provide a block which is called for each entry.
-  def verify_log_entries(n, params, payload_type = 'textPayload',
+  def verify_log_entries(expected_count, params, payload_type = 'textPayload',
                          check_exact_entry_labels = true, &block)
-    verify_json_log_entries(n, params, payload_type, check_exact_entry_labels,
-                            &block)
+    verify_json_log_entries(expected_count, params, payload_type,
+                            check_exact_entry_labels, &block)
   end
 
   # For an optional field with default values, Protobuf omits the field when it

data/test/plugin/test_out_google_cloud_grpc.rb

@@ -34,6 +34,8 @@ class GoogleCloudOutputGRPCTest < Test::Unit::TestCase
     # Record user agent when creating a GRPC::Core::Channel.
     GRPC::Core::Channel.class_eval do
       old_initialize = instance_method(:initialize)
+      # Suppress redefine warning (https://bugs.ruby-lang.org/issues/17055).
+      alias_method :initialize, :initialize
       define_method(:initialize) do |url, args, creds|
         user_agent = args['grpc.primary_user_agent']
         old_initialize.bind(self).call(url, args, creds)
@@ -88,7 +90,8 @@ class GoogleCloudOutputGRPCTest < Test::Unit::TestCase
     clear_metrics
     setup_logging_stubs(
       GRPC::PermissionDenied.new('User not authorized.',
-                                 PARTIAL_SUCCESS_GRPC_METADATA)) do
+                                 PARTIAL_SUCCESS_GRPC_METADATA)
+    ) do
       # The API Client should not retry this and the plugin should consume
       # the exception.
       d = create_driver(ENABLE_PROMETHEUS_CONFIG)
@@ -99,23 +102,28 @@ class GoogleCloudOutputGRPCTest < Test::Unit::TestCase
       assert_prometheus_metric_value(
         :stackdriver_successful_requests_count, 1,
         'agent.googleapis.com/agent', OpenCensus::Stats::Aggregation::Sum, d,
-        grpc: use_grpc, code: GRPC::Core::StatusCodes::OK)
+        grpc: use_grpc, code: GRPC::Core::StatusCodes::OK
+      )
       assert_prometheus_metric_value(
         :stackdriver_failed_requests_count, 0,
         'agent.googleapis.com/agent', OpenCensus::Stats::Aggregation::Sum, d,
-        grpc: use_grpc, code: GRPC::Core::StatusCodes::PERMISSION_DENIED)
+        grpc: use_grpc, code: GRPC::Core::StatusCodes::PERMISSION_DENIED
+      )
       assert_prometheus_metric_value(
         :stackdriver_ingested_entries_count, 1,
         'agent.googleapis.com/agent', OpenCensus::Stats::Aggregation::Sum, d,
-        grpc: use_grpc, code: GRPC::Core::StatusCodes::OK)
+        grpc: use_grpc, code: GRPC::Core::StatusCodes::OK
+      )
       assert_prometheus_metric_value(
         :stackdriver_dropped_entries_count, 2,
         'agent.googleapis.com/agent', OpenCensus::Stats::Aggregation::Sum, d,
-        grpc: use_grpc, code: GRPC::Core::StatusCodes::INVALID_ARGUMENT)
+        grpc: use_grpc, code: GRPC::Core::StatusCodes::INVALID_ARGUMENT
+      )
       assert_prometheus_metric_value(
         :stackdriver_dropped_entries_count, 1,
         'agent.googleapis.com/agent', OpenCensus::Stats::Aggregation::Sum, d,
-        grpc: use_grpc, code: GRPC::Core::StatusCodes::PERMISSION_DENIED)
+        grpc: use_grpc, code: GRPC::Core::StatusCodes::PERMISSION_DENIED
+      )
     end
   end
 
@@ -124,7 +132,8 @@ class GoogleCloudOutputGRPCTest < Test::Unit::TestCase
     clear_metrics
     setup_logging_stubs(
       GRPC::InvalidArgument.new('internal client error',
-                                PARSE_ERROR_GRPC_METADATA)) do
+                                PARSE_ERROR_GRPC_METADATA)
+    ) do
       # The API Client should not retry this and the plugin should consume
       # the exception.
       d = create_driver(ENABLE_PROMETHEUS_CONFIG)
@@ -133,19 +142,23 @@ class GoogleCloudOutputGRPCTest < Test::Unit::TestCase
       assert_prometheus_metric_value(
         :stackdriver_successful_requests_count, 0,
         'agent.googleapis.com/agent', OpenCensus::Stats::Aggregation::Sum, d,
-        grpc: use_grpc, code: GRPC::Core::StatusCodes::OK)
+        grpc: use_grpc, code: GRPC::Core::StatusCodes::OK
+      )
       assert_prometheus_metric_value(
         :stackdriver_failed_requests_count, 1,
         'agent.googleapis.com/agent', OpenCensus::Stats::Aggregation::Sum, d,
-        grpc: use_grpc, code: GRPC::Core::StatusCodes::INVALID_ARGUMENT)
+        grpc: use_grpc, code: GRPC::Core::StatusCodes::INVALID_ARGUMENT
+      )
       assert_prometheus_metric_value(
         :stackdriver_ingested_entries_count, 0,
         'agent.googleapis.com/agent', OpenCensus::Stats::Aggregation::Sum, d,
-        grpc: use_grpc, code: GRPC::Core::StatusCodes::OK)
+        grpc: use_grpc, code: GRPC::Core::StatusCodes::OK
+      )
       assert_prometheus_metric_value(
         :stackdriver_dropped_entries_count, 1,
         'agent.googleapis.com/agent', OpenCensus::Stats::Aggregation::Sum, d,
-        grpc: use_grpc, code: GRPC::Core::StatusCodes::INVALID_ARGUMENT)
+        grpc: use_grpc, code: GRPC::Core::StatusCodes::INVALID_ARGUMENT
+      )
     end
   end
 
@@ -165,8 +178,8 @@ class GoogleCloudOutputGRPCTest < Test::Unit::TestCase
         d.emit('message' => log_entry(0))
         begin
           d.run
-        rescue GRPC::BadStatus => error
-          assert_equal "#{code}:#{message}", error.message
+        rescue GRPC::BadStatus => e
+          assert_equal "#{code}:#{message}", e.message
           exception_count += 1
         end
       end
@@ -189,8 +202,8 @@ class GoogleCloudOutputGRPCTest < Test::Unit::TestCase
     setup_logging_stubs do
       d = create_driver
       # Array of pairs of [parsed_severity, expected_severity]
-      [%w(INFO INFO), %w(warn WARNING), %w(E ERROR), %w(BLAH DEFAULT),
-       %w(105 DEBUG), ['', 'DEFAULT']].each do |sev|
+      [%w[INFO INFO], %w[warn WARNING], %w[E ERROR], %w[BLAH DEFAULT],
+       %w[105 DEBUG], ['', 'DEFAULT']].each do |sev|
         d.emit('message' => log_entry(emit_index), 'severity' => sev[0])
         expected_severity.push(sev[1])
         emit_index += 1
@@ -259,8 +272,8 @@ class GoogleCloudOutputGRPCTest < Test::Unit::TestCase
 
   private
 
-  WriteLogEntriesRequest = Google::Logging::V2::WriteLogEntriesRequest
-  WriteLogEntriesResponse = Google::Logging::V2::WriteLogEntriesResponse
+  WriteLogEntriesRequest = Google::Cloud::Logging::V2::WriteLogEntriesRequest
+  WriteLogEntriesResponse = Google::Cloud::Logging::V2::WriteLogEntriesResponse
 
   USE_GRPC_CONFIG = %(
     use_grpc true
@@ -297,10 +310,12 @@ class GoogleCloudOutputGRPCTest < Test::Unit::TestCase
     conf += USE_GRPC_CONFIG
     driver = if multi_tags
                Fluent::Test::MultiTagBufferedOutputTestDriver.new(
-                 GoogleCloudOutputWithGRPCMock.new(@grpc_stub))
+                 GoogleCloudOutputWithGRPCMock.new(@grpc_stub)
+               )
              else
                Fluent::Test::BufferedOutputTestDriver.new(
-                 GoogleCloudOutputWithGRPCMock.new(@grpc_stub), tag)
+                 GoogleCloudOutputWithGRPCMock.new(@grpc_stub), tag
+               )
              end
     driver.configure(conf, true)
   end
@@ -319,13 +334,13 @@ class GoogleCloudOutputGRPCTest < Test::Unit::TestCase
 
   # GRPC logging mock that successfully logs the records.
   class GRPCLoggingMockService <
-      Google::Cloud::Logging::V2::LoggingServiceV2Client
+      Google::Cloud::Logging::V2::LoggingService::Client
     def initialize(requests_received)
       super()
       @requests_received = requests_received
     end
 
-    def write_log_entries(entries,
+    def write_log_entries(entries:,
                           log_name: nil,
                           resource: nil,
                           labels: nil,
@@ -344,7 +359,7 @@ class GoogleCloudOutputGRPCTest < Test::Unit::TestCase
 
   # GRPC logging mock that fails and returns server side or client side errors.
   class GRPCLoggingMockFailingService <
-      Google::Cloud::Logging::V2::LoggingServiceV2Client
+      Google::Cloud::Logging::V2::LoggingService::Client
     def initialize(error, failed_attempts)
       super()
       @error = error
@@ -352,7 +367,7 @@ class GoogleCloudOutputGRPCTest < Test::Unit::TestCase
     end
 
     # rubocop:disable Lint/UnusedMethodArgument
-    def write_log_entries(entries,
+    def write_log_entries(entries:,
                           log_name: nil,
                           resource: nil,
                           labels: nil,
@@ -360,9 +375,9 @@ class GoogleCloudOutputGRPCTest < Test::Unit::TestCase
       @failed_attempts << 1
       begin
         raise @error
-      rescue
-        # Google::Gax::GaxError will wrap the latest thrown exception as @cause.
-        raise Google::Gax::GaxError, 'This test message does not matter.'
+      rescue StandardError
+        # Google::Cloud::Error will wrap the latest thrown exception as @cause.
+        raise Google::Cloud::Error, 'This test message does not matter.'
       end
     end
     # rubocop:enable Lint/UnusedMethodArgument
@@ -370,7 +385,7 @@ class GoogleCloudOutputGRPCTest < Test::Unit::TestCase
 
   # Set up grpc stubs to mock the external calls.
   def setup_logging_stubs(error = nil, code = nil, message = 'some message')
-    if error.nil? && (code.nil? || code == 0)
+    if error.nil? && (code.nil? || code.zero?)
       @requests_sent = []
       @grpc_stub = GRPCLoggingMockService.new(@requests_sent)
     else
@@ -410,7 +425,7 @@ class GoogleCloudOutputGRPCTest < Test::Unit::TestCase
 
   # Verify the number and the content of the log entries match the expectation.
   # The caller can optionally provide a block which is called for each entry.
-  def verify_log_entries(n, params, payload_type = 'textPayload',
+  def verify_log_entries(expected_count, params, payload_type = 'textPayload',
                          check_exact_entry_labels = true, &block)
     @requests_sent.each do |request|
       @logs_sent << {
@@ -420,8 +435,8 @@ class GoogleCloudOutputGRPCTest < Test::Unit::TestCase
         'logName' => request.log_name
       }
     end
-    verify_json_log_entries(n, params, payload_type, check_exact_entry_labels,
-                            &block)
+    verify_json_log_entries(expected_count, params, payload_type,
+                            check_exact_entry_labels, &block)
   end
 
   # Use the right single quotation mark as the sample non-utf8 character.