avro_turf 1.20.1 → 1.20.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80b65f5f08285ac85c04012f6b9f1fa9483095013a36fbaa5f93fa5b6d379e33
-  data.tar.gz: 6cfc6bdc7b87a0c2784bed5d6451c4803466fdd0d2fc0c8fa3d8bd61546ddbce
+  metadata.gz: 470551a79cda6c0bd70278cc897ce49865da245cf23343e470cfe678d9be8337
+  data.tar.gz: 8cad926076373c9e4dca011cea71bd5db2765eaacca3e9ca041e8ecb676aefed
 SHA512:
-  metadata.gz: 921c736f0889497e0db8327b96797a34f69d64410b1edcd05d3e961116eebc1476ecc039e78c4a06b49e8b03bfc8706153e446ac07831fef20c49002333f6c5d
-  data.tar.gz: 74d4ca51d66e3f5aa4f232cec3e3f52b86467d20c04145d51bb4e71c861f3120897eb38934e52ca35756b2fe69f0a1c6d22dae027ea923c258a7b12faf382cec
+  metadata.gz: 3ba8a93fb62a571993c31ea9b6bd5ca7113f0b090b3d846e0b350bad8ad0068af4801d0e090af1454f2d83cae6d06f2fe5c487f58e76451204f6cbbb5ecfd24f
+  data.tar.gz: 750fde4b42c44ee5d68e43d72ce4f33e28565993ead7982fa3d720c480e8b47e0bd55f0fd4bdbe326a26c43e60643f5d63815b2ab8b0949db99ce93325a90d29

data/CHANGELOG.md

@@ -2,11 +2,14 @@
 
 ## Unreleased
 
-- Memoize parsed schemas to improve encoding performance when using `AvroTurf::Messaging` (#206)
+## v1.20.2
+
+- Fix stale reads from `AvroTurf::ConfluentSchemaRegistry` after `Exceptions`
 
 ## v1.20.1
 
 - Remove `sinatra` as a development dependency (#237)
+- Memoize parsed schemas to improve encoding performance when using `AvroTurf::Messaging` (#206)
 
 ## v1.20.0
 

data/avro_turf.gemspec

@@ -22,7 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "avro", ">= 1.11.3", "< 1.13"
   spec.add_dependency "excon", ">= 0.104", "< 2"
 
-  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.2"
   spec.add_development_dependency "fakefs", "~> 3"

data/lib/avro_turf/confluent_schema_registry.rb

@@ -163,7 +163,15 @@ class AvroTurf::ConfluentSchemaRegistry
   def request(path, **options)
     options = {expects: 200}.merge!(options)
     path = File.join(@path_prefix, path) unless @path_prefix.nil?
-    response = @connection.request(path: path, **options)
+    response = begin
+      @connection.request(path: path, **options)
+    rescue Exception # rubocop:disable Lint/RescueException
+      # Excon only resets the connection for StandardError, so an exception
+      # outside that hierarchy (e.g. Rack::Timeout::RequestTimeoutException)
+      # leaves the socket cached with unread bytes still on it.
+      @connection.reset
+      raise
+    end
     JSON.parse(response.body)
   end
 end

data/lib/avro_turf/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class AvroTurf
-  VERSION = "1.20.1"
+  VERSION = "1.20.2"
 end

data/spec/confluent_schema_registry_socket_reset_spec.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+require "avro_turf/confluent_schema_registry"
+
+describe AvroTurf::ConfluentSchemaRegistry, "socket reset on interrupt" do
+  let(:registry) { described_class.new("http://127.0.0.1:#{port}", logger: logger) }
+  let(:server) { TCPServer.new("127.0.0.1", 0) }
+  let(:port) { server.addr[1] }
+  let(:logger) { Logger.new(StringIO.new) }
+
+  let(:timeout_exception) { Class.new(Exception) } # rubocop:disable Lint/InheritException
+
+  # These specs need an actual socket to the local test server
+  around do |example|
+    FakeFS.deactivate!
+    WebMock.allow_net_connect! if defined?(WebMock)
+
+    example.call
+  ensure
+    WebMock.disable_net_connect! if defined?(WebMock)
+    FakeFS.activate!
+  end
+
+  before do
+    @server_thread = Thread.new do
+      loop do
+        socket = server.accept
+
+        Thread.new(socket) do |connection|
+          request_line = connection.gets
+          path = request_line.split[1]
+
+          schema = {type: "string", path: path}.to_json
+          body = {schema: schema}.to_json
+
+          connection.write(
+            "HTTP/1.1 200 OK\r\n" \
+            "Content-Type: application/json\r\n" \
+            "Content-Length: #{body.bytesize}\r\n\r\n" \
+            "#{body}"
+          )
+          connection.flush
+        end
+      end
+    end
+
+    timeout = true
+    this = self
+    Excon::Socket.class_eval do
+      alias_method :__unstubbed_readline, :readline
+      define_method(:readline) do |*args|
+        if timeout
+          timeout = false
+          raise this.timeout_exception, "request timeout"
+        end
+
+        __unstubbed_readline(*args)
+      end
+    end
+  end
+
+  after do
+    Excon::Socket.class_eval do
+      alias_method :readline, :__unstubbed_readline
+      remove_method :__unstubbed_readline
+    end
+
+    @server_thread&.kill
+    server.close unless server.closed?
+  end
+
+  it "does not hand the next request the abandoned response" do
+    expect { registry.fetch("1") }.to raise_error(timeout_exception)
+    expect(registry.fetch("2")).to include("/schemas/ids/2")
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avro_turf
 version: !ruby/object:Gem::Version
-  version: 1.20.1
+  version: 1.20.2
 platform: ruby
 authors:
 - Daniel Schierbeck
@@ -49,20 +49,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -211,6 +197,7 @@ files:
 - perf/person.avsc
 - spec/avro_turf_spec.rb
 - spec/cached_confluent_schema_registry_spec.rb
+- spec/confluent_schema_registry_socket_reset_spec.rb
 - spec/confluent_schema_registry_spec.rb
 - spec/core_ext/date_spec.rb
 - spec/core_ext/enumerable_spec.rb
@@ -261,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.20
 specification_version: 4
 summary: A library that makes it easier to use the Avro serialization format from
   Ruby