fluent-plugin-google-cloud 0.1.3 → 0.2.0

data/fluent-plugin-google-cloud.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |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.license       = 'Apache 2.0'
-  gem.version       = '0.1.3'
+  gem.version       = '0.2.0'
   gem.authors       = ['Todd Derr', 'Alex Robinson']
   gem.email         = ['salty@google.com']
 
@@ -14,6 +14,8 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'fluentd', '~> 0.10'
   gem.add_runtime_dependency 'google-api-client', '~> 0.7'
+  gem.add_runtime_dependency 'signet', '~> 0.5.0'
   gem.add_development_dependency "rake", '>= 10.3.2'
   gem.add_development_dependency "webmock", '>= 1.17.0'
+  gem.add_development_dependency "minitest", '~> 4.0'
 end

data/lib/fluent/plugin/out_google_cloud.rb

@@ -92,7 +92,7 @@ module Fluent
       @zone = fully_qualified_zone.rpartition('/')[2]
       @vm_id = fetch_metadata('instance/id')
       # TODO: Send instance tags and/or hostname with the logs as well?
-      @common_labels = []
+      @common_labels = {}
 
       # If this is running on a Managed VM, grab the relevant App Engine
       # metadata as well.
@@ -107,26 +107,21 @@ module Fluent
         @gae_backend_version =
             fetch_metadata('instance/attributes/gae_backend_version')
         @service_name = APPENGINE_SERVICE
-        add_label(common_labels, "#{APPENGINE_SERVICE}/module_id",
-                  'strValue', @gae_backend_name)
-        add_label(common_labels, "#{APPENGINE_SERVICE}/version_id",
-                  'strValue', @gae_backend_version)
+        common_labels["#{APPENGINE_SERVICE}/module_id"] = @gae_backend_name
+        common_labels["#{APPENGINE_SERVICE}/version_id"] = @gae_backend_version
       elsif (attributes.include?('job_id'))
         @running_on_managed_vm = false
         @service_name = DATAFLOW_SERVICE
         @dataflow_job_id = fetch_metadata('instance/attributes/job_id')
-        add_label(common_labels, "#{DATAFLOW_SERVICE}/job_id",
-                  'strValue', @dataflow_job_id)
+        common_labels["#{DATAFLOW_SERVICE}/job_id"] = @dataflow_job_id
       else
         @running_on_managed_vm = false
         @service_name = COMPUTE_SERVICE
       end
 
       if (@service_name != DATAFLOW_SERVICE)
-        add_label(common_labels, "#{COMPUTE_SERVICE}/resource_type",
-                  'strValue', 'instance')
-        add_label(common_labels, "#{COMPUTE_SERVICE}/resource_id",
-                  'strValue', @vm_id)
+        common_labels["#{COMPUTE_SERVICE}/resource_type"] = 'instance'
+        common_labels["#{COMPUTE_SERVICE}/resource_id"] = @vm_id
       end
     end
 
@@ -138,10 +133,6 @@ module Fluent
       [tag, time, record].to_msgpack
     end
 
-    def add_label(labels, key, type, value)
-      labels.push({'key' => key, type => value})
-    end
-
     def write(chunk)
       # Group the entries since we have to make one call per tag.
       grouped_entries = {}
@@ -189,7 +180,7 @@ module Fluent
         # and also escape the log name.
         log_name = CGI::escape(@running_on_managed_vm ?
                                "#{APPENGINE_SERVICE}/#{tag}" : tag)
-        url = ('https://www.googleapis.com/logging/v1beta/projects/' +
+        url = ('https://logging.googleapis.com/v1beta3/projects/' +
                "#{@project_id}/logs/#{log_name}/entries:write")
         begin
           client = api_client()
@@ -229,7 +220,7 @@ module Fluent
     def init_api_client
       @client = Google::APIClient.new(
         :application_name => 'Fluentd Google Cloud Logging plugin',
-        :application_version => '0.1.3',
+        :application_version => '0.2.0',
         :retries => 1)
 
       if @auth_method == 'private_key'

data/test/plugin/test_out_google_cloud.rb

@@ -84,8 +84,8 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     'service_name' => COMPUTE_SERVICE_NAME,
     'log_name' => 'test',
     'labels' => {
-      "#{COMPUTE_SERVICE_NAME}/resource_type" => ['strValue', 'instance'],
-      "#{COMPUTE_SERVICE_NAME}/resource_id" => ['strValue', VM_ID]
+      "#{COMPUTE_SERVICE_NAME}/resource_type" => 'instance',
+      "#{COMPUTE_SERVICE_NAME}/resource_id" => VM_ID
     }
   }
 
@@ -93,12 +93,10 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     'service_name' => APPENGINE_SERVICE_NAME,
     'log_name' => "#{APPENGINE_SERVICE_NAME}%2Ftest",
     'labels' => {
-      "#{APPENGINE_SERVICE_NAME}/module_id" => [
-        'strValue', MANAGED_VM_BACKEND_NAME],
-      "#{APPENGINE_SERVICE_NAME}/version_id" => [
-        'strValue', MANAGED_VM_BACKEND_VERSION],
-      "#{COMPUTE_SERVICE_NAME}/resource_type" => ['strValue', 'instance'],
-      "#{COMPUTE_SERVICE_NAME}/resource_id" => ['strValue', VM_ID]
+      "#{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
     }
   }
 
@@ -287,7 +285,7 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
   private
 
   def uri_for_log(config)
-    'https://www.googleapis.com/logging/v1beta/projects/' + PROJECT_ID +
+    'https://logging.googleapis.com/v1beta3/projects/' + PROJECT_ID +
         '/logs/' + config['log_name'] + '/entries:write'
   end
 
@@ -312,16 +310,12 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
 
   def check_labels(entry, common_labels, expected_labels)
     # TODO(salty) test/handle overlap between common_labels and entry labels
-    all_labels = common_labels.to_a + entry['metadata']['labels'].to_a
-    all_labels.each do |label|
-      key = label['key']
-      assert expected_labels.has_key?(key), "Unexpected label #{label}"
-      expected_type = expected_labels[key][0]
-      expected_value = expected_labels[key][1]
-      assert label.has_key?(expected_type),
-          "Type mismatch - expected #{expected_type} in #{label}"
-      assert_equal label[expected_type], expected_value,
-          "Value mismatch - expected #{expected_value} in #{label}"
+    all_labels ||= common_labels
+    all_labels.merge!(entry['metadata']['labels'] || {})
+    all_labels.each do |key, value|
+      assert expected_labels.has_key?(key), "Unexpected label #{key} => #{value}"
+      assert_equal value, expected_labels[key],
+          "Value mismatch - expected #{expected_labels[key]} in #{key} => #{value}"
     end
     assert_equal expected_labels.length, all_labels.length,
         ("Expected #{expected_labels.length} labels, got " +

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-google-cloud
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -44,6 +44,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: signet
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -76,6 +92,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.17.0
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
 description: 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