fluent-plugin-google-cloud 0.4.2 → 0.4.3

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-google-cloud (0.4.1)
+    fluent-plugin-google-cloud (0.4.3)
       fluentd (>= 0.10)
-      google-api-client (>= 0.8)
+      google-api-client (~> 0.8.6)
       googleauth (~> 0.4)
       json (~> 1.8.2)
 
@@ -17,6 +17,9 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.3.8)
+    ast (2.0.0)
+    astrolabe (1.3.1)
+      parser (~> 2.2)
     autoparse (0.3.3)
       addressable (>= 2.3.1)
       extlib (>= 0.9.15)
@@ -27,7 +30,7 @@ GEM
     extlib (0.9.16)
     faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
-    fluentd (0.12.12)
+    fluentd (0.12.14)
       cool.io (>= 1.2.2, < 2.0.0)
       http_parser.rb (>= 0.5.1, < 0.7.0)
       json (>= 1.4.3)
@@ -73,9 +76,20 @@ GEM
     msgpack (0.5.12)
     multi_json (1.11.0)
     multipart-post (2.0.0)
-    power_assert (0.2.3)
+    parser (2.2.2.6)
+      ast (>= 1.1, < 3.0)
+    power_assert (0.2.4)
+    powerpack (0.1.1)
+    rainbow (2.0.0)
     rake (10.4.2)
     retriable (1.4.1)
+    rubocop (0.32.1)
+      astrolabe (~> 1.3)
+      parser (>= 2.2.2.5, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.4)
+    ruby-progressbar (1.7.5)
     safe_yaml (1.0.4)
     sigdump (0.2.3)
     signet (0.6.1)
@@ -104,6 +118,7 @@ DEPENDENCIES
   fluent-plugin-google-cloud!
   mocha (~> 1.1)
   rake (>= 10.3.2)
+  rubocop (~> 0.30)
   test-unit (~> 3.0.2)
   webmock (>= 1.17.0)
 

data/README.rdoc

@@ -1,33 +1,44 @@
-= Google Cloud Platform plugin for {fluentd}[http://github.com/fluent/fluentd]
+= Google Cloud Logging plugin for {fluentd}[http://github.com/fluent/fluentd]
 
-fluent-plugin-google-cloud sends logs to the Google Cloud Platform logging API.
+fluent-plugin-google-cloud is an
+{output plugin for fluentd}[http://docs.fluentd.org/articles/output-plugin-overview]
+which sends logs to the
+{Google Cloud Logging API}[https://cloud.google.com/logging/docs/api/].
+
+This is an official Google Ruby gem.
+
+{<img src="https://badge.fury.io/rb/fluent-plugin-google-cloud.svg" alt="Gem Version" />}[http://badge.fury.io/rb/fluent-plugin-google-cloud]
+{<img src="https://secure.travis-ci.org/google/google-auth-library-ruby.png" alt="Build Status" />}[https://travis-ci.org/GoogleCloudPlatform/fluent-plugin-google-cloud]
 
 == Installation
 
-The gem is hosted at {RubyGems.org}[http://rubygems.org]. You can install the gem as follows:
+This gem is hosted at
+{RubyGems.org}[https://rubygems.org/gems/fluent-plugin-google-cloud]
+and can be installed using:
 
     $ gem install fluent-plugin-google-cloud
 
+Installing {google-fluentd}[https://cloud.google.com/logging/docs/agent/]
+will also install and configure the gem.
+
 == Configuration
 
+To send logs to Google Cloud Logging, specify <code>type google_cloud</code>
+in a
+{match clause}[http://docs.fluentd.org/articles/config-file#2-ldquomatchrdquo-tell-fluentd-what-to-do]
+of your fluentd configuration file, for example:
+
     <match **>
       type google_cloud
-      auth_method <method>
-      private_key_email <address>
-      private_key_path <path>
     </match>
 
-Supported options:
-* auth_method: either 'compute_engine_service_account' or 'private_key' (default: compute_engine_service_account)
-* private_key_email: email address of your project's service account.
-* private_key_path: path to a file containing service account credentials.
-
-private_key_email and private_key_path are required if auth_method is
-'private_key', otherwise they are ignored.
-
-== Caveats
+No further configuration is required. The plugin uses
+{Google Application Default Credentials}[https://developers.google.com/identity/protocols/application-default-credentials]
+for authorization - for additional information see 
+{here}[https://cloud.google.com/logging/docs/agent/authorization].
 
-This plugin currently only supports being run on a Google Compute Engine VM because it grabs its authentication token as well as important metadata from the VM metadata server.
+<em>The previously documented parameters auth_method, private_key_email,
+and private_key_path are deprecated and should no longer be used.</em>
 
 == Copyright
 

data/Rakefile

@@ -4,9 +4,19 @@ require 'bundler'
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
+require 'rubocop/rake_task'
 
+desc 'Run Rubocop to check for style violations'
+RuboCop::RakeTask.new
+
+desc 'Run unit tests'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
   test.test_files = FileList['test/plugin/*.rb']
   test.verbose = true
 end
+
+desc 'Does rubocop lint and runs tests'
+task all: [:rubocop, :test]
+
+task default: :all

data/fluent-plugin-google-cloud.gemspec

@@ -1,23 +1,31 @@
 Gem::Specification.new do |gem|
   gem.name          = 'fluent-plugin-google-cloud'
-  gem.description   = %q{Fluentd plugin to stream logs to the Google Cloud Platform's logging API, which will make them viewable in the Developer Console's log viewer and can optionally store them in Google Cloud Storage and/or BigQuery. This is an official Google Ruby gem.}
-  gem.summary       = %q{Fluentd plugin to stream logs to the Google Cloud Platform's logging API}
-  gem.homepage      = 'https://github.com/GoogleCloudPlatform/fluent-plugin-google-cloud'
+  gem.description   = <<-eos
+   Fluentd output plugin for the Google Cloud Logging API, which will make
+   loge viewable in the Developer Console's log viewer and can optionally
+   store them in Google Cloud Storage and/or BigQuery.
+   This is an official Google Ruby gem.'
+eos
+  gem.summary       =  'fluentd output plugin for the Google Cloud Logging API'
+  gem.homepage      = \
+    'https://github.com/GoogleCloudPlatform/fluent-plugin-google-cloud'
   gem.license       = 'Apache 2.0'
-  gem.version       = '0.4.2'
+  gem.version       = '0.4.3'
   gem.authors       = ['Todd Derr', 'Alex Robinson']
   gem.email         = ['salty@google.com']
 
   gem.files         = Dir['**/*'].keep_if { |file| File.file?(file) }
-  gem.test_files    = gem.files.grep(%r{^(test)})
+  gem.test_files    = gem.files.grep(/^(test)/)
   gem.require_paths = ['lib']
 
   gem.add_runtime_dependency 'fluentd', '>= 0.10'
-  gem.add_runtime_dependency 'google-api-client', '>= 0.8'
+  gem.add_runtime_dependency 'google-api-client', '~> 0.8.6'
   gem.add_runtime_dependency 'googleauth', '~> 0.4'
   gem.add_runtime_dependency 'json', '~> 1.8.2'
-  gem.add_development_dependency "rake", '>= 10.3.2'
-  gem.add_development_dependency "webmock", '>= 1.17.0'
-  gem.add_development_dependency "test-unit", "~> 3.0.2"
-  gem.add_development_dependency "mocha", "~> 1.1"
+
+  gem.add_development_dependency 'mocha', '~> 1.1'
+  gem.add_development_dependency 'rake', '>= 10.3.2'
+  gem.add_development_dependency 'rubocop', '~> 0.30'
+  gem.add_development_dependency 'webmock', '>= 1.17.0'
+  gem.add_development_dependency 'test-unit', '~> 3.0.2'
 end

data/lib/fluent/plugin/out_google_cloud.rb

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 module Fluent
+  # fluentd output plugin for the Google Cloud Logging API
   class GoogleCloudOutput < BufferedOutput
     Fluent::Plugin.register_output('google_cloud', self)
 
@@ -28,6 +29,9 @@ module Fluent
     # Address of the metadata service.
     METADATA_SERVICE_ADDR = '169.254.169.254'
 
+    # Disable this warning to conform to fluentd config_param conventions.
+    # rubocop:disable Style/HashSyntax
+
     # DEPRECATED: auth_method (and support for 'private_key') is deprecated in
     # favor of Google Application Default Credentials as documented at:
     # https://developers.google.com/identity/protocols/application-default-credentials
@@ -74,6 +78,8 @@ module Fluent
     #   }
     config_param :label_map, :hash, :default => nil
 
+    # rubocop:enable Style/HashSyntax
+
     # TODO: Add a log_name config option rather than just using the tag?
 
     # Expose attr_readers to make testing of metadata more direct than only
@@ -95,24 +101,27 @@ module Fluent
       require 'googleauth'
       require 'json'
       require 'open-uri'
+
+      # use the global logger
+      @log = $log # rubocop:disable Style/GlobalVars
     end
 
     def configure(conf)
       super
 
-      if !@auth_method.nil?
-        $log.warn ('auth_method is deprecated; please migrate to using ' +
-                   'Application Default Credentials.')
+      unless @auth_method.nil?
+        @log.warn 'auth_method is deprecated; please migrate to using ' \
+          'Application Default Credentials.'
         if @auth_method == 'private_key'
           if !@private_key_email
-            raise Fluent::ConfigError, ('"private_key_email" must be ' +
-                'specified if auth_method is "private_key"')
+            fail Fluent::ConfigError, '"private_key_email" must be ' \
+              'specified if auth_method is "private_key"'
           elsif !@private_key_path
-            raise Fluent::ConfigError, ('"private_key_path" must be ' +
-                'specified if auth_method is "private_key"')
+            fail Fluent::ConfigError, '"private_key_path" must be ' \
+              'specified if auth_method is "private_key"'
           elsif !@private_key_passphrase
-            raise Fluent::ConfigError, ('"private_key_passphrase" must be ' +
-                'specified if auth_method is "private_key"')
+            fail Fluent::ConfigError, '"private_key_passphrase" must be ' \
+              'specified if auth_method is "private_key"'
           end
         end
       end
@@ -133,34 +142,32 @@ module Fluent
           fully_qualified_zone = fetch_gce_metadata('instance/zone')
           @zone = fully_qualified_zone.rpartition('/')[2]
         end
-        if @vm_id.nil?
-          @vm_id = fetch_gce_metadata('instance/id')
-        end
+        @vm_id = fetch_gce_metadata('instance/id') if @vm_id.nil?
       when Platform::EC2
         metadata = fetch_ec2_metadata
-        if @zone.nil? && metadata.has_key?('availabilityZone')
+        if @zone.nil? && metadata.key?('availabilityZone')
           @zone = 'aws:' + metadata['availabilityZone']
         end
-        if @vm_id.nil? && metadata.has_key?('instanceId')
+        if @vm_id.nil? && metadata.key?('instanceId')
           @vm_id = metadata['instanceId']
         end
-        if metadata.has_key?('accountId')
+        if metadata.key?('accountId')
           common_labels["#{EC2_SERVICE}/account_id"] = metadata['accountId']
         end
       when Platform::OTHER
         # do nothing
       else
-        raise Fluent::ConfigError, 'Unknown platform ' + @platform
+        fail Fluent::ConfigError, 'Unknown platform ' + @platform
       end
 
       # all metadata parameters must now be set
       unless @project_id && @zone && @vm_id
         missing = []
-        missing << "project_id" unless @project_id
-        missing << "zone" unless @zone
-        missing << "vm_id" unless @vm_id
-        raise Fluent::ConfigError,
-          ('Unable to obtain metadata parameters: ' + missing.join(' '))
+        missing << 'project_id' unless @project_id
+        missing << 'zone' unless @zone
+        missing << 'vm_id' unless @vm_id
+        fail Fluent::ConfigError, 'Unable to obtain metadata parameters: ' +
+          missing.join(' ')
       end
 
       # Default this to false; it is only overwritten if we detect Managed VM.
@@ -173,8 +180,8 @@ module Fluent
         # Check for specialized GCE environments (Managed VM or Dataflow).
         # TODO: Add config options for these to allow for running outside GCE?
         attributes = fetch_gce_metadata('instance/attributes/').split
-        if (attributes.include?('gae_backend_name') &&
-            attributes.include?('gae_backend_version'))
+        if attributes.include?('gae_backend_name') &&
+           attributes.include?('gae_backend_version')
           # Managed VM
           @running_on_managed_vm = true
           @gae_backend_name =
@@ -185,7 +192,7 @@ module Fluent
           common_labels["#{APPENGINE_SERVICE}/module_id"] = @gae_backend_name
           common_labels["#{APPENGINE_SERVICE}/version_id"] =
             @gae_backend_version
-        elsif (attributes.include?('job_id'))
+        elsif attributes.include?('job_id')
           # Dataflow
           @service_name = DATAFLOW_SERVICE
           @dataflow_job_id = fetch_gce_metadata('instance/attributes/job_id')
@@ -212,7 +219,7 @@ module Fluent
     def start
       super
 
-      init_api_client()
+      init_api_client
 
       @successful_call = false
       @timenanos_warning = false
@@ -230,43 +237,41 @@ module Fluent
       # Group the entries since we have to make one call per tag.
       grouped_entries = {}
       chunk.msgpack_each do |tag, *arr|
-        if !grouped_entries.has_key?(tag)
-          grouped_entries[tag] = []
-        end
+        grouped_entries[tag] = [] unless grouped_entries.key?(tag)
         grouped_entries[tag].push(arr)
       end
 
       grouped_entries.each do |tag, arr|
         write_log_entries_request = {
           'commonLabels' => @common_labels,
-          'entries' => [],
+          'entries' => []
         }
         arr.each do |time, record|
           next unless record.is_a?(Hash)
-          if (record.has_key?('timestamp') &&
-              record['timestamp'].is_a?(Hash) &&
-              record['timestamp'].has_key?('seconds') &&
-              record['timestamp'].has_key?('nanos'))
+          if record.key?('timestamp') &&
+             record['timestamp'].is_a?(Hash) &&
+             record['timestamp'].key?('seconds') &&
+             record['timestamp'].key?('nanos')
             ts_secs = record['timestamp']['seconds']
             ts_nanos = record['timestamp']['nanos']
             record.delete('timestamp')
-          elsif (record.has_key?('timestampSeconds') &&
-                 record.has_key?('timestampNanos'))
+          elsif record.key?('timestampSeconds') &&
+                record.key?('timestampNanos')
             ts_secs = record['timestampSeconds']
             ts_nanos = record['timestampNanos']
             record.delete('timestampSeconds')
             record.delete('timestampNanos')
-          elsif (record.has_key?('timeNanos'))
+          elsif record.key?('timeNanos')
             # This is deprecated since the precision is insufficient.
             # Use timestampSeconds/timestampNanos instead
-            ts_secs = (record['timeNanos'] / 1000000000).to_i
-            ts_nanos = record['timeNanos'] % 1000000000
+            ts_secs = (record['timeNanos'] / 1_000_000_000).to_i
+            ts_nanos = record['timeNanos'] % 1_000_000_000
             record.delete('timeNanos')
-            if (!@timenanos_warning)
+            unless @timenanos_warning
               # Warn the user this is deprecated, but only once to avoid spam.
               @timenanos_warning = true
-              $log.warn ("timeNanos is deprecated - please use " +
-                         "timestampSeconds and timestampNanos instead.")
+              @log.warn 'timeNanos is deprecated - please use ' \
+                'timestampSeconds and timestampNanos instead.'
             end
           else
             timestamp = Time.at(time)
@@ -281,10 +286,10 @@ module Fluent
               'timestamp' => {
                 'seconds' => ts_secs,
                 'nanos' => ts_nanos
-              },
-            },
+              }
+            }
           }
-          if record.has_key?('severity')
+          if record.key?('severity')
             entry['metadata']['severity'] = parse_severity(record['severity'])
             record.delete('severity')
           else
@@ -294,22 +299,20 @@ module Fluent
           # If a field is present in the label_map, send its value as a label
           # (mapping the field name to label name as specified in the config)
           # and do not send that field as part of the payload.
-          if !label_map.nil?
+          unless label_map.nil?
             labels = {}
             @label_map.each do |field, label|
-              if record.has_key?(field)
+              if record.key?(field)
                 labels[label] = record[field]
                 record.delete(field)
               end
             end
-            if !labels.empty?
-              entry['metadata']['labels'] = labels
-            end
+            entry['metadata']['labels'] = labels unless labels.empty?
           end
 
           # use textPayload if the only remainaing key is 'message',
           # otherwise use a struct.
-          if (record.size == 1 && record.has_key?('message'))
+          if record.size == 1 && record.key?('message')
             entry['textPayload'] = record['message']
           else
             entry['structPayload'] = record
@@ -321,24 +324,24 @@ module Fluent
 
         # Add a prefix to VMEngines logs to prevent namespace collisions,
         # and also escape the log name.
-        log_name = CGI::escape(@running_on_managed_vm ?
-                               "#{APPENGINE_SERVICE}/#{tag}" : tag)
-        url = ('https://logging.googleapis.com/v1beta3/projects/' +
-               "#{@project_id}/logs/#{log_name}/entries:write")
+        log_name = CGI.escape(
+          @running_on_managed_vm ? "#{APPENGINE_SERVICE}/#{tag}" : tag)
+        url = 'https://logging.googleapis.com/v1beta3/projects/' \
+          "#{@project_id}/logs/#{log_name}/entries:write"
         begin
-          client = api_client()
-          request = client.generate_request({
-            :uri => url,
-            :body_object => write_log_entries_request,
-            :http_method => 'POST',
-            :authenticated => true
-          })
+          client = api_client
+          request = client.generate_request(
+            uri: url,
+            body_object: write_log_entries_request,
+            http_method: 'POST',
+            authenticated: true
+          )
           client.execute!(request)
           # Let the user explicitly know when the first call succeeded,
           # to aid with verification and troubleshooting.
-          if (!@successful_call)
+          unless @successful_call
             @successful_call = true
-            $log.info "Successfully sent to Google Cloud Logging API."
+            @log.info 'Successfully sent to Google Cloud Logging API.'
           end
         # Allow most exceptions to propagate, which will cause fluentd to
         # retry (with backoff), but in some cases we catch the error and
@@ -347,9 +350,7 @@ module Fluent
           # Most ClientErrors indicate a problem with the request itself and
           # should not be retried, unless it is an authentication issue, in
           # which case we will retry the request via re-raising the exception.
-          if (is_retriable_client_error(error))
-            raise error
-          end
+          raise error if retriable_client_error?(error)
           log_write_failure(write_log_entries_request, error)
         rescue JSON::GeneratorError => error
           # This happens if the request contains illegal characters;
@@ -365,17 +366,18 @@ module Fluent
       'Invalid Credentials',
       'Request had invalid credentials.',
       'The caller does not have permission',
-      'Project has not enabled the API. Please use Google Developers Console to activate the API for your project.',
+      'Project has not enabled the API. Please use Google Developers ' \
+        'Console to activate the API for your project.',
       'Unable to fetch access token (no scopes configured?)']
 
-    def is_retriable_client_error(error)
-      return RETRIABLE_CLIENT_ERRORS.include?(error.message)
+    def retriable_client_error?(error)
+      RETRIABLE_CLIENT_ERRORS.include?(error.message)
     end
 
     def log_write_failure(request, error)
       dropped = request['entries'].length
-      $log.warn "Dropping #{dropped} log message(s)",
-        :error_class => error.class.to_s, :error => error.to_s
+      @log.warn "Dropping #{dropped} log message(s)",
+                error_class: error.class.to_s, error: error.to_s
     end
 
     # "enum" of Platform values
@@ -388,55 +390,54 @@ module Fluent
     # Determine what platform we are running on by consulting the metadata
     # service (unless the user has explicitly disabled using that).
     def detect_platform
-      if !@use_metadata_service
-        $log.info "use_metadata_service is false; not detecting platform"
+      unless @use_metadata_service
+        @log.info 'use_metadata_service is false; not detecting platform'
         return Platform::OTHER
       end
 
       begin
         open('http://' + METADATA_SERVICE_ADDR) do |f|
           if (f.meta['metadata-flavor'] == 'Google')
-            $log.info 'Detected GCE platform'
+            @log.info 'Detected GCE platform'
             return Platform::GCE
           end
           if (f.meta['server'] == 'EC2ws')
-            $log.info 'Detected EC2 platform'
+            @log.info 'Detected EC2 platform'
             return Platform::EC2
           end
         end
-      rescue Exception => e
-        $log.debug "Failed to access metadata service: ", :error => e
+      rescue StandardError => e
+        @log.debug 'Failed to access metadata service: ', error: e
       end
 
-      $log.info 'Unable to determine platform'
-      return Platform::OTHER
+      @log.info 'Unable to determine platform'
+      Platform::OTHER
     end
 
     def fetch_gce_metadata(metadata_path)
-      raise "Called fetch_gce_metadata with platform=#{@platform}" unless
+      fail "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/' +
-           metadata_path, {'Metadata-Flavor' => 'Google'}) do |f|
+           metadata_path, 'Metadata-Flavor' => 'Google') do |f|
         f.read
       end
     end
 
     def fetch_ec2_metadata
-      raise "Called fetch_ec2_metadata with platform=#{@platform}" unless
+      fail "Called fetch_ec2_metadata with platform=#{@platform}" unless
         @platform == Platform::EC2
       # See http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-metadata.html
       open('http://' + METADATA_SERVICE_ADDR +
            '/latest/dynamic/instance-identity/document') do |f|
-        contents = f.read()
+        contents = f.read
         return JSON.parse(contents)
       end
     end
 
     # Values permitted by the API for 'severity' (which is an enum).
-    VALID_SEVERITIES = Set.new [
-      'DEFAULT', 'DEBUG', 'INFO', 'NOTICE', 'WARNING', 'ERROR', 'CRITICAL',
-      'ALERT', 'EMERGENCY']
+    VALID_SEVERITIES = Set.new(
+      %w(DEFAULT DEBUG INFO NOTICE WARNING ERROR CRITICAL ALERT EMERGENCY))
 
     # Translates other severity strings to one of the valid values above.
     SEVERITY_TRANSLATIONS = {
@@ -457,7 +458,7 @@ module Fluent
       'C' => 'CRITICAL',
       'A' => 'ALERT',
       # other misc. translations.
-      'ERR' => 'ERROR',
+      'ERR' => 'ERROR'
     }
 
     def parse_severity(severity_str)
@@ -465,18 +466,16 @@ module Fluent
       severity = severity_str.upcase.strip
 
       # If the severity is already valid, just return it.
-      if (VALID_SEVERITIES.include?(severity))
-        return severity
-      end
+      return severity if VALID_SEVERITIES.include?(severity)
 
       # 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/.match(severity)
         begin
           numeric_severity = (severity.to_i / 100) * 100
-          if (numeric_severity < 0)
+          if numeric_severity < 0
             return 0
-          elsif (numeric_severity > 800)
+          elsif numeric_severity > 800
             return 800
           else
             return numeric_severity
@@ -487,19 +486,19 @@ module Fluent
       end
 
       # Try to translate the severity.
-      if (SEVERITY_TRANSLATIONS.has_key?(severity))
+      if SEVERITY_TRANSLATIONS.key?(severity)
         return SEVERITY_TRANSLATIONS[severity]
       end
 
       # If all else fails, use 'DEFAULT'.
-      return 'DEFAULT'
+      'DEFAULT'
     end
 
     def init_api_client
       @client = Google::APIClient.new(
-        :application_name => 'Fluentd Google Cloud Logging plugin',
-        :application_version => '0.4.2',
-        :retries => 1)
+        application_name: 'Fluentd Google Cloud Logging plugin',
+        application_version: '0.4.3',
+        retries: 1)
 
       if @auth_method == 'private_key'
         key = Google::APIClient::PKCS12.load_key(@private_key_path,
@@ -510,22 +509,22 @@ module Fluent
         @client.authorization.expiry = 3600  # 3600s is the max allowed value
       else
         @client.authorization = Google::Auth.get_application_default(
-            LOGGING_SCOPE)
+          LOGGING_SCOPE)
       end
     end
 
     def api_client
-      if !@client.authorization.expired?
+      unless @client.authorization.expired?
         begin
           @client.authorization.fetch_access_token!
         rescue MultiJson::ParseError
           # Workaround an issue in the API client; just re-raise a more
           # descriptive error for the user (which will still cause a retry).
-          raise Google::APIClient::ClientError,
-            'Unable to fetch access token (no scopes configured?)'
+          raise Google::APIClient::ClientError, 'Unable to fetch access ' \
+            'token (no scopes configured?)'
         end
       end
-      return @client
+      @client
     end
   end
 end