scout_apm 2.1.27 → 2.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6582ade5d3c4c94d6b8fa70ef5581d7a6257196b
-  data.tar.gz: 840305139be243d6a891cecddf2d6e33d18f1854
+  metadata.gz: 22f54f5575e5fa0642c1cf7ff44765a6e0c98d1a
+  data.tar.gz: eeb667d66ae69e342b2de1edc62ec475bcfa253c
 SHA512:
-  metadata.gz: 70fafc4515edd1af5528705100bc14bf0d9196db6db26057376c5623c7696415b7ca80133a7b0923faa1fcad4889c53b2edc69770ffc5b934f57f2aa06c97069
-  data.tar.gz: 3b75c9c1b417190aa5487e4a8b9b1cb6ef1723dd7320347d4167eaac683ece60d259648d4872326ed48477ca7d38ea09ca6b83739d0939cd22e03c83b251027b
+  metadata.gz: fb7d3f65c107e6b9f1a09e4def243b10827f061160f9a38426ee1d66b8e19f22d971f337bcdf22acf844492c3838c261ce87874f95a636ccc17e4c03aeb66093
+  data.tar.gz: 62e63d73def12c4eca6f27f724cf6d06b3945aa8ebb467c76015032b6942279beade0c262969b147142018a10351cef5a9539ee6ea2f465ae1fcafc8d46a4adb

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 2.1.28
+
+* Changes to app server load data
+
 # 2.1.27
 
 * Don't attempt to call `current_layer.type` on nil

data/lib/scout_apm/app_server_load.rb

@@ -27,20 +27,30 @@ module ScoutApm
     end
 
     def data
-      { :server_time        => Time.now,
-        :framework          => ScoutApm::Environment.instance.framework_integration.human_name,
-        :framework_version  => ScoutApm::Environment.instance.framework_integration.version,
-        :environment        => ScoutApm::Environment.instance.framework_integration.env,
-        :app_server         => ScoutApm::Environment.instance.app_server,
+      { :server_time        => to_s_safe(Time.now),
+        :framework          => to_s_safe(ScoutApm::Environment.instance.framework_integration.human_name),
+        :framework_version  => to_s_safe(ScoutApm::Environment.instance.framework_integration.version),
+        :environment        => to_s_safe(ScoutApm::Environment.instance.framework_integration.env),
+        :app_server         => to_s_safe(ScoutApm::Environment.instance.app_server),
         :ruby_version       => RUBY_VERSION,
-        :hostname           => ScoutApm::Environment.instance.hostname,
-        :database_engine    => ScoutApm::Environment.instance.database_engine,      # Detected
-        :database_adapter   => ScoutApm::Environment.instance.raw_database_adapter, # Raw
-        :application_name   => ScoutApm::Environment.instance.application_name,
+        :hostname           => to_s_safe(ScoutApm::Environment.instance.hostname),
+        :database_engine    => to_s_safe(ScoutApm::Environment.instance.database_engine),      # Detected
+        :database_adapter   => to_s_safe(ScoutApm::Environment.instance.raw_database_adapter), # Raw
+        :application_name   => to_s_safe(ScoutApm::Environment.instance.application_name),
         :libraries          => ScoutApm::Utils::InstalledGems.new.run,
-        :paas               => ScoutApm::Environment.instance.platform_integration.name,
-        :git_sha            => ScoutApm::Environment.instance.git_revision.sha
+        :paas               => to_s_safe(ScoutApm::Environment.instance.platform_integration.name),
+        :git_sha            => to_s_safe(ScoutApm::Environment.instance.git_revision.sha)
       }
     end
+
+    # Calls `.to_s` on the object passed in.
+    # Returns literal string 'to_s error' if the object does not respond to .to_s
+    def to_s_safe(obj)
+      if obj.respond_to?(:to_s)
+        obj.to_s
+      else
+        'to_s error'
+      end
+    end
   end
 end

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "2.1.27"
+  VERSION = "2.1.28"
 end
 

metadata

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