fluent-plugin-google-cloud 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 494526c8a4880080e9176ccd912a4692d773fb67
-  data.tar.gz: 008470c8bc3aeab7f902bfd159e030b2dbfafee1
+  metadata.gz: e6d35bf9167d8e4847b5e54cc16e0f78dc41310d
+  data.tar.gz: 3481166160940b98b9433cbe80811dfb71f98434
 SHA512:
-  metadata.gz: aaabfa2e76c33959ab2d68c21380d73ce1e315bef2556fdd99b9772fc9cdb33c0d7ea8632a3742f17a9641e44c5e45914eab1ba49ebf035cd02f324ab0984a81
-  data.tar.gz: c86c292744824fd8163e08daaefbd034baaaf91ca1c422b68caed7ab3835578070a694c59dbc1cc5adb85c55cf87eadfefbca28cae1b801f8543bdf70426c70a
+  metadata.gz: 0db9e3e069795d1965bbe72c49e2c7d9c8efce96087b099045dfb2308d21c55697bed09c6e6758aaab37d7ae267d1300970203df78f78db5a753f756b40717b9
+  data.tar.gz: 6006bd9033b7d82aa7a720eb8c330f852487e03de9f2816e18795704df69cedfe362fe210741059fe83ca26bd5e61bf83a5499cb761bc154233e11f633cc1516

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-google-cloud (0.4.6)
+    fluent-plugin-google-cloud (0.4.7)
       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.7'
+  gem.version       = '0.4.8'
   gem.authors       = ['Todd Derr', 'Alex Robinson']
   gem.email         = ['salty@google.com']
 

data/lib/fluent/plugin/out_google_cloud.rb

@@ -19,6 +19,7 @@ module Fluent
 
     # Constants for service names.
     APPENGINE_SERVICE = 'appengine.googleapis.com'
+    CLOUDFUNCTIONS_SERVICE = 'cloudfunctions.googleapis.com'
     COMPUTE_SERVICE = 'compute.googleapis.com'
     CONTAINER_SERVICE = 'container.googleapis.com'
     DATAFLOW_SERVICE = 'dataflow.googleapis.com'
@@ -70,6 +71,12 @@ module Fluent
     # component (Docker, Kubelet, etc.) logs from container logs.
     config_param :detect_subservice, :bool, :default => true
 
+    # The regular expression to use on Kubernetes logs to extract some basic
+    # information about the log source. The regex must contain capture groups
+    # for pod_name, namespace_name, and container_name.
+    config_param :kubernetes_tag_regexp, :string, :default =>
+      '\.(?<pod_name>[^_]+)_(?<namespace_name>[^_]+)_(?<container_name>.+)$'
+
     # 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
     # struct payload.
@@ -142,8 +149,19 @@ module Fluent
 
       # TODO: Send instance tags as labels as well?
       @common_labels = {}
-      @tag_to_kubernetes_labels_regexp =
-        /\.(?<pod_name>[^\._]+)_(?<namespace_name>[^_]+)_(?<container_name>.+)$/
+
+      @compiled_kubernetes_tag_regexp = nil
+      if @kubernetes_tag_regexp
+        @compiled_kubernetes_tag_regexp = Regexp.new(@kubernetes_tag_regexp)
+      end
+
+      @cloudfunctions_tag_regexp =
+        /\.(?<function_name>.+)-[^-]+_default_worker$/
+      @cloudfunctions_log_regexp = /^
+        (?:\[(?<severity>.)\])?
+        \[(?<timestamp>.{24})\]
+        (?:\[(?<execution_id>[^\]]+)\])?
+        [ ](?<text>.*)$/x
 
       # set attributes from metadata (unless overriden by static config)
       @vm_name = Socket.gethostname if @vm_name.nil?
@@ -190,12 +208,16 @@ module Fluent
       # Default this to false; it is only overwritten if we detect Managed VM.
       @running_on_managed_vm = false
 
+      # Default this to false; it is only overwritten if we detect Cloud
+      # Functions.
+      @running_cloudfunctions = false
+
       # Set labels, etc. based on the config
       case @platform
       when Platform::GCE
         @service_name = COMPUTE_SERVICE
         if @detect_subservice
-          # Check for specialized GCE environments (Managed VM or Dataflow).
+          # Check for specialized GCE environments.
           # TODO: Add config options for these to allow for running outside GCE?
           attributes = fetch_gce_metadata('instance/attributes/').split
           # Do nothing, just don't populate other service's labels.
