centralized_ruby_logger 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 284ef6a7a04a2b02eecf798ad5331630a64fe2a9
-  data.tar.gz: 3079d66dca0f547ffc62e43a0cce7970f1c478a5
+  metadata.gz: ee5ffc79f691e5234632af4da8e288917c659641
+  data.tar.gz: 52b9d4c416af247bfcea6536f6f66a553ad546ed
 SHA512:
-  metadata.gz: e204d76673a29b0cf508d807ce1636ff430e05f138805ed528fe418fac88fe47ba137341e95706a4cb72a9e4f16c9bd9e4be9d076fc594ec97052ceab83de2e5
-  data.tar.gz: f1433bcac07831848d10060344999d19882c2e627b7f04bf5421f0b329886abc7166b58722a32221ce1398121c7b6e1ddac031a62316fc91379cde4ca79276e3
+  metadata.gz: fc0d37f583e37b085e829d52e83c46f5d68b784dcbdcf8b6d485ecc39ea29ac4dd4e39799154411332e864815771380493be0ca4bea33abe69c56aee41c533da
+  data.tar.gz: 5a4549704e2d0d40fce9829c71251c778879689bbe89281e7c87929beca8808653d31402e882d4e903c60a289001530e3ce4201305da5cc2b8d0159b9388c63e

data/lib/centralized_ruby_logger.rb

@@ -8,11 +8,11 @@ module Coralogix
         # Constructor. 
         #
         # @param name    -   logger name.
-        def initialize private_key, app_name, sub_system_name, debug=false, type_name="Centralized Ruby"
+        def initialize private_key, app_name, sub_system_name, debug=false, type_name="Centralized Ruby", force_compression = false
             self.debug_mode=debug            
             @category = CORALOGIX_CATEGORY
             @manager = LoggerManager.new
-            configure(private_key, app_name, sub_system_name, type_name)
+            configure(private_key, app_name, sub_system_name, type_name, force_compression)
         end
 
         # A getter for debug_mode. 
@@ -44,15 +44,18 @@ module Coralogix
 
         # Configure coralogix logger with customer specific values
         #
-        # @param private_key    -   private key
-        # @param app_name       -   application name
-        # @param sub_system     -   sub system name
+        # @param private_key           -   private key
+        # @param app_name              -   application name
+        # @param sub_system            -   sub system name
+        # @param type_name             -   type name
+        # @param force_compression     -   when true, will not send the raw data if data compression failed 
         # @return [boolean] return a true or false.
-        def configure private_key, app_name, sub_system, type_name
+        def configure private_key, app_name, sub_system, type_name, force_compression
             private_key = (private_key.nil? || private_key.to_s.strip.empty?) ? FAILED_PRIVATE_KEY : private_key
             app_name = (app_name.nil? || app_name.to_s.strip.empty?) ? NO_APP_NAME : app_name
             sub_system = (sub_system.nil? || sub_system.to_s.strip.empty?) ? NO_SUB_SYSTEM : sub_system
             @manager.set_logger_type_name type_name
+            @manager.force_compression = force_compression
             @manager.configure(:privateKey => private_key, :applicationName => app_name, :subsystemName => sub_system) unless @manager.configured
         end
 

data/lib/constants.rb

@@ -1,10 +1,10 @@
 module Coralogix
 
     #Maximum log buffer size
-    MAX_LOG_BUFFER_SIZE = 12582912 #12mb
+    MAX_LOG_BUFFER_SIZE = ENV['CORALOGIX_MAX_LOG_BUFFER_SIZE'] ? ENV['CORALOGIX_MAX_LOG_BUFFER_SIZE'].to_i : 12582912 #12mb
 
     #Maximum chunk size
-    MAX_LOG_CHUNK_SIZE = 1572864 #1.5 mb
+    MAX_LOG_CHUNK_SIZE = 2097152 #2 mb
 
     #Bulk send interval in normal mode.
     NORMAL_SEND_SPEED_INTERVAL = 500.0 / 1000
@@ -15,7 +15,6 @@ module Coralogix
     #Corologix severity mapper
     SEVERITIES = {:debug => 1, :verbose => 2, :info => 3, :warning => 4, :error => 5, :critical => 6}
 
-
     module Severity
         DEBUG = 1
         VERBOSE = 2

data/lib/httpsender.rb

@@ -6,6 +6,8 @@ require 'openssl'
 require 'benchmark'
 require 'date'
 require 'time'
+require 'zlib'
+require 'base64'
 
 module Coralogix
     # @private
@@ -19,6 +21,10 @@ module Coralogix
             @disable_proxy = value
         end
 
+        def force_compression=(value)
+            @force_compression = value
+        end
+
         def initialize
             begin
                 @initialized = false
@@ -34,13 +40,33 @@ module Coralogix
                 @http.verify_mode = OpenSSL::SSL::VERIFY_NONE
                 @http.read_timeout = HTTP_TIMEOUT # seconds
                 @http.open_timeout = HTTP_TIMEOUT # seconds
-                @req = Net::HTTP::Post.new(@uri.path, 'Content-Type' => 'application/json')
+
+                headers = {
+                    'Content-Type': 'application/json',
+                    'Content-Encoding': 'deflate'
+                }
+                @req = Net::HTTP::Post.new(@uri.path, headers)
             rescue Exception => e  
                 DebugLogger.error e.message  
                 DebugLogger.error e.backtrace.inspect  
             end
         end
 
+        # Compress json
+        # @param json   -   json to compress
+        #
+        # @return [String] return base 64 string that represents the compresed log message binary data
+        def json2zip(json)
+            begin
+                compressed_data = Zlib::Deflate.deflate(json)
+                return compressed_data
+            rescue Exception => e
+                DebugLogger.error e.message
+                DebugLogger.error e.backtrace.inspect
+                return nil
+            end
+        end
+
         # A helper method to post http request
         #
         # @param bulk    -   JSON bulk containing the log entries
@@ -49,8 +75,25 @@ module Coralogix
                 attempt = 0
                 while attempt < HTTP_SEND_RETRY_COUNT
                     begin
-                        DebugLogger.info "About to send bulk to Coralogix server. Attempt number: #{attempt+1}"  
-                        @req.body = bulk.to_json
+                        DebugLogger.info "About to send bulk to Coralogix server. Attempt number: #{attempt+1}"
+
+                        DebugLogger.debug "Compressing bulk..."
+                        zippedBulk = json2zip(bulk.to_json)
+
+                        if zippedBulk.nil? && !@force_compression
+                            DebugLogger.info "Failed to compress bulk, sending raw data instead" 
+                            @req = Net::HTTP::Post.new(@uri.path, 'Content-Type' => 'application/json')
+                            @req.body = bulk.to_json
+                        else
+                            if zippedBulk.nil?
+                                DebugLogger.error "Failed to compress bulk"
+                                DebugLogger.error "Compressed bulk is nil"
+                            end
+
+                            DebugLogger.debug "Sending compressed bulk"
+                            @req.body = zippedBulk
+                        end
+                        
                         DebugLogger.debug Benchmark.measure { 
                             res = @http.request(@req)
                             DebugLogger.info "Successfully sent bulk to Coralogix server. Result is: #{res.code}"

data/lib/manager.rb

@@ -171,6 +171,13 @@ module Coralogix
             @http_sender.disable_proxy=value
         end
 
+        # A setter for force data sending even if somehow the compression of data failed. 
+        #
+        # @param value    -   true or false. (Default is false)
+        def force_compression=(value)
+            @http_sender.force_compression=value
+        end
+
         # Sync log timestamps with coralogix server
         def update_time_delta_interval
             return

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: centralized_ruby_logger
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Royee Goldberg