scout_apm 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91a0c14d41ab0d56bce566a96e08014a452ba693
-  data.tar.gz: 8b1f7239c3f43bfaa1cb6191ff20d8bcc29bd288
+  metadata.gz: a9841d34d8ea8772e1f432ea8902b87adca2eca5
+  data.tar.gz: cb278b70b62479d3039893a62fa797f7769b8d17
 SHA512:
-  metadata.gz: 0f11acf434f45f02d92106f76d7976aa13c86808a10e5716d6698660f82889a9de4a374060acaa5c170df182b60eb9943226da10478f76c33e6ac02bebd4bde6
-  data.tar.gz: baa5db394ee68a07b26fae9a493a96f0e512c6dbc0c583082b2eb5974dfdbd946632c11d83b914cd8033c60f85b3cebc94bccb44b18153f3f95d478fa801c487
+  metadata.gz: 41c7e87187b02c3e5013f74316059569eb0a5c62208c45eb4881bac47993ad5162f36c9bc8ff3f8e97cf1dd70c91fdb62d2caaa900ecab3633b7eee758fb9606
+  data.tar.gz: 74cd457db440e285c645ab045a11ed6da76aefa7e8d95847a61f1e19640337684b6c56ebf0407992c50a7c397fcde16208630074c0424283dfe3573109cbb9cb

data/CHANGELOG.markdown

@@ -1,3 +1,8 @@
+# 0.1.8
+
+* Ping APM on Application Load
+* Fix compatibility with Ruby 1.8 and 1.9
+
 # 0.1.7
 
 * Ability to ignore child calls in instrumentation.

data/lib/scout_apm/agent/reporting.rb

@@ -73,7 +73,7 @@ module ScoutApm
         @samplers.each do |sampler|
           begin
             result = sampler.run
-            store.track!(sampler.metric_name, result, scope: nil) if result
+            store.track!(sampler.metric_name, result, {:scope => nil}) if result
           rescue => e
             logger.info "Error reading #{sampler.human_name}"
             logger.debug e.message

data/lib/scout_apm/app_server_load.rb

@@ -2,27 +2,27 @@ module ScoutApm
   class AppServerLoad
     attr_reader :logger
 
-    def initialize(logger: Agent.instance.logger)
+    def initialize(logger=Agent.instance.logger)
       @logger = logger
     end
 
     def run
       logger.info("Sending Startup Info: #{data.inspect}")
       payload = ScoutApm::Serializers::AppServerLoadSerializer.serialize(data)
-      reporter = Reporter.new(type: :app_server_load)
+      reporter = Reporter.new(:app_server_load)
       reporter.report(payload)
     rescue => e
       logger.debug("Failed Startup Info - #{e.message} \n\t#{e.backtrace.join("\t\n")}")
     end
 
     def data
-      { server_time:       Time.now,
-        framework:         ScoutApm::Environment.instance.framework_integration.name,
-        framework_version: ScoutApm::Environment.instance.framework_integration.version,
-        ruby_version:      RUBY_VERSION,
-        hostname:          ScoutApm::Environment.instance.hostname,
-        database_engine:   ScoutApm::Environment.instance.database_engine,
-        application_name:  ScoutApm::Environment.instance.application_name,
+      { :server_time        => Time.now,
+        :framework          => ScoutApm::Environment.instance.framework_integration.human_name,
+        :framework_version  => ScoutApm::Environment.instance.framework_integration.version,
+        :ruby_version       => RUBY_VERSION,
+        :hostname           => ScoutApm::Environment.instance.hostname,
+        :database_engine    => ScoutApm::Environment.instance.database_engine,
+        :application_name   => ScoutApm::Environment.instance.application_name,
       }
     end
   end

data/lib/scout_apm/framework_integrations/rails_2.rb

@@ -5,6 +5,10 @@ module ScoutApm
         :rails
       end
 
+      def human_name
+        "Rails"
+      end
+
       def version
         Rails::VERSION::STRING
       end
@@ -17,8 +21,8 @@ module ScoutApm
 
       def application_name
         if defined?(::Rails)
-          ::Rails.application.class.to_s
-            .sub(/::Application$/, '')
+          ::Rails.application.class.to_s.
+            sub(/::Application$/, '')
         end
       rescue
         nil

data/lib/scout_apm/framework_integrations/rails_3_or_4.rb

@@ -5,6 +5,10 @@ module ScoutApm
         :rails3_or_4
       end
 
+      def human_name
+        "Rails"
+      end
+
       def version
         Rails::VERSION::STRING
       end
@@ -17,8 +21,8 @@ module ScoutApm
 
       def application_name
         if defined?(::Rails)
-          ::Rails.application.class.to_s
-            .sub(/::Application$/, '')
+          ::Rails.application.class.to_s.
+             sub(/::Application$/, '')
         end
       rescue
         nil

data/lib/scout_apm/framework_integrations/ruby.rb

@@ -5,6 +5,10 @@ module ScoutApm
         :ruby
       end
 
+      def human_name
+        "Ruby"
+      end
+
       def version
         "Unknown"
       end

data/lib/scout_apm/framework_integrations/sinatra.rb

@@ -5,6 +5,10 @@ module ScoutApm
         :sinatra
       end
 
+      def human_name
+        "Sinatra"
+      end
+
       def version
         Sinatra::VERSION
       end

data/lib/scout_apm/reporter.rb

@@ -1,3 +1,5 @@
+require 'openssl'
+
 module ScoutApm
   class Reporter
     CA_FILE     = File.join( File.dirname(__FILE__), *%w[.. .. data cacert.pem] )
@@ -7,7 +9,7 @@ module ScoutApm
     attr_reader :logger
     attr_reader :type
 
-    def initialize(config=Agent.instance.config, logger=Agent.instance.logger, type: :checkin)
+    def initialize(config=Agent.instance.config, logger=Agent.instance.logger, type = :checkin)
       @config = config
       @logger = logger
       @type = type

data/lib/scout_apm/store.rb

@@ -1,3 +1,5 @@
+require 'thread'
+
 # The store encapsolutes the logic that (1) saves instrumented data by Metric name to memory and (2) maintains a stack (just an Array)
 # of instrumented methods that are being called. It's accessed via +ScoutApm::Agent.instance.store+.
 class ScoutApm::Store
@@ -149,7 +151,7 @@ class ScoutApm::Store
   # Options:
   # :scope => If provided, overrides the default scope.
   # :exclusive_time => Sets the exclusive time for the method. If not provided, uses +call_time+.
-  def track!(metric_name,call_time,options = {})
+  def track!(metric_name, call_time, options = {})
      meta = ScoutApm::MetricMeta.new(metric_name)
      meta.scope = options[:scope] if options.has_key?(:scope)
      stat = metric_hash[meta] || ScoutApm::MetricStats.new

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2015-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest