nonnative 1.25.0 → 1.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02a90943c6dc7f21344409f9ee8be6f2a885fdf93a349ec89d3d0e690f040727
-  data.tar.gz: '029e6c5d065db3e63a757d54fa163b9523c8dce1114341c43416709aa0fb3407'
+  metadata.gz: 12206912ca29ab82602d7d07fdc15f5b42124e890572d463ad1c4358c7de9f08
+  data.tar.gz: ee0393650b33d8a3c5b1d31019f717a3fb680f8872171c7fea1ac4892e186ad5
 SHA512:
-  metadata.gz: 8274f8202cd8b5b4a9bf81872ef9d25944b58171451469ef16c2ca9040cceda0ed41ab3e28b69c780b33260c4bfee5c231e5947738bf12413d3324e0f00a9d3e
-  data.tar.gz: bdedecceaf8a08ca7bd8b52e69fdbb8e5cc4336ca28677d0bce5f17a9db735a08d59a7180e2cd4e65c6819be704155ac6aac8a07db48d3ba293de2839ba69d84
+  metadata.gz: 9bbd95d62ddf01d04fd7f6bc4a783276e65dcc7775fbc1844316ee5f12ce150cf06cb3536c77e98f2b600fa5126fd2ed6e2946466559a53a4444ea4e1448b62f
+  data.tar.gz: 4417fe28fb3f291a7ac81bab44cbf398fc897acbf815397bd58aba7a72548c0320faba7aeab15778f7037c05b9fb84e2429cbd0a19ec6daba2d0c4f9f646318e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nonnative (1.25.0)
+    nonnative (1.26.0)
       concurrent-ruby (~> 1.0, >= 1.0.5)
       cucumber (>= 4, < 5)
       grpc (>= 1, < 2)

data/README.md

@@ -310,7 +310,7 @@ Nonnative.load_configuration('configuration.yml')
 
 We allow different proxies to be configured. These proxies can be used to simulate all kind of situations. The proxies that can be configured are:
 - `none` (this is the default)
-- `chaos`
+- `fault_injection`
 
 Setup it up programmatically:
 
@@ -322,8 +322,9 @@ Nonnative.configure do |config|
 
   config.server do |d|
     d.proxy = {
-      type: 'chaos',
+      type: 'fault_injection',
       port: 20_000,
+      log: 'features/logs/proxy_server.log',
       options: {
         delay: 5
       }
@@ -340,15 +341,16 @@ strategy: manual
 servers:
   -
     proxy:
-      type: chaos
+      type: fault_injection
       port: 20000
+      log: features/logs/proxy_server.log
       options:
         delay: 5
 ```
 
 ##### Fault Injection
 
-The `chaos` proxy allows you to simulate failures by injecting them. We currently support the following:
+The `fault_injection` proxy allows you to simulate failures by injecting them. We currently support the following:
 - `close_all` - Closes the socket as soon as it connects.
 - `delay` - This delays the communication between the connection. Default is 2 secs can be configured through options.
 - `invalid_data` - This takes the input and rearranges it to produce invalid data.

data/lib/nonnative.rb

@@ -34,7 +34,7 @@ require 'nonnative/observability'
 require 'nonnative/proxy_factory'
 require 'nonnative/proxy'
 require 'nonnative/no_proxy'
-require 'nonnative/chaos_proxy'
+require 'nonnative/fault_injection_proxy'
 require 'nonnative/socket_pair'
 require 'nonnative/close_all_socket_pair'
 require 'nonnative/delay_socket_pair'

data/lib/nonnative/configuration.rb

@@ -46,6 +46,7 @@ module Nonnative
               s.proxy = {
                 type: proxy['type'],
                 port: proxy['port'],
+                log: proxy['log'],
                 options: proxy['options']
               }
             end

data/lib/nonnative/configuration_proxy.rb

@@ -2,7 +2,7 @@
 
 module Nonnative
   class ConfigurationProxy
-    attr_accessor :type, :port, :options
+    attr_accessor :type, :port, :log, :options
 
     def initialize
       self.type = 'none'

data/lib/nonnative/configuration_server.rb

@@ -12,6 +12,7 @@ module Nonnative
     def proxy=(value)
       proxy.type = value[:type]
       proxy.port = value[:port]
+      proxy.log = value[:log]
       proxy.options = value[:options]
     end
   end

data/lib/nonnative/{chaos_proxy.rb → fault_injection_proxy.rb}

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
 module Nonnative
-  class ChaosProxy < Nonnative::Proxy
+  class FaultInjectionProxy < Nonnative::Proxy
     def initialize(service)
       @connections = Concurrent::Hash.new
+      @logger = Logger.new(service.proxy.log)
       @mutex = Mutex.new
       @state = :none
 
@@ -42,19 +43,30 @@ module Nonnative
 
     private
 
-    attr_reader :tcp_server, :thread, :connections, :mutex, :state
+    attr_reader :tcp_server, :thread, :connections, :mutex, :state, :logger
 
     def perform_start
       loop do
         thread = Thread.start(tcp_server.accept) do |local_socket|
-          SocketPairFactory.create(read_state, service.proxy).connect(local_socket)
-          connections.delete(Thread.current.object_id)
+          id = Thread.current.object_id
+
+          logger.info "started connection for #{id} with socket #{local_socket.inspect}"
+
+          connect local_socket
+          connections.delete(id)
+
+          logger.info "finished connection for #{id} with socket #{local_socket.inspect}"
         end
+
         thread.report_on_exception = false
         connections[thread.object_id] = thread
       end
     end
 
+    def connect(local_socket)
+      SocketPairFactory.create(read_state, service.proxy, logger).connect(local_socket)
+    end
+
     def apply_state(state)
       mutex.synchronize { @state = state }
     end

data/lib/nonnative/proxy_factory.rb

@@ -4,13 +4,14 @@ module Nonnative
   class ProxyFactory
     class << self
       def create(service)
-        case service.proxy.type
-        when 'chaos'
-          ChaosProxy.new(service)
-        else
-          # By default we want no proxy.
-          NoProxy.new(service)
-        end
+        proxy = case service.proxy.type
+                when 'fault_injection'
+                  FaultInjectionProxy
+                else
+                  NoProxy
+                end
+
+        proxy.new(service)
       end
     end
   end

data/lib/nonnative/socket_pair.rb

@@ -2,8 +2,9 @@
 
 module Nonnative
   class SocketPair
-    def initialize(proxy)
+    def initialize(proxy, logger)
       @proxy = proxy
+      @logger = logger
     end
 
     def connect(local_socket)
@@ -15,6 +16,8 @@ module Nonnative
         break if pipe(ready, local_socket, remote_socket)
         break if pipe(ready, remote_socket, local_socket)
       end
+    rescue StandardError => e
+      logger.error e
     ensure
       local_socket.close
       remote_socket&.close
@@ -22,7 +25,7 @@ module Nonnative
 
     protected
 
-    attr_reader :proxy
+    attr_reader :proxy, :logger
 
     def create_remote_socket
       ::TCPSocket.new('0.0.0.0', proxy.port)

data/lib/nonnative/socket_pair_factory.rb

@@ -3,17 +3,19 @@
 module Nonnative
   class SocketPairFactory
     class << self
-      def create(type, port)
-        case type
-        when :close_all
-          CloseAllSocketPair.new(port)
-        when :delay
-          DelaySocketPair.new(port)
-        when :invalid_data
-          InvalidDataSocketPair.new(port)
-        else
-          SocketPair.new(port)
-        end
+      def create(type, proxy, logger)
+        pair = case type
+               when :close_all
+                 CloseAllSocketPair
+               when :delay
+                 DelaySocketPair
+               when :invalid_data
+                 InvalidDataSocketPair
+               else
+                 SocketPair
+               end
+
+        pair.new(proxy, logger)
       end
     end
   end

data/lib/nonnative/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Nonnative
-  VERSION = '1.25.0'
+  VERSION = '1.26.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nonnative
 version: !ruby/object:Gem::Version
-  version: 1.25.0
+  version: 1.26.0
 platform: ruby
 authors:
 - Alex Falkowski
@@ -283,7 +283,6 @@ files:
 - bin/setup
 - lib/nonnative.rb
 - lib/nonnative/before.rb
-- lib/nonnative/chaos_proxy.rb
 - lib/nonnative/close_all_socket_pair.rb
 - lib/nonnative/command.rb
 - lib/nonnative/configuration.rb
@@ -292,6 +291,7 @@ files:
 - lib/nonnative/configuration_server.rb
 - lib/nonnative/delay_socket_pair.rb
 - lib/nonnative/error.rb
+- lib/nonnative/fault_injection_proxy.rb
 - lib/nonnative/grpc_server.rb
 - lib/nonnative/http_client.rb
 - lib/nonnative/http_server.rb