tracebin 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1154bcf6a675e91b8bf67d1996b669ffdb35ff7a
-  data.tar.gz: 4e898dbe53ffea1676abfe241a1c8adfb40d5ea7
+  metadata.gz: d94ffa099d279c476c327437396669eaa91e0f46
+  data.tar.gz: af463513780cde0a9f5b15c16f6ad81946485733
 SHA512:
-  metadata.gz: 071b0a19683f51231b3f0a7e431f39531ae240111278736e7349637d9f15c3dd6e4a835ca99f2a0b5fea99aee0e1d8a3bf233590ce7981b45deeb1aa33e02a53
-  data.tar.gz: 8e74447c51d81cbc755ab936f726f1720af9e4e0e7bd9429f14e2058285f353b075b52f4caa7752822198b65e0c8cf239d904acbc12189baf6a7b000bf0476cc
+  metadata.gz: bb95a49c5155ce797593b1d49e7067ef0bd87add0c573787f78a123aa77f77a0356907794eee4930a60cb5927d80822e243d5f5fb8b1948bff265b3c7b6a66e9
+  data.tar.gz: 789d333045a7620c5e7858f3ef4fcc1771da2956bbf1c2dd766c61b4662925e9d228c1df95a115cece2d2ef155f5887b44616eb795e0bab2321c5a33031e471b

data/lib/tracebin/events.rb

@@ -24,7 +24,7 @@ module Tracebin
         start: event[1],
         stop: event[2],
         duration: to_milliseconds(event[2] - event[1]),
-        data: event.last
+        data: select_data || event.last
       }
     end
   end
@@ -39,6 +39,14 @@ module Tracebin
     def type
       :sql
     end
+
+    def select_data
+      {
+        sql: event.last[:sql],
+        name: event.last[:name],
+        statement_name: event.last[:statement_name]
+      }
+    end
   end
 
   class ControllerEvent < Event
@@ -47,6 +55,19 @@ module Tracebin
     def type
       :controller_action
     end
+
+    def select_data
+      {
+        controller: event.last[:controller],
+        action: event.last[:action],
+        format: event.last[:format],
+        method: event.last[:method],
+        path: event.last[:path],
+        status: event.last[:status],
+        view_runtime: event.last[:view_runtime],
+        db_runtime: event.last[:db_runtime]
+      }
+    end
   end
 
   class ViewEvent < Event
@@ -55,6 +76,10 @@ module Tracebin
     def type
       :view
     end
+
+    def select_data
+      nil
+    end
   end
 
   class SinatraEvent < Event
@@ -63,5 +88,9 @@ module Tracebin
     def type
       :route
     end
+
+    def select_data
+      nil
+    end
   end
 end

data/lib/tracebin/middleware.rb

@@ -3,13 +3,14 @@ require 'tracebin/puppet_master'
 
 module Tracebin
   class Middleware
-    attr_reader :config
+    attr_reader :config, :logger
 
     def initialize(app)
       @app = app
       @config = Tracebin::Agent.config
+      @logger = Tracebin::Agent.logger
 
-      Tracebin::Agent.start! unless Tracebin::Agent.started?
+      start_agent
     end
 
     def call(env)
@@ -17,24 +18,21 @@ module Tracebin
     end
 
     def __call(env)
-      path = env['REQUEST_PATH']
-      ignored_paths = config.ignored_paths.map { |root| %r{^#{root}} }
-
-      if ignored_paths.any? { |root| !!root.match(path) }
-        @app.call env
+      if agent_disabled?(env)
+        return @app.call env
       else
-        timer = Timer.new
-        timer.start!
+        @tracebin_timer = Timer.new
+        @tracebin_timer.start!
 
         status, headers, response = @app.call(env)
 
-        timer.transaction_name = fetch_endpoint_name env
+        @tracebin_timer.transaction_name = fetch_endpoint_name(env)
 
-        timer.stop!
+        @tracebin_timer.stop!
 
-        PuppetMaster.new(timer).process
+        PuppetMaster.new(@tracebin_timer).process
 
-        [status, headers, response]
+        return [status, headers, response]
       end
     end
 
@@ -47,5 +45,19 @@ module Tracebin
         'RackTransaction'
       end
     end
+
+    def start_agent
+      Tracebin::Agent.start!
+    rescue => e
+      @logger.warn "TRACEBIN: Failed to start agent: #{e.message}"
+    end
+
+    def agent_disabled?(env)
+      path = env['REQUEST_PATH']
+      ignored_paths = config.ignored_paths.map { |root| %r{^#{root}} }
+
+      !Tracebin::Agent.started? ||
+        ignored_paths.any? { |root| !!root.match(path) }
+    end
   end
 end

data/lib/tracebin/patches/action_view_layout.rb

@@ -14,8 +14,10 @@
 
     if layout
       start_time = Time.now
-      render_with_layout_without_tracebin(path, locals, *args, &block)
-      end_time = Time.new
+
+      result = render_with_layout_without_tracebin(path, locals, *args, &block)
+
+      end_time = Time.now
 
       event_data = [
         'render_layout.action_view',
@@ -27,6 +29,8 @@
       ]
 
       ::Tracebin::Patches.handle_event :action_view_layout, event_data
+
+      result
     else
       render_with_layout_without_tracebin(path, locals, *args, &block)
     end

data/lib/tracebin/reporter.rb

@@ -62,6 +62,7 @@ module Tracebin
       res
     rescue Exception => e
       logger.warn "TRACEBIN: Exception occurred sending data to the server: #{e.message}"
+      logger.debug "TRACEBIN: #{e.backtrace.join("\n\t")}"
       Tracebin::Agent.stop!
     end
 
@@ -69,9 +70,12 @@ module Tracebin
       case res
       when Net::HTTPSuccess
         logger.info 'TRACEBIN: Successfully sent payload to the server.'
-      when Net::HTTPBadRequest
+      when Net::HTTPNotFound
         logger.warn 'TRACEBIN: App bin ID not found. Please create a new app bin and add it to the config.'
         Tracebin::Agent.stop!
+      when Net::HTTPBadRequest
+        logger.warn 'Something went wrong with the server. Please contact us!'
+        Tracebin::Agent.stop!
       else
         logger.warn 'TRACEBIN: Failed to send data to the server. Will try again in 1 minute.'
         @storage.add_payload payload

data/lib/tracebin/version.rb

@@ -1,3 +1,3 @@
 module Tracebin
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tracebin
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Tyler Guillen