fluent-plugin-google-cloud 0.4.14 → 0.4.15

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NGQxM2IzZmRjNjdmOTQ0ZmE3ZDVjNmNkOTIzZWU4YjQxZDk4YjU2Mw==
+  data.tar.gz: !binary |-
+    M2UwYzcyNzUyNzI2NTM1YTUzMDk4N2EyNzlmMzA0MGVkMWJjNjZhNw==
+SHA512:
+  metadata.gz: !binary |-
+    OGQ4ZGQ2MDljOTJkNjA0ODZhYTUwYTQ0OWZhYTIyOWU5YTE3YTA4MTM0ODQz
+    NWYzYjVlMjg1ZDA4MzgwMTVmZGYwODE5MzU2NGM5OGQ4NzJkNDIzNjMwMGMw
+    OGRhOTYyOTcyMmNjNjJiZGYyMDg3Y2UzNzM0YjY3Y2QwNDBiZWY=
+  data.tar.gz: !binary |-
+    NGM5MTdhM2ExYjIzZGYwMGM3NjgwZjQyYWQ5NWE4NGIzNWFjZmNmMjE0OTNk
+    YjQ5N2EwM2ZmOGE2Njc5NGE1NDM5MTYzMjExNjQ5ZmMxMzkxNzZkNWViODMz
+    M2YyNGE5MzFiM2ZjZjUzOTMxZWQyZGQxNTc4M2I1M2ZmMjdiZjE=

data/Gemfile.lock

@@ -1,16 +1,17 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-google-cloud (0.4.12)
+    fluent-plugin-google-cloud (0.4.14)
       fluentd (~> 0.10)
-      google-api-client (>= 0.8.6, <= 0.9)
+      google-api-client (>= 0.8.6, < 0.9)
       googleauth (~> 0.4)
       json (~> 1.8)
+      jwt (< 1.5.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.4)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -24,13 +25,13 @@ GEM
       addressable (>= 2.3.1)
       extlib (>= 0.9.15)
       multi_json (>= 1.0.0)
-    cool.io (1.4.1)
+    cool.io (1.4.3)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     extlib (0.9.16)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    fluentd (0.12.16)
+    fluentd (0.12.22)
       cool.io (>= 1.2.2, < 2.0.0)
       http_parser.rb (>= 0.5.1, < 0.7.0)
       json (>= 1.4.3)
@@ -51,13 +52,14 @@ GEM
       multi_json (~> 1.10)
       retriable (~> 1.4)
       signet (~> 0.6)
-    googleauth (0.4.2)
+    googleauth (0.5.1)
       faraday (~> 0.9)
       jwt (~> 1.4)
       logging (~> 2.0)
       memoist (~> 0.12)
       multi_json (~> 1.11)
-      signet (~> 0.6)
+      os (~> 0.9)
+      signet (~> 0.7)
     hashdiff (0.2.2)
     http_parser.rb (0.6.0)
     i18n (0.7.0)
@@ -66,17 +68,18 @@ GEM
     launchy (2.4.3)
       addressable (~> 2.3)
     little-plugger (1.1.4)
-    logging (2.0.0)
+    logging (2.1.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
-    memoist (0.12.0)
+    memoist (0.14.0)
     metaclass (0.0.4)
-    minitest (5.8.2)
+    minitest (5.8.4)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     msgpack (0.5.12)
     multi_json (1.11.2)
     multipart-post (2.0.0)
+    os (0.9.6)
     parser (2.2.3.0)
       ast (>= 1.1, < 3.0)
     power_assert (0.2.5)
@@ -92,10 +95,9 @@ GEM
       ruby-progressbar (~> 1.4)
     ruby-progressbar (1.7.5)
     safe_yaml (1.0.4)
-    sigdump (0.2.3)
-    signet (0.6.1)
+    sigdump (0.2.4)
+    signet (0.7.2)
       addressable (~> 2.3)
-      extlib (~> 0.9)
       faraday (~> 0.9)
       jwt (~> 1.5)
       multi_json (~> 1.10)
@@ -105,7 +107,7 @@ GEM
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2015.7)
+    tzinfo-data (1.2016.2)
       tzinfo (>= 1.0.0)
     webmock (1.22.3)
       addressable (>= 2.3.6)
@@ -123,6 +125,3 @@ DEPENDENCIES
   rubocop (= 0.34.2)
   test-unit (~> 3.0)
   webmock (~> 1.17)
-
-BUNDLED WITH
-   1.10.6

data/fluent-plugin-google-cloud.gemspec

@@ -9,8 +9,8 @@ eos
   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.14'
+  gem.license       = 'Apache-2.0'
+  gem.version       = '0.4.15'
   gem.authors       = ['Todd Derr', 'Alex Robinson']
   gem.email         = ['salty@google.com']
 
@@ -22,6 +22,9 @@ eos
   gem.add_runtime_dependency 'google-api-client', '>= 0.8.6', '< 0.9'
   gem.add_runtime_dependency 'googleauth', '~> 0.4'
   gem.add_runtime_dependency 'json', '~> 1.8'
+  # workaround for jwt 1.5.3 breaking ruby 1.9 support (included by googleauth)
+  # see https://github.com/jwt/ruby-jwt/issues/132
+  gem.add_runtime_dependency 'jwt', '< 1.5.3'
 
   gem.add_development_dependency 'mocha', '~> 1.1'
   gem.add_development_dependency 'rake', '~> 10.3'

data/lib/fluent/plugin/out_google_cloud.rb

@@ -31,6 +31,11 @@ module Fluent
     # Address of the metadata service.
     METADATA_SERVICE_ADDR = '169.254.169.254'
 
+    # Fields allowed in httpRequest object
+    HTTP_REQUEST_FIELDS = %w(requestMethod requestUrl requestSize status
+                             responseSize userAgent remoteIp referer
+                             cacheHit validatedWithOriginServer)
+
     # Disable this warning to conform to fluentd config_param conventions.
     # rubocop:disable Style/HashSyntax
 
@@ -434,6 +439,8 @@ module Fluent
 
           set_severity(record, entry)
 
+          set_http_request(record, entry)
+
           # If a field is present in the label_map, send its value as a label
           # (mapping the field name to label name as specified in the config)
           # and do not send that field as part of the payload.
@@ -656,6 +663,21 @@ module Fluent
       end
     end
 
+    def set_http_request(record, entry)
+      return unless record['httpRequest'].is_a?(Hash)
+
+      entry['httpRequest'] = {}
+
+      HTTP_REQUEST_FIELDS.each do |field|
+        if record['httpRequest'].key?(field)
+          entry['httpRequest'][field] = record['httpRequest'][field]
+          record['httpRequest'].delete(field)
+        end
+      end
+
+      record.delete('httpRequest') if record['httpRequest'].empty?
+    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))
@@ -787,7 +809,7 @@ module Fluent
     def init_api_client
       @client = Google::APIClient.new(
         application_name: 'Fluentd Google Cloud Logging plugin',
-        application_version: '0.4.14',
+        application_version: '0.4.15',
         retries: 1)
 
       if @auth_method == 'private_key'

data/test/plugin/test_out_google_cloud.rb

@@ -299,6 +299,19 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     }
   }
 
+  HTTP_REQUEST_MESSAGE = {
+    'requestMethod' => 'POST',
+    'requestUrl' => 'http://example/',
+    'requestSize' => 210,
+    'status' => 200,
+    'responseSize' => 65,
+    'userAgent' => 'USER AGENT 1.0',
+    'remoteIp' => '55.55.55.55',
+    'referer' => 'http://referer/',
+    'cacheHit' => false,
+    'validatedWithOriginServer' => true
+  }
+
   def create_driver(conf = APPLICATION_DEFAULT_CONFIG, tag = 'test')
     Fluent::Test::BufferedOutputTestDriver.new(
       Fluent::GoogleCloudOutput, tag).configure(conf, use_v1_config: true)
@@ -1048,6 +1061,43 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     end
   end
 
+  def test_http_request_from_record
+    setup_gce_metadata_stubs
+    setup_logging_stubs
+    d = create_driver(APPLICATION_DEFAULT_CONFIG)
+    d.emit('httpRequest' => HTTP_REQUEST_MESSAGE)
+    d.run
+    verify_log_entries(1, COMPUTE_PARAMS, 'httpRequest') do |entry|
+      assert_equal HTTP_REQUEST_MESSAGE, entry['httpRequest'], entry
+      assert_equal nil, entry['structPayload']['httpRequest'], entry
+    end
+  end
+
+  def test_http_request_partial_from_record
+    setup_gce_metadata_stubs
+    setup_logging_stubs
+    d = create_driver(APPLICATION_DEFAULT_CONFIG)
+    d.emit('httpRequest' => HTTP_REQUEST_MESSAGE.merge('otherKey' => 'value'))
+    d.run
+    verify_log_entries(1, COMPUTE_PARAMS, 'httpRequest') do |entry|
+      assert_equal HTTP_REQUEST_MESSAGE, entry['httpRequest'], entry
+      assert_equal 'value', entry['structPayload']['httpRequest']['otherKey'],
+                   entry
+    end
+  end
+
+  def test_http_request_when_not_hash
+    setup_gce_metadata_stubs
+    setup_logging_stubs
+    d = create_driver(APPLICATION_DEFAULT_CONFIG)
+    d.emit('httpRequest' => 'a_string')
+    d.run
+    verify_log_entries(1, COMPUTE_PARAMS, 'structPayload') do |entry|
+      assert_equal 'a_string', entry['structPayload']['httpRequest'], entry
+      assert_equal nil, entry['httpRequest'], entry
+    end
+  end
+
   # Make parse_severity public so we can test it.
   class Fluent::GoogleCloudOutput # rubocop:disable Style/ClassAndModuleChildren
     public :parse_severity

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-google-cloud
 version: !ruby/object:Gem::Version
-  version: 0.4.14
-  prerelease: 
+  version: 0.4.15
 platform: ruby
 authors:
 - Todd Derr
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-27 00:00:00.000000000 Z
+date: 2016-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -31,7 +28,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -42,7 +38,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -53,7 +48,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: googleauth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -61,7 +55,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,7 +62,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -77,15 +69,27 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: jwt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.5.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.5.3
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -93,7 +97,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -101,7 +104,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -109,7 +111,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -117,7 +118,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -125,7 +125,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -133,7 +132,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -141,7 +139,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -149,7 +146,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -157,7 +153,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -172,44 +167,43 @@ 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/iam-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
+- 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.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: fluentd output plugin for the Google Cloud Logging API
 test_files:
 - test/helper.rb