logjam_agent 0.10.2 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85dbd1e17f5976041db6945c0b146d462a65bdb9
-  data.tar.gz: 7138bb521e856d3ea1ec8c3b95c393b02d5d5bf0
+  metadata.gz: c30b74711dc78c0beb70361f01b1bf9ea0b12445
+  data.tar.gz: f43e5841691c3c66b0be5a7ef57bd69c97ef6eb6
 SHA512:
-  metadata.gz: 6cae11da795df8e5a3af5239a019db5a84fbbda5c61b2ce9bdd2e010eb10480148c5f91c072b6d80b87ed0bc3af3f4e751c7a679d2e474e348904c90d393964d
-  data.tar.gz: 747623a913bb64e627b710dafb0b893b1704ed941462ce7a68b56f9ac92798f32f47063a95c962f9a9b64b9851ef2f4b3df5e308a125d7337d74704e9a891210
+  metadata.gz: c7dcfd56d0d814e70368f0b1c4012fed93c7c327ce9b798f76490c06ab38fa878b0ed7b2498ac001b120482f0a65bd64a2a9e3b48b52a2e3611d30ef97fd4011
+  data.tar.gz: 79382ec2f801f546bcbc9f9b0c95c77e0700b10b96b4fa1bec0d2f61093563d1beb780662d7e4ba4c1760c2a7552ad9dbb1bcde1e76fa69885c913f113e46245

data/lib/logjam_agent/amqp_forwarder.rb

@@ -5,12 +5,15 @@ module LogjamAgent
 
     attr_reader :app, :env
 
+    include LogjamAgent::Util
+
     def initialize(*args)
       opts = args.extract_options!
       @app = args[0] || LogjamAgent.application_name
       @env = args[1] || LogjamAgent.environment_name
       @config = default_options(@app, @env).merge!(opts)
       @exchange = @bunny = nil
+      @sequence = 0
       ensure_bunny_gem_is_available
     end
 
@@ -33,10 +36,11 @@ module LogjamAgent
         if engine = options[:engine]
           key += ".#{engine}"
         end
-        exchange.publish(msg, :key => key, :persistent => false)
-      rescue Exception => exception
+        info = pack_info(@sequence = next_fixnum(@sequence))
+        exchange.publish(msg, :key => key, :persistent => false, :headers => {:info => info})
+      rescue => error
         reraise_expectation_errors!
-        pause(exception)
+        pause(error)
       end
     end
 
@@ -48,7 +52,7 @@ module LogjamAgent
         else
           @bunny.stop
         end
-      rescue Exception
+      rescue
         # if bunny throws an exception here, its not usable anymore anyway
       ensure
         @exchange = @bunny = nil

data/lib/logjam_agent/util.rb

@@ -0,0 +1,55 @@
+module LogjamAgent
+  module Util
+    # copied from amqp protocol gem (slightly modified)
+    BIG_ENDIAN = ([1].pack("s") == "\x00\x01")
+
+    UINT64 = "Q"
+
+    # we assume we're running on MRI ruby
+    FIXNUM_MAX = 2 ** (1.size * 8 - 2) - 1
+
+    if BIG_ENDIAN
+
+      def pack_uint64_big_endian(uint64)
+        [uint64].pack(UINT64)
+      end
+
+      def unpack_uint64_big_endian(string)
+        string.unpack(UINT64)
+      end
+
+    else
+
+      def pack_uint64_big_endian(uint64)
+        [uint64].pack(UINT64).bytes.map(&:chr).reverse.join
+      end
+
+      def unpack_uint64_big_endian(string)
+        string.bytes.map(&:chr).reverse.join.unpack(UINT64)[0]
+      end
+
+    end
+
+    def zclock_time(t = Time.now)
+      t.tv_sec*1000 + t.tv_usec/1000
+    end
+
+    def next_fixnum(i)
+      (i+=1) > FIXNUM_MAX ? 0 : i
+    end
+
+    def pack_info(n)
+      info = pack_uint64_big_endian(zclock_time)
+      info << pack_uint64_big_endian(n)
+    end
+
+    def unpack_info(info)
+      zclock = unpack_uint64_big_endian(info[0..7])
+      secs = zclock / 1000
+      msecs = zclock % 1000
+      sent = Time.at(secs) + 1000.0/msecs
+      sequence = unpack_uint64_big_endian(info[8..15])
+      [sent, sequence]
+    end
+  end
+end

data/lib/logjam_agent/version.rb

@@ -1,3 +1,3 @@
 module LogjamAgent
-  VERSION = "0.10.2"
+  VERSION = "0.11.0"
 end

data/lib/logjam_agent/zmq_forwarder.rb

@@ -2,6 +2,8 @@ module LogjamAgent
   class ZMQForwarder
     attr_reader :app, :env
 
+    include Util
+
     def initialize(*args)
       opts = args.extract_options!
       @app = args[0] || LogjamAgent.application_name
@@ -10,6 +12,7 @@ module LogjamAgent
       @app_env = "#{@app}-#{@env}"
       @zmq_hosts = Array(@config[:host])
       @zmq_port = @config[:port]
+      @sequence = 0
     end
 
     def default_options(app, env)
@@ -71,7 +74,8 @@ module LogjamAgent
     end
 
     def publish(key, data)
-      parts = [@app_env, key, data]
+      info = pack_info(@sequence = next_fixnum(@sequence))
+      parts = [@app_env, key, data, info]
       if socket.send_strings(parts, ZMQ::DONTWAIT) < 0
         raise "ZMQ error: #{ZMQ::Util.error_string}"
       end

data/lib/logjam_agent.rb

@@ -29,6 +29,7 @@ module LogjamAgent
 end
 
 require "logjam_agent/version"
+require "logjam_agent/util"
 require "logjam_agent/amqp_forwarder"
 require "logjam_agent/zmq_forwarder"
 require "logjam_agent/forwarders"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logjam_agent
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.11.0
 platform: ruby
 authors:
 - Stefan Kaes
@@ -86,6 +86,7 @@ files:
 - lib/logjam_agent/railtie.rb
 - lib/logjam_agent/request.rb
 - lib/logjam_agent/syslog_like_formatter.rb
+- lib/logjam_agent/util.rb
 - lib/logjam_agent/version.rb
 - lib/logjam_agent/zmq_forwarder.rb
 - logjam_agent.gemspec