coralogix_logger 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6cd392cb48af14a79cb7cf58d901c7d4e1b976e
-  data.tar.gz: db4691005c5c7d2056c24ab830d2225ba46d0157
+  metadata.gz: d79ae660063e583a61b3a6033f9cc28e247d85bb
+  data.tar.gz: 47599e3e7f0d052839223b54d55df4987180ab2c
 SHA512:
-  metadata.gz: 955a9052ecceab5a80b59630272fb04ad09920c3488783f9c7530ec940ad873461720fde9a35716eb83a92bc0b7b3af5c860593c0b776f88d48cdf47f5d0853b
-  data.tar.gz: 63d0f88dc5404058e9ed03d659f79ec0fd21b7589f6f1f4b4c6e4e5bb989b43e210e6c0d099f5f97eb5883a557e22d8ab29272e326a5156c945ff9363e9f2018
+  metadata.gz: 3b1bf87bed18fffbb29a03ecfeacf46c358c24d9e64e3a9e71e0dda9bfb05fca639216d0497be9543d35dc3589ac52442faa5b3fce5f4f7e2d0e5035ff3370f2
+  data.tar.gz: e42f79bd33f8229e6fc4c17c9f7071f1f12124fad23f403d2568ad5ebd660ff4a5e81e6492edb74e7823c6856bcce7456fd7d211a369f882d7e1992401b55486

data/lib/constants.rb

@@ -29,6 +29,9 @@ module Coralogix
     #Coralogix logs url
     CORALOGIX_LOG_URL = "https://api.coralogix.com:443/api/v1/logs"
 
+    #Coralogix time delat url
+    CORALOGIX_TIME_DELTA_URL = "https://api.coralogix.com:443/sdk/v1/time"
+
     #Default private key
     FAILED_PRIVATE_KEY = "9626c7dd-8174-5015-a3fe-5572e042b6d9"
 

data/lib/httpsender.rb

@@ -8,7 +8,7 @@ require 'benchmark'
 module Coralogix
     # @private
     module CoralogixHTTPSender
-        
+        TICKS_IN_SECOND = 10**7
         @initialized = false
         
         def CoralogixHTTPSender.disable_proxy value
@@ -23,10 +23,8 @@ module Coralogix
             begin
                 @uri = URI(CORALOGIX_LOG_URL)
                 if(@disable_proxy)
-                    #@http = Net::HTTP.start(@uri.host, @uri.port, p_addr=nil, p_port=nil, :use_ssl => true, :verify_mode=> OpenSSL::SSL::VERIFY_NONE)
                     @http = Net::HTTP.new(@uri.host, @uri.port, p_addr=nil, p_port=nil)
                 else
-                    #@http = Net::HTTP.start(@uri.host, @uri.port, :use_ssl => true, :verify_mode=> OpenSSL::SSL::VERIFY_NONE)
                     @http = Net::HTTP.new(@uri.host, @uri.port)
                 end
                 @http.use_ssl = true
@@ -68,6 +66,36 @@ module Coralogix
                 sleep HTTP_SEND_RETRY_INTERVAL
             end
         end
+
+        # A helper method to get coralogix server current time and calculate the time difference
+        #
+        # @return [float]    -   time delta
+        def CoralogixHTTPSender.get_time_sync
+            self.initialize unless @initialized
+            begin
+                DebugLogger.info "Syncing time with coralogix server"
+                res = @http.get(CORALOGIX_TIME_DELTA_URL)
+                
+                if res.is_a?(Net::HTTPSuccess) && !res.body.to_s.empty?
+                    #Get server ticks from 1970
+                    server_ticks = res.body.to_i.to_s # Relative to 1970
+                    #Take the first 13 digits
+                    server_ticks = server_ticks[0..12]
+                    #Convert the ticks to utc time
+                    server_time = Time.parse(Time.at(server_ticks.to_i / 1000.to_f).strftime('%H:%M:%S.%L')).utc
+                    local_time = Time.now.utc
+                    
+                    time_delta = (server_time - local_time) * 1000.0
+                    DebugLogger.info "Updating time delta to: #{time_delta}"
+                    return true, time_delta
+                end
+                return false, 0
+            rescue Exception => e  
+                DebugLogger.error e.message  
+                DebugLogger.error e.backtrace.inspect  
+                return false, 0
+            end
+        end
     end
 
 end

data/lib/manager.rb

@@ -18,6 +18,8 @@ module Coralogix
             @buffer_size = 0
             @bulk_template = {:privateKey => FAILED_PRIVATE_KEY, :applicationName => FAILED_APP_NAME, :subsystemName => FAILED_SUB_SYSTEM}
             @mutex = Mutex.new
+            @time_delta_last_update = 0
+            @time_delta = 0
             self.run
         end
 
@@ -52,7 +54,7 @@ module Coralogix
                 @mutex.synchronize do
                     if @buffer_size < MAX_LOG_BUFFER_SIZE
                         #Combine a logentry from the must parameters together with the optional one.
-                        new_entry = {:text => message, :timestamp => Time.now.utc.to_f * 1000, :severity => severity, :category => category}.merge(args)
+                        new_entry = {:text => message, :timestamp => Time.now.utc.to_f * 1000 + @time_delta, :severity => severity, :category => category}.merge(args)
                         @buffer << new_entry
                         #Updte the buffer size to reflect the new size.
                         @buffer_size+=new_entry.to_json.bytesize
@@ -71,6 +73,8 @@ module Coralogix
         # Send bulk from the buffer
         def self.send_bulk
             begin
+                self.update_time_delta_interval
+
                 @mutex.synchronize do
                     # Total buffer size
                     size = @buffer.size
@@ -96,6 +100,23 @@ module Coralogix
             end
         end
 
+        # Sync log timestamps with coralogix server
+        def self.update_time_delta_interval
+            begin
+                #If more than 5 seconds passed from the last sync update
+                if ((DateTime.now.strftime('%Q').to_i - @time_delta_last_update) / 1000) >= 300 #5 minuts
+                    res, _time_delta = CoralogixHTTPSender.get_time_sync
+                    if res
+                        @time_delta = _time_delta
+                        @time_delta_last_update = DateTime.now.strftime('%Q').to_i
+                    end
+                end
+             rescue Exception => e  
+                DebugLogger.error e.message  
+                DebugLogger.error e.backtrace.inspect  
+            end
+        end
+
         # Start timer execution.
         # The timer should send every X seconds logs from the buffer.
         def self.run

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coralogix_logger
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Royee Goldberg