heimdall_apm 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f1d534cb7c6454c3d80e42c5a5d6c43eb399fe4
-  data.tar.gz: 50874cb30661dc750183cc6aa0694bbc78db3cd2
+  metadata.gz: 26c9a55f5ae8de27e0b1607ba223096d78e5e6dd
+  data.tar.gz: 61ffda192893aed8a11f769b55e31ba12cf364fd
 SHA512:
-  metadata.gz: 701c5cb8ef98c9c27c5d368cec5bddcc90b6627a7d676887424f4b6277e3ad13d337235815afa938660f5a4586a30ff9680cc4da1fe4dd7e2b5069a8e0eb8694
-  data.tar.gz: 4710a3e60d589f3d5582fbe989d0de66e50da4dbb5c92a78be225c7f90bee37567bee4425fde4a7655ce294089d3ff905443833991a318c0c19f13d68f219db2
+  metadata.gz: e747d3db5d12695d933acb7b92dfb1ff564b8a8dbdc9e78ced3bbe1763d9b07276a1ab9d7edabf0c4b694daa147551cf3e99c31e27a35bbb723548eec5970f22
+  data.tar.gz: 5d178d6e1c0a16ee59edf0d53fcab5799cf80fa528f148f79bdf6caf714dcad26589441139b18c016df4ce9bbbe072613aa051dcfda82ba07c91fa89de245477

data/lib/heimdall_apm/agent.rb

@@ -45,8 +45,6 @@ module HeimdallApm
     def start(options = {})
       return unless context.config.value('enabled')
 
-      @background_thread = Thread.new { background_run }
-
       # TODO: use instruments manager
       require 'heimdall_apm/instruments/active_record'      if defined?(ActiveRecord)
       require 'heimdall_apm/instruments/action_controller'  if defined?(ActionController)
@@ -57,10 +55,14 @@ module HeimdallApm
         # TODO: make the position configurable
         options[:app].config.middleware.insert_after Rack::Cors, HeimdallApm::Instruments::Middleware
       end
+
+      context.started!
+      @background_thread = Thread.new { background_run }
     end
 
     def stop
       @stopped = true
+      context.stopped!
       if @background_thread.alive?
         @background_thread.wakeup
         @background_thread.join

data/lib/heimdall_apm/agent_context.rb

@@ -11,6 +11,18 @@ module HeimdallApm
     # Global configuration object
     attr_writer :config
 
+    def started!
+      @started = true
+    end
+
+    def stopped!
+      @started = false
+    end
+
+    def started?
+      @started
+    end
+
     def config
       @config ||= ::HeimdallApm::Config.new
     end

data/lib/heimdall_apm/points_collection.rb

@@ -12,7 +12,10 @@ module HeimdallApm
   class PointsCollection
     # Metrics we want to explicitely keep separated into measurements. Everything
     # else will be label as Ruby.
-    ROOT_METRICS = Set.new(['Sql', 'Elastic', 'Redis'])
+    ROOT_METRICS = ['Sql', 'Elastic', 'Redis'].map do |key|
+      downcased = key.downcase
+      [key, ["#{downcased}_time", "#{downcased}_count"]]
+    end.to_h
 
     def initialize
       @points = []
@@ -35,9 +38,11 @@ module HeimdallApm
       tags[:endpoint] = txn.scope
 
       metrics.each do |meta, stat|
-        if ROOT_METRICS.include?(meta.type)
-          key = -"#{meta.type.downcase}_time"
-          values[key] += stat.total_exclusive_time
+        if ROOT_METRICS.key?(meta.type)
+          time_key, count_key = ROOT_METRICS[meta.type]
+
+          values[time_key]  += stat.total_exclusive_time
+          values[count_key] += stat.call_count
         else
           values['ruby_time'] += stat.total_exclusive_time
         end

data/lib/heimdall_apm/version.rb

@@ -1,3 +1,3 @@
 module HeimdallApm
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heimdall_apm
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Christopher Cocchi-Perrier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-10 00:00:00.000000000 Z
+date: 2018-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler