fluent-plugin-google-cloud 0.4.15 → 0.4.16

data/Gemfile.lock

@@ -1,17 +1,16 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-google-cloud (0.4.14)
+    fluent-plugin-google-cloud (0.4.16)
       fluentd (~> 0.10)
       google-api-client (>= 0.8.6, < 0.9)
       googleauth (~> 0.4)
       json (~> 1.8)
-      jwt (< 1.5.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.6)
+    activesupport (4.2.4)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -25,13 +24,13 @@ GEM
       addressable (>= 2.3.1)
       extlib (>= 0.9.15)
       multi_json (>= 1.0.0)
-    cool.io (1.4.3)
+    cool.io (1.4.1)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     extlib (0.9.16)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    fluentd (0.12.22)
+    fluentd (0.12.16)
       cool.io (>= 1.2.2, < 2.0.0)
       http_parser.rb (>= 0.5.1, < 0.7.0)
       json (>= 1.4.3)
@@ -52,14 +51,13 @@ GEM
       multi_json (~> 1.10)
       retriable (~> 1.4)
       signet (~> 0.6)
-    googleauth (0.5.1)
+    googleauth (0.4.2)
       faraday (~> 0.9)
       jwt (~> 1.4)
       logging (~> 2.0)
       memoist (~> 0.12)
       multi_json (~> 1.11)
-      os (~> 0.9)
-      signet (~> 0.7)
+      signet (~> 0.6)
     hashdiff (0.2.2)
     http_parser.rb (0.6.0)
     i18n (0.7.0)
@@ -68,18 +66,17 @@ GEM
     launchy (2.4.3)
       addressable (~> 2.3)
     little-plugger (1.1.4)
-    logging (2.1.0)
+    logging (2.0.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
-    memoist (0.14.0)
+    memoist (0.12.0)
     metaclass (0.0.4)
-    minitest (5.8.4)
+    minitest (5.8.2)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     msgpack (0.5.12)
     multi_json (1.11.2)
     multipart-post (2.0.0)
-    os (0.9.6)
     parser (2.2.3.0)
       ast (>= 1.1, < 3.0)
     power_assert (0.2.5)
@@ -95,9 +92,10 @@ GEM
       ruby-progressbar (~> 1.4)
     ruby-progressbar (1.7.5)
     safe_yaml (1.0.4)
-    sigdump (0.2.4)
-    signet (0.7.2)
+    sigdump (0.2.3)
+    signet (0.6.1)
       addressable (~> 2.3)
+      extlib (~> 0.9)
       faraday (~> 0.9)
       jwt (~> 1.5)
       multi_json (~> 1.10)
@@ -107,7 +105,7 @@ GEM
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2016.2)
+    tzinfo-data (1.2015.7)
       tzinfo (>= 1.0.0)
     webmock (1.22.3)
       addressable (>= 2.3.6)
@@ -125,3 +123,6 @@ DEPENDENCIES
   rubocop (= 0.34.2)
   test-unit (~> 3.0)
   webmock (~> 1.17)
+
+BUNDLED WITH
+   1.10.6

data/fluent-plugin-google-cloud.gemspec

@@ -10,7 +10,7 @@ eos
   gem.homepage      = \
     'https://github.com/GoogleCloudPlatform/fluent-plugin-google-cloud'
   gem.license       = 'Apache-2.0'
-  gem.version       = '0.4.15'
+  gem.version       = '0.4.16'
   gem.authors       = ['Todd Derr', 'Alex Robinson']
   gem.email         = ['salty@google.com']
 

data/lib/fluent/plugin/out_google_cloud.rb

@@ -11,12 +11,23 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+require 'cgi'
+require 'google/api_client'
+require 'google/api_client/auth/compute_service_account'
+require 'googleauth'
+require 'json'
+require 'open-uri'
+require 'socket'
+require 'yaml'
 
 module Fluent
   # fluentd output plugin for the Google Cloud Logging API
   class GoogleCloudOutput < BufferedOutput
     Fluent::Plugin.register_output('google_cloud', self)
 
+    PLUGIN_NAME = 'Fluentd Google Cloud Logging plugin'
+    PLUGIN_VERSION = '0.4.16'
+
     # Constants for service names.
     APPENGINE_SERVICE = 'appengine.googleapis.com'
     CLOUDFUNCTIONS_SERVICE = 'cloudfunctions.googleapis.com'
@@ -123,15 +134,6 @@ module Fluent
 
     def initialize
       super
-      require 'cgi'
-      require 'google/api_client'
-      require 'google/api_client/auth/compute_service_account'
-      require 'googleauth'
-      require 'json'
-      require 'open-uri'
-      require 'socket'
-      require 'yaml'
-
       # use the global logger
       @log = $log # rubocop:disable Style/GlobalVars
     end
@@ -290,9 +292,7 @@ module Fluent
 
     def start
       super
-
       init_api_client
-
       @successful_call = false
       @timenanos_warning = false
     end
@@ -314,10 +314,9 @@ module Fluent
       end
 
       grouped_entries.each do |tag, arr|
-        write_log_entries_request = {
-          'commonLabels' => @common_labels,
-          'entries' => []
-        }
+        entries = []
+        labels = @common_labels.clone
+
         if @running_cloudfunctions
           # If the current group of entries is coming from a Cloud Functions
           # function, the function name can be extracted from the tag.
@@ -326,7 +325,6 @@ module Fluent
             # Service name is set to Cloud Functions only for logs actually
             # coming from a function.
             @service_name = CLOUDFUNCTIONS_SERVICE
-            labels = write_log_entries_request['commonLabels']
             labels["#{CLOUDFUNCTIONS_SERVICE}/region"] = @gcf_region
             labels["#{CLOUDFUNCTIONS_SERVICE}/function_name"] =
               decode_cloudfunctions_function_name(
@@ -343,7 +341,6 @@ module Fluent
           # Do this here to avoid having to repeat it for each record.
           match_data = @compiled_kubernetes_tag_regexp.match(tag)
           if match_data
-            labels = write_log_entries_request['commonLabels']
             %w(namespace_name pod_name container_name).each do |field|
               labels["#{CONTAINER_SERVICE}/#{field}"] = match_data[field]
             end
@@ -397,48 +394,8 @@ module Fluent
             end
           end
 
-          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.key?('timestampSeconds') &&
-                record.key?('timestampNanos')
-            ts_secs = record['timestampSeconds']
-            ts_nanos = record['timestampNanos']
-            record.delete('timestampSeconds')
-            record.delete('timestampNanos')
-          elsif record.key?('timeNanos')
-            # This is deprecated since the precision is insufficient.
-            # Use timestampSeconds/timestampNanos instead
-            ts_secs = (record['timeNanos'] / 1_000_000_000).to_i
-            ts_nanos = record['timeNanos'] % 1_000_000_000
-            record.delete('timeNanos')
-            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.'
-            end
-          elsif @service_name == CLOUDFUNCTIONS_SERVICE &&
-                @cloudfunctions_log_match
-            timestamp = DateTime.parse(@cloudfunctions_log_match['timestamp'])
-            ts_secs = timestamp.strftime('%s')
-            ts_nanos = timestamp.strftime('%N')
-          else
-            timestamp = Time.at(time)
-            ts_secs = timestamp.tv_sec
-            ts_nanos = timestamp.tv_nsec
-          end
-          entry['metadata']['timestamp'] = {
-            'seconds' => ts_secs,
-            'nanos' => ts_nanos
-          }
-
+          set_timestamp(record, entry, time)
           set_severity(record, entry)
-
           set_http_request(record, entry)
 
           # If a field is present in the label_map, send its value as a label
@@ -464,22 +421,25 @@ module Fluent
             entry['metadata'].delete('labels')
           end
 
-          write_log_entries_request['entries'].push(entry)
+          entries.push(entry)
         end
         # Don't send an empty request if we rejected all the entries.
-        next if write_log_entries_request['entries'].empty?
+        next if entries.empty?
 
-        log_name = CGI.escape(
-          log_name(tag, write_log_entries_request['commonLabels']))
+        log_name = CGI.escape(log_name(tag, labels))
         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
+            authenticated: true,
+            body_object: {
+              'commonLabels' => labels,
+              'entries' => entries
+            }
           )
           client.execute!(request)
           # Let the user explicitly know when the first call succeeded,
@@ -496,11 +456,11 @@ module Fluent
           # should not be retried, unless it is an authentication issue, in
           # which case we will retry the request via re-raising the exception.
           raise error if retriable_client_error?(error)
-          log_write_failure(write_log_entries_request, error)
+          log_write_failure(entries.length, error)
         rescue JSON::GeneratorError => error
           # This happens if the request contains illegal characters;
           # do not retry it because it will fail repeatedly.
-          log_write_failure(write_log_entries_request, error)
+          log_write_failure(entries.length, error)
         end
       end
     end
@@ -519,8 +479,7 @@ module Fluent
       RETRIABLE_CLIENT_ERRORS.include?(error.message)
     end
 
-    def log_write_failure(request, error)
-      dropped = request['entries'].length
+    def log_write_failure(dropped, error)
       @log.warn "Dropping #{dropped} log message(s)",
                 error_class: error.class.to_s, error: error.to_s
     end
@@ -641,6 +600,48 @@ module Fluent
       instance_prefix
     end
 
+    def set_timestamp(record, entry, time)
+      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.key?('timestampSeconds') &&
+            record.key?('timestampNanos')
+        ts_secs = record['timestampSeconds']
+        ts_nanos = record['timestampNanos']
+        record.delete('timestampSeconds')
+        record.delete('timestampNanos')
+      elsif record.key?('timeNanos')
+        # This is deprecated since the precision is insufficient.
+        # Use timestampSeconds/timestampNanos instead
+        ts_secs = (record['timeNanos'] / 1_000_000_000).to_i
+        ts_nanos = record['timeNanos'] % 1_000_000_000
+        record.delete('timeNanos')
+        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.'
+        end
+      elsif @service_name == CLOUDFUNCTIONS_SERVICE &&
+            @cloudfunctions_log_match
+        timestamp = DateTime.parse(@cloudfunctions_log_match['timestamp'])
+        ts_secs = timestamp.strftime('%s')
+        ts_nanos = timestamp.strftime('%N')
+      else
+        timestamp = Time.at(time)
+        ts_secs = timestamp.tv_sec
+        ts_nanos = timestamp.tv_nsec
+      end
+      entry['metadata']['timestamp'] = {
+        'seconds' => ts_secs,
+        'nanos' => ts_nanos
+      }
+    end
+
     def set_severity(record, entry)
       if @service_name == CLOUDFUNCTIONS_SERVICE
         if @cloudfunctions_log_match && @cloudfunctions_log_match['severity']
@@ -808,8 +809,8 @@ module Fluent
 
     def init_api_client
       @client = Google::APIClient.new(
-        application_name: 'Fluentd Google Cloud Logging plugin',
-        application_version: '0.4.15',
+        application_name: PLUGIN_NAME,
+        application_version: PLUGIN_VERSION,
         retries: 1)
 
       if @auth_method == 'private_key'

data/test/plugin/test_out_google_cloud.rb

@@ -21,7 +21,18 @@ require 'webmock/test_unit'
 class GoogleCloudOutputTest < Test::Unit::TestCase
   def setup
     Fluent::Test.setup
+    # delete environment variables that googleauth uses to find credentials.
     ENV.delete('GOOGLE_APPLICATION_CREDENTIALS')
+    # service account env.
+    ENV.delete('PRIVATE_KEY_VAR')
+    ENV.delete('CLIENT_EMAIL_VAR')
+    # authorized_user env.
+    ENV.delete('CLIENT_ID_VAR')
+    ENV.delete('CLIENT_SECRET_VAR')
+    ENV.delete('REFRESH_TOKEN_VAR')
+    # home var, which is used to find $HOME/.gcloud/...
+    ENV.delete('HOME')
+
     setup_auth_stubs
     @logs_sent = []
   end
@@ -88,16 +99,16 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
   # path: Path to the credentials file.
   # project_id: ID of the project, which must correspond to the file contents.
   IAM_CREDENTIALS = {
-    'path' => 'test/plugin/data/iam-credentials.json',
-    'project_id' => 'fluent-test-project'
+    path: 'test/plugin/data/iam-credentials.json',
+    project_id: 'fluent-test-project'
   }
   LEGACY_CREDENTIALS = {
-    'path' => 'test/plugin/data/credentials.json',
-    'project_id' => '847859579879'
+    path: 'test/plugin/data/credentials.json',
+    project_id: '847859579879'
   }
   INVALID_CREDENTIALS = {
-    'path' => 'test/plugin/data/invalid_credentials.json',
-    'project_id' => ''
+    path: 'test/plugin/data/invalid_credentials.json',
+    project_id: ''
   }
 
   # Configuration files for various test scenarios
@@ -167,11 +178,11 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
   EC2_SERVICE_NAME = 'ec2.amazonaws.com'
 
   COMPUTE_PARAMS = {
-    'service_name' => COMPUTE_SERVICE_NAME,
-    'log_name' => 'test',
-    'project_id' => PROJECT_ID,
-    'zone' => ZONE,
-    'labels' => {
+    service_name: COMPUTE_SERVICE_NAME,
+    log_name: 'test',
+    project_id: PROJECT_ID,
+    zone: ZONE,
+    labels: {
       "#{COMPUTE_SERVICE_NAME}/resource_type" => 'instance',
       "#{COMPUTE_SERVICE_NAME}/resource_id" => VM_ID,
       "#{COMPUTE_SERVICE_NAME}/resource_name" => HOSTNAME
@@ -179,11 +190,11 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
   }
 
   VMENGINE_PARAMS = {
-    'service_name' => APPENGINE_SERVICE_NAME,
-    'log_name' => "#{APPENGINE_SERVICE_NAME}%2Ftest",
-    'project_id' => PROJECT_ID,
-    'zone' => ZONE,
-    'labels' => {
+    service_name: APPENGINE_SERVICE_NAME,
+    log_name: "#{APPENGINE_SERVICE_NAME}%2Ftest",
+    project_id: PROJECT_ID,
+    zone: ZONE,
+    labels: {
       "#{APPENGINE_SERVICE_NAME}/module_id" => MANAGED_VM_BACKEND_NAME,
       "#{APPENGINE_SERVICE_NAME}/version_id" => MANAGED_VM_BACKEND_VERSION,
       "#{COMPUTE_SERVICE_NAME}/resource_type" => 'instance',
@@ -196,11 +207,11 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
                   "#{CONTAINER_NAMESPACE_NAME}_#{CONTAINER_CONTAINER_NAME}"
 
   CONTAINER_FROM_METADATA_PARAMS = {
-    'service_name' => CONTAINER_SERVICE_NAME,
-    'log_name' => CONTAINER_CONTAINER_NAME,
-    'project_id' => PROJECT_ID,
-    'zone' => ZONE,
-    'labels' => {
+    service_name: CONTAINER_SERVICE_NAME,
+    log_name: CONTAINER_CONTAINER_NAME,
+    project_id: PROJECT_ID,
+    zone: ZONE,
+    labels: {
       "#{CONTAINER_SERVICE_NAME}/instance_id" => VM_ID,
       "#{CONTAINER_SERVICE_NAME}/cluster_name" => CONTAINER_CLUSTER_NAME,
       "#{CONTAINER_SERVICE_NAME}/namespace_name" => CONTAINER_NAMESPACE_NAME,
@@ -218,11 +229,11 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
 
   # Almost the same as from metadata, but missing namespace_id and pod_id.
   CONTAINER_FROM_TAG_PARAMS = {
-    'service_name' => CONTAINER_SERVICE_NAME,
-    'log_name' => CONTAINER_CONTAINER_NAME,
-    'project_id' => PROJECT_ID,
-    'zone' => ZONE,
-    'labels' => {
+    service_name: CONTAINER_SERVICE_NAME,
+    log_name: CONTAINER_CONTAINER_NAME,
+    project_id: PROJECT_ID,
+    zone: ZONE,
+    labels: {
       "#{CONTAINER_SERVICE_NAME}/instance_id" => VM_ID,
       "#{CONTAINER_SERVICE_NAME}/cluster_name" => CONTAINER_CLUSTER_NAME,
       "#{CONTAINER_SERVICE_NAME}/namespace_name" => CONTAINER_NAMESPACE_NAME,
@@ -240,11 +251,11 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
                         "#{CLOUDFUNCTIONS_CONTAINER_NAME}"
 
   CLOUDFUNCTIONS_PARAMS = {
-    'service_name' => CLOUDFUNCTIONS_SERVICE_NAME,
-    'log_name' => 'cloud-functions',
-    'project_id' => PROJECT_ID,
-    'zone' => ZONE,
-    'labels' => {
+    service_name: CLOUDFUNCTIONS_SERVICE_NAME,
+    log_name: 'cloud-functions',
+    project_id: PROJECT_ID,
+    zone: ZONE,
+    labels: {
       'execution_id' => CLOUDFUNCTIONS_EXECUTION_ID,
       "#{CLOUDFUNCTIONS_SERVICE_NAME}/function_name" =>
         CLOUDFUNCTIONS_FUNCTION_NAME,
@@ -258,11 +269,11 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
   }
 
   CLOUDFUNCTIONS_TEXT_NOT_MATCHED_PARAMS = {
-    'service_name' => CLOUDFUNCTIONS_SERVICE_NAME,
-    'log_name' => 'cloud-functions',
-    'project_id' => PROJECT_ID,
-    'zone' => ZONE,
-    'labels' => {
+    service_name: CLOUDFUNCTIONS_SERVICE_NAME,
+    log_name: 'cloud-functions',
+    project_id: PROJECT_ID,
+    zone: ZONE,
+    labels: {
       "#{CLOUDFUNCTIONS_SERVICE_NAME}/function_name" =>
         CLOUDFUNCTIONS_FUNCTION_NAME,
       "#{CLOUDFUNCTIONS_SERVICE_NAME}/region" => CLOUDFUNCTIONS_REGION,
@@ -275,11 +286,11 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
   }
 
   CUSTOM_PARAMS = {
-    'service_name' => COMPUTE_SERVICE_NAME,
-    'log_name' => 'test',
-    'project_id' => CUSTOM_PROJECT_ID,
-    'zone' => CUSTOM_ZONE,
-    'labels' => {
+    service_name: COMPUTE_SERVICE_NAME,
+    log_name: 'test',
+    project_id: CUSTOM_PROJECT_ID,
+    zone: CUSTOM_ZONE,
+    labels: {
       "#{COMPUTE_SERVICE_NAME}/resource_type" => 'instance',
       "#{COMPUTE_SERVICE_NAME}/resource_id" => CUSTOM_VM_ID,
       "#{COMPUTE_SERVICE_NAME}/resource_name" => CUSTOM_HOSTNAME
@@ -287,11 +298,11 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
   }
 
   EC2_PARAMS = {
-    'service_name' => EC2_SERVICE_NAME,
-    'log_name' => 'test',
-    'project_id' => EC2_PROJECT_ID,
-    'zone' => EC2_PREFIXED_ZONE,
-    'labels' => {
+    service_name: EC2_SERVICE_NAME,
+    log_name: 'test',
+    project_id: EC2_PROJECT_ID,
+    zone: EC2_PREFIXED_ZONE,
+    labels: {
       "#{EC2_SERVICE_NAME}/resource_type" => 'instance',
       "#{EC2_SERVICE_NAME}/resource_id" => EC2_VM_ID,
       "#{EC2_SERVICE_NAME}/account_id" => EC2_ACCOUNT_ID,
@@ -516,10 +527,10 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
   def test_ec2_metadata_project_id_from_credentials
     setup_ec2_metadata_stubs
     [IAM_CREDENTIALS, LEGACY_CREDENTIALS].each do |creds|
-      ENV['GOOGLE_APPLICATION_CREDENTIALS'] = creds['path']
+      ENV['GOOGLE_APPLICATION_CREDENTIALS'] = creds[:path]
       d = create_driver
       d.run
-      assert_equal creds['project_id'], d.instance.project_id
+      assert_equal creds[:project_id], d.instance.project_id
     end
   end
 
@@ -535,7 +546,7 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
   def test_one_log_with_json_credentials
     setup_gce_metadata_stubs
     setup_logging_stubs
-    ENV['GOOGLE_APPLICATION_CREDENTIALS'] = IAM_CREDENTIALS['path']
+    ENV['GOOGLE_APPLICATION_CREDENTIALS'] = IAM_CREDENTIALS[:path]
     d = create_driver
     d.emit('message' => log_entry(0))
     d.run
@@ -545,7 +556,7 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
   def test_one_log_with_invalid_json_credentials
     setup_gce_metadata_stubs
     setup_logging_stubs
-    ENV['GOOGLE_APPLICATION_CREDENTIALS'] = INVALID_CREDENTIALS['path']
+    ENV['GOOGLE_APPLICATION_CREDENTIALS'] = INVALID_CREDENTIALS[:path]
     d = create_driver
     d.emit('message' => log_entry(0))
     exception_count = 0
@@ -571,7 +582,7 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     # don't set up any metadata stubs, so the test will fail if we try to
     # fetch metadata (and explicitly check this as well).
     Fluent::GoogleCloudOutput.any_instance.expects(:fetch_metadata).never
-    ENV['GOOGLE_APPLICATION_CREDENTIALS'] = IAM_CREDENTIALS['path']
+    ENV['GOOGLE_APPLICATION_CREDENTIALS'] = IAM_CREDENTIALS[:path]
     setup_logging_stubs
     d = create_driver(NO_METADATA_SERVICE_CONFIG + CUSTOM_METADATA_CONFIG)
     d.emit('message' => log_entry(0))
@@ -580,7 +591,7 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
   end
 
   def test_one_log_ec2
-    ENV['GOOGLE_APPLICATION_CREDENTIALS'] = IAM_CREDENTIALS['path']
+    ENV['GOOGLE_APPLICATION_CREDENTIALS'] = IAM_CREDENTIALS[:path]
     setup_ec2_metadata_stubs
     setup_logging_stubs
     d = create_driver(CONFIG_EC2_PROJECT_ID)
@@ -695,7 +706,7 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     d.run
     # make a deep copy of COMPUTE_PARAMS and add the parsed label.
     params = Marshal.load(Marshal.dump(COMPUTE_PARAMS))
-    params['labels']['sent_label'] = 'label_value'
+    params[:labels]['sent_label'] = 'label_value'
     verify_log_entries(1, params)
   end
 
@@ -708,7 +719,7 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     d.run
     # make a deep copy of COMPUTE_PARAMS and add the parsed label.
     params = Marshal.load(Marshal.dump(COMPUTE_PARAMS))
-    params['labels']['sent_label'] = '123456789'
+    params[:labels]['sent_label'] = '123456789'
     verify_log_entries(1, params)
   end
 
@@ -724,7 +735,7 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     d.run
     # make a deep copy of COMPUTE_PARAMS and add the parsed label.
     params = Marshal.load(Marshal.dump(COMPUTE_PARAMS))
-    params['labels']['sent_label'] = '{"k1"=>10, "k2"=>"val"}'
+    params[:labels]['sent_label'] = '{"k1"=>10, "k2"=>"val"}'
     verify_log_entries(1, params)
   end
 
@@ -748,9 +759,9 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     d.run
     # make a deep copy of COMPUTE_PARAMS and add the parsed labels.
     params = Marshal.load(Marshal.dump(COMPUTE_PARAMS))
-    params['labels']['sent_label_1'] = 'value1'
-    params['labels']['foo.googleapis.com/bar'] = 'value2'
-    params['labels']['label3'] = 'value3'
+    params[:labels]['sent_label_1'] = 'value1'
+    params[:labels]['foo.googleapis.com/bar'] = 'value2'
+    params[:labels]['label3'] = 'value3'
     verify_log_entries(1, params, 'structPayload') do |entry|
       assert_equal 2, entry['structPayload'].size, entry
       assert_equal 'test log entry 0', entry['structPayload']['message'], entry
@@ -1178,9 +1189,9 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
 
   private
 
-  def uri_for_log(config)
-    'https://logging.googleapis.com/v1beta3/projects/' + config['project_id'] +
-      '/logs/' + config['log_name'] + '/entries:write'
+  def uri_for_log(params)
+    'https://logging.googleapis.com/v1beta3/projects/' + params[:project_id] +
+      '/logs/' + params[:log_name] + '/entries:write'
   end
 
   def stub_metadata_request(metadata_path, response_body)
@@ -1269,9 +1280,10 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     stub_metadata_request(
       'instance/attributes/',
       "attribute1\ngae_backend_name\ngae_backend_version\nlast_attribute")
-    stub_metadata_request('instance/attributes/gae_backend_name', 'default')
+    stub_metadata_request('instance/attributes/gae_backend_name',
+                          MANAGED_VM_BACKEND_NAME)
     stub_metadata_request('instance/attributes/gae_backend_version',
-                          'guestbook2.0')
+                          MANAGED_VM_BACKEND_VERSION)
   end
 
   def setup_container_metadata_stubs
@@ -1280,7 +1292,8 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
       "attribute1\nkube-env\nlast_attribute")
     stub_metadata_request('instance/attributes/kube-env',
                           "ENABLE_NODE_LOGGING: \"true\"\n"\
-                          "INSTANCE_PREFIX: gke-cluster-1-740fdafa\n"\
+                          'INSTANCE_PREFIX: '\
+                          "gke-#{CONTAINER_CLUSTER_NAME}-740fdafa\n"\
                           'KUBE_BEARER_TOKEN: AoQiMuwkNP2BMT0S')
   end
 
@@ -1290,9 +1303,11 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
       "attribute1\nkube-env\ngcf_region\nlast_attribute")
     stub_metadata_request('instance/attributes/kube-env',
                           "ENABLE_NODE_LOGGING: \"true\"\n"\
-                          "INSTANCE_PREFIX: gke-cluster-1-740fdafa\n"\
+                          'INSTANCE_PREFIX: '\
+                          "gke-#{CLOUDFUNCTIONS_CLUSTER_NAME}-740fdafa\n"\
                           'KUBE_BEARER_TOKEN: AoQiMuwkNP2BMT0S')
-    stub_metadata_request('instance/attributes/gcf_region', 'us-central1')
+    stub_metadata_request('instance/attributes/gcf_region',
+                          CLOUDFUNCTIONS_REGION)
   end
 
   def container_log_entry_with_metadata(log)
@@ -1366,9 +1381,9 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
           end
         end
 
-        assert_equal params['zone'], entry['metadata']['zone']
-        assert_equal params['service_name'], entry['metadata']['serviceName']
-        check_labels entry, batch['commonLabels'], params['labels']
+        assert_equal params[:zone], entry['metadata']['zone']
+        assert_equal params[:service_name], entry['metadata']['serviceName']
+        check_labels entry, batch['commonLabels'], params[:labels]
         yield(entry) if block_given?
         i += 1
         assert i <= n, "Number of entries #{i} exceeds expected number #{n}"

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-google-cloud
 version: !ruby/object:Gem::Version
-  version: 0.4.15
+  version: 0.4.16
+  prerelease: 
 platform: ruby
 authors:
 - Todd Derr
@@ -9,11 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -21,6 +23,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -28,6 +31,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,6 +42,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +53,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: googleauth
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +61,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +69,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +77,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +85,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - <
       - !ruby/object:Gem::Version
@@ -83,6 +93,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - <
       - !ruby/object:Gem::Version
@@ -90,6 +101,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -97,6 +109,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -104,6 +117,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -111,6 +125,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,6 +133,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -125,6 +141,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -132,6 +149,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -139,6 +157,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -146,6 +165,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -153,6 +173,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -167,43 +188,44 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CONTRIBUTING
-- Gemfile
-- Gemfile.lock
-- LICENSE
-- README.rdoc
-- Rakefile
-- fluent-plugin-google-cloud.gemspec
-- lib/fluent/plugin/out_google_cloud.rb
 - test/helper.rb
 - test/plugin/data/c31e573fd7f62ed495c9ca3821a5a85cb036dee1-privatekey.p12
 - test/plugin/data/credentials.json
 - test/plugin/data/iam-credentials.json
 - test/plugin/data/invalid_credentials.json
 - test/plugin/test_out_google_cloud.rb
+- LICENSE
+- Rakefile
+- fluent-plugin-google-cloud.gemspec
+- lib/fluent/plugin/out_google_cloud.rb
+- CONTRIBUTING
+- Gemfile.lock
+- Gemfile
+- README.rdoc
 homepage: https://github.com/GoogleCloudPlatform/fluent-plugin-google-cloud
 licenses:
 - Apache-2.0
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: fluentd output plugin for the Google Cloud Logging API
 test_files:
 - test/helper.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NGQxM2IzZmRjNjdmOTQ0ZmE3ZDVjNmNkOTIzZWU4YjQxZDk4YjU2Mw==
-  data.tar.gz: !binary |-
-    M2UwYzcyNzUyNzI2NTM1YTUzMDk4N2EyNzlmMzA0MGVkMWJjNjZhNw==
-SHA512:
-  metadata.gz: !binary |-
-    OGQ4ZGQ2MDljOTJkNjA0ODZhYTUwYTQ0OWZhYTIyOWU5YTE3YTA4MTM0ODQz
-    NWYzYjVlMjg1ZDA4MzgwMTVmZGYwODE5MzU2NGM5OGQ4NzJkNDIzNjMwMGMw
-    OGRhOTYyOTcyMmNjNjJiZGYyMDg3Y2UzNzM0YjY3Y2QwNDBiZWY=
-  data.tar.gz: !binary |-
-    NGM5MTdhM2ExYjIzZGYwMGM3NjgwZjQyYWQ5NWE4NGIzNWFjZmNmMjE0OTNk
-    YjQ5N2EwM2ZmOGE2Njc5NGE1NDM5MTYzMjExNjQ5ZmMxMzkxNzZkNWViODMz
-    M2YyNGE5MzFiM2ZjZjUzOTMxZWQyZGQxNTc4M2I1M2ZmMjdiZjE=