protobuf-nats 0.9.0.pre3 → 0.10.3.pre0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 22955c5ba9df8f9ad52ea33c197fd740cdfe8434
-  data.tar.gz: ff0dc5ef47d11178b7f8960030f025a389f2024c
+SHA256:
+  metadata.gz: 3ff8c1cf794fd44ab13e6de90476890c29c083d242aa80a2f1e1072485c7bfe2
+  data.tar.gz: edba1e8c55228916e506e7840f4fae4b2118420b8ea1d2fc4879eac14169134c
 SHA512:
-  metadata.gz: 9e75e969b3ce1561a4d402931147e5a8b4e52d09b47e36c3809694d3069b4f47c2d304771b5dd3167c44ab44e283af9000458aec6ddf6f018525f5b24dbeb70e
-  data.tar.gz: 340adf7236b84ec9f1d9a519a03d64ef0e31dcacbbecdd5bfa856db078608c70bd4571b4a02569095a3243933bccf76ab8025e11519d5dc4f61e795401f750af
+  metadata.gz: a2284a77ebd58b47b6812d221554d3becc19f4a724b648fc3d101fdfb8f9ebf73194b4cf92557cbfab458ffaa99e998f8fc37092fe5dc03ce16781ff7c3d0c4d
+  data.tar.gz: 1e9894389ae24f8ec6288b0022234277a00f49a6ad2f816137bdc80e4c3423b75e289f98db9560b2d926cfc6d7e4cc7fab10ccdbd0960fff12fa2c3f16c920ef

data/.travis.yml

@@ -1,8 +1,16 @@
 sudo: false
 language: ruby
+jdk:
+ - openjdk8
 rvm:
   - 2.3.0
+  - 2.7.0
   - jruby-9.1.7.0
+  - jruby-9.2.13.0
 before_install:
-  - gem install bundler -v 1.14.3
+  # Install and start gnatsd
+  - ./scripts/install_gnatsd.sh
+  - $HOME/nats-server/nats-server &
+  # Install deps for project
+  - gem install bundler
   - gem update --system

data/README.md

@@ -154,6 +154,8 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+The java-nats client is temporarily forked to support jruby > 9.2.10.0. The living branch for that is here: https://github.com/film42/java-nats/tree/jruby-compat. This will be removed when we upgrade to the new nats.java client.
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/abrandoned/protobuf-nats.

data/lib/protobuf/nats.rb

@@ -78,11 +78,10 @@ module Protobuf
     end
 
     def self.start_client_nats_connection
-      return true if @start_client_nats_connection && @client_nats_connection
+      return true if @client_nats_connection
 
       GET_CONNECTED_MUTEX.synchronize do
         break true if @client_nats_connection
-        break true if @start_client_nats_connection
 
         # Disable publisher pending buffer on reconnect
         options = config.connection_options.merge(:disable_reconnect_buffer => true)

data/lib/protobuf/nats/client.rb

@@ -151,12 +151,12 @@ module Protobuf
           when :ack_timeout
             ::ActiveSupport::Notifications.instrument "client.request_timeout.protobuf-nats"
             next if (retries -= 1) > 0
-            raise ::Protobuf::Nats::Errors::RequestTimeout
+            raise ::Protobuf::Nats::Errors::RequestTimeout, formatted_service_and_method_name
           when :nack
             ::ActiveSupport::Notifications.instrument "client.request_nack.protobuf-nats"
             interval = nack_backoff_intervals[nack_retry]
             nack_retry += 1
-            raise ::Protobuf::Nats::Errors::RequestTimeout if interval.nil?
+            raise ::Protobuf::Nats::Errors::RequestTimeout, formatted_service_and_method_name if interval.nil?
             sleep((interval + nack_backoff_splay)/1000.0)
             next
           end
@@ -186,6 +186,12 @@ module Protobuf
         end
       end
 
+      def formatted_service_and_method_name
+        klass = @options[:service]
+        method_name = @options[:method]
+        "#{klass}##{method_name}"
+      end
+
       # The Java nats client offers better message queueing so we're going to use
       # that over locking ourselves. This split in code isn't great, but we can
       # refactor this later.
@@ -231,7 +237,7 @@ module Protobuf
                          else return :ack_timeout
                          end
 
-              fail(::Protobuf::Nats::Errors::ResponseTimeout, subject) unless response
+              fail(::Protobuf::Nats::Errors::ResponseTimeout, formatted_service_and_method_name) unless response
 
               completed_request = true
               response
@@ -287,7 +293,7 @@ module Protobuf
                      else return :ack_timeout
                      end
 
-          fail(::Protobuf::Nats::Errors::ResponseTimeout, subject) unless response
+          fail(::Protobuf::Nats::Errors::ResponseTimeout, formatted_service_and_method_name) unless response
 
           response
         ensure

data/lib/protobuf/nats/errors.rb

@@ -1,13 +1,13 @@
 module Protobuf
   module Nats
     module Errors
-      class Base < ::StandardError
+      class ClientError < ::StandardError
       end
 
-      class RequestTimeout < Base
+      class RequestTimeout < ClientError
       end
 
-      class ResponseTimeout < Base
+      class ResponseTimeout < ClientError
       end
 
       class MriIOException < ::StandardError

data/lib/protobuf/nats/jnats.rb

@@ -5,11 +5,6 @@ require ::File.join(ext_base, "jars/slf4j-simple-1.7.25.jar")
 require ::File.join(ext_base, "jars/gson-2.6.2.jar")
 require ::File.join(ext_base, "jars/jnats-1.1-SNAPSHOT.jar")
 
-# Set field accessors so we can access the member variables directly.
-class Java::IoNatsClient::SubscriptionImpl
-  field_accessor :pMsgs, :pBytes, :delivered
-end
-
 module Protobuf
   module Nats
     class JNats
@@ -190,9 +185,9 @@ module Protobuf
               # We have to update the subscription stats so we're not considered a slow consumer.
               begin
                 sub.lock
-                sub.pMsgs -= 1
-                sub.pBytes -= message.getData.length if message.getData
-                sub.delivered += 1 unless sub.isClosed
+                sub.incrPMsgs(-1)
+                sub.incrPBytes(-message.getData.length) if message.getData
+                sub.incrDelivered(1) unless sub.isClosed
               ensure
                 sub.unlock
               end

data/lib/protobuf/nats/server.rb

@@ -12,6 +12,8 @@ module Protobuf
 
       attr_reader :nats, :thread_pool, :subscriptions
 
+      MILLISECOND = 1000
+
       def initialize(options)
         @options = options
         @processing_requests = true
@@ -52,7 +54,7 @@ module Protobuf
             # Instrument the thread pool time-to-execute duration.
             processed_at = ::Time.now
             ::ActiveSupport::Notifications.instrument("server.thread_pool_execution_delay.protobuf-nats",
-                                                      (processed_at - enqueued_at))
+                                                      (processed_at - enqueued_at) * MILLISECOND)
 
             # Process request.
             response_data = handle_request(request_data, 'server' => @server)
@@ -64,7 +66,7 @@ module Protobuf
             # Instrument the request duration.
             completed_at = ::Time.now
             ::ActiveSupport::Notifications.instrument("server.request_duration.protobuf-nats",
-                                                      (completed_at - enqueued_at))
+                                                      (completed_at - enqueued_at) * MILLISECOND)
           end
         end
 

data/lib/protobuf/nats/version.rb

@@ -1,5 +1,5 @@
 module Protobuf
   module Nats
-    VERSION = "0.9.0.pre3"
+    VERSION = "0.10.3.pre0"
   end
 end

data/protobuf-nats.gemspec

@@ -33,9 +33,9 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "activesupport", ">= 3.2"
   spec.add_runtime_dependency "connection_pool"
   spec.add_runtime_dependency "protobuf", "~> 3.7", ">= 3.7.2"
-  spec.add_runtime_dependency "nats-pure"
+  spec.add_runtime_dependency "nats-pure", "~> 0.3", "< 0.4"
 
-  spec.add_development_dependency "bundler", "~> 1.14"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "benchmark-ips"

data/scripts/install_gnatsd.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -e
+
+export DEFAULT_NATS_SERVER_VERSION=v2.0.0
+
+export NATS_SERVER_VERSION="${NATS_SERVER_VERSION:=$DEFAULT_NATS_SERVER_VERSION}"
+
+# check to see if nats-server folder is empty
+if [ ! "$(ls -A $HOME/nats-server)" ]; then
+    (
+	mkdir -p $HOME/nats-server
+	cd $HOME/nats-server
+	wget https://github.com/nats-io/nats-server/releases/download/$NATS_SERVER_VERSION/nats-server-$NATS_SERVER_VERSION-linux-amd64.zip -O nats-server.zip
+	unzip nats-server.zip
+	cp nats-server-$NATS_SERVER_VERSION-linux-amd64/nats-server $HOME/nats-server/nats-server
+    )
+else
+  echo 'Using cached directory.';
+fi

metadata

@@ -1,22 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: protobuf-nats
 version: !ruby/object:Gem::Version
-  version: 0.9.0.pre3
+  version: 0.10.3.pre0
 platform: ruby
 authors:
 - Brandon Dewitt
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2020-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+  name: activesupport
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -25,12 +25,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: connection_pool
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -39,7 +39,6 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: protobuf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -48,6 +47,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.7.2
+  name: protobuf
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,40 +59,46 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.7.2
 - !ruby/object:Gem::Dependency
-  name: nats-pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  name: nats-pure
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
+  name: bundler
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+  name: rake
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -101,12 +107,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: rspec
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -115,12 +121,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: benchmark-ips
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -129,12 +135,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: pry
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -178,12 +184,13 @@ files:
 - lib/protobuf/nats/thread_pool.rb
 - lib/protobuf/nats/version.rb
 - protobuf-nats.gemspec
-homepage: 
+- scripts/install_gnatsd.sh
+homepage:
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -198,9 +205,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: ruby-protobuf client/server for nats
 test_files: []