fluent-plugin-google-cloud 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 927dc2cbf24d19427cf2f48b1c663c3c0a79a517
-  data.tar.gz: 91abb6d0a081b66401636bff11d63695c6d330b8
+  metadata.gz: 4d8ff06da0025190972720ffd13b941d21f79329
+  data.tar.gz: 5c6253b111461fca1d2435f835d6bff911c4241f
 SHA512:
-  metadata.gz: 17044484ee4f77fae94fa5724b2334844fc0f3293bb907e383d2061fa89fa8fb3ad97e5c8e1d059fb4f663c2ab9754f9a8a2bee37dddcb3c243165c519528e3b
-  data.tar.gz: f891eb04f7073b1f8b889a2be004b85d2a3d7c7f72f818788ec69212999aa6cb6ef3d207c9721d7ee6a883f275e3cae673f7c86beb93e0e49537addc2574fd0f
+  metadata.gz: 38a1fe0c31f761690a9328ca4fc1d94c50a19f0701893fb74873db17456c65e15ca0dd159a6dde731705f151976565ed709719ff755c4ff516cea2fc821314cb
+  data.tar.gz: ea3d462b54d1c1a3bf8a76526d77b2c4b0590a510a89f6b969c6ae36923a3d4ae2847f89e52e6b3287383e8b911ec691aac1c53c53fedcde51708ce51ecf868d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-google-cloud (0.6.0)
+    fluent-plugin-google-cloud (0.6.1)
       fluentd (~> 0.10)
       google-api-client (~> 0.9.0)
       google-cloud-logging (~> 0.23.2)
@@ -13,7 +13,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.0)
+    addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
     ast (2.3.0)
     astrolabe (1.3.1)
@@ -21,9 +21,9 @@ GEM
     cool.io (1.4.6)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    faraday (0.11.0)
+    faraday (0.12.0.1)
       multipart-post (>= 1.2, < 3)
-    fluentd (0.14.13)
+    fluentd (0.14.14)
       cool.io (~> 1.4.5)
       http_parser.rb (>= 0.5.1, < 0.7.0)
       msgpack (>= 0.7.0, < 2.0.0)
@@ -57,7 +57,7 @@ GEM
       googleauth (~> 0.5.1)
       grpc (~> 1.0)
       rly (~> 0.2.3)
-    google-protobuf (3.2.0)
+    google-protobuf (3.2.0.2)
     googleapis-common-protos (1.3.5)
       google-protobuf (~> 3.2)
       grpc (~> 1.0)
@@ -69,7 +69,7 @@ GEM
       multi_json (~> 1.11)
       os (~> 0.9)
       signet (~> 0.7)
-    grpc (1.1.2)
+    grpc (1.2.2)
       google-protobuf (~> 3.1)
       googleauth (~> 0.5.1)
     hashdiff (0.3.2)
@@ -79,7 +79,7 @@ GEM
     json (1.8.6)
     jwt (1.5.6)
     little-plugger (1.1.4)
-    logging (2.1.0)
+    logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
     memoist (0.15.0)
@@ -89,7 +89,7 @@ GEM
     mime-types-data (3.2016.0521)
     mocha (1.2.1)
       metaclass (~> 0.0.1)
-    msgpack (1.0.3)
+    msgpack (1.1.0)
     multi_json (1.12.1)
     multipart-post (2.0.0)
     orderedhash (0.0.6)
@@ -114,7 +114,7 @@ GEM
       tins (<= 1.6.0)
     ruby-progressbar (1.8.1)
     safe_yaml (1.0.4)
-    serverengine (2.0.4)
+    serverengine (2.0.5)
       sigdump (~> 0.2.2)
     sigdump (0.2.4)
     signet (0.7.3)
@@ -128,9 +128,9 @@ GEM
       power_assert
     thread_safe (0.3.6)
     tins (1.6.0)
-    tzinfo (1.2.2)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2016.10)
+    tzinfo-data (1.2017.2)
       tzinfo (>= 1.0.0)
     uber (0.0.15)
     webmock (1.24.6)
@@ -151,4 +151,4 @@ DEPENDENCIES
   webmock (~> 1.17)
 
 BUNDLED WITH
-   1.14.5
+   1.14.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.6.0'
+  gem.version       = '0.6.1'
   gem.authors       = ['Todd Derr', 'Alex Robinson']
   gem.email         = ['salty@google.com']
   gem.required_ruby_version = Gem::Requirement.new('>= 2.0')

data/lib/fluent/plugin/out_google_cloud.rb

@@ -73,7 +73,7 @@ module Fluent
     Fluent::Plugin.register_output('google_cloud', self)
 
     PLUGIN_NAME = 'Fluentd Google Cloud Logging plugin'
-    PLUGIN_VERSION = '0.6.0'
+    PLUGIN_VERSION = '0.6.1'
 
     # Name of the the Google cloud logging write scope.
     LOGGING_SCOPE = 'https://www.googleapis.com/auth/logging.write'
@@ -590,7 +590,7 @@ module Fluent
                 nanos: ts_nanos
               )
             end
-            set_http_request_grpc(record, entry)
+            set_http_request(record, entry)
             set_payload_grpc(entry_resource.type, record, entry, is_json)
           else
             # Remove the labels if we didn't populate them with anything.
@@ -930,29 +930,14 @@ module Fluent
     def set_http_request(record, entry)
       return nil unless record['httpRequest'].is_a?(Hash)
       input = record['httpRequest']
-      output = Google::Apis::LoggingV2beta1::HttpRequest.new
-      output.request_method = input.delete('requestMethod')
-      output.request_url = input.delete('requestUrl')
-      output.request_size = input.delete('requestSize')
-      output.status = input.delete('status')
-      output.response_size = input.delete('responseSize')
-      output.user_agent = input.delete('userAgent')
-      output.remote_ip = input.delete('remoteIp')
-      output.referer = input.delete('referer')
-      output.cache_hit = input.delete('cacheHit')
-      output.cache_validated_with_origin_server = \
-        input.delete('cacheValidatedWithOriginServer')
-      record.delete('httpRequest') if input.empty?
-      entry.http_request = output
-    end
-
-    def set_http_request_grpc(record, entry)
-      return nil unless record['httpRequest'].is_a?(Hash)
-      input = record['httpRequest']
-      output = Google::Logging::Type::HttpRequest.new
+      if @use_grpc
+        output = Google::Logging::Type::HttpRequest.new
+      else
+        output = Google::Apis::LoggingV2beta1::HttpRequest.new
+      end
       # We need to delete each field from 'httpRequest' even if its value is
-      # nil. However we do not want to assign this nil value to proto fields
-      # defined as strings / integers.
+      # nil. However we do not want to assign this nil value to the constructed
+      # json or proto.
       request_method = input.delete('requestMethod')
       output.request_method = request_method unless request_method.nil?
       request_url = input.delete('requestUrl')

data/test/plugin/base_test.rb

@@ -1348,6 +1348,26 @@ module BaseTest
     end
   end
 
+  def test_http_request_from_record_with_referer_nil_or_absent
+    setup_gce_metadata_stubs
+    [
+      http_request_message_with_nil_referer,
+      http_request_message_with_absent_referer
+    ].each do |input|
+      setup_logging_stubs do
+        @logs_sent = []
+        d = create_driver
+        d.emit('httpRequest' => input)
+        d.run
+      end
+      verify_log_entries(1, COMPUTE_PARAMS, 'httpRequest') do |entry|
+        assert_equal http_request_message_with_absent_referer,
+                     entry['httpRequest'], entry
+        assert_nil get_fields(entry['jsonPayload'])['httpRequest'], entry
+      end
+    end
+  end
+
   private
 
   def stub_metadata_request(metadata_path, response_body)
@@ -1565,6 +1585,13 @@ module BaseTest
     HTTP_REQUEST_MESSAGE.merge('referer' => nil)
   end
 
+  # Unset the 'referer' field.
+  def http_request_message_with_absent_referer
+    HTTP_REQUEST_MESSAGE.reject do |k, _|
+      k == 'referer'
+    end
+  end
+
   # This module expects the methods below to be overridden.
 
   # Create a Fluentd output test driver with the Google Cloud Output plugin.

data/test/plugin/test_out_google_cloud.rb

@@ -70,24 +70,6 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     assert_equal 1, exception_count
   end
 
-  def test_http_request_from_record_with_referer_nil
-    setup_gce_metadata_stubs
-    setup_logging_stubs do
-      d = create_driver
-      d.emit('httpRequest' => http_request_message_with_nil_referer)
-      d.run
-    end
-    verify_log_entries(1, COMPUTE_PARAMS, 'httpRequest') do |entry|
-      # The request we send to Logging API has json like:
-      # "httpRequest": { "referer": null }, but eventually the stored LogEntry
-      # would be "httpRequest": {}, since 'referer' is defined as a string in
-      # the proto.
-      assert_equal http_request_message_with_nil_referer,
-                   entry['httpRequest'], entry
-      assert_nil get_fields(entry['jsonPayload'])['httpRequest'], entry
-    end
-  end
-
   # This test looks similar between the grpc and non-grpc paths except that when
   # parsing "105", the grpc path responds with "DEBUG", while the non-grpc path
   # responds with "100".

data/test/plugin/test_out_google_cloud_grpc.rb

@@ -72,34 +72,6 @@ class GoogleCloudOutputGRPCTest < Test::Unit::TestCase
     end
   end
 
-  def test_http_request_from_record_with_referer_nil
-    setup_gce_metadata_stubs
-    setup_logging_stubs do
-      d = create_driver
-      d.emit('httpRequest' => http_request_message_with_nil_referer)
-      d.run
-    end
-    verify_log_entries(1, COMPUTE_PARAMS, 'httpRequest') do |entry|
-      assert_equal http_request_message_with_absent_referer,
-                   entry['httpRequest'], entry
-      assert_nil get_fields(entry['jsonPayload'])['httpRequest'], entry
-    end
-  end
-
-  def test_http_request_from_record_with_referer_absent
-    setup_gce_metadata_stubs
-    setup_logging_stubs do
-      d = create_driver
-      d.emit('httpRequest' => http_request_message_with_absent_referer)
-      d.run
-    end
-    verify_log_entries(1, COMPUTE_PARAMS, 'httpRequest') do |entry|
-      assert_equal http_request_message_with_absent_referer,
-                   entry['httpRequest'], entry
-      assert_nil get_fields(entry['jsonPayload'])['httpRequest'], entry
-    end
-  end
-
   # This test looks similar between the grpc and non-grpc paths except that when
   # parsing "105", the grpc path responds with "DEBUG", while the non-grpc path
   # responds with "100".
@@ -340,13 +312,6 @@ class GoogleCloudOutputGRPCTest < Test::Unit::TestCase
     end
   end
 
-  # Unset the 'referer' field.
-  def http_request_message_with_absent_referer
-    HTTP_REQUEST_MESSAGE.reject do |k, _|
-      k == 'referer'
-    end
-  end
-
   # Get the fields of the payload.
   def get_fields(payload)
     payload['fields']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-google-cloud
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Todd Derr
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-27 00:00:00.000000000 Z
+date: 2017-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -226,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: fluentd output plugin for the Stackdriver Logging API