fluent-plugin-google-cloud 0.4.3 → 0.4.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-google-cloud (0.4.3)
+    fluent-plugin-google-cloud (0.4.4)
       fluentd (>= 0.10)
       google-api-client (~> 0.8.6)
       googleauth (~> 0.4)

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.3'
+  gem.version       = '0.4.4'
   gem.authors       = ['Todd Derr', 'Alex Robinson']
   gem.email         = ['salty@google.com']
 

data/lib/fluent/plugin/out_google_cloud.rb

@@ -302,10 +302,10 @@ module Fluent
           unless label_map.nil?
             labels = {}
             @label_map.each do |field, label|
-              if record.key?(field)
-                labels[label] = record[field]
-                record.delete(field)
-              end
+              next unless record.key?(field)
+              # label values are required to be strings.
+              labels[label] = record[field].to_s
+              record.delete(field)
             end
             entry['metadata']['labels'] = labels unless labels.empty?
           end
@@ -497,7 +497,7 @@ module Fluent
     def init_api_client
       @client = Google::APIClient.new(
         application_name: 'Fluentd Google Cloud Logging plugin',
-        application_version: '0.4.3',
+        application_version: '0.4.4',
         retries: 1)
 
       if @auth_method == 'private_key'

data/test/plugin/test_out_google_cloud.rb

@@ -537,6 +537,35 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     verify_log_entries(1, params)
   end
 
+  def test_label_map_with_numeric_field
+    setup_gce_metadata_stubs
+    setup_logging_stubs
+    config = %(label_map { "label_field": "sent_label" })
+    d = create_driver(config)
+    d.emit('message' => log_entry(0), 'label_field' => 123_456_789)
+    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'
+    verify_log_entries(1, params)
+  end
+
+  def test_label_map_with_hash_field
+    setup_gce_metadata_stubs
+    setup_logging_stubs
+    config = %(label_map { "label_field": "sent_label" })
+    d = create_driver(config)
+    # I'm not sure this actually makes sense for a user to do, but make
+    # sure that it works if they try it.
+    d.emit('message' => log_entry(0),
+           'label_field' => { 'k1' => 10, 'k2' => 'val' })
+    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"}'
+    verify_log_entries(1, params)
+  end
+
   def test_label_map_with_multiple_fields
     setup_gce_metadata_stubs
     setup_logging_stubs
@@ -874,6 +903,8 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     all_labels ||= common_labels
     all_labels.merge!(entry['metadata']['labels'] || {})
     all_labels.each do |key, value|
+      assert value.is_a?(String), "Value #{value} for label #{key} " \
+        'is not a string: ' + value.class.name
       assert expected_labels.key?(key), "Unexpected label #{key} => #{value}"
       assert_equal value, expected_labels[key], 'Value mismatch - expected ' \
         "#{expected_labels[key]} in #{key} => #{value}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-google-cloud
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2015-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd