fluent-plugin-google-cloud 0.12.11 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa2b2de4444cf81be485251db598ee31599684827a2c4ecef5227e1254622aa6
-  data.tar.gz: 0d11b11e1f6fcdbb6d712133f911c15eb968f74e020dbfa98a30cfb6e5717602
+  metadata.gz: d9e2068fdf6e41a45b160c309d16a3fa0dd58ef555f19c76c93e798f0da03815
+  data.tar.gz: f9902899c11ecf784433b7437d9efcd0ebda4ff812aeaee7edb6e7aeffbc6d66
 SHA512:
-  metadata.gz: ca9bf71962b1f2f19270a278f12d4c4e4626bc8f7e0bfc235802ae24f95ae7e65f44243c6600d8f23fedbdcdd840b4fce53b3ccddb4a454806cf32286b3d7ed8
-  data.tar.gz: 64cf9cd901800e5ea6711356101c8a39a1310ef99c17e34fd2a3676629abc2a32ad4a60af709d57749953c14e7f6dcad5d01c14880a3e0781e09579924fe8cc7
+  metadata.gz: 39777bfde0e2c738c2d50506660604209e0860bd89a6669acfa1cc94bae5696d6bfae1089f17c7b197fa807ff6db8caac5e278a94b3c7db35b44366cf31c8d40
+  data.tar.gz: 71ded0ece74b31da78d665862a1fcd54c9ef0407c6b0f6bbd4eff26cfbe49072d8f17d84c9c86af8a97b14a3c380756df2578f88eb3beefacce2278724e02be5

data/Gemfile.lock

@@ -1,14 +1,15 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-google-cloud (0.12.11)
+    fluent-plugin-google-cloud (0.13.1)
       fluentd (= 1.13.3)
-      google-api-client (= 0.44.2)
-      google-cloud-logging (= 1.6.6)
-      google-protobuf (= 3.20.0)
-      googleapis-common-protos (= 1.3.10)
-      googleauth (= 0.9.0)
-      grpc (= 1.45.0)
+      google-api-client (= 0.53.0)
+      google-cloud-logging (= 2.3.2)
+      google-cloud-monitoring-v3 (= 0.10.0)
+      google-protobuf (= 3.22.1)
+      googleapis-common-protos (= 1.4.0)
+      googleauth (= 1.3.0)
+      grpc (= 1.53.0)
       json (= 2.6.3)
       opencensus (= 0.5.0)
       opencensus-stackdriver (= 0.4.1)
@@ -16,7 +17,12 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.1)
+    activesupport (7.0.6)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     concurrent-ruby (1.2.2)
@@ -31,8 +37,12 @@ GEM
       rexml
     declarative (0.0.20)
     docile (1.4.0)
-    faraday (0.17.6)
-      multipart-post (>= 1.2, < 3)
+    faraday (2.7.10)
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
+    faraday-net_http (3.0.2)
+    faraday-retry (2.2.0)
+      faraday (~> 2.0)
     fluentd (1.13.3)
       bundler
       cool.io (>= 1.4.5, < 2.0.0)
@@ -45,76 +55,87 @@ GEM
       tzinfo-data (~> 1.0)
       webrick (>= 1.4.2, < 1.8.0)
       yajl-ruby (~> 1.0)
-    gapic-common (0.3.4)
-      google-protobuf (~> 3.12, >= 3.12.2)
-      googleapis-common-protos (>= 1.3.9, < 2.0)
-      googleapis-common-protos-types (>= 1.0.4, < 2.0)
-      googleauth (~> 0.9)
-      grpc (~> 1.25)
-    google-api-client (0.44.2)
+    gapic-common (0.19.1)
+      faraday (>= 1.9, < 3.a)
+      faraday-retry (>= 1.0, < 3.a)
+      google-protobuf (~> 3.14)
+      googleapis-common-protos (>= 1.3.12, < 2.a)
+      googleapis-common-protos-types (>= 1.3.1, < 2.a)
+      googleauth (~> 1.0)
+      grpc (~> 1.36)
+    gems (1.2.0)
+    google-api-client (0.53.0)
+      google-apis-core (~> 0.1)
+      google-apis-generator (~> 0.1)
+    google-apis-core (0.11.0)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (~> 0.9)
-      httpclient (>= 2.8.1, < 3.0)
+      googleauth (>= 0.16.2, < 2.a)
+      httpclient (>= 2.8.1, < 3.a)
       mini_mime (~> 1.0)
       representable (~> 3.0)
-      retriable (>= 2.0, < 4.0)
+      retriable (>= 2.0, < 4.a)
       rexml
-      signet (~> 0.12)
+      webrick
+    google-apis-discovery_v1 (0.14.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-generator (0.12.0)
+      activesupport (>= 5.0)
+      gems (~> 1.2)
+      google-apis-core (>= 0.11.0, < 2.a)
+      google-apis-discovery_v1 (~> 0.5)
+      thor (>= 0.20, < 2.a)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
     google-cloud-errors (1.3.1)
-    google-cloud-logging (1.6.6)
+    google-cloud-logging (2.3.2)
       concurrent-ruby (~> 1.1)
-      google-cloud-core (~> 1.2)
-      google-gax (~> 1.7)
-      googleapis-common-protos-types (>= 1.0.2)
+      google-cloud-core (~> 1.5)
+      google-cloud-logging-v2 (~> 0.0)
       stackdriver-core (~> 1.3)
-    google-cloud-monitoring-v3 (0.3.0)
-      gapic-common (~> 0.3)
+    google-cloud-logging-v2 (0.10.1)
+      gapic-common (>= 0.19.1, < 2.a)
+      google-cloud-errors (~> 1.0)
+    google-cloud-monitoring-v3 (0.10.0)
+      gapic-common (>= 0.16.0, < 2.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-trace-v2 (0.3.0)
-      gapic-common (~> 0.3)
+    google-cloud-trace-v2 (0.6.1)
+      gapic-common (>= 0.19.1, < 2.a)
       google-cloud-errors (~> 1.0)
-    google-gax (1.8.2)
-      google-protobuf (~> 3.9)
-      googleapis-common-protos (>= 1.3.9, < 2.0)
-      googleapis-common-protos-types (>= 1.0.4, < 2.0)
-      googleauth (~> 0.9)
-      grpc (~> 1.24)
-      rly (~> 0.2.3)
-    google-protobuf (3.20.0-x86_64-linux)
-    googleapis-common-protos (1.3.10)
-      google-protobuf (~> 3.11)
-      googleapis-common-protos-types (>= 1.0.5, < 2.0)
+    google-protobuf (3.22.1)
+    googleapis-common-protos (1.4.0)
+      google-protobuf (~> 3.14)
+      googleapis-common-protos-types (~> 1.2)
       grpc (~> 1.27)
-    googleapis-common-protos-types (1.5.0)
+    googleapis-common-protos-types (1.6.0)
       google-protobuf (~> 3.14)
-    googleauth (0.9.0)
-      faraday (~> 0.12)
+    googleauth (1.3.0)
+      faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
-      signet (~> 0.7)
-    grpc (1.45.0-x86_64-linux)
-      google-protobuf (~> 3.19)
+      signet (>= 0.16, < 2.a)
+    grpc (1.53.0)
+      google-protobuf (~> 3.21)
       googleapis-common-protos-types (~> 1.0)
     hashdiff (1.0.1)
     http_parser.rb (0.7.0)
     httpclient (2.8.3)
+    i18n (1.14.1)
+      concurrent-ruby (~> 1.0)
     json (2.6.3)
-    jwt (2.7.0)
+    jwt (2.7.1)
     memoist (0.16.2)
     metaclass (0.0.4)
     mini_mime (1.1.2)
+    minitest (5.18.1)
     mocha (1.9.0)
       metaclass (~> 0.0.1)
-    msgpack (1.6.1)
+    msgpack (1.7.1)
     multi_json (1.15.0)
-    multipart-post (2.3.0)
     opencensus (0.5.0)
     opencensus-stackdriver (0.4.1)
       concurrent-ruby (~> 1.0)
@@ -123,24 +144,25 @@ GEM
       google-cloud-trace-v2 (~> 0.1)
       opencensus (~> 0.5)
     os (1.1.4)
-    parallel (1.22.1)
-    parser (3.2.1.1)
+    parallel (1.23.0)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
+      racc
     power_assert (2.0.3)
     prometheus-client (0.9.0)
       quantile (~> 0.2.1)
-    public_suffix (5.0.1)
+    public_suffix (5.0.3)
     quantile (0.2.1)
+    racc (1.7.1)
     rainbow (3.1.1)
-    rake (10.5.0)
-    regexp_parser (2.7.0)
+    rake (13.0.6)
+    regexp_parser (2.8.1)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
     rexml (3.2.5)
-    rly (0.2.3)
     rubocop (1.48.1)
       json (~> 2.3)
       parallel (~> 1.10)
@@ -151,12 +173,13 @@ GEM
       rubocop-ast (>= 1.26.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.28.0)
+    rubocop-ast (1.29.0)
       parser (>= 3.2.1.0)
     ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
     serverengine (2.3.2)
       sigdump (~> 0.2.2)
-    sigdump (0.2.4)
+    sigdump (0.2.5)
     signet (0.17.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
@@ -175,35 +198,35 @@ GEM
       tins (~> 1.0)
     test-unit (3.3.3)
       power_assert
-    thor (1.2.1)
+    thor (1.2.2)
     tins (1.32.1)
       sync
     trailblazer-option (0.1.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2023.2)
+    tzinfo-data (1.2023.3)
       tzinfo (>= 1.0.0)
     uber (0.1.0)
     unicode-display_width (2.4.2)
-    webmock (3.6.2)
-      addressable (>= 2.3.6)
+    webmock (3.17.1)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     webrick (1.7.0)
     yajl-ruby (1.4.3)
 
 PLATFORMS
-  x86_64-linux
+  ruby
 
 DEPENDENCIES
   coveralls (= 0.8.23)
   fluent-plugin-google-cloud!
   mocha (= 1.9.0)
   prometheus-client (< 0.10)
-  rake (= 10.5.0)
+  rake (= 13.0.6)
   rubocop (= 1.48.1)
   test-unit (= 3.3.3)
-  webmock (= 3.6.2)
+  webmock (= 3.17.1)
 
 BUNDLED WITH
-   2.4.1
+   2.1.4

data/fluent-plugin-google-cloud.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   gem.homepage      =
     'https://github.com/GoogleCloudPlatform/fluent-plugin-google-cloud'
   gem.license       = 'Apache-2.0'
-  gem.version       = '0.12.11'
+  gem.version       = '0.13.1'
   gem.authors       = ['Stackdriver Agents Team']
   gem.email         = ['stackdriver-agents@google.com']
   gem.required_ruby_version = Gem::Requirement.new('>= 2.6')
@@ -23,12 +23,13 @@ Gem::Specification.new do |gem|
   # also the fluentd version in
   # https://github.com/GoogleCloudPlatform/google-fluentd/blob/master/config/software/fluentd.rb.
   gem.add_runtime_dependency 'fluentd', '1.13.3'
-  gem.add_runtime_dependency 'google-api-client', '0.44.2'
-  gem.add_runtime_dependency 'googleapis-common-protos', '1.3.10'
-  gem.add_runtime_dependency 'googleauth', '0.9.0'
-  gem.add_runtime_dependency 'google-cloud-logging', '1.6.6'
-  gem.add_runtime_dependency 'google-protobuf', '3.20.0'
-  gem.add_runtime_dependency 'grpc', '1.45.0'
+  gem.add_runtime_dependency 'google-api-client', '0.53.0'
+  gem.add_runtime_dependency 'googleapis-common-protos', '1.4.0'
+  gem.add_runtime_dependency 'googleauth', '1.3.0'
+  gem.add_runtime_dependency 'google-cloud-logging', '2.3.2'
+  gem.add_runtime_dependency 'google-cloud-monitoring-v3', '0.10.0'
+  gem.add_runtime_dependency 'google-protobuf', '3.22.1'
+  gem.add_runtime_dependency 'grpc', '1.53.0'
   gem.add_runtime_dependency 'json', '2.6.3'
   gem.add_runtime_dependency 'opencensus', '0.5.0'
   gem.add_runtime_dependency 'opencensus-stackdriver', '0.4.1'
@@ -36,15 +37,10 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'mocha', '1.9.0'
   # Keep this the same as in
   # https://github.com/fluent/fluent-plugin-prometheus/blob/master/fluent-plugin-prometheus.gemspec
-  gem.add_development_dependency 'prometheus-client', '< 0.10'
-  # TODO(qingling128): Upgrade rake to 11.0+ after the following issues are
-  # fixed because rake (11.0+) requires ALL variables to be explicitly
-  # initialized.
-  # https://github.com/googleapis/google-auth-library-ruby/issues/227
-  # https://github.com/farcaller/rly/issues/2
   gem.add_development_dependency 'coveralls', '0.8.23'
-  gem.add_development_dependency 'rake', '10.5.0'
+  gem.add_development_dependency 'prometheus-client', '< 0.10'
+  gem.add_development_dependency 'rake', '13.0.6'
   gem.add_development_dependency 'rubocop', '1.48.1'
   gem.add_development_dependency 'test-unit', '3.3.3'
-  gem.add_development_dependency 'webmock', '3.6.2'
+  gem.add_development_dependency 'webmock', '3.17.1'
 end

data/lib/fluent/plugin/filter_add_insert_ids.rb

@@ -51,9 +51,6 @@ module Fluent
     desc 'The field name for insertIds in the log record.'
     config_param :insert_id_key, :string, default: DEFAULT_INSERT_ID_KEY
 
-    # Expose attr_readers for testing.
-    attr_reader :insert_id_key
-
     def start
       super
       @log = $log # rubocop:disable Style/GlobalVars

data/lib/fluent/plugin/out_google_cloud.rb

@@ -20,9 +20,9 @@ require 'socket'
 require 'time'
 require 'yaml'
 require 'google/apis'
+require 'google/cloud/errors'
 require 'google/apis/logging_v2'
 require 'google/cloud/logging/v2'
-require 'google/gax'
 require 'google/logging/v2/logging_pb'
 require 'google/logging/v2/logging_services_pb'
 require 'google/logging/v2/log_entry_pb'
@@ -149,7 +149,7 @@ module Fluent
             %w[userAgent user_agent parse_string]
           ],
           # The grpc version class name.
-          'Google::Logging::Type::HttpRequest',
+          'Google::Cloud::Logging::Type::HttpRequest',
           # The non-grpc version class name.
           'Google::Apis::LoggingV2::HttpRequest'
         ],
@@ -161,7 +161,7 @@ module Fluent
             %w[first first parse_bool],
             %w[last last parse_bool]
           ],
-          'Google::Logging::V2::LogEntryOperation',
+          'Google::Cloud::Logging::V2::LogEntryOperation',
           'Google::Apis::LoggingV2::LogEntryOperation'
         ],
         'source_location' => [
@@ -171,7 +171,7 @@ module Fluent
             %w[function function parse_string],
             %w[line line parse_int]
           ],
-          'Google::Logging::V2::LogEntrySourceLocation',
+          'Google::Cloud::Logging::V2::LogEntrySourceLocation',
           'Google::Apis::LoggingV2::LogEntrySourceLocation'
         ]
       }.freeze
@@ -431,7 +431,7 @@ module Fluent
 
     # Expose attr_readers to make testing of metadata more direct than only
     # testing it indirectly through metadata sent with logs.
-    attr_reader :project_id, :zone, :vm_id, :resource, :common_labels, :monitoring_resource
+    attr_reader :resource, :common_labels, :monitoring_resource
 
     def initialize
       super
@@ -784,7 +784,7 @@ module Fluent
 
       if @split_logs_by_tag
         requests_to_send.each do |request|
-          @write_request.call(request)
+          @write_request.call(**request)
         end
       else
         # Combine all requests into one. The request level "log_name" will be
@@ -846,7 +846,7 @@ module Fluent
                                            severity,
                                            ts_secs,
                                            ts_nanos)
-      entry = Google::Logging::V2::LogEntry.new(
+      entry = Google::Cloud::Logging::V2::LogEntry.new(
         labels: labels,
         resource: Google::Api::MonitoredResource.new(
           type: resource.type,
@@ -893,7 +893,7 @@ module Fluent
       client = api_client
       entries_count = entries.length
       client.write_log_entries(
-        entries,
+        entries: entries,
         log_name: log_name,
         # Leave resource nil if it's nil.
         resource: if resource
@@ -916,7 +916,7 @@ module Fluent
         @successful_call = true
         @log.info 'Successfully sent gRPC to Stackdriver Logging API.'
       end
-    rescue Google::Gax::GaxError => e
+    rescue Google::Cloud::Error => e
       # GRPC::BadStatus is wrapped in error.cause.
       error = e.cause
 
@@ -1007,7 +1007,7 @@ module Fluent
                    error: error.to_s, error_code: error_code.to_s
       end
 
-    # Got an unexpected error (not Google::Gax::GaxError) from the
+    # Got an unexpected error (not Google::Cloud::Error) from the
     # google-cloud-logging lib.
     rescue StandardError => e
       increment_failed_requests_count(GRPC::Core::StatusCodes::UNKNOWN)
@@ -1470,20 +1470,20 @@ module Fluent
 
           extracted_subfields = subfields.each_with_object({}) \
             do |(original_key, destination_key, cast_fn), extracted_fields|
-            value = fields.delete(original_key)
-            next if value.nil?
-
-            begin
-              casted_value = send(cast_fn, value)
-            rescue TypeError
-              @log.error "Failed to #{cast_fn} for #{field_name}." \
-                         "#{original_key} with value #{value.inspect}.", err
-              next
-            end
-            next if casted_value.nil?
+              value = fields.delete(original_key)
+              next if value.nil?
+
+              begin
+                casted_value = send(cast_fn, value)
+              rescue TypeError
+                @log.error "Failed to #{cast_fn} for #{field_name}." \
+                           "#{original_key} with value #{value.inspect}.", err
+                next
+              end
+              next if casted_value.nil?
 
-            extracted_fields[destination_key] = casted_value
-          end
+              extracted_fields[destination_key] = casted_value
+            end
 
           next unless extracted_subfields
 
@@ -1599,30 +1599,30 @@ module Fluent
     end
 
     GRPC_SEVERITY_MAPPING = {
-      'DEFAULT' => Google::Logging::Type::LogSeverity::DEFAULT,
-      'DEBUG' => Google::Logging::Type::LogSeverity::DEBUG,
-      'INFO' => Google::Logging::Type::LogSeverity::INFO,
-      'NOTICE' => Google::Logging::Type::LogSeverity::NOTICE,
-      'WARNING' => Google::Logging::Type::LogSeverity::WARNING,
-      'ERROR' => Google::Logging::Type::LogSeverity::ERROR,
-      'CRITICAL' => Google::Logging::Type::LogSeverity::CRITICAL,
-      'ALERT' => Google::Logging::Type::LogSeverity::ALERT,
-      'EMERGENCY' => Google::Logging::Type::LogSeverity::EMERGENCY,
-      0 => Google::Logging::Type::LogSeverity::DEFAULT,
-      100 => Google::Logging::Type::LogSeverity::DEBUG,
-      200 => Google::Logging::Type::LogSeverity::INFO,
-      300 => Google::Logging::Type::LogSeverity::NOTICE,
-      400 => Google::Logging::Type::LogSeverity::WARNING,
-      500 => Google::Logging::Type::LogSeverity::ERROR,
-      600 => Google::Logging::Type::LogSeverity::CRITICAL,
-      700 => Google::Logging::Type::LogSeverity::ALERT,
-      800 => Google::Logging::Type::LogSeverity::EMERGENCY
+      'DEFAULT' => Google::Cloud::Logging::Type::LogSeverity::DEFAULT,
+      'DEBUG' => Google::Cloud::Logging::Type::LogSeverity::DEBUG,
+      'INFO' => Google::Cloud::Logging::Type::LogSeverity::INFO,
+      'NOTICE' => Google::Cloud::Logging::Type::LogSeverity::NOTICE,
+      'WARNING' => Google::Cloud::Logging::Type::LogSeverity::WARNING,
+      'ERROR' => Google::Cloud::Logging::Type::LogSeverity::ERROR,
+      'CRITICAL' => Google::Cloud::Logging::Type::LogSeverity::CRITICAL,
+      'ALERT' => Google::Cloud::Logging::Type::LogSeverity::ALERT,
+      'EMERGENCY' => Google::Cloud::Logging::Type::LogSeverity::EMERGENCY,
+      0 => Google::Cloud::Logging::Type::LogSeverity::DEFAULT,
+      100 => Google::Cloud::Logging::Type::LogSeverity::DEBUG,
+      200 => Google::Cloud::Logging::Type::LogSeverity::INFO,
+      300 => Google::Cloud::Logging::Type::LogSeverity::NOTICE,
+      400 => Google::Cloud::Logging::Type::LogSeverity::WARNING,
+      500 => Google::Cloud::Logging::Type::LogSeverity::ERROR,
+      600 => Google::Cloud::Logging::Type::LogSeverity::CRITICAL,
+      700 => Google::Cloud::Logging::Type::LogSeverity::ALERT,
+      800 => Google::Cloud::Logging::Type::LogSeverity::EMERGENCY
     }.freeze
 
     def grpc_severity(severity)
       # TODO: find out why this doesn't work.
       # if severity.is_a? String
-      #   return Google::Logging::Type::LogSeverity.resolve(severity)
+      #   return Google::Cloud::Logging::Type::LogSeverity.resolve(severity)
       # end
       return GRPC_SEVERITY_MAPPING[severity] if GRPC_SEVERITY_MAPPING.key?(severity)
 
@@ -1700,9 +1700,9 @@ module Fluent
 
       label_map.each_with_object({}) \
         do |(original_label, new_label), extracted_labels|
-        value = hash.delete(original_label)
-        extracted_labels[new_label] = convert_to_utf8(value.to_s) if value
-      end
+          value = hash.delete(original_label)
+          extracted_labels[new_label] = convert_to_utf8(value.to_s) if value
+        end
     end
 
     def value_from_ruby(value)
@@ -1834,11 +1834,11 @@ module Fluent
           "#{Google::Apis::OS_VERSION}"
         channel_args = { 'grpc.primary_user_agent' => user_agent }
                        .merge!(compression_channel_args)
-        @client = Google::Cloud::Logging::V2::LoggingServiceV2Client.new(
-          credentials: GRPC::Core::Channel.new(
+        @client = Google::Cloud::Logging::V2::LoggingService::Client.new do |config|
+          config.credentials = GRPC::Core::Channel.new(
             "#{host}#{port}", channel_args, creds
           )
-        )
+        end
       else
         # TODO: Use a non-default ClientOptions object.
         Google::Apis::ClientOptions.default.application_name = PLUGIN_NAME
@@ -2004,11 +2004,10 @@ module Fluent
     # are a list of indexes of log entries that failed due to this error.
     #
     # A sample error looks like:
-    # <Google::Gax::RetryError:
-    #   message: 'GaxError Exception occurred in retry method that was not class
-    #             ified as transient, caused by 7:User not authorized.',
+    # <Google::Cloud::PermissionDeniedError:
+    #   message: 'User not authorized.',
     #   details: [
-    #     <Google::Logging::V2::WriteLogEntriesPartialErrors:
+    #     <Google::Cloud::Logging::V2::WriteLogEntriesPartialErrors:
     #       log_entry_errors: {
     #         0 => <Google::Rpc::Status:
     #                code: 7,
@@ -2038,13 +2037,14 @@ module Fluent
     #   [3, 'Log name contains illegal character :']: [1, 3]
     # }
     def construct_error_details_map_grpc(gax_error)
+      @log.error "construct_error_details_map_grpc: #{gax_error}"
       error_details_map = Hash.new { |h, k| h[k] = [] }
       error_details = ensure_array(gax_error.status_details)
       raise JSON::ParserError, 'The error details are empty.' if
         error_details.empty?
       raise JSON::ParserError, 'No partial error info in error details.' unless
         error_details[0].is_a?(
-          Google::Logging::V2::WriteLogEntriesPartialErrors
+          Google::Cloud::Logging::V2::WriteLogEntriesPartialErrors
         )
 
       log_entry_errors = ensure_hash(error_details[0].log_entry_errors)

data/lib/fluent/plugin/statusz.rb

@@ -19,14 +19,16 @@ require 'erb'
 module Statusz
   module_function
 
-  # NOTE: The plugin parameter is referenced in STATUSZ_TMPL.
   def response(plugin)
     uptime = Time.now - SERVER_START
     uptime_str = format('%<hours>d hr %<minutes>02d min %<seconds>02d sec',
                         hours: uptime / 3600,
                         minutes: (uptime / 60) % 60,
                         seconds: uptime % 60)
-    ERB.new(STATUSZ_TMPL).result(binding)
+    ERB.new(STATUSZ_TMPL).result_with_hash(
+      plugin: plugin,
+      uptime_str: uptime_str
+    )
   end
 end
 

data/test/plugin/base_test.rb

@@ -29,8 +29,10 @@ require_relative 'utils'
 
 module Monitoring
   # Prevent OpenCensus from writing to the network.
-  class OpenCensusMonitoringRegistry
-    def export
+  OpenCensusMonitoringRegistry.class_eval do
+    # Suppress redefine warning (https://bugs.ruby-lang.org/issues/17055).
+    alias_method :export, :export
+    define_method(:export) do
       nil
     end
   end
@@ -55,6 +57,7 @@ module BaseTest
     registry.unregister(:stackdriver_retried_entries_count)
 
     setup_auth_stubs('https://www.googleapis.com/oauth2/v4/token')
+    setup_auth_stubs('https://oauth2.googleapis.com/token')
     @logs_sent = []
   end
 

data/test/plugin/constants.rb

@@ -12,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 = {
@@ -1018,7 +1007,7 @@ 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,

data/test/plugin/test_out_google_cloud.rb

@@ -198,10 +198,10 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     # known severities should translate to themselves, regardless of case
     %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'))

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)
@@ -270,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
@@ -332,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,
@@ -357,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
@@ -365,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,
@@ -374,8 +376,8 @@ class GoogleCloudOutputGRPCTest < Test::Unit::TestCase
       begin
         raise @error
       rescue StandardError
-        # Google::Gax::GaxError will wrap the latest thrown exception as @cause.
-        raise Google::Gax::GaxError, 'This test message does not matter.'
+        # 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

data/test/plugin/utils.rb

@@ -60,8 +60,7 @@ module Utils
                           "attribute1\nattribute2\nattribute3")
 
     # Used by 'googleauth' to fetch the default service account credentials.
-    stub_request(:get, 'http://169.254.169.254/computeMetadata/v1/' \
-                 'instance/service-accounts/default/token')
+    stub_request(:get, %r{http://169.254.169.254/computeMetadata/v1/instance/service-accounts/default/token(?:\?.*)})
       .to_return(body: %({"access_token": "#{FAKE_AUTH_TOKEN}"}),
                  status: 200,
                  headers: { 'Content-Length' => FAKE_AUTH_TOKEN.length,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-google-cloud
 version: !ruby/object:Gem::Version
-  version: 0.12.11
+  version: 0.13.1
 platform: ruby
 authors:
 - Stackdriver Agents Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-27 00:00:00.000000000 Z
+date: 2023-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -30,84 +30,98 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.44.2
+        version: 0.53.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.44.2
+        version: 0.53.0
 - !ruby/object:Gem::Dependency
   name: googleapis-common-protos
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.10
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.10
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: googleauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: google-cloud-logging
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.6
+        version: 2.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.6
+        version: 2.3.2
+- !ruby/object:Gem::Dependency
+  name: google-cloud-monitoring-v3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: google-protobuf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.20.0
+        version: 3.22.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.20.0
+        version: 3.22.1
 - !ruby/object:Gem::Dependency
   name: grpc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.45.0
+        version: 1.53.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.45.0
+        version: 1.53.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -165,47 +179,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.9.0
 - !ruby/object:Gem::Dependency
-  name: prometheus-client
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.8.23
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.8.23
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: prometheus-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.8.23
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.8.23
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.5.0
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.5.0
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -240,14 +254,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.6.2
+        version: 3.17.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.6.2
+        version: 3.17.1
 description: |2
      Fluentd plugins for the Stackdriver Logging API, which will make logs
      viewable in the Stackdriver Logs Viewer and can optionally store them