xhummingbird 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc55dc479a1ea3b8fba17b4f2f38a493fe1c190160a004585bcbd785fb0c9d21
-  data.tar.gz: a45754510d4490b253aeb9daec6360c37d52b662504a953a8bbb946fe134e191
+  metadata.gz: 139d598e50a5cc35a31ca2f292308931d02e296e7f94474c12cdf27bc10b4a62
+  data.tar.gz: b5f529c38a79024d63bda6c580d39d29fc46f034c0988f849c44dcec430491cc
 SHA512:
-  metadata.gz: 50f009f45946de188c80ba59e682a3d17496d3921192bc28432cc8f911a53f752ea1aaa1bae4864f4f2605f55a4628fab6bc39b87b0a447e21843bbd0f5f5bc7
-  data.tar.gz: 153ac10ec24214bc7edbcb70fa369cf905a6aaa2c29c547cd34a83014033798998d3401d11359344d543666297b49ab656e09dbb00a00b61eb4b81eea59758dc
+  metadata.gz: b2365a30d985c6a2311dbe03aff8d1f10cfd9fd97043508564173291a48e0ee7548e5915eb6f81ae74c4b6787eb64e092a77eb4e6412629b0ee8cfbf589446b8
+  data.tar.gz: d091a1f78b159c4f174129e2df9440b65fa87f971398c0179c85c251b74c7f5476789b822fd53ad1e76e1bc49a86d2119ee90921e7f3b9b8ee78ab4616e94115

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xhummingbird (0.1.2)
+    xhummingbird (0.1.3)
       ffi-rzmq
       google-protobuf
 

data/examples/custom_tags.rb

@@ -2,6 +2,8 @@ require 'xhummingbird'
 
 raise "Set #{Xhummingbird::Client::XH_SERVER} environment variable" unless Xhummingbird.enabled?
 
