scout_apm 2.6.3 → 2.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a0344ecd846204d2b4057246c9719ebf4453a1c240847e54357a75cecda39b6
-  data.tar.gz: 55b8b4c379fee7e5f8275bde73f27fa7d9e1e16b560c70207e51e4225e45184c
+  metadata.gz: 96f6a10ca19691ef0b5feb036811700759fbd6164a0811efbe52b1fcaa97b6c9
+  data.tar.gz: c2c39bcb738f22115d0a0f69f40340a5096f523e542c844fe007b15f42a324d1
 SHA512:
-  metadata.gz: 45cd0a3dc5b6632a980a38324e6c933d2552eb33aa32e1e9e9da74e5a6b848b5bdb694c27f017502c6a437dd6576486d8186ccbea8ae3c5563b8778bac158870
-  data.tar.gz: d20753a142c71ef03a47608bcae15acdb2aeec11e5f7f75c78ece78657ac828b077af15c152b4e1aac92eb81f98e6a7b211db1aa35349cd8746a37ae76089b25
+  metadata.gz: ea5173420001f92d54aae2a05b7ca71287ca08b3da08b27769895b9ddc0aca791dfb226c93ed84464728cc02a7c6defc486b3b1d606e58f64323d7c523dfdbfb
+  data.tar.gz: 91b7ace32216ea11bffa119d782b3f43dba518fc1adf07bae866e20c8cf83e25e055ded16fd57ee2d6dc7d1c2f4b92c88849ab207adf316435d520b016bf7e3a

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 2.6.4
+
+* Add defensive check against a nil @address in Net/HTTP instruments (#306)
+
 # 2.6.3
 
 * Standardize Metadata with other language agents (#302)

data/lib/scout_apm/instruments/net_http.rb

@@ -25,7 +25,7 @@ module ScoutApm
           ::Net::HTTP.class_eval do
             include ScoutApm::Tracer
 
-            def request_with_scout_instruments(*args,&block)
+            def request_with_scout_instruments(*args, &block)
               self.class.instrument("HTTP", "request", :ignore_children => true, :desc => request_scout_description(args.first)) do
                 request_without_scout_instruments(*args, &block)
               end
@@ -35,8 +35,15 @@ module ScoutApm
               path = req.path
               path = path.path if path.respond_to?(:path)
 
+              # Protect against a nil address value
+              if @address.nil?
+                return "No Address Found"
+              end
+
               max_length = ScoutApm::Agent.instance.context.config.value('instrument_http_url_length')
               (@address + path.split('?').first)[0..(max_length - 1)]
+            rescue
+              ""
             end
 
             alias request_without_scout_instruments request

data/lib/scout_apm/version.rb

@@ -1,3 +1,3 @@
 module ScoutApm
-  VERSION = "2.6.3"
+  VERSION = "2.6.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 2.6.3
+  version: 2.6.4
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-31 00:00:00.000000000 Z
+date: 2019-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest