logjam_agent 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27c960ded3fc0d72bf9712505dc0bae9b401c4ad
-  data.tar.gz: 9ffc60c42b42a2774f5e8652dd5696bbcfe8a599
+  metadata.gz: fa38a215553f0e5b93916fbe5f5b1f23d25a088d
+  data.tar.gz: 86d813bd6c4ca2830637eca5799d4e23866434de
 SHA512:
-  metadata.gz: 4f33b5fc478e0d43f6f7aae8884cc809632b71747b772e5da4c1ac049266337a5f656dd569653772d34870dd6a058fd3671f140b6fd2c860c483f7c397abecda
-  data.tar.gz: 20aad7ff6e1fd3404112575aa182cfcadfc2f24e69e8ccce941127bfabb09cf9ab6ee63f5bdf86e4e961ad7d082d51528263ab9cf54ac480841714d3613ae2d5
+  metadata.gz: 2a6fef99a5b96a77e12d5467ee064187499cfce06f2d179a6a110753d8997ff477903bea56f5d3b97faeb426c9fa6cb1116f1aa65b780d237e271aac6763c74a
+  data.tar.gz: 3e0055031a828a202bb9d12db658e9437eabe9bfa22b39a6c9c8eb787dde3312a423d80e9169936a4cf177c8e4f6d4d0286554f2d886c18d519a88c5f73b76cf

data/README.md

@@ -78,6 +78,12 @@ module LogjamAgent
   # Configure max bytes allowed for all log lines. Defaults to 1Mb.
   # This setting only applies to the lines sent with the request.
   self.max_bytes_all_lines = 1024 * 1024
+
+  # Configure compression method. Defaults to NO_COMPRESSION. Available
+  # compression methods are GZIP_COMPRESSION and SNAPPY_COMPRESSION.
+  # Snappy is faster and less CPU intensive than GZIP, GZIP achieves
+  # higher compression rates.
+  # self.compression_method = GZIP_COMPRESSION
 end
 ```
 

data/lib/logjam_agent/util.rb

@@ -43,19 +43,19 @@ module LogjamAgent
     end
 
     def pack_info(n)
-      info = [META_INFO_TAG, META_INFO_VERSION, META_INFO_DEVICE_NUMBER].pack("nnN")
+      info = [META_INFO_TAG, LogjamAgent.compression_method, META_INFO_VERSION, META_INFO_DEVICE_NUMBER].pack("nCCN")
       info << pack_uint64_big_endian(zclock_time)
       info << pack_uint64_big_endian(n)
     end
 
     def unpack_info(info)
-      tag, version, device = info[0..7].unpack("nnN")
+      tag, compression_method, version, device = info[0..7].unpack("nCCN")
       zclock = unpack_uint64_big_endian(info[8..15])
       secs = zclock / 1000
       msecs = zclock % 1000
       sent = Time.at(secs) + 1000.0/msecs
       sequence = unpack_uint64_big_endian(info[16..23])
-      [tag, version, device, sent, sequence]
+      [tag, compression_method, version, device, sent, sequence]
     end
   end
 end

data/lib/logjam_agent/version.rb

@@ -1,3 +1,3 @@
 module LogjamAgent
-  VERSION = "0.16.0"
+  VERSION = "0.17.0"
 end

data/lib/logjam_agent.rb

@@ -114,6 +114,28 @@ module LogjamAgent
 
   extend RequestHandling
 
+  NO_COMPRESSION = 0
+  GZIP_COMPRESSION = 1
+  SNAPPY_COMPRESSION = 2
+
+  mattr_reader :compression_method
+  def self.compression_method=(compression_method)
+    case compression_method
+    when SNAPPY_COMPRESSION
+      begin
+        require "snappy"
+        @@compression_method = SNAPPY_COMPRESSION
+      rescue LoadError
+        # do nothing
+      end
+    when NO_COMPRESSION, GZIP_COMPRESSION
+      @@compression_method = compression_method
+    else
+      raise ArgumentError.new("unknown compression method")
+    end
+  end
+  self.compression_method = NO_COMPRESSION
+
   mattr_accessor :exception_classes
   self.exception_classes = []
 
@@ -191,15 +213,27 @@ module LogjamAgent
   # setup json encoding
   begin
     require "oj"
-    def self.encode_payload(data)
+    def self.json_encode_payload(data)
       Oj.dump(data, :mode => :compat)
     end
   rescue LoadError
-    def self.encode_payload(data)
+    def self.json_encode_payload(data)
       data.to_json
     end
   end
 
+  def self.encode_payload(data)
+    json = json_encode_payload(data)
+    case compression_method
+    when GZIP_COMPRESSION
+      ActiveSupport::Gzip.compress(json)
+    when SNAPPY_COMPRESSION
+      Snappy.deflate(json)
+    else
+      json
+    end
+  end
+
   def self.event(label, extra_fields = {})
     fields = {
       :label      => label,

data/logjam_agent.gemspec

@@ -20,6 +20,9 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "rake"
   s.add_development_dependency "i18n"
+  s.add_development_dependency "snappy"
+  s.add_development_dependency "oj"
+  s.add_development_dependency "byebug"
 
   s.add_runtime_dependency "activesupport"
   s.add_runtime_dependency "time_bandits", [">= 0.6.0"]

data/script/console

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+require 'optparse'
+
+options = { }
+OptionParser.new do |opt|
+  opt.banner = "Usage: console [options]"
+  opt.on("--debugger", 'Enable ruby-debugging for the console.') { |v| options[:debugger] = v }
+  opt.parse!(ARGV)
+end
+
+lib_dir = File.expand_path("../../lib/", __FILE__)
+libs =  " -r irb/completion"
+libs << " -I #{lib_dir}"
+libs << " -r #{lib_dir}/logjam_agent.rb"
+
+if options[:debugger]
+  begin
+    require 'byebug'
+    libs << " -r byebug"
+    puts "=> Debugger enabled"
+  rescue Exception
+    puts "You need to install ruby-debug to run the console in debugging mode. With gems, use 'gem install ruby-debug'"
+    exit
+  end
+end
+
+irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
+exec "#{irb} #{libs} --simple-prompt"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logjam_agent
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -38,6 +38,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: snappy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -90,6 +132,7 @@ files:
 - lib/logjam_agent/version.rb
 - lib/logjam_agent/zmq_forwarder.rb
 - logjam_agent.gemspec
+- script/console
 homepage: ''
 licenses: []
 metadata: {}