beetle 3.3.2 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7182d9c5ef7c4970ae13bbabe91b1fcdea45991fa85a4abb3f53cfca22597a88
-  data.tar.gz: 857b842d7c2b81ee95d374ef78d02fbe15bfbae585d6afa4988e848f1c31d164
+  metadata.gz: 4aceed6177b4f2b7e4d02cb52910ebec0ea0f0fbd90fbf552bc9ddaa49a833bd
+  data.tar.gz: 16a61b5e7384e215a3af25a06c65b43707c25bfc1a46dfd9ee1f4da1c3365acd
 SHA512:
-  metadata.gz: 57fa3450b087d9221224e8d6700074f2ba00aef9a39cd77ffbb81709f72fa115c360f89b56741e3ece716e2d7300c5d3023ca2b4db16fd59135ac99c7dc881e3
-  data.tar.gz: d6acfd5c143adfb4ec75320265a1a29f97916344d2b041d5e5ee6cb023dac514b30e357a06b4ef9258847440b8ba6bfd8b938ab0df3400b3c696462fef7600ba
+  metadata.gz: a9c7acebd383b549f6c6cfca1c0aa19559487db55a3095c89da3e24f3696a6a7d8a77dcb9e05127cc997d165130f766fec22bd7d0aa8de49855c3414b590603b
+  data.tar.gz: 348913abe61bf69f20046b050b17fdc510074016ff3e39c0fe4562bde640b076329c326980fe7fd0ee32428e1748e162f653115da62d4c2e7406219c9bac9d97

data/README.rdoc

@@ -55,8 +55,8 @@ windows and execute the following commands:
 
     rake rabbit:start1
     rake rabbit:start2
-    rake redis:start1
-    rake redis:start2
+    rake redis:start:master
+    rake redis:start:slave
 
 == Prerequisites
 
@@ -87,8 +87,6 @@ should suffice.
 == Gem Dependencies
 
 At runtime, Beetle will use
-* {uuid4r}[http://github.com/skaes/uuid4r]
-  (which needs ossp-uuid)
 * {bunny}[http://github.com/ruby-amqp/bunny]
 * {redis}[http://github.com/redis/redis-rb]
 * {amqp}[http://github.com/ruby-amqp/amqp]
@@ -106,6 +104,8 @@ For tests, you'll need
 * {activerecord}[https://github.com/rails/rails/tree/master/activerecord]
 * {mysql2}[https://github.com/brianmario/mysql2/]
 
+Dependencies are managed by bundler.
+
 == Authors
 
 {Stefan Kaes}[http://github.com/skaes],
@@ -133,22 +133,48 @@ distribution.
 Don't increase the gem version in your pull requests. It will be done after merging the request,
 to allow merging of pull requests in a flexible order.
 
-== Running the tests
+== Compiling beetle and running tests
+
+In order to execute the unit tests, you need Ruby, a running rabbitmq server, a running
+redis-server, a running mysql server and a runnning consul server.
+
+In addition, beetle ships with a cucumber feature to test the automatic redis failover as
+an integration test. For this you need a recent Go installation in order to compile the
+beetle go binary. Just invoke `make` in the top level directory.
+
+There are two ways to start the required test dependencies: using `docker-compose` or
+starting the services manually.
+
+=== Testing with docker-compose
+
+Open a separate terminal window and run
+
+     docker-compose pull
+
+followed by
 
-Beetle ships with a cucumber feature to test the automatic redis failover
-as an integration test.
+     docker-compose up
 
-To run it, you have to start a RabbitMQ server and a consul
-development mode.
+This will start mysql, two redis servers, two RabbitMQ instances and a single consul
+development node.
 
-The top level Rakefile comes with targets to start several RabbitMQ
-instances locally.  Make sure the corresponding binaries are in your
-search path. Open two shell windows and execute the following command:
+Note: make sure to wait until all services are properly started.
+
+
+== Tesing with  locally installed services
+
+The top level Rakefile comes with targets to start several RabbitMQ instances locally.
+Make sure the corresponding binaries are in your search path. Open three shell windows and
+execute the following command:
 
     rake rabbit:start1
 
 and
 
+   rake redis:start:master
+
+as well as
+
    rake consul:start
 
 Then you can run the cucumber feature by running:
@@ -159,9 +185,8 @@ or
 
     rake cucumber
 
-
-Note: Cucumber will automatically run after the unit test when you run rake.
-
+Note: Cucumber will automatically run after the unit tests when you run `rake` without
+arguments.
 
 
 == How to release a new gem version

data/RELEASE_NOTES.rdoc

@@ -1,5 +1,8 @@
 = Release Notes
 
+== Version 3.3.3
+* Track publishing policy options metrics.
+
 == Version 3.3.2
 * Changed order of queue policy application to avoid ahead of line blocking in dead letter
   queues.

data/Rakefile

@@ -58,11 +58,11 @@ namespace :rabbit do
 
   desc "start rabbit instance 1"
   task :start1 do
-    start "rabbit1", 5672, 15672
+    start "rabbit1@localhost", 5672, 15672
   end
   desc "start rabbit instance 2"
   task :start2 do
-    start "rabbit2", 5673, 15673
+    start "rabbit2@localhost", 5673, 15673
   end
   desc "reset rabbit instances (deletes all data!)"
   task :reset do

data/beetle.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "minitest",            "~> 5.1"
   s.add_development_dependency "mocha",               "~> 1.3.0"
   s.add_development_dependency "mysql2",              "~> 0.4.4"
-  s.add_development_dependency "rake",                "~> 11.2"
+  s.add_development_dependency "rake",                "~> 13.0"
   s.add_development_dependency "rdoc",                "~> 4.0"
   s.add_development_dependency "simplecov",           "~> 0.15"
   s.add_development_dependency "webmock",             "~> 3.0"

data/lib/beetle/base.rb

@@ -99,10 +99,12 @@ module Beetle
       payload = options.merge(:server => @server)
       logger.debug("Beetle: publishing policy options on #{@server}: #{payload.inspect}")
       # make sure to declare the queue, so the message does not get lost
-      queue(@client.config.beetle_policy_updates_queue_name)
-      data = payload.to_json
-      opts = Message.publishing_options(:key => @client.config.beetle_policy_updates_routing_key, :persistent => true, :redundant => false)
-      exchange(@client.config.beetle_policy_exchange_name).publish(data, opts)
+      ActiveSupport::Notifications.instrument('publish.beetle') do
+        queue(@client.config.beetle_policy_updates_queue_name)
+        data = payload.to_json
+        opts = Message.publishing_options(:key => @client.config.beetle_policy_updates_routing_key, :persistent => true, :redundant => false)
+        exchange(@client.config.beetle_policy_exchange_name).publish(data, opts)
+      end
     end
 
   end

data/lib/beetle/version.rb

@@ -1,3 +1,3 @@
 module Beetle
-  VERSION = "3.3.2"
+  VERSION = "3.3.3"
 end

data/script/start_rabbit

@@ -14,7 +14,7 @@ export RABBITMQ_NODENAME=$1
 # combination. See clustering on a single machine guide at <http://www.rab-
 # bitmq.com/clustering.html#single-machine> for details.
 
-export RABBITMQ_NODE_IP_ADDRESS=localhost
+export RABBITMQ_NODE_IP_ADDRESS=127.0.0.1
 # Defaults to 0.0.0.0. This can be changed if you only want to bind to one net-
 # work interface.
 

data/test/beetle/message_test.rb

@@ -116,6 +116,7 @@ module Beetle
   class KeyManagementTest < Minitest::Test
     def setup
       @config = Configuration.new
+      @config.redis_server = Beetle.config.redis_server
       @store = DeduplicationStore.new(@config)
       @store.flushdb
       @null_handler = Handler.create(lambda {|*args|})
@@ -339,6 +340,7 @@ module Beetle
   class SimpleMessageTest < Minitest::Test
     def setup
       @config = Configuration.new
+      @config.redis_server = Beetle.config.redis_server
       @store = DeduplicationStore.new(@config)
       @store.flushdb
     end
@@ -765,7 +767,7 @@ module Beetle
         username: "root",
         encoding: "utf8",
         host: ENV['MYSQL_HOST'] || "127.0.0.1",
-        port: ENV['MYSQL_PORT'] || 3306
+        port: (ENV['MYSQL_PORT'] || 3306).to_i
       )
     end
 

data/test/test_helper.rb

@@ -27,9 +27,13 @@ end
 I18n.enforce_available_locales = false
 
 Beetle.config.logger = Logger.new(File.dirname(__FILE__) + '/../test.log')
-Beetle.config.redis_server = "localhost:6379"
-Beetle.config.redis_servers = "localhost:6379,localhost:6380"
-
+if `docker inspect beetle-redis-master -f '{{.State.Status}}'`.chomp == "running"
+  Beetle.config.redis_server = "localhost:6370"
+  Beetle.config.redis_servers = "localhost:6370,localhost:6380"
+else
+  Beetle.config.redis_server = "localhost:6379"
+  Beetle.config.redis_servers = "localhost:6379,localhost:6380"
+end
 
 def header_with_params(opts = {})
   beetle_headers = Beetle::Message.publishing_options(opts)
@@ -46,3 +50,7 @@ def redis_stub(name, opts = {})
   opts = {'host' => default_host, 'port' => default_port, 'server' => "#{default_host}:#{default_port}"}.update(opts)
   stub(name, opts)
 end
+
+if `docker inspect beetle-mysql -f '{{.State.Status}}'`.chomp == "running"
+  ENV['MYSQL_PORT'] = '6612'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beetle
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.3
 platform: ruby
 authors:
 - Stefan Kaes
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-22 00:00:00.000000000 Z
+date: 2020-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -216,14 +216,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -375,7 +375,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.7
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 3
 summary: High Availability AMQP Messaging with Redundant Queues