+Xhummingbird.start
+
 Xhummingbird.send_trace(
   title: "CustomTagTrace",
   message: "CustomTags",

data/examples/send_exception.rb

@@ -2,6 +2,8 @@ require 'xhummingbird'
 
 raise "Set #{Xhummingbird::Client::XH_SERVER} environment variable" unless Xhummingbird.enabled?
 
+Xhummingbird.start
+
 begin
   raise 'Something wrong'
 rescue => e

data/examples/send_trace.rb

@@ -2,6 +2,8 @@ require 'xhummingbird'
 
 raise "Set #{Xhummingbird::Client::XH_SERVER} environment variable" unless Xhummingbird.enabled?
 
+Xhummingbird.start
+
 Xhummingbird.send_trace(title: "SampleTrace", message: "Something happend")
 
 sleep 1 # Await sending

data/examples/short_name.rb

@@ -3,6 +3,8 @@ require 'xhummingbird/short_name'
 
 raise "Set #{XH::Client::XH_SERVER} environment variable" unless XH.enabled?
 
+XH.start
+
 XH.send_trace(title: "ShortNameTrace", message: "Send trace from short name reference")
 
 begin

data/examples/use_in_processes.rb

@@ -2,10 +2,14 @@ require 'xhummingbird'
 
 raise "Set #{Xhummingbird::Client::XH_SERVER} environment variable" unless Xhummingbird.enabled?
 
+Xhummingbird.start
+
 Xhummingbird.send_trace(title: "ParentProcess", message: "Send trace from parent process")
 
 process_ids = 10.times.map do |i|
   fork do
+    Xhummingbird.start
+
     Xhummingbird.send_trace(title: "ChildProcess", message: "Send trace from child process #{i}")
 
     sleep 1 # Await sending

data/examples/use_in_threads.rb

@@ -2,6 +2,8 @@ require 'xhummingbird'
 
 raise "Set #{Xhummingbird::Client::XH_SERVER} environment variable" unless Xhummingbird.enabled?
 
+Xhummingbird.start
+
 threads = 10.times.map do |i|
   Thread.start do
     Xhummingbird.send_trace(title: "Thread", message: "Send trace from thread #{i}")

data/lib/xhummingbird.rb

@@ -3,6 +3,8 @@
 require 'singleton'
 require 'ffi-rzmq'
 require 'socket'
+require 'logger'
+require 'set'
 
 require_relative "xhummingbird/version"
 require_relative "xhummingbird/client"
@@ -11,7 +13,23 @@ require_relative "xhummingbird/protos/event_pb"
 module Xhummingbird
   class Error < StandardError; end
 
+  LOGGER = Logger.new(STDERR)
+
+  def self.debug(*args)
+    LOGGER.debug(*args) if ENV['XH_DEBUG']
+  end
+
+  def self.start
+    debug(__method__)
+
+    Client.instance.start
+
+    send_trace(title: "Started", message: "Xhummingbird Ruby SDK started.", level: 0)
+  end
+
   def self.send_trace(title:, message: "", level: 1, tags: {})
+    debug(__method__)
+
     return unless enabled?
 
     send(
@@ -22,11 +40,13 @@ module Xhummingbird
       tags: default_tags.merge(format_hash(tags)),
       timestamp: Time.now
     )
-  rescue
-    raise Error
+  rescue => e
+    debug(e)
   end
 
   def self.send_exception(exception, level: 2, tags: {})
+    debug(__method__)
+
     return unless enabled?
 
     send(
@@ -37,23 +57,29 @@ module Xhummingbird
       tags: default_tags.merge(format_hash(tags)),
       timestamp: Time.now
     )
-  rescue
-    raise Error
+  rescue => e
+    debug(e)
   end
 
   def self.send_event(**args)
+    debug(__method__)
+
     return unless enabled?
 
     send(**args)
-  rescue
-    raise Error
+  rescue => e
+    debug(e)
   end
 
   def self.enabled?
+    debug(__method__)
+
     Client.instance.enabled?
   end
 
   def self.default_tags
+    debug(__method__)
+
     {
       "default/sdk" => "Ruby #{Xhummingbird::VERSION}",
       "default/hostname" =>  Socket.gethostname,
@@ -64,12 +90,16 @@ module Xhummingbird
   end
 
   def self.send(**args)
+    debug(__method__)
+
     event = Event.new(**args)
     message = Event.encode(event)
     Client.instance.send(message)
   end
 
   def self.format_hash(hash)
+    debug(__method__)
+
     formatted = {}
 
     hash.each do |k, v|

data/lib/xhummingbird/client.rb

@@ -5,41 +5,48 @@ module Xhummingbird
     XH_SERVER = 'XH_SERVER'
 
     def initialize
-      @mutex = Mutex.new
+      @pid = nil
+      @socket = nil
+      @active = false
     end
 
     def send(message)
-      socket.send_string(message)
+      if active?
+        @socket.send_string(message)
+      else
+        Xhummingbird.debug("Xhummingbird not started.")
+      end
     end
 
     def enabled?
-      @setup ||= !!address
+      @enabled ||= !!address
     end
 
-    private
-
-    def socket
-      return @socket if defined?(@socket) && @pid == Process.pid
+    def start
+      ctx = ZMQ::Context.new
+      socket = ctx.socket(ZMQ::PUSH)
+      socket.connect(address)
+      @socket = socket
+      Xhummingbird.debug("Socket created (pid: #{$$})")
+
+      at_exit do
+        Xhummingbird.debug("at_exit started.")
+        @socket.close
+        Xhummingbird.debug("at_exit stopped.")
+      end
 
-      @socket = init_socket
+      @pid = $$
+      @active = true
     end
 
-    def init_socket
-      @mutex.synchronize do
-        return @socket if defined?(@socket) && @pid == Process.pid
-
-        @pid = Process.pid
-
-        ctx = ZMQ::Context.new
-        socket = ctx.socket(ZMQ::PUSH)
-        socket.connect(address)
-
-        @socket = socket
-      end
-    end
+    private
 
     def address
       ENV[XH_SERVER]
     end
+
+    def active?
+      @pid == $$ && @socket && @active
+    end
   end
 end

data/lib/xhummingbird/rack/capture_exception.rb

@@ -43,7 +43,11 @@ module Xhummingbird
 
         env.each do |k, v|
           if CONVERT_KEYS.include?(k) || k.start_with?(HTTP_HEADER_PREFIX)
-            tags["rack_env/" +  k.to_s] = v.to_s rescue nil
+            begin
+              tags["rack_env/" +  k.to_s] = v.to_s
+            rescue => e
+              Xhummingbird.debug(e)
+            end
           end
         end
 

data/lib/xhummingbird/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Xhummingbird
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xhummingbird
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - xmisao