@@ -224,6 +246,7 @@ module Fluent
             @kube_env = YAML.load(@raw_kube_env)
             common_labels["#{CONTAINER_SERVICE}/cluster_name"] =
               cluster_name_from_kube_env(@kube_env)
+            detect_cloudfunctions(attributes)
           end
         end
         common_labels["#{COMPUTE_SERVICE}/resource_type"] = 'instance'
@@ -273,11 +296,11 @@ module Fluent
           'commonLabels' => @common_labels,
           'entries' => []
         }
-        if @service_name == CONTAINER_SERVICE
+        if @service_name == CONTAINER_SERVICE && @compiled_kubernetes_tag_regexp
           # Container logs in Kubernetes are tagged based on where they came
           # from, so we can extract useful metadata from the tag.
           # Do this here to avoid having to repeat it for each record.
-          match_data = @tag_to_kubernetes_labels_regexp.match(tag)
+          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|
@@ -285,8 +308,30 @@ module Fluent
             end
           end
         end
+        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.
+          match_data = @cloudfunctions_tag_regexp.match(tag)
+          if match_data
+            # 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"] =
+              match_data['function_name']
+          else
+            # Other logs are considered as coming from the Container Engine
+            # service.
+            @service_name = CONTAINER_SERVICE
+          end
+        end
         arr.each do |time, record|
           next unless record.is_a?(Hash)
+          if @service_name == CLOUDFUNCTIONS_SERVICE && record.key?('log')
+            @cloudfunctions_log_match =
+              @cloudfunctions_log_regexp.match(record['log'])
+          end
           if record.key?('timestamp') &&
              record['timestamp'].is_a?(Hash) &&
              record['timestamp'].key?('seconds') &&
@@ -312,6 +357,11 @@ module Fluent
               @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
@@ -329,12 +379,8 @@ module Fluent
               'labels' => {}
             }
           }
-          if record.key?('severity')
-            entry['metadata']['severity'] = parse_severity(record['severity'])
-            record.delete('severity')
-          else
-            entry['metadata']['severity'] = 'DEFAULT'
-          end
+
+          set_severity(record, entry)
 
           # If the record has been annotated by the kubernetes_metadata_filter
           # plugin, then use that metadata. Otherwise, rely on commonLabels
@@ -352,14 +398,15 @@ module Fluent
             end
           end
 
-          # use textPayload if the only remainaing key is 'message',
-          # otherwise use a struct.
-          if record.size == 1 && record.key?('message')
-            entry['textPayload'] = record['message']
-          else
-            entry['structPayload'] = record
+          if @service_name == CLOUDFUNCTIONS_SERVICE &&
+             @cloudfunctions_log_match &&
+             @cloudfunctions_log_match['execution_id']
+            entry['metadata']['labels']['execution_id'] =
+              @cloudfunctions_log_match['execution_id']
           end
 
+          set_payload(record, entry)
+
           # Remove the labels metadata if we didn't populate it with anything.
           if entry['metadata']['labels'].empty?
             entry['metadata'].delete('labels')
@@ -370,10 +417,7 @@ module Fluent
         # Don't send an empty request if we rejected all the entries.
         next if write_log_entries_request['entries'].empty?
 
-        # 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)
+        log_name = CGI.escape(log_name(tag))
         url = 'https://logging.googleapis.com/v1beta3/projects/' \
           "#{@project_id}/logs/#{log_name}/entries:write"
         begin
@@ -483,6 +527,13 @@ module Fluent
       end
     end
 
+    def detect_cloudfunctions(attributes)
+      return unless attributes.include?('gcf_region')
+      # Cloud Functions detected
+      @running_cloudfunctions = true
+      @gcf_region = fetch_gce_metadata('instance/attributes/gcf_region')
+    end
+
     def cluster_name_from_kube_env(kube_env)
       return kube_env['CLUSTER_NAME'] if kube_env.key?('CLUSTER_NAME')
       instance_prefix = kube_env['INSTANCE_PREFIX']
@@ -492,6 +543,28 @@ module Fluent
       instance_prefix
     end
 
+    def set_severity(record, entry)
+      if @service_name == CLOUDFUNCTIONS_SERVICE
+        if @cloudfunctions_log_match && @cloudfunctions_log_match['severity']
+          entry['metadata']['severity'] =
+            parse_severity(@cloudfunctions_log_match['severity'])
+        elsif record.key?('stream') && record['stream'] == 'stdout'
+          entry['metadata']['severity'] = 'INFO'
+          record.delete('stream')
+        elsif record.key?('stream') && record['stream'] == 'stderr'
+          entry['metadata']['severity'] = 'ERROR'
+          record.delete('stream')
+        else
+          entry['metadata']['severity'] = 'DEFAULT'
+        end
+      elsif record.key?('severity')
+        entry['metadata']['severity'] = parse_severity(record['severity'])
+        record.delete('severity')
+      else
+        entry['metadata']['severity'] = 'DEFAULT'
+      end
+    end
+
     # Values permitted by the API for 'severity' (which is an enum).
     VALID_SEVERITIES = Set.new(
       %w(DEFAULT DEBUG INFO NOTICE WARNING ERROR CRITICAL ALERT EMERGENCY))
@@ -577,10 +650,33 @@ module Fluent
       record.delete(field)
     end
 
+    def set_payload(record, entry)
+      # Use textPayload if this is the Cloud Functions service and 'log' key is
+      # available, or if the only remainaing key is 'message'.
+      if @service_name == CLOUDFUNCTIONS_SERVICE && @cloudfunctions_log_match
+        entry['textPayload'] = @cloudfunctions_log_match['text']
+      elsif @service_name == CLOUDFUNCTIONS_SERVICE && record.key?('log')
+        entry['textPayload'] = record['log']
+      elsif record.size == 1 && record.key?('message')
+        entry['textPayload'] = record['message']
+      else
+        entry['structPayload'] = record
+      end
+    end
+
+    def log_name(tag)
+      if @service_name == CLOUDFUNCTIONS_SERVICE
+        return 'cloud-functions'
+      else
+        # Add a prefix to VMEngines logs to prevent namespace collisions.
+        return @running_on_managed_vm ? "#{APPENGINE_SERVICE}/#{tag}" : tag
+      end
+    end
+
     def init_api_client
       @client = Google::APIClient.new(
         application_name: 'Fluentd Google Cloud Logging plugin',
-        application_version: '0.4.7',
+        application_version: '0.4.8',
         retries: 1)
 
       if @auth_method == 'private_key'

data/test/plugin/test_out_google_cloud.rb

@@ -65,9 +65,18 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
   CONTAINER_NAMESPACE_ID = '898268c8-4a36-11e5-9d81-42010af0194c'
   CONTAINER_NAMESPACE_NAME = 'kube-system'
   CONTAINER_POD_ID = 'cad3c3c4-4b9c-11e5-9d81-42010af0194c'
-  CONTAINER_POD_NAME = 'redis-master-c0l82'
+  CONTAINER_POD_NAME = 'redis-master-c0l82.foo.bar'
   CONTAINER_CONTAINER_NAME = 'redis'
 
+  # Cloud Functions specific labels
+  CLOUDFUNCTIONS_FUNCTION_NAME = 'function-1'
+  CLOUDFUNCTIONS_REGION = 'us-central1'
+  CLOUDFUNCTIONS_EXECUTION_ID = '123-0'
+  CLOUDFUNCTIONS_CLUSTER_NAME = 'cluster-1'
+  CLOUDFUNCTIONS_NAMESPACE_NAME = 'default'
+  CLOUDFUNCTIONS_POD_NAME = "#{CLOUDFUNCTIONS_FUNCTION_NAME}-c0l82"
+  CLOUDFUNCTIONS_CONTAINER_NAME = 'worker'
+
   # Parameters used for authentication
   AUTH_GRANT_TYPE = 'urn:ietf:params:oauth:grant-type:jwt-bearer'
   FAKE_AUTH_TOKEN = 'abc123'
@@ -135,6 +144,7 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
   COMPUTE_SERVICE_NAME = 'compute.googleapis.com'
   APPENGINE_SERVICE_NAME = 'appengine.googleapis.com'
   CONTAINER_SERVICE_NAME = 'container.googleapis.com'
+  CLOUDFUNCTIONS_SERVICE_NAME = 'cloudfunctions.googleapis.com'
   EC2_SERVICE_NAME = 'ec2.amazonaws.com'
 
   COMPUTE_PARAMS = {
@@ -203,6 +213,55 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     }
   }
 
+  CLOUDFUNCTIONS_TAG = "kubernetes.#{CLOUDFUNCTIONS_POD_NAME}_" \
+                        "#{CLOUDFUNCTIONS_NAMESPACE_NAME}_" \
+                        "#{CLOUDFUNCTIONS_CONTAINER_NAME}"
+
+  CLOUDFUNCTIONS_PARAMS = {
+    '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,
+      "#{CLOUDFUNCTIONS_SERVICE_NAME}/region" => CLOUDFUNCTIONS_REGION,
+      "#{CONTAINER_SERVICE_NAME}/instance_id" => VM_ID,
+      "#{CONTAINER_SERVICE_NAME}/cluster_name" => CLOUDFUNCTIONS_CLUSTER_NAME,
+      "#{CONTAINER_SERVICE_NAME}/namespace_name" =>
+        CLOUDFUNCTIONS_NAMESPACE_NAME,
+      "#{CONTAINER_SERVICE_NAME}/pod_name" => CLOUDFUNCTIONS_POD_NAME,
+      "#{CONTAINER_SERVICE_NAME}/container_name" =>
+        CLOUDFUNCTIONS_CONTAINER_NAME,
+      "#{COMPUTE_SERVICE_NAME}/resource_type" => 'instance',
+      "#{COMPUTE_SERVICE_NAME}/resource_id" => VM_ID,
+      "#{COMPUTE_SERVICE_NAME}/resource_name" => HOSTNAME
+    }
+  }
+
+  CLOUDFUNCTIONS_TEXT_NOT_MATCHED_PARAMS = {
+    '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,
+      "#{CONTAINER_SERVICE_NAME}/instance_id" => VM_ID,
+      "#{CONTAINER_SERVICE_NAME}/cluster_name" => CLOUDFUNCTIONS_CLUSTER_NAME,
+      "#{CONTAINER_SERVICE_NAME}/namespace_name" =>
+        CLOUDFUNCTIONS_NAMESPACE_NAME,
+      "#{CONTAINER_SERVICE_NAME}/pod_name" => CLOUDFUNCTIONS_POD_NAME,
+      "#{CONTAINER_SERVICE_NAME}/container_name" =>
+        CLOUDFUNCTIONS_CONTAINER_NAME,
+      "#{COMPUTE_SERVICE_NAME}/resource_type" => 'instance',
+      "#{COMPUTE_SERVICE_NAME}/resource_id" => VM_ID,
+      "#{COMPUTE_SERVICE_NAME}/resource_name" => HOSTNAME
+    }
+  }
+
   CUSTOM_PARAMS = {
     'service_name' => COMPUTE_SERVICE_NAME,
     'log_name' => 'test',
@@ -839,6 +898,105 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     end
   end
 
+  def test_one_cloudfunctions_log
+    setup_gce_metadata_stubs
+    setup_cloudfunctions_metadata_stubs
+    setup_logging_stubs
+    d = create_driver(APPLICATION_DEFAULT_CONFIG, CLOUDFUNCTIONS_TAG)
+    d.emit(cloudfunctions_log_entry(0))
+    d.run
+    verify_log_entries(1, CLOUDFUNCTIONS_PARAMS) do |entry|
+      assert_equal 'DEBUG', entry['metadata']['severity'], entry
+    end
+  end
+
+  def test_multiple_cloudfunctions_logs
+    setup_gce_metadata_stubs
+    setup_cloudfunctions_metadata_stubs
+    setup_logging_stubs
+    d = create_driver(APPLICATION_DEFAULT_CONFIG, CLOUDFUNCTIONS_TAG)
+    [2, 3, 5, 11, 50].each do |n|
+      # The test driver doesn't clear its buffer of entries after running, so
+      # do it manually here.
+      d.instance_variable_get('@entries').clear
+      @logs_sent = []
+      n.times { |i| d.emit(cloudfunctions_log_entry(i)) }
+      d.run
+      verify_log_entries(n, CLOUDFUNCTIONS_PARAMS) do |entry|
+        assert_equal 'DEBUG', entry['metadata']['severity'], entry
+      end
+    end
+  end
+
+  def test_one_cloudfunctions_log_text_not_matched
+    setup_gce_metadata_stubs
+    setup_cloudfunctions_metadata_stubs
+    setup_logging_stubs
+    d = create_driver(APPLICATION_DEFAULT_CONFIG, CLOUDFUNCTIONS_TAG)
+    d.emit(cloudfunctions_log_entry_text_not_matched(0))
+    d.run
+    verify_log_entries(1, CLOUDFUNCTIONS_TEXT_NOT_MATCHED_PARAMS) do |entry|
+      assert_equal 'INFO', entry['metadata']['severity'], entry
+    end
+  end
+
+  def test_multiple_cloudfunctions_logs_text_not_matched
+    setup_gce_metadata_stubs
+    setup_cloudfunctions_metadata_stubs
+    setup_logging_stubs
+    d = create_driver(APPLICATION_DEFAULT_CONFIG, CLOUDFUNCTIONS_TAG)
+    [2, 3, 5, 11, 50].each do |n|
+      # The test driver doesn't clear its buffer of entries after running, so
+      # do it manually here.
+      d.instance_variable_get('@entries').clear
+      @logs_sent = []
+      n.times { |i| d.emit(cloudfunctions_log_entry_text_not_matched(i)) }
+      d.run
+      verify_log_entries(n, CLOUDFUNCTIONS_TEXT_NOT_MATCHED_PARAMS) do |entry|
+        assert_equal 'INFO', entry['metadata']['severity'], entry
+      end
+    end
+  end
+
+  def test_one_cloudfunctions_log_tag_not_matched
+    setup_gce_metadata_stubs
+    setup_cloudfunctions_metadata_stubs
+    setup_logging_stubs
+    d = create_driver(APPLICATION_DEFAULT_CONFIG, CONTAINER_LOG_NAME)
+    d.emit(cloudfunctions_log_entry(0))
+    d.run
+    verify_log_entries(1, CONTAINER_FROM_TAG_PARAMS, 'structPayload') do |entry|
+      assert_equal 2, entry['structPayload'].size, entry
+      assert_equal '[D][2015-09-25T12:34:56.789Z][123-0] test log entry 0',
+                   entry['structPayload']['log'], entry
+      assert_equal 'stdout', entry['structPayload']['stream'], entry
+    end
+  end
+
+  def test_multiple_cloudfunctions_logs_tag_not_matched
+    setup_gce_metadata_stubs
+    setup_cloudfunctions_metadata_stubs
+    setup_logging_stubs
+    d = create_driver(APPLICATION_DEFAULT_CONFIG, CONTAINER_LOG_NAME)
+    [2, 3, 5, 11, 50].each do |n|
+      # The test driver doesn't clear its buffer of entries after running, so
+      # do it manually here.
+      d.instance_variable_get('@entries').clear
+      @logs_sent = []
+      n.times { |i| d.emit(cloudfunctions_log_entry(i)) }
+      d.run
+      i = 0
+      params = CONTAINER_FROM_TAG_PARAMS
+      verify_log_entries(n, params, 'structPayload') do |entry|
+        assert_equal 2, entry['structPayload'].size, entry
+        assert_equal "[D][2015-09-25T12:34:56.789Z][123-0] test log entry #{i}",
+                     entry['structPayload']['log'], entry
+        assert_equal 'stdout', entry['structPayload']['stream'], entry
+        i += 1
+      end
+    end
+  end
+
   # Make parse_severity public so we can test it.
   class Fluent::GoogleCloudOutput # rubocop:disable Style/ClassAndModuleChildren
     public :parse_severity
@@ -972,7 +1130,8 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
 
   def setup_logging_stubs
     [COMPUTE_PARAMS, VMENGINE_PARAMS, CONTAINER_FROM_TAG_PARAMS,
-     CONTAINER_FROM_METADATA_PARAMS, CUSTOM_PARAMS, EC2_PARAMS].each do |params|
+     CONTAINER_FROM_METADATA_PARAMS, CLOUDFUNCTIONS_PARAMS, CUSTOM_PARAMS,
+     EC2_PARAMS].each do |params|
       stub_request(:post, uri_for_log(params)).to_return do |request|
         @logs_sent << JSON.parse(request.body)
         { body: '' }
@@ -1024,6 +1183,17 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
                           'KUBE_BEARER_TOKEN: AoQiMuwkNP2BMT0S')
   end
 
+  def setup_cloudfunctions_metadata_stubs
+    stub_metadata_request(
+      'instance/attributes/',
+      "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"\
+                          'KUBE_BEARER_TOKEN: AoQiMuwkNP2BMT0S')
+    stub_metadata_request('instance/attributes/gcf_region', 'us-central1')
+  end
+
   def container_log_entry_with_metadata(i)
     {
       message: log_entry(i),
@@ -1037,6 +1207,20 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     }
   end
 
+  def cloudfunctions_log_entry(i)
+    {
+      stream: 'stdout',
+      log: '[D][2015-09-25T12:34:56.789Z][123-0] ' + log_entry(i)
+    }
+  end
+
+  def cloudfunctions_log_entry_text_not_matched(i)
+    {
+      stream: 'stdout',
+      log: log_entry(i)
+    }
+  end
+
   def log_entry(i)
     'test log entry ' + i.to_s
   end
@@ -1049,7 +1233,7 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
       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 ' \
+      assert_equal expected_labels[key], value, 'Value mismatch - expected ' \
         "#{expected_labels[key]} in #{key} => #{value}"
     end
     assert_equal expected_labels.length, all_labels.length, 'Expected ' \

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-google-cloud
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Todd Derr
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2015-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd