fluent-plugin-google-cloud 0.4.4 → 0.4.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 66d74a0b5f7bb8a69f0b229fab8db399efe33a5e
+  data.tar.gz: fa1f657fbbe617ab9ef5159c1577caba6f09b44f
+SHA512:
+  metadata.gz: 0091443b2d9a27ad9cde62f200d0c11d2ded76633ac126649680a5eb1b54bc914b19bc8148ec6fb3af083e4889c652e0f7f56289dff09cec4eb77ba56d22eaa2
+  data.tar.gz: c35ee5aa129a3420e83e17d753573c1c6a64fce215d6a783a692efe26f33c91516f8ad2cff2a6104827bf89e642df306bff7980671b513f6b80ebc9952fb8b60

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-google-cloud (0.4.4)
+    fluent-plugin-google-cloud (0.4.5)
       fluentd (>= 0.10)
       google-api-client (~> 0.8.6)
       googleauth (~> 0.4)
@@ -17,7 +17,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.3.8)
-    ast (2.0.0)
+    ast (2.1.0)
     astrolabe (1.3.1)
       parser (~> 2.2)
     autoparse (0.3.3)
@@ -30,7 +30,7 @@ GEM
     extlib (0.9.16)
     faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
-    fluentd (0.12.14)
+    fluentd (0.12.15)
       cool.io (>= 1.2.2, < 2.0.0)
       http_parser.rb (>= 0.5.1, < 0.7.0)
       json (>= 1.4.3)
@@ -51,12 +51,12 @@ GEM
       multi_json (~> 1.10)
       retriable (~> 1.4)
       signet (~> 0.6)
-    googleauth (0.4.1)
+    googleauth (0.4.2)
       faraday (~> 0.9)
       jwt (~> 1.4)
       logging (~> 2.0)
       memoist (~> 0.12)
-      multi_json (= 1.11)
+      multi_json (~> 1.11)
       signet (~> 0.6)
     http_parser.rb (0.6.0)
     i18n (0.7.0)
@@ -70,11 +70,11 @@ GEM
       multi_json (~> 1.10)
     memoist (0.12.0)
     metaclass (0.0.4)
-    minitest (5.7.0)
+    minitest (5.8.0)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     msgpack (0.5.12)
-    multi_json (1.11.0)
+    multi_json (1.11.2)
     multipart-post (2.0.0)
     parser (2.2.2.6)
       ast (>= 1.1, < 3.0)
@@ -83,7 +83,7 @@ GEM
     rainbow (2.0.0)
     rake (10.4.2)
     retriable (1.4.1)
-    rubocop (0.32.1)
+    rubocop (0.33.0)
       astrolabe (~> 1.3)
       parser (>= 2.2.2.5, < 3.0)
       powerpack (~> 0.1)
@@ -104,7 +104,7 @@ GEM
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2015.5)
+    tzinfo-data (1.2015.6)
       tzinfo (>= 1.0.0)
     webmock (1.21.0)
       addressable (>= 2.3.6)
@@ -118,9 +118,9 @@ DEPENDENCIES
   fluent-plugin-google-cloud!
   mocha (~> 1.1)
   rake (>= 10.3.2)
-  rubocop (~> 0.30)
+  rubocop (~> 0.33.0)
   test-unit (~> 3.0.2)
   webmock (>= 1.17.0)
 
 BUNDLED WITH
-   1.10.5
+   1.10.6

data/README.rdoc

@@ -8,7 +8,7 @@ which sends logs to the
 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]
+{<img src="https://secure.travis-ci.org/GoogleCloudPlatform/fluent-plugin-google-cloud.png" alt="Build Status" />}[https://travis-ci.org/GoogleCloudPlatform/fluent-plugin-google-cloud]
 
 == Installation
 

data/Rakefile

@@ -16,7 +16,7 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-desc 'Does rubocop lint and runs tests'
-task all: [:rubocop, :test]
+desc 'Run unit tests and RuboCop to check for style violations'
+task all: [:test, :rubocop]
 
 task default: :all

data/fluent-plugin-google-cloud.gemspec

@@ -2,15 +2,15 @@ Gem::Specification.new do |gem|
   gem.name          = '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
+   logs 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.'
+   This is an official Google Ruby gem.
 eos
-  gem.summary       =  'fluentd output plugin for the Google Cloud Logging API'
+  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.4'
+  gem.version       = '0.4.5'
   gem.authors       = ['Todd Derr', 'Alex Robinson']
   gem.email         = ['salty@google.com']
 
@@ -25,7 +25,7 @@ eos
 
   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 'rubocop', '~> 0.33.0'
   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

@@ -57,6 +57,7 @@ module Fluent
     config_param :project_id, :string, :default => nil
     config_param :zone, :string, :default => nil
     config_param :vm_id, :string, :default => nil
+    config_param :vm_name, :string, :default => nil
 
     # label_map (specified as a JSON object) is an unordered set of fluent
     # field names whose values are sent as labels rather than as part of the
@@ -101,6 +102,7 @@ module Fluent
       require 'googleauth'
       require 'json'
       require 'open-uri'
+      require 'socket'
 
       # use the global logger
       @log = $log # rubocop:disable Style/GlobalVars
@@ -130,6 +132,7 @@ module Fluent
       @common_labels = {}
 
       # set attributes from metadata (unless overriden by static config)
+      @vm_name = Socket.gethostname if @vm_name.nil?
       @platform = detect_platform
       case @platform
       when Platform::GCE
@@ -203,16 +206,19 @@ module Fluent
         if (@service_name != DATAFLOW_SERVICE)
           common_labels["#{COMPUTE_SERVICE}/resource_type"] = 'instance'
           common_labels["#{COMPUTE_SERVICE}/resource_id"] = @vm_id
+          common_labels["#{COMPUTE_SERVICE}/resource_name"] = @vm_name
         end
       when Platform::EC2
         @service_name = EC2_SERVICE
         common_labels["#{EC2_SERVICE}/resource_type"] = 'instance'
         common_labels["#{EC2_SERVICE}/resource_id"] = @vm_id
+        common_labels["#{EC2_SERVICE}/resource_name"] = @vm_name
       when Platform::OTHER
         # Use COMPUTE_SERVICE as the default environment.
         @service_name = COMPUTE_SERVICE
         common_labels["#{COMPUTE_SERVICE}/resource_type"] = 'instance'
         common_labels["#{COMPUTE_SERVICE}/resource_id"] = @vm_id
+        common_labels["#{COMPUTE_SERVICE}/resource_name"] = @vm_name
       end
     end
 
@@ -497,7 +503,7 @@ module Fluent
     def init_api_client
       @client = Google::APIClient.new(
         application_name: 'Fluentd Google Cloud Logging plugin',
-        application_version: '0.4.4',
+        application_version: '0.4.5',
         retries: 1)
 
       if @auth_method == 'private_key'
@@ -506,7 +512,7 @@ module Fluent
         jwt_asserter = Google::APIClient::JWTAsserter.new(
           @private_key_email, LOGGING_SCOPE, key)
         @client.authorization = jwt_asserter.to_authorization
-        @client.authorization.expiry = 3600  # 3600s is the max allowed value
+        @client.authorization.expiry = 3600 # 3600s is the max allowed value
       else
         @client.authorization = Google::Auth.get_application_default(
           LOGGING_SCOPE)

data/test/plugin/test_out_google_cloud.rb

@@ -17,9 +17,6 @@ require 'json'
 require 'mocha/test_unit'
 require 'webmock/test_unit'
 
-# This trips for many tests due to the use of conditionals.
-# rubocop:disable Metrics/AbcSize
-
 # Unit tests for Google Cloud Logging plugin
 class GoogleCloudOutputTest < Test::Unit::TestCase
   def setup
@@ -29,6 +26,9 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     @logs_sent = []
   end
 
+  # generic attributes
+  HOSTNAME = Socket.gethostname
+
   # attributes used for the GCE metadata service
   PROJECT_ID = 'test-project-id'
   ZONE = 'us-central1-b'
@@ -40,6 +40,7 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
   CUSTOM_ZONE = 'us-custom-central1-b'
   CUSTOM_FULLY_QUALIFIED_ZONE = 'projects/' + PROJECT_ID + '/zones/' + ZONE
   CUSTOM_VM_ID = 'C9876543210'
+  CUSTOM_HOSTNAME = 'custom.hostname.org'
 
   # attributes used for the EC2 metadata service
   EC2_PROJECT_ID = 'test-ec2-project-id'
@@ -83,6 +84,7 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     project_id #{CUSTOM_PROJECT_ID}
     zone #{CUSTOM_ZONE}
     vm_id #{CUSTOM_VM_ID}
+    vm_name #{CUSTOM_HOSTNAME}
   )
 
   CONFIG_MISSING_PRIVATE_KEY_PATH = %(
@@ -129,7 +131,8 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     'zone' => ZONE,
     'labels' => {
       "#{COMPUTE_SERVICE_NAME}/resource_type" => 'instance',
-      "#{COMPUTE_SERVICE_NAME}/resource_id" => VM_ID
+      "#{COMPUTE_SERVICE_NAME}/resource_id" => VM_ID,
+      "#{COMPUTE_SERVICE_NAME}/resource_name" => HOSTNAME
     }
   }
 
@@ -142,7 +145,8 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
       "#{APPENGINE_SERVICE_NAME}/module_id" => MANAGED_VM_BACKEND_NAME,
       "#{APPENGINE_SERVICE_NAME}/version_id" => MANAGED_VM_BACKEND_VERSION,
       "#{COMPUTE_SERVICE_NAME}/resource_type" => 'instance',
-      "#{COMPUTE_SERVICE_NAME}/resource_id" => VM_ID
+      "#{COMPUTE_SERVICE_NAME}/resource_id" => VM_ID,
+      "#{COMPUTE_SERVICE_NAME}/resource_name" => HOSTNAME
     }
   }
 
@@ -153,7 +157,8 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     'zone' => CUSTOM_ZONE,
     'labels' => {
       "#{COMPUTE_SERVICE_NAME}/resource_type" => 'instance',
-      "#{COMPUTE_SERVICE_NAME}/resource_id" => CUSTOM_VM_ID
+      "#{COMPUTE_SERVICE_NAME}/resource_id" => CUSTOM_VM_ID,
+      "#{COMPUTE_SERVICE_NAME}/resource_name" => CUSTOM_HOSTNAME
     }
   }
 
@@ -165,7 +170,8 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     'labels' => {
       "#{EC2_SERVICE_NAME}/resource_type" => 'instance',
       "#{EC2_SERVICE_NAME}/resource_id" => EC2_VM_ID,
-      "#{EC2_SERVICE_NAME}/account_id" => EC2_ACCOUNT_ID
+      "#{EC2_SERVICE_NAME}/account_id" => EC2_ACCOUNT_ID,
+      "#{EC2_SERVICE_NAME}/resource_name" => HOSTNAME
     }
   }
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-google-cloud
 version: !ruby/object:Gem::Version
-  version: 0.4.4
-  prerelease: 
+  version: 0.4.5
 platform: ruby
 authors:
 - Todd Derr
@@ -10,199 +9,181 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2015-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.6
 - !ruby/object:Gem::Dependency
   name: googleauth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.2
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.3.2
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: 0.33.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: 0.33.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.17.0
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.2
-description: ! "   Fluentd output plugin for the Google Cloud Logging API, which will
-  make\n   loge viewable in the Developer Console's log viewer and can optionally\n
-  \  store them in Google Cloud Storage and/or BigQuery.\n   This is an official Google
-  Ruby gem.'\n"
+description: |2
+     Fluentd output plugin for the Google Cloud Logging API, which will make
+     logs 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.
 email:
 - salty@google.com
 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/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: 1.8.23
+rubygems_version: 2.4.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: fluentd output plugin for the Google Cloud Logging API
 test_files:
 - test/helper.rb
@@ -210,4 +191,3 @@ test_files:
 - test/plugin/data/credentials.json
 - test/plugin/data/invalid_credentials.json
 - test/plugin/test_out_google_cloud.rb
-has_rdoc: