xhummingbird 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 582e31f5f12893d74a24a8bc948e544778c7ad847bd95d8acd020f9617b6e27e
-  data.tar.gz: c68df314d986f338ee06fec0f0c43c5b6024aaba74787fde79a939096fb8171a
+  metadata.gz: 3f5561122802f0f1a8c90a640b69802ed5dff468da607b47c7bfbff63eaf893c
+  data.tar.gz: 871d26b48fb2a0dc04b8ec266c497b6366f04261e1af5c1012144f2ba9c21bfb
 SHA512:
-  metadata.gz: 3efd449a0ae81617f6941e821ae60cfd7d248188b5d74ada5cc5c398a07232880c214fe41ae285d5e2fd0e106c6cb866556e91f7ccf33e91990ba7fbefa9e9eb
-  data.tar.gz: 7fb41838d484f79b1a2738a726ee44486d1ce97e1cf72aa255ce235a42b235dca48bc8d5c3155c5ad65a807b246eac7ad3565e9331bdbcc5f2aaa575c212e1ee
+  metadata.gz: 1600c2a4cefa208e379da4313ff4a7bf9f66a21e56cfee784b24a479aa6e827c27a85be32657ceabf9c5fc796e17b3ea3f6b5c694c560f0da8f5141db628cb28
+  data.tar.gz: ce403ecee0b90f896d1af6c5e760c6066abdb5ff57c444d15f4401c663e49ba47328bffa34f28524ae9895d0b0da3568055eadd03af472e734a8a5e1dab141e0

data/.ruby-version

@@ -0,0 +1 @@
+3.0.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xhummingbird (0.1.0)
+    xhummingbird (0.1.1)
       ffi-rzmq
       google-protobuf
 
@@ -14,7 +14,7 @@ GEM
       ffi-rzmq-core (>= 1.0.7)
     ffi-rzmq-core (1.0.7)
       ffi
-    google-protobuf (3.15.5-x86_64-linux)
+    google-protobuf (3.15.6-x86_64-linux)
     minitest (5.14.4)
     parallel (1.20.1)
     parser (3.0.0.0)

data/examples/custom_tags.rb

@@ -0,0 +1,21 @@
+require 'xhummingbird'
+
+raise "Set #{Xhummingbird::Client::XH_SERVER} environment variable" unless Xhummingbird.enabled?
+
+Xhummingbird.send_trace(
+  title: "CustomTagTrace",
+  message: "CustomTags",
+  tags: {
+    tag_a: 42,
+    tag_b: "foo",
+    tag_c: :bar
+  }
+)
+
+begin
+  raise 'Something wrong'
+rescue => e
+  Xhummingbird.send_exception(e, tags: {path: __FILE__})
+end
+
+sleep 1 # Await sending

data/lib/xhummingbird.rb

@@ -11,7 +11,7 @@ require_relative "xhummingbird/protos/event_pb"
 module Xhummingbird
   class Error < StandardError; end
 
-  def self.send_trace(title:, message: "", level: 1)
+  def self.send_trace(title:, message: "", level: 1, tags: {})
     return unless enabled?
 
     send(
@@ -19,14 +19,14 @@ module Xhummingbird
       title: title.to_s,
       message: message.to_s,
       trace: caller,
-      tags: default_tags,
+      tags: default_tags.merge(format_hash(tags)),
       timestamp: Time.now
     )
   rescue
     raise Error
   end
 
-  def self.send_exception(exception, level: 2)
+  def self.send_exception(exception, level: 2, tags: {})
     return unless enabled?
 
     send(
@@ -34,7 +34,7 @@ module Xhummingbird
       title: exception.class.name,
       message: exception.message,
       trace: exception.backtrace,
-      tags: default_tags,
+      tags: default_tags.merge(format_hash(tags)),
       timestamp: Time.now
     )
   rescue
@@ -55,10 +55,11 @@ module Xhummingbird
 
   def self.default_tags
     {
-       hostname: Socket.gethostname,
-       ruby_version: RUBY_VERSION,
-       pid: Process.pid.to_s,
-       thread_object_id: Thread.current.object_id.to_s
+      "default/sdk" => "Ruby #{Xhummingbird::VERSION}",
+      "default/hostname" =>  Socket.gethostname,
+      "default/ruby_version" =>  RUBY_VERSION,
+      "default/pid" =>  Process.pid.to_s,
+      "default/thread_object_id" => Thread.current.object_id.to_s
     }
   end
 
@@ -67,4 +68,14 @@ module Xhummingbird
     message = Event.encode(event)
     Client.instance.send(message)
   end
+
+  def self.format_hash(hash)
+    formatted = {}
+
+    hash.each do |k, v|
+      formatted[k.to_s] = v.to_s
+    end
+
+    formatted
+  end
 end

data/lib/xhummingbird/rack.rb

@@ -0,0 +1 @@
+require_relative 'rack/capture_exception'

data/lib/xhummingbird/rack/capture_exception.rb

@@ -0,0 +1,37 @@
+module Xhummingbird
+  module Rack
+    class CaptureException
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        p env
+
+        begin
+          response = @app.call(env)
+        rescue => e
+          Xhummingbird.send_exception(e, tags: convert_to_rack_tags(env))
+        end
+
+        error = env['rack.exception'] || env['sinatra.error']
+
+        Xhummingbird.send_exception(error, tags: convert_to_rack_tags(env)) if error
+
+        response
+      end
+
+      private
+
+      def convert_to_rack_tags(env)
+        tags = {}
+
+        env.each do |k, v|
+          tags["rack_env/" +  k.to_s] = v.to_s rescue nil
+        end
+
+        tags
+      end
+    end
+  end
+end

data/lib/xhummingbird/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xhummingbird
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - xmisao
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-13 00:00:00.000000000 Z
+date: 2021-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-rzmq
@@ -47,6 +47,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- ".ruby-version"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -55,6 +56,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- examples/custom_tags.rb
 - examples/send_exception.rb
 - examples/send_trace.rb
 - examples/short_name.rb
@@ -63,6 +65,8 @@ files:
 - lib/xhummingbird.rb
 - lib/xhummingbird/client.rb
 - lib/xhummingbird/protos/event_pb.rb
+- lib/xhummingbird/rack.rb
+- lib/xhummingbird/rack/capture_exception.rb
 - lib/xhummingbird/short_name.rb
 - lib/xhummingbird/version.rb
 - xhummingbird.gemspec