fluent-plugin-google-cloud 0.6.9.pre.1 → 0.6.10.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88272d0a151ead26a57ac7b523602e566a2c6e79
-  data.tar.gz: 3161e4dd7387a67af1c725a5423165f42d85a448
+  metadata.gz: 39661a11e58b52f626ece8c74056504cc8357f85
+  data.tar.gz: db78d67f4c56435d85011a66332f01c4fd6d69df
 SHA512:
-  metadata.gz: b3e2e2acd6e6b7083bf806ad2cdda05f2bb0014cb751a2ee7777b05c21428e2c6256ff16764652b337700f8568df3e02b3e055e3ce8da8505f24e95220e50f6f
-  data.tar.gz: d9bed2291c45799ead9d6ef38d3f59bfb9e49f26c34b141e1f2f7db60e4bdc7623304d276b468d6816b02981b8439a39a5158d23b954bc319a93922db1b0e786
+  metadata.gz: 2d856be37dcd8bf41c8c35dec9a1e712bf05e684cf2d824dc76a75c279c5f65ea8ebc9b8f3d01922f6e15479cfd0aa2fa87359f407c56227364a40922d0c9037
+  data.tar.gz: 58c0e3b7eba803069baa7bc411269e0f829a43cf76d8555427f03d8cc350e3151e567216504daa4ea10c91162af1e0a375e03ac58e263383a76b85a0667c25e8

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-google-cloud (0.6.9.pre.1)
+    fluent-plugin-google-cloud (0.6.10.pre.1)
       fluentd (~> 0.10)
       google-api-client (~> 0.14)
       google-cloud-logging (~> 1.2, >= 1.2.3)
       googleapis-common-protos (~> 1.3)
       googleauth (~> 0.4, < 0.5.2)
-      grpc (~> 1.0, < 1.3)
+      grpc (~> 1.0)
       json (~> 1.8)
 
 GEM
@@ -16,8 +16,6 @@ GEM
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     ast (2.3.0)
-    astrolabe (1.3.1)
-      parser (~> 2.2)
     cool.io (1.5.1)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
@@ -25,7 +23,7 @@ GEM
     declarative-option (0.1.0)
     faraday (0.13.1)
       multipart-post (>= 1.2, < 3)
-    fluentd (0.14.21)
+    fluentd (0.14.22)
       cool.io (>= 1.4.5, < 2.0.0)
       http_parser.rb (>= 0.5.1, < 0.7.0)
       msgpack (>= 0.7.0, < 2.0.0)
@@ -36,9 +34,9 @@ GEM
       tzinfo (~> 1.0)
       tzinfo-data (~> 1.0)
       yajl-ruby (~> 1.0)
-    google-api-client (0.15.0)
+    google-api-client (0.17.1)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (~> 0.5)
+      googleauth (>= 0.5, < 0.7.0)
       httpclient (>= 2.8.1, < 3.0)
       mime-types (~> 3.0)
       representable (~> 3.0)
@@ -59,11 +57,11 @@ GEM
       grpc (~> 1.0)
       rly (~> 0.2.3)
     google-protobuf (3.4.1.1)
-    googleapis-common-protos (1.3.6)
+    googleapis-common-protos (1.3.7)
       google-protobuf (~> 3.0)
       googleapis-common-protos-types (~> 1.0)
       grpc (~> 1.0)
-    googleapis-common-protos-types (1.0.0)
+    googleapis-common-protos-types (1.0.1)
       google-protobuf (~> 3.0)
     googleauth (0.5.1)
       faraday (~> 0.9)
@@ -73,9 +71,10 @@ GEM
       multi_json (~> 1.11)
       os (~> 0.9)
       signet (~> 0.7)
-    grpc (1.2.5)
+    grpc (1.7.2)
       google-protobuf (~> 3.1)
-      googleauth (~> 0.5.1)
+      googleapis-common-protos-types (~> 1.0.0)
+      googleauth (>= 0.5.1, < 0.7)
     hashdiff (0.3.7)
     http_parser.rb (0.6.0)
     httpclient (2.8.3)
@@ -96,13 +95,13 @@ GEM
     multi_json (1.12.2)
     multipart-post (2.0.0)
     os (0.9.6)
-    parser (2.4.0.0)
-      ast (~> 2.2)
-    power_assert (1.1.0)
+    parser (2.4.0.2)
+      ast (~> 2.3)
+    power_assert (1.1.1)
     powerpack (0.1.1)
     prometheus-client (0.7.1)
       quantile (~> 0.2.0)
-    public_suffix (3.0.0)
+    public_suffix (3.0.1)
     quantile (0.2.0)
     rainbow (2.2.2)
       rake
@@ -113,13 +112,12 @@ GEM
       uber (< 0.2.0)
     retriable (3.1.1)
     rly (0.2.3)
-    rubocop (0.35.1)
-      astrolabe (~> 1.3)
-      parser (>= 2.2.3.0, < 3.0)
+    rubocop (0.39.0)
+      parser (>= 2.3.0.7, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
-      tins (<= 1.6.0)
+      unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.9.0)
     ruby_dig (0.0.2)
     safe_yaml (1.0.4)
@@ -136,17 +134,17 @@ GEM
     test-unit (3.2.6)
       power_assert
     thread_safe (0.3.6)
-    tins (1.6.0)
-    tzinfo (1.2.3)
+    tzinfo (1.2.4)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2017.2)
+    tzinfo-data (1.2017.3)
       tzinfo (>= 1.0.0)
     uber (0.1.0)
+    unicode-display_width (1.3.0)
     webmock (2.3.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    yajl-ruby (1.3.0)
+    yajl-ruby (1.3.1)
 
 PLATFORMS
   ruby
@@ -156,9 +154,9 @@ DEPENDENCIES
   mocha (~> 1.1)
   prometheus-client (~> 0.7.1)
   rake (~> 10.3)
-  rubocop (~> 0.35.0)
+  rubocop (~> 0.39.0)
   test-unit (~> 3.0)
   webmock (~> 2.3.1)
 
 BUNDLED WITH
-   1.15.4
+   1.16.0

data/fluent-plugin-google-cloud.gemspec

@@ -7,10 +7,10 @@ Gem::Specification.new do |gem|
    This is an official Google Ruby gem.
 eos
   gem.summary       = 'fluentd output plugin for the Stackdriver Logging API'
-  gem.homepage      = \
+  gem.homepage      =
     'https://github.com/GoogleCloudPlatform/fluent-plugin-google-cloud'
   gem.license       = 'Apache-2.0'
-  gem.version       = '0.6.9.pre.1'
+  gem.version       = '0.6.10.pre.1'
   gem.authors       = ['Todd Derr', 'Alex Robinson']
   gem.email         = ['salty@google.com']
   gem.required_ruby_version = Gem::Requirement.new('>= 2.0')
@@ -24,12 +24,12 @@ eos
   gem.add_runtime_dependency 'google-api-client', '~> 0.14'
   gem.add_runtime_dependency 'google-cloud-logging', '~> 1.2', '>= 1.2.3'
   gem.add_runtime_dependency 'googleauth', '~> 0.4', '< 0.5.2'
-  gem.add_runtime_dependency 'grpc', '~> 1.0', '< 1.3'
+  gem.add_runtime_dependency 'grpc', '~> 1.0'
   gem.add_runtime_dependency 'json', '~> 1.8'
 
   gem.add_development_dependency 'mocha', '~> 1.1'
   gem.add_development_dependency 'rake', '~> 10.3'
-  gem.add_development_dependency 'rubocop', '~> 0.35.0'
+  gem.add_development_dependency 'rubocop', '~> 0.39.0'
   gem.add_development_dependency 'webmock', '~> 2.3.1'
   gem.add_development_dependency 'test-unit', '~> 3.0'
   gem.add_development_dependency 'prometheus-client', '~> 0.7.1'

data/lib/fluent/plugin/out_google_cloud.rb

@@ -31,7 +31,7 @@ module Google
   module Protobuf
     # Alias the has_key? method to have the same interface as a regular map.
     class Map
-      alias_method :key?, :has_key?
+      alias key? has_key?
     end
   end
 end
@@ -45,80 +45,92 @@ module Fluent
         service: 'appengine.googleapis.com',
         resource_type: 'gae_app',
         metadata_attributes: %w(gae_backend_name gae_backend_version)
-      }
+      }.freeze
       CLOUDFUNCTIONS_CONSTANTS = {
         service: 'cloudfunctions.googleapis.com',
-        resource_type: 'cloud_function'
-      }
+        resource_type: 'cloud_function',
+        stream_severity_map: {
+          'stdout' => 'INFO',
+          'stderr' => 'ERROR'
+        }
+      }.freeze
       COMPUTE_CONSTANTS = {
         service: 'compute.googleapis.com',
         resource_type: 'gce_instance'
-      }
+      }.freeze
       GKE_CONSTANTS = {
         service: 'container.googleapis.com',
         resource_type: 'container',
         extra_resource_labels: %w(namespace_id pod_id container_name),
         extra_common_labels: %w(namespace_name pod_name),
-        metadata_attributes: %w(kube-env)
-      }
+        metadata_attributes: %w(kube-env),
+        stream_severity_map: {
+          'stdout' => 'INFO',
+          'stderr' => 'ERROR'
+        }
+      }.freeze
       DOCKER_CONSTANTS = {
         service: 'docker.googleapis.com',
         resource_type: 'docker_container'
-      }
+      }.freeze
       DATAFLOW_CONSTANTS = {
         service: 'dataflow.googleapis.com',
         resource_type: 'dataflow_step',
         extra_resource_labels: %w(region job_name job_id step_id)
-      }
+      }.freeze
       DATAPROC_CONSTANTS = {
         service: 'cluster.dataproc.googleapis.com',
         resource_type: 'cloud_dataproc_cluster',
         metadata_attributes: %w(dataproc-cluster-uuid dataproc-cluster-name)
-      }
+      }.freeze
       EC2_CONSTANTS = {
         service: 'ec2.amazonaws.com',
         resource_type: 'aws_ec2_instance'
-      }
+      }.freeze
       ML_CONSTANTS = {
         service: 'ml.googleapis.com',
         resource_type: 'ml_job',
         extra_resource_labels: %w(job_id task_name)
-      }
+      }.freeze
 
       # The map between a subservice name and a resource type.
-      SUBSERVICE_MAP = \
+      SUBSERVICE_MAP =
         [APPENGINE_CONSTANTS, GKE_CONSTANTS, DATAFLOW_CONSTANTS,
          DATAPROC_CONSTANTS, ML_CONSTANTS]
         .map { |consts| [consts[:service], consts[:resource_type]] }.to_h
       # Default back to GCE if invalid value is detected.
       SUBSERVICE_MAP.default = COMPUTE_CONSTANTS[:resource_type]
+      SUBSERVICE_MAP.freeze
 
       # The map between a resource type and expected subservice attributes.
-      SUBSERVICE_METADATA_ATTRIBUTES = \
+      SUBSERVICE_METADATA_ATTRIBUTES =
         [APPENGINE_CONSTANTS, GKE_CONSTANTS, DATAPROC_CONSTANTS].map do |consts|
           [consts[:resource_type], consts[:metadata_attributes].to_set]
-        end.to_h
+        end.to_h.freeze
     end
 
     # Constants for configuration.
     module ConfigConstants
       # Default values for JSON payload keys to set the "httpRequest",
       # "operation", "sourceLocation", "trace" fields in the LogEntry.
-      DEFAULT_HTTP_REQUEST_KEY = 'httpRequest'
-      DEFAULT_OPERATION_KEY = 'logging.googleapis.com/operation'
-      DEFAULT_SOURCE_LOCATION_KEY = 'logging.googleapis.com/sourceLocation'
-      DEFAULT_TRACE_KEY = 'logging.googleapis.com/trace'
+      DEFAULT_HTTP_REQUEST_KEY = 'httpRequest'.freeze
+      DEFAULT_OPERATION_KEY = 'logging.googleapis.com/operation'.freeze
+      DEFAULT_SOURCE_LOCATION_KEY =
+        'logging.googleapis.com/sourceLocation'.freeze
+      DEFAULT_TRACE_KEY = 'logging.googleapis.com/trace'.freeze
 
       DEFAULT_METADATA_AGENT_URL =
-        'http://local-metadata-agent.stackdriver.com:8000'
+        'http://local-metadata-agent.stackdriver.com:8000'.freeze
     end
 
     # Internal constants.
     module InternalConstants
+      DEFAULT_LOGGING_API_URL = 'logging.googleapis.com'.freeze
+
       # The label name of local_resource_id in the json payload. When a record
       # has this field in the payload, we will use the value to retrieve
       # monitored resource from Stackdriver Metadata agent.
-      LOCAL_RESOURCE_ID_KEY = 'logging.googleapis.com/local_resource_id'
+      LOCAL_RESOURCE_ID_KEY = 'logging.googleapis.com/local_resource_id'.freeze
 
       # Map from each field name under LogEntry to corresponding variables
       # required to perform field value extraction from the log record.
@@ -168,11 +180,12 @@ module Fluent
           'Google::Logging::V2::LogEntryOperation',
           'Google::Apis::LoggingV2::LogEntryOperation'
         ]
-      }
+      }.freeze
 
       # The name of the WriteLogEntriesPartialErrors field in the error details.
       PARTIAL_ERROR_FIELD =
-        'type.googleapis.com/google.logging.v2.WriteLogEntriesPartialErrors'
+        'type.googleapis.com/google.logging.v2.WriteLogEntriesPartialErrors' \
+        .freeze
     end
 
     include self::ServiceConstants
@@ -181,14 +194,14 @@ module Fluent
 
     Fluent::Plugin.register_output('google_cloud', self)
 
-    PLUGIN_NAME = 'Fluentd Google Cloud Logging plugin'
-    PLUGIN_VERSION = '0.6.9.pre.1'
+    PLUGIN_NAME = 'Fluentd Google Cloud Logging plugin'.freeze
+    PLUGIN_VERSION = '0.6.10.pre.1'.freeze
 
     # Name of the the Google cloud logging write scope.
-    LOGGING_SCOPE = 'https://www.googleapis.com/auth/logging.write'
+    LOGGING_SCOPE = 'https://www.googleapis.com/auth/logging.write'.freeze
 
     # Address of the metadata service.
-    METADATA_SERVICE_ADDR = '169.254.169.254'
+    METADATA_SERVICE_ADDR = '169.254.169.254'.freeze
 
     # Disable this warning to conform to fluentd config_param conventions.
     # rubocop:disable Style/HashSyntax
@@ -310,6 +323,10 @@ module Fluent
                  :default => nil,
                  :secret => true
 
+    # The URL of Stackdriver Logging API. Right now this only works with the
+    # gRPC path (use_grpc = true).
+    config_param :logging_api_url, :string, :default => DEFAULT_LOGGING_API_URL
+
     # Whether to collect metrics about the plugin usage. The mechanism for
     # collecting and exposing metrics is controlled by the monitoring_type
     # parameter.
@@ -358,6 +375,15 @@ module Fluent
                   ' partial_success flag will be ignored.'
       end
 
+      # TODO(qingling128): Remove this warning after the support is added. Also
+      # remove the comment in the description of this configuration.
+      unless @logging_api_url == DEFAULT_LOGGING_API_URL || @use_grpc
+        @log.warn 'Detected customized logging_api_url while use_grpc is not' \
+                  ' enabled. Customized logging_api_url for the non-gRPC path' \
+                  ' is not supported. The logging_api_url option will be' \
+                  ' ignored.'
+      end
+
       # If monitoring is enabled, register metrics in the default registry
       # and store metric objects for future use.
       if @enable_monitoring
@@ -391,10 +417,9 @@ module Fluent
         extra << 'private_key_path' unless @private_key_path.nil?
         extra << 'private_key_passphrase' unless @private_key_passphrase.nil?
 
-        fail Fluent::ConfigError,
-             "#{PLUGIN_NAME} no longer supports auth_method.\n" \
-             'Please remove configuration parameters: ' +
-               extra.join(' ')
+        raise Fluent::ConfigError,
+              "#{PLUGIN_NAME} no longer supports auth_method.\n" \
+              "Please remove configuration parameters: #{extra.join(' ')}"
       end
 
       set_regexp_patterns
@@ -641,7 +666,7 @@ module Fluent
           end
         else
           begin
-            write_request = \
+            write_request =
               Google::Apis::LoggingV2::WriteLogEntriesRequest.new(
                 log_name: log_name,
                 resource: group_level_resource,
@@ -767,7 +792,7 @@ module Fluent
     end
 
     def fetch_gce_metadata(metadata_path)
-      fail "Called fetch_gce_metadata with platform=#{@platform}" unless
+      raise "Called fetch_gce_metadata with platform=#{@platform}" unless
         @platform == Platform::GCE
       # See https://cloud.google.com/compute/docs/metadata
       open('http://' + METADATA_SERVICE_ADDR + '/computeMetadata/v1/' +
@@ -777,7 +802,7 @@ module Fluent
     # EC2 Metadata server returns everything in one call. Store it after the
     # first fetch to avoid making multiple calls.
     def ec2_metadata
-      fail "Called ec2_metadata with platform=#{@platform}" unless
+      raise "Called ec2_metadata with platform=#{@platform}" unless
         @platform == Platform::EC2
       unless @ec2_metadata
         # See http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-metadata.html
@@ -821,8 +846,8 @@ module Fluent
       missing << 'zone' unless @zone
       missing << 'vm_id' unless @vm_id
       return if missing.empty?
-      fail Fluent::ConfigError, 'Unable to obtain metadata parameters: ' +
-        missing.join(' ')
+      raise Fluent::ConfigError,
+            "Unable to obtain metadata parameters: #{missing.join(' ')}"
     end
 
     # 1. Return the value if it is explicitly set in the config already.
@@ -991,13 +1016,11 @@ module Fluent
       # GCE instance and GKE container.
       when COMPUTE_CONSTANTS[:resource_type],
            GKE_CONSTANTS[:resource_type]
-        labels.merge!(
-          "#{COMPUTE_CONSTANTS[:service]}/resource_name" => @vm_name)
+        labels["#{COMPUTE_CONSTANTS[:service]}/resource_name"] = @vm_name
 
       # EC2.
       when EC2_CONSTANTS[:resource_type]
-        labels.merge!(
-          "#{EC2_CONSTANTS[:service]}/resource_name" => @vm_name)
+        labels["#{EC2_CONSTANTS[:service]}/resource_name"] = @vm_name
       end
       labels
     end
@@ -1354,29 +1377,17 @@ module Fluent
       if resource_type == CLOUDFUNCTIONS_CONSTANTS[:resource_type]
         if @cloudfunctions_log_match && @cloudfunctions_log_match['severity']
           return parse_severity(@cloudfunctions_log_match['severity'])
-        elsif record.key?('stream') && record['stream'] == 'stdout'
-          record.delete('stream')
-          return 'INFO'
-        elsif record.key?('stream') && record['stream'] == 'stderr'
-          record.delete('stream')
-          return 'ERROR'
-        else
-          return 'DEFAULT'
+        elsif record.key?('stream')
+          return CLOUDFUNCTIONS_CONSTANTS[:stream_severity_map].fetch(
+            record.delete('stream'), 'DEFAULT')
         end
       elsif record.key?('severity')
         return parse_severity(record.delete('severity'))
       elsif resource_type == GKE_CONSTANTS[:resource_type]
         stream = entry_level_common_labels["#{GKE_CONSTANTS[:service]}/stream"]
-        if stream == 'stdout'
-          return 'INFO'
-        elsif stream == 'stderr'
-          return 'ERROR'
-        else
-          return 'DEFAULT'
-        end
-      else
-        return 'DEFAULT'
+        return GKE_CONSTANTS[:stream_severity_map].fetch(stream, 'DEFAULT')
       end
+      'DEFAULT'
     end
 
     def set_log_entry_fields(record, entry)
@@ -1404,11 +1415,11 @@ module Fluent
 
           next unless extracted_subfields
 
-          if @use_grpc
-            output = Object.const_get(grpc_class).new
-          else
-            output = Object.const_get(non_grpc_class).new
-          end
+          output = if @use_grpc
+                     Object.const_get(grpc_class).new
+                   else
+                     Object.const_get(non_grpc_class).new
+                   end
           extracted_subfields.each do |key, value|
             output.send("#{key}=", value)
           end
@@ -1424,7 +1435,8 @@ module Fluent
 
     # Values permitted by the API for 'severity' (which is an enum).
     VALID_SEVERITIES = Set.new(
-      %w(DEFAULT DEBUG INFO NOTICE WARNING ERROR CRITICAL ALERT EMERGENCY))
+      %w(DEFAULT DEBUG INFO NOTICE WARNING ERROR CRITICAL ALERT EMERGENCY)
+    ).freeze
 
     # Translates other severity strings to one of the valid values above.
     SEVERITY_TRANSLATIONS = {
@@ -1453,7 +1465,7 @@ module Fluent
       # other misc. translations.
       'ERR' => 'ERROR',
       'F' => 'CRITICAL'
-    }
+    }.freeze
 
     def parse_severity(severity_str)
       # The API is case insensitive, but uppercase to make things simpler.
@@ -1464,12 +1476,13 @@ module Fluent
 
       # If the severity is an integer (string) return it as an integer,
       # truncated to the closest valid value (multiples of 100 between 0-800).
-      if /\A\d+\z/.match(severity)
+      if /\A\d+\z/ =~ severity
         begin
           numeric_severity = (severity.to_i / 100) * 100
-          if numeric_severity < 0
+          case
+          when numeric_severity < 0
             return 0
-          elsif numeric_severity > 800
+          when numeric_severity > 800
             return 800
           else
             return numeric_severity
@@ -1507,7 +1520,7 @@ module Fluent
       600 => Google::Logging::Type::LogSeverity::CRITICAL,
       700 => Google::Logging::Type::LogSeverity::ALERT,
       800 => Google::Logging::Type::LogSeverity::EMERGENCY
-    }
+    }.freeze
 
     def grpc_severity(severity)
       # TODO: find out why this doesn't work.
@@ -1561,11 +1574,14 @@ module Fluent
 
     def decode_cloudfunctions_function_name(function_name)
       function_name.gsub(/c\.[a-z]/) { |s| s.upcase[-1] }
-        .gsub('u.u', '_').gsub('d.d', '$').gsub('a.a', '@').gsub('p.p', '.')
+                   .gsub('u.u', '_')
+                   .gsub('d.d', '$')
+                   .gsub('a.a', '@')
+                   .gsub('p.p', '.')
     end
 
     def format(tag, time, record)
-      [tag, time, record].to_msgpack
+      Fluent::Engine.msgpack_factory.packer.write([tag, time, record]).to_s
     end
 
     # Given a tag, returns the corresponding valid tag if possible, or nil if
@@ -1618,7 +1634,7 @@ module Fluent
         ret.list_value = list_from_ruby(value)
       else
         @log.error "Unknown type: #{value.class}"
-        fail Google::Protobuf::Error, "Unknown type: #{value.class}"
+        raise Google::Protobuf::Error, "Unknown type: #{value.class}"
       end
       ret
     end
@@ -1717,7 +1733,7 @@ module Fluent
         creds = GRPC::Core::CallCredentials.new(authentication.updater_proc)
         creds = ssl_creds.compose(creds)
         @client = Google::Logging::V2::LoggingServiceV2::Stub.new(
-          'logging.googleapis.com', creds)
+          @logging_api_url, creds)
       else
         unless @client.authorization.expired?
           begin
@@ -1839,7 +1855,7 @@ module Fluent
       error_details = ensure_array(
         ensure_hash(ensure_hash(JSON.parse(error.body))['error'])['details'])
       partial_errors = error_details.detect(
-        -> { fail JSON::ParserError, "No type #{PARTIAL_ERROR_FIELD}." }
+        -> { raise JSON::ParserError, "No type #{PARTIAL_ERROR_FIELD}." }
       ) do |error_detail|
         ensure_hash(error_detail)['@type'] == PARTIAL_ERROR_FIELD
       end
@@ -1847,8 +1863,8 @@ module Fluent
         ensure_hash(partial_errors)['logEntryErrors'])
       log_entry_errors.each do |index, log_entry_error|
         error_hash = ensure_hash(log_entry_error)
-        fail JSON::ParserError,
-             "Entry #{index} is missing 'code' or 'message'." unless
+        raise JSON::ParserError,
+              "Entry #{index} is missing 'code' or 'message'." unless
           error_hash['code'] && error_hash['message']
         error_key = [error_hash['code'], error_hash['message']].freeze
         # TODO(qingling128): Convert indexes to integers.
@@ -1862,11 +1878,11 @@ module Fluent
     end
 
     def ensure_array(value)
-      Array.try_convert(value) || (fail JSON::ParserError, "#{value.class}")
+      Array.try_convert(value) || (raise JSON::ParserError, value.class.to_s)
     end
 
     def ensure_hash(value)
-      Hash.try_convert(value) || (fail JSON::ParserError, "#{value.class}")
+      Hash.try_convert(value) || (raise JSON::ParserError, value.class.to_s)
     end
 
     # Increment the metric for the number of successful requests.