scout_apm 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5af3fd0ff7d9f43aa8ec1b205104fb90784ba83b98250ef871d5bd1282734432
-  data.tar.gz: aae89c06e87f165d0ee87491fbb58253b7b38cdad29375e555e9e0c1d5607129
+  metadata.gz: 8b7247aa1c6545f1bad63c0f911359ba038686c9cf15b30d560ca887467956ef
+  data.tar.gz: 1fd60f4f23521c1274d27cbf710886bbb5af1baa922ddb3642254917c4db9061
 SHA512:
-  metadata.gz: 304283c6c853ce0b2421eccaf3e331c784bd97bda96014777a3a52b64212250595c8d6f7ff390ee154a090d096d1b37f93f221a5e22b2133e47b4a4e36dc4d8e
-  data.tar.gz: 453dd2e29eb7d8bc44ef3527a7ab8ba486d5c9c709b9be275a0223df96deb1d7628c97418a220ca0425e5c6706e1e60c1a8f750f544b223a3b3fcd6c4e924d4f
+  metadata.gz: 1581588299fe697107ce3fd8be5575bd63dbc811cf1b6827e08e666ff7e24a9f857366592e632a441e53daea21914c9a9ec7dfdc8acaa1cfaabccde9636b3b56
+  data.tar.gz: 41c2b41c8e7875188f671b59ad23aa62974b2e0c2ae3d08e93366e81158809b14b8b4c8f217c198e39d311ec8ef1921ec672da726a095702c1b7d7521ab0f7f3

data/.github/workflows/test.yml

@@ -26,6 +26,9 @@ jobs:
           - ruby: 2.4
           - ruby: 2.5
           - ruby: 2.6
+          - ruby: 2.6
+            gemfile: gems/typhoeus.gemfile
+            test_features: "typhoeus"
           - ruby: 2.6
             gemfile: gems/octoshark.gemfile
           - ruby: 2.6
@@ -36,6 +39,7 @@ jobs:
 
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+      SCOUT_TEST_FEATURES: ${{ matrix.test_features }}
 
     runs-on: ubuntu-latest
 

data/.travis.yml

@@ -13,6 +13,9 @@ matrix:
     - rvm: 2.6
     - rvm: 2.7
     - rvm: 3.0
+    - rvm: 2.6
+      gemfile: gems/typhoeus.gemfile
+      env: "SCOUT_TEST_FEATURES=typhoeus"
     - rvm: 2.6
       gemfile: gems/octoshark.gemfile
     - rvm: 2.6

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 4.1.1
+
+* Fix issue with Typheous Hydra instrument (#418)
+
 # 4.1.0
 
 * Preload Celluloid in Shoryuken instrumentation (#331)

data/gems/typhoeus.gemfile

@@ -0,0 +1,3 @@
+eval_gemfile("../Gemfile")
+
+gem 'typhoeus'

data/lib/scout_apm/instruments/typhoeus.rb

@@ -30,7 +30,7 @@ module ScoutApm
       module TyphoeusHydraInstrumentation
         def run(*args, &block)
           layer = ScoutApm::Layer.new("HTTP", "Hydra")
-          layer.desc = scout_desc if current_layer
+          layer.desc = scout_desc
 
           req = ScoutApm::RequestManager.lookup
           req.start_layer(layer)

data/lib/scout_apm/version.rb

@@ -1,3 +1,3 @@
 module ScoutApm
-  VERSION = "4.1.0"
+  VERSION = "4.1.1"
 end

data/test/unit/instruments/typhoeus_test.rb

@@ -0,0 +1,42 @@
+if (ENV["SCOUT_TEST_FEATURES"] || "").include?("typhoeus")
+  require 'test_helper'
+
+  require 'scout_apm/instruments/typhoeus'
+
+  require 'typhoeus'
+
+  class TyphoeusTest < Minitest::Test
+    def setup
+      @context = ScoutApm::AgentContext.new
+      @recorder = FakeRecorder.new
+      ScoutApm::Agent.instance.context.recorder = @recorder
+      ScoutApm::Instruments::Typhoeus.new(@context).install
+    end
+
+    def test_instruments_typhoeus_hydra
+      hydra = Typhoeus::Hydra.new
+      2.times.map{ hydra.queue(Typhoeus::Request.new("example.com", followlocation: true)) }
+
+      assert_equal "2 requests", hydra.scout_desc
+
+      hydra.run
+      assert_equal "0 requests", hydra.scout_desc
+      assert_recorded(@recorder, "HTTP", "Hydra", "2 requests")
+    end
+
+    def test_instruments_typhoeus
+      Typhoeus.get("example.com", followlocation: true)
+      assert_recorded(@recorder, "HTTP", "get", "example.com")
+    end
+
+    private
+
+    def assert_recorded(recorder, type, name, desc = nil)
+      req = recorder.requests.first
+      assert req, "recorder recorded no layers"
+      assert_equal type, req.root_layer.type
+      assert_equal name, req.root_layer.name
+      assert_equal desc, req.root_layer.desc if !desc.nil?
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-03 00:00:00.000000000 Z
+date: 2021-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -238,6 +238,7 @@ files:
 - gems/rails4.gemfile
 - gems/rails5.gemfile
 - gems/rails6.gemfile
+- gems/typhoeus.gemfile
 - lib/scout_apm.rb
 - lib/scout_apm/agent.rb
 - lib/scout_apm/agent/exit_handler.rb
@@ -435,6 +436,7 @@ files:
 - test/unit/instruments/active_record_test.rb
 - test/unit/instruments/net_http_test.rb
 - test/unit/instruments/percentile_sampler_test.rb
+- test/unit/instruments/typhoeus_test.rb
 - test/unit/layaway_test.rb
 - test/unit/layer_children_set_test.rb
 - test/unit/layer_converters/depth_first_walker_test.rb