graphite-api-middleware 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d8f0e57a178f384b38405f15f092e986e88fa5585055cdbe65e893da2db4fa4
-  data.tar.gz: b278408d5aab2272821259e5f3dc3a4d03e4b63b74ccdc0f69adcef5ba64c4e8
+  metadata.gz: 27b2522dd39bed00f6fcccd339081a4cb19931263002640847e8a9a794b6d73a
+  data.tar.gz: 8e80ffd81a903196341155cdf575d4b36ff9600a8f5f9bae025d2a26473c9a67
 SHA512:
-  metadata.gz: 2e21491fcc8861de88a3b1756da647302aaf0fea3f7bcdf6d87361a6027abf4b82e0a584d857a6e589c567d33d5d55ceff739f6b25c511160257c0fcfb1c9cd2
-  data.tar.gz: 5a04645a1a4531549134266d76cae67d5777dd35d23a4cbfb4f068ae8a337c25a02c56dfde05506470dcb054362afb250fc9d5b512aa7561c92828205269e616
+  metadata.gz: e27478176fcd4d3fed13dc7d082b3a59ca8db502336d8cef778689f1b0b3cb4c1aa18459f5a015c72e22ae99a1b9ccad081a6f594da371778634e259f334e98e
+  data.tar.gz: c975f8590a1e13f8f1c55c6e9f2d6c75966e1c2e80e5378edd44d2fa03aa0aa6ff759bdfc2b24faa7622f75475415b34928f16fd18e52cba29ad0ab450d77960

data/bin/graphite-api-middleware

@@ -63,15 +63,16 @@ begin
   options[:cache] = opts["--cache"].to_i * 3600 if opts["--cache"].to_i > 0
   options[:default_aggregation_method] = opts["--aggregation-method"].to_sym if opts["--aggregation-method"]
 
-  logger = Logger.new options[:log_file] ||  STDOUT
+  logger = Logger.new options[:log_file] || STDOUT
   logger.level= Logger.const_get options[:log_level].to_s.upcase
   Process.daemon if options[:daemonize]
   GraphiteApiMiddleware::Server.start options, logger
 rescue Docopt::Exit => e
   puts e.message
 rescue Interrupt
-  logger.info "Shutting down..."
-  Zscheduler.stop
+  logger.info "Shutting down..." if defined? logger
 rescue StandardError => e
   puts (Docopt::Exit.new e.message).message
+ensure
+  GraphiteApiMiddleware::Server.stop rescue nil
 end

data/lib/graphite-api-middleware.rb

@@ -25,12 +25,12 @@ require 'logger'
 module GraphiteApiMiddleware
   class Server < EventMachine::Connection
 
-    def initialize buffer, logger
-      @buffer = buffer and super
+    def initialize client, logger
+      @client = client
       @logger = logger
     end
 
-    attr_reader :buffer, :client_id
+    attr_reader :client, :client_id
 
     def post_init
       @client_id = peername
@@ -39,11 +39,12 @@ module GraphiteApiMiddleware
 
     def receive_data data
       @logger.debug [:middleware, :message, client_id, data]
-      buffer.stream data, client_id
+      client.stream data, client_id
     end
 
     def unbind
       @logger.debug [:middleware, :disconnecting, client_id]
+      client.cancel
     end
 
     def peername
@@ -62,21 +63,18 @@ module GraphiteApiMiddleware
         GraphiteAPI::Logger.logger = logger
         logger.info "Server running on port #{options[:port]}"
 
-        buffer = GraphiteAPI::Buffer.new options
-        group  = GraphiteAPI::Connector::Group.new options
+        client = GraphiteAPI::Client.new options
 
         # Starting server
-        [:start_server, :open_datagram_socket].each do |m|
-          EventMachine.send(m, '0.0.0.0', options[:port], self, buffer, logger)
+        [:start_server, :open_datagram_socket].each do |method_name|
+          EventMachine.send(method_name, '0.0.0.0', options[:port], self, client, logger)
         end
-
-        # Send metrics to graphite every X seconds
-        Zscheduler.every(options[:interval], :on_shutdown => true) do
-          group.publish buffer.pull :string if buffer.new_records?
-        end
-
       end
     end
 
+    def self.stop
+      EventMachine.stop
+    end
+
   end
 end

data/lib/graphite-api-middleware/version.rb

@@ -1,3 +1,3 @@
-module GraphiteAPIMiddleware
-  VERSION = "1.0.0"
+module GraphiteApiMiddleware
+  VERSION = "1.1.0"
 end

data/test/functional/middleware_sanity_test.rb

@@ -16,8 +16,9 @@ module GraphiteApiMiddleware::Tests
       Utils.stop_em_if_running
     end
 
-    def start_middleware middleware_port, mock_server_port, aggregation_method=nil, interval=2
-      options = %W(tcp://localhost:#{mock_server_port} --port #{middleware_port} --interval #{interval} -L error)
+    def start_middleware middleware_port, servers, aggregation_method=nil, interval=2
+      options = Array(servers)
+      options += %W(--port #{middleware_port} --interval #{interval} -L error)
       options += ["--aggregation-method", aggregation_method] if aggregation_method
       @pid = Process.spawn("ruby", MIDDLEWARE_BIN_FILE, *options)
       sleep MIDDLEWARE_STARTUP_WAIT
@@ -29,7 +30,7 @@ module GraphiteApiMiddleware::Tests
     end
 
     def test_with_defaults
-      start_middleware @middleware_port, @mock_server_port
+      start_middleware @middleware_port, "tcp://localhost:#{@mock_server_port}"
       EventMachine.run {
         EventMachine.start_server("0.0.0.0", @mock_server_port, MockServer, @data)
         socket = TCPSocket.new("0.0.0.0", @middleware_port)
@@ -49,8 +50,30 @@ module GraphiteApiMiddleware::Tests
       assert_expected_equals_data expected
     end
 
+    def test_with_multiple_backends
+      backend_ports = [@mock_server_port, Utils.random_non_repeating_port]
+      start_middleware @middleware_port, backend_ports.map { |port| "tcp://localhost:#{port}" }
+      data_sets = backend_ports.zip([[],[]])
+      EventMachine.run {
+        data_sets.map { |port, data| EventMachine.start_server("0.0.0.0", port, MockServer, data) }
+        socket = TCPSocket.new("0.0.0.0", @middleware_port)
+        1.upto(1000) do
+          socket.puts("shuki.tuki1 1.1 123456789\n")
+          socket.puts("shuki.tuki2 10 123456789\n")
+          socket.puts("shuki.tuki3 10 123456789\n")
+        end
+        EventMachine::Timer.new(EM_STOP_AFTER, &EM.method(:stop))
+      }
+      expected = [
+        "shuki.tuki1 1100.0 123456780",
+        "shuki.tuki2 10000.0 123456780",
+        "shuki.tuki3 10000.0 123456780"
+      ]
+      data_sets.each { |_,data| assert_expected_equals_data expected, data }
+    end
+
     def test_with_avg
-      start_middleware @middleware_port, @mock_server_port, 'avg'
+      start_middleware @middleware_port, "tcp://localhost:#{@mock_server_port}", 'avg'
       EventMachine.run {
         EventMachine.start_server("0.0.0.0", @mock_server_port, MockServer, @data)
         socket = TCPSocket.new("0.0.0.0", @middleware_port)
@@ -65,7 +88,7 @@ module GraphiteApiMiddleware::Tests
     end
 
     def test_with_replace
-      start_middleware @middleware_port, @mock_server_port, 'replace'
+      start_middleware @middleware_port, "tcp://localhost:#{@mock_server_port}", 'replace'
       EventMachine.run {
         EventMachine.start_server("0.0.0.0", @mock_server_port, MockServer, @data)
         socket = TCPSocket.new("0.0.0.0", @middleware_port)
@@ -79,8 +102,8 @@ module GraphiteApiMiddleware::Tests
       assert_expected_equals_data ["shuki.tuki1 5.0 123456780"]
     end
 
-    def assert_expected_equals_data expected
-      assert_equal expected, @data.map {|o| o.split("\n")}.flatten(1).map(&:strip)
+    def assert_expected_equals_data expected, data=@data
+      assert_equal expected, data.map {|o| o.split("\n")}.flatten(1).map(&:strip)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphite-api-middleware
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Eran Levi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-19 00:00:00.000000000 Z
+date: 2019-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -40,33 +40,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.3
 - !ruby/object:Gem::Dependency
-  name: zscheduler
+  name: timers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: graphite-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement