tracebin 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d94ffa099d279c476c327437396669eaa91e0f46
-  data.tar.gz: af463513780cde0a9f5b15c16f6ad81946485733
+  metadata.gz: e823382bbf674934553df737b9a52652f9081a14
+  data.tar.gz: ab4ac41cead343e9d8068c925113c241340e15a7
 SHA512:
-  metadata.gz: bb95a49c5155ce797593b1d49e7067ef0bd87add0c573787f78a123aa77f77a0356907794eee4930a60cb5927d80822e243d5f5fb8b1948bff265b3c7b6a66e9
-  data.tar.gz: 789d333045a7620c5e7858f3ef4fcc1771da2956bbf1c2dd766c61b4662925e9d228c1df95a115cece2d2ef155f5887b44616eb795e0bab2321c5a33031e471b
+  metadata.gz: cdb4d07940b6895511a4866ca1e140502f463f984c074b82524930e493042b1020a7edf02a75e9ca79d21f5da4a53c34eb458b73860266ee0fd3ad049a58439d
+  data.tar.gz: b6d60fd08949816eb22f5273f415d4dfb04266ce25b4e7829bfa00799624690d8c70cd45bdbac37923007f297a3bc02c9af6e769f11ab0111fe15e2e8003f8a4

data/lib/tracebin/config.rb

@@ -4,6 +4,7 @@ module Tracebin
       log_level: 'info',
       host: 'https://traceb.in',
       report_path: 'reports',
+      enable_ssl: true,
       ignored_paths: [],
       enabled: true
     }.freeze

data/lib/tracebin/events.rb

@@ -21,9 +21,9 @@ module Tracebin
     def data_hash
       {
         event_type: type,
-        start: event[1],
-        stop: event[2],
-        duration: to_milliseconds(event[2] - event[1]),
+        start: time_to_string(event[1]),
+        stop: time_to_string(event[2]),
+        duration: milliseconds_between(event[2], event[1]),
         data: select_data || event.last
       }
     end

data/lib/tracebin/helpers.rb

@@ -3,5 +3,32 @@ module Tracebin
     def to_milliseconds(time)
       time.to_f * 1000
     end
+
+    def time_to_string(time)
+      time.is_a?(String) ? time : time.iso8601(6)
+    end
+
+    def timestamp_string
+      Time.now.iso8601 6
+    end
+
+    def deserialize_time_string(str)
+      Time.parse str
+    end
+
+    def milliseconds_between(time1, time2)
+      time1 = deserialize_time_string(time1) if time1.is_a?(String)
+      time2 = deserialize_time_string(time2) if time2.is_a?(String)
+
+      to_milliseconds(time1 - time2).abs
+    end
+  end
+end
+
+module Tracebin
+  class PatchHelper
+    class << self
+      include ::Tracebin::Helpers
+    end
   end
 end

data/lib/tracebin/middleware.rb

@@ -41,6 +41,8 @@ module Tracebin
     def fetch_endpoint_name(env)
       if controller = env['action_controller.instance']
         "#{controller.class}##{controller.params['action']}"
+      elsif route = env['sinatra.route']
+        route
       else
         'RackTransaction'
       end

data/lib/tracebin/patches/action_view_layout.rb

@@ -13,11 +13,11 @@
     end
 
     if layout
-      start_time = Time.now
+      start_time = ::Tracebin::PatchHelper.timestamp_string
 
       result = render_with_layout_without_tracebin(path, locals, *args, &block)
 
-      end_time = Time.now
+      end_time = ::Tracebin::PatchHelper.timestamp_string
 
       event_data = [
         'render_layout.action_view',

data/lib/tracebin/patches/mysql2.rb

@@ -2,9 +2,9 @@
   alias_method :query_without_tracebin, :query
 
   def query(*args, &block)
-    start_time   = Time.now
+    start_time   = ::Tracebin::PatchHelper.timestamp_string
     result       = query_without_tracebin(*args, &block)
-    end_time     = Time.now
+    end_time     = ::Tracebin::PatchHelper.timestamp_string
 
     event_data = [
       'sql.mysql2_query',

data/lib/tracebin/patches/postgres.rb

@@ -3,9 +3,9 @@
   alias_method :exec_params_without_tracebin, :exec_params
 
   def exec_params(*args, &block)
-    start_time   = Time.now
+    start_time   = ::Tracebin::PatchHelper.timestamp_string
     result       = exec_params_without_tracebin(*args, &block)
-    end_time     = Time.now
+    end_time     = ::Tracebin::PatchHelper.timestamp_string
 
     event_data = [
       'sql.postgres_exec',
@@ -22,9 +22,9 @@
   end
 
   def exec(*args, &block)
-    start_time   = Time.now
+    start_time   = ::Tracebin::PatchHelper.timestamp_string
     result       = exec_without_tracebin(*args, &block)
-    end_time     = Time.now
+    end_time     = ::Tracebin::PatchHelper.timestamp_string
 
     event_data = [
       'sql.postgres_exec',

data/lib/tracebin/patches/sinatra.rb

@@ -2,16 +2,18 @@
   alias_method :dispatch_without_tracebin!, :dispatch!
 
   def dispatch!(*args, &block)
-    start_time = Time.now
+    start_time = ::Tracebin::PatchHelper.timestamp_string
     result = dispatch_without_tracebin!(*args, *block)
-    end_time = Time.now
+    end_time = ::Tracebin::PatchHelper.timestamp_string
     route = env['sinatra.route']
 
     event_data = [
-      'sinatra.route_exec',
+      'sinatra.route',
       start_time,
       end_time,
-      route
+      {
+        endpoint: route
+      }
     ]
 
     ::Tracebin::Patches.handle_event :sinatra, event_data

data/lib/tracebin/reporter.rb

@@ -1,4 +1,3 @@
-require 'net/https'
 require 'json'
 require 'concurrent'
 
@@ -11,6 +10,12 @@ module Tracebin
       @config = config
       @storage = storage
 
+      if config.enable_ssl
+        require 'net/https'
+      else
+        require 'net/http'
+      end
+
       host = Tracebin::Agent.config.host
       path = Tracebin::Agent.config.report_path
       @uri = URI("#{host}/#{path}")
@@ -44,8 +49,11 @@ module Tracebin
       logger.info "TRACEBIN: Sending #{payload.length} samples to: #{@uri}"
 
       http = Net::HTTP.new @uri.host, @uri.port
-      http.use_ssl = true
-      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+      if config.enable_ssl
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      end
 
       body = {
         bin_id: @bin_id,

data/lib/tracebin/system_health_sample.rb

@@ -1,10 +1,12 @@
 module Tracebin
   class SystemHealthSample
+    include ::Tracebin::Helpers
+
     DATA_TYPE = 'system_health_sample'.freeze
 
     def initialize(options = {})
       @process = options[:process] || :web
-      @sampled_at = Time.new
+      @sampled_at = timestamp_string
       @metrics = sample_metrics
     end
 
@@ -139,9 +141,11 @@ module Tracebin
         info[:processor_count] = get_sysctl_value('hw.packages').to_i
         info[:core_count] = get_sysctl_value('hw.physicalcpu_max').to_i,
         info[:logical_cpu_count] = get_sysctl_value('hw.logicalcpu_max').to_i
+        info[:usage] = get_darwin_cpu_usage
       elsif linux?
         proc_string = read_proc('/proc/cpuinfo')
         info = parse_proc_cpuinfo_string(proc_string)
+        info[:usage] = get_linux_cpu_usage
       end
       info
     end
@@ -183,5 +187,24 @@ module Tracebin
         logical_cpu_count: threads.count
       }
     end
+
+    def get_darwin_cpu_usage
+      iostat = `iostat 2>/dev/null`.split(/\n+/).map do |line|
+        line.strip.split(/\s+/)
+      end
+      cpu_idx = iostat[0].index('cpu') * 3
+      user, sys, idle = iostat[2].map(&:to_f)[cpu_idx..cpu_idx + 2]
+
+      (user + sys) / (user + sys + idle)
+    end
+
+    def get_linux_cpu_usage
+      proc_data = File.readlines('/proc/stat').grep(/^cpu /).first.split(" ")
+
+      usage = proc_data[1].to_i + proc_data[2].to_i + proc_data[3].to_i
+      total = usage + proc_data[4].to_i
+
+      usage.to_f / total.to_f
+    end
   end
 end

data/lib/tracebin/timer.rb

@@ -2,6 +2,10 @@ require 'tracebin/recorder'
 require 'tracebin/helpers'
 
 module Tracebin
+  ##
+  # This is the timer for a top-level transaction. Transactions include
+  # request/response cycles, as well as background jobs. Background jobs
+  # subclass this class and overwrite the +#transaction_type+ method.
   class Timer
     include ::Tracebin::Helpers
 
@@ -15,14 +19,14 @@ module Tracebin
     end
 
     def start!
-      @start_time = Time.now
+      @start_time = timestamp_string
       Recorder.start_recording
     end
 
     def stop!
       collect_events
       Recorder.stop_recording
-      @stop_time = Time.now
+      @stop_time = timestamp_string
     end
 
     def payload
@@ -43,7 +47,7 @@ module Tracebin
     end
 
     def duration
-      to_milliseconds @stop_time - @start_time
+      milliseconds_between @stop_time, @start_time
     end
 
     def transaction_type

data/lib/tracebin/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tracebin
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Tyler Guillen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-25 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby