fluent-plugin-google-cloud 0.6.9.pre.1 → 0.6.10.pre.1

data/test/plugin/test_out_google_cloud.rb

@@ -273,7 +273,8 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
 
   private
 
-  WRITE_LOG_ENTRIES_URI = 'https://logging.googleapis.com/v2/entries:write'
+  WRITE_LOG_ENTRIES_URI =
+    'https://logging.googleapis.com/v2/entries:write'.freeze
 
   def rename_key(hash, old_key, new_key)
     hash.merge(new_key => hash[old_key]).reject { |k, _| k == old_key }

data/test/plugin/test_out_google_cloud_grpc.rb

@@ -91,8 +91,8 @@ class GoogleCloudOutputGRPCTest < Test::Unit::TestCase
       [true, 13, 1, 2, [0, 1, 0, 0, 2]]
     ].each do |should_fail, code, request_count, entry_count, metric_values|
       setup_prometheus
-      setup_logging_stubs(should_fail, code, 'SomeMessage') do
-        (1..request_count).each do
+      (1..request_count).each do
+        setup_logging_stubs(should_fail, code, 'SomeMessage') do
           d = create_driver(USE_GRPC_CONFIG + PROMETHEUS_ENABLE_CONFIG, 'test',
                             GRPCLoggingMockFailingService.rpc_stub_class)
           (1..entry_count).each do |i|
@@ -205,14 +205,21 @@ class GoogleCloudOutputGRPCTest < Test::Unit::TestCase
 
   private
 
-  GRPC_MOCK_HOST = 'localhost:56789'
-
   WriteLogEntriesRequest = Google::Logging::V2::WriteLogEntriesRequest
   WriteLogEntriesResponse = Google::Logging::V2::WriteLogEntriesResponse
 
   USE_GRPC_CONFIG = %(
     use_grpc true
-  )
+  ).freeze
+
+  @@mock_port = 0 # rubocop:disable Style/ClassVars
+
+  def generate_mock_host
+    # rubocop:disable Style/ClassVars
+    @@mock_port = (@@mock_port + 1) % 10_000 + 50_000
+    "localhost:#{@@mock_port}"
+    # rubocop:enable Style/ClassVars
+  end
 
   # Create a Fluentd output test driver with the Google Cloud Output plugin with
   # grpc enabled. The signature of this method is different between the grpc
@@ -222,14 +229,16 @@ class GoogleCloudOutputGRPCTest < Test::Unit::TestCase
                     grpc_stub = GRPCLoggingMockService.rpc_stub_class)
     conf += USE_GRPC_CONFIG
     Fluent::Test::BufferedOutputTestDriver.new(
-      GoogleCloudOutputWithGRPCMock.new(grpc_stub), tag).configure(conf, true)
+      GoogleCloudOutputWithGRPCMock.new(grpc_stub, @mock_host),
+      tag).configure(conf, true)
   end
 
   # Google Cloud Fluent output stub with grpc mock.
   class GoogleCloudOutputWithGRPCMock < Fluent::GoogleCloudOutput
-    def initialize(grpc_stub)
+    def initialize(grpc_stub, mock_host)
       super()
       @grpc_stub = grpc_stub
+      @mock_host = mock_host
     end
 
     def api_client
@@ -240,7 +249,7 @@ class GoogleCloudOutputGRPCTest < Test::Unit::TestCase
 
       # Here we have obtained the creds, but for the mock, we will leave the
       # channel insecure.
-      @grpc_stub.new(GRPC_MOCK_HOST, :this_channel_is_insecure)
+      @grpc_stub.new(@mock_host, :this_channel_is_insecure)
     end
   end
 
@@ -261,15 +270,15 @@ class GoogleCloudOutputGRPCTest < Test::Unit::TestCase
     # These methods should never be called, so they will just fail the tests
     # with "unimplemented" errors..
     def _undefined
-      fail "Method #{__callee__} is unimplemented and needs to be overridden."
+      raise "Method #{__callee__} is unimplemented and needs to be overridden."
     end
 
-    alias_method :list_logs, :_undefined
-    alias_method :list_log_entries, :_undefined
-    alias_method :list_log_services, :_undefined
-    alias_method :list_log_service_indexes, :_undefined
-    alias_method :list_monitored_resource_descriptors, :_undefined
-    alias_method :delete_log, :_undefined
+    alias list_logs _undefined
+    alias list_log_entries _undefined
+    alias list_log_services _undefined
+    alias list_log_service_indexes _undefined
+    alias list_monitored_resource_descriptors _undefined
+    alias delete_log _undefined
     undef_method :_undefined
   end
 
@@ -288,7 +297,7 @@ class GoogleCloudOutputGRPCTest < Test::Unit::TestCase
 
     def write_log_entries(_request, _call)
       @failed_attempts << 1
-      fail GRPC::BadStatus.new(@code, @message)
+      raise GRPC::BadStatus.new(@code, @message)
     end
 
     # TODO(lingshi) Remove these dummy methods when grpc/9033 is fixed.
@@ -296,20 +305,27 @@ class GoogleCloudOutputGRPCTest < Test::Unit::TestCase
     # These methods should never be called, so they will just fail the tests
     # with "unimplemented" errors..
     def _undefined
-      fail "Method #{__callee__} is unimplemented and needs to be overridden."
+      raise "Method #{__callee__} is unimplemented and needs to be overridden."
     end
 
-    alias_method :list_logs, :_undefined
-    alias_method :list_log_entries, :_undefined
-    alias_method :list_log_services, :_undefined
-    alias_method :list_log_service_indexes, :_undefined
-    alias_method :list_monitored_resource_descriptors, :_undefined
-    alias_method :delete_log, :_undefined
+    alias list_logs _undefined
+    alias list_log_entries _undefined
+    alias list_log_services _undefined
+    alias list_log_service_indexes _undefined
+    alias list_monitored_resource_descriptors _undefined
+    alias delete_log _undefined
     undef_method :_undefined
   end
 
   # Set up grpc stubs to mock the external calls.
+  # TODO(qingling128): Remove this comment after grpc/grpc#12506 is resolved.
+  # Due to a gRPC load balancing issue (grpc/grpc#12506), we have to use a
+  # different port each time we create a gRPC mock as a temporary workaround.
+  # Thus we can only create one driver in each setup_logging_stubs context.
   def setup_logging_stubs(should_fail = false, code = 0, message = 'Ok')
+    # Save the mock host in an instance variable, so later on when creating the
+    # logging driver, we can refer to this host with exactly the same port.
+    @mock_host = generate_mock_host
     srv = GRPC::RpcServer.new
     @failed_attempts = []
     @requests_sent = []
@@ -319,7 +335,7 @@ class GoogleCloudOutputGRPCTest < Test::Unit::TestCase
       grpc = GRPCLoggingMockService.new(@requests_sent)
     end
     srv.handle(grpc)
-    srv.add_http2_port(GRPC_MOCK_HOST, :this_port_is_insecure)
+    srv.add_http2_port(@mock_host, :this_port_is_insecure)
     t = Thread.new { srv.run }
     srv.wait_till_running
     begin
@@ -331,6 +347,7 @@ class GoogleCloudOutputGRPCTest < Test::Unit::TestCase
     end
     srv.stop
     t.join
+    @mock_host = nil
   end
 
   # Verify the number and the content of the log entries match the expectation.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-google-cloud
 version: !ruby/object:Gem::Version
-  version: 0.6.9.pre.1
+  version: 0.6.10.pre.1
 platform: ruby
 authors:
 - Todd Derr
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-18 00:00:00.000000000 Z
+date: 2017-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -100,9 +100,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -110,9 +107,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -161,14 +155,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.0
+        version: 0.39.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.0
+        version: 0.39.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement