scout_apm 5.3.0 → 5.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a454dcd926d9c3d9a9432c43ee101bfb9305b2ed181193d55a51fd8d525f3d8
-  data.tar.gz: 9bfdbfb6852b7b933f83f947cb225fe1096083c6a4fe44a0620ff888ee01e26d
+  metadata.gz: c81f31cea98bcd57302e874b0efdbeee694af968f40f71a8f527f081c4b456db
+  data.tar.gz: 5bddaf96e0dec2e801b8625fbc8400f285a7e1d9cbd4a984429ce06e6abfa417
 SHA512:
-  metadata.gz: 29012317cfdcb2958395ca541ec628d4f8d3d2ee5278428075930be30cb9fa445c23463cc11f32dab39649a5b34fd6caf6f981eee7c5c88ef1ade39c36e5806d
-  data.tar.gz: a45e503bcd08fa16cbc885133efcc2bbea64bf76eff6a9de7d5c35a7ddce4ea5a059904c902de6afacba0daba5128b62ce477565aecf2512391962cfea729623
+  metadata.gz: '02537899ea45c1a3e12178f2d208231670ac3b5e79b993fe19b99b004ce21f0c5017d4ca57673ff6e9d69eb739e00ab147c2a31d33ca46ac058faf5728c818be'
+  data.tar.gz: 56cb31af74654f8cf1579cd208907cb3ea769d5e99959e6e4df5ead8a257926cd67b9901215010115bd31c5b9184177d7bd6e63e9b9d4735cecc3b53924ef6c5

data/CHANGELOG.markdown

@@ -1,5 +1,12 @@
 # Unreleased
 
+# 5.3.2
+
+* Update redis instruments to support redis v5.0+ (#458)
+# 5.3.1
+
+* Fix typo in HTTPClient prepend instrumentation (#457)
+
 # 5.3.0
 
 * Add configuraiton option to use `Module#prepend` instead of `Module#alias_method` (default)

data/lib/scout_apm/instrument_manager.rb

@@ -35,6 +35,7 @@ module ScoutApm
       install_instrument(ScoutApm::Instruments::HTTP)
       install_instrument(ScoutApm::Instruments::Memcached)
       install_instrument(ScoutApm::Instruments::Redis)
+      install_instrument(ScoutApm::Instruments::Redis5)
       install_instrument(ScoutApm::Instruments::InfluxDB)
       install_instrument(ScoutApm::Instruments::Elasticsearch)
       install_instrument(ScoutApm::Instruments::Grape)

data/lib/scout_apm/instruments/http_client.rb

@@ -59,7 +59,7 @@ module ScoutApm
         url = url && url.to_s[0..(max_length - 1)]
 
         self.class.instrument("HTTP", method, :desc => url) do
-          super(request, *args, &block)
+          super(*args, &block)
         end
       end
     end

data/lib/scout_apm/instruments/redis.rb

@@ -17,7 +17,7 @@ module ScoutApm
       end
 
       def install(prepend:)
-        if defined?(::Redis) && defined?(::Redis::Client)
+        if defined?(::Redis) && defined?(::Redis::Client) && ::Redis::Client.instance_methods(false).include?(:call)
           @installed = true
 
           logger.info "Instrumenting Redis. Prepend: #{prepend}"

data/lib/scout_apm/instruments/redis5.rb

@@ -0,0 +1,59 @@
+module ScoutApm
+    module Instruments
+      class Redis5
+        attr_reader :context
+  
+        def initialize(context)
+          @context = context
+          @installed = false
+        end
+  
+        def logger
+          context.logger
+        end
+  
+        def installed?
+          @installed
+        end
+  
+        def install(prepend:)
+          if defined?(::Redis) && defined?(::Redis::Client) && ::Redis::Client.instance_methods(false).include?(:call_v)
+            @installed = true
+  
+            logger.info "Instrumenting Redis5. Prepend: #{prepend}"
+  
+            if prepend
+              ::Redis::Client.send(:include, ScoutApm::Tracer)
+              ::Redis::Client.send(:prepend, Redis5ClientInstrumentationPrepend)
+            else
+              ::Redis::Client.class_eval do
+                include ScoutApm::Tracer
+  
+                def call_with_scout_instruments(args, &block)
+                  command = args.first rescue "Unknown"
+  
+                  self.class.instrument("Redis", command) do
+                    call_without_scout_instruments(args, &block)
+                  end
+                end
+  
+                alias_method :call_without_scout_instruments, :call_v
+                alias_method :call_v, :call_with_scout_instruments
+              end
+            end
+          end
+        end
+      end
+  
+      module Redis5ClientInstrumentationPrepend
+        def call(args, &block)
+          command = args.first rescue "Unknown"
+  
+          self.class.instrument("Redis", command) do
+            super(args, &block)
+          end
+        end
+      end
+    end
+  end
+  

data/lib/scout_apm/version.rb

@@ -1,3 +1,3 @@
 module ScoutApm
-  VERSION = "5.3.0"
+  VERSION = "5.3.2"
 end

data/lib/scout_apm.rb

@@ -87,6 +87,7 @@ require 'scout_apm/instruments/moped'
 require 'scout_apm/instruments/mongoid'
 require 'scout_apm/instruments/memcached'
 require 'scout_apm/instruments/redis'
+require 'scout_apm/instruments/redis5'
 require 'scout_apm/instruments/influxdb'
 require 'scout_apm/instruments/elasticsearch'
 require 'scout_apm/instruments/active_record'

data/test/unit/instruments/redis_test.rb

@@ -1,23 +1,23 @@
 if (ENV["SCOUT_TEST_FEATURES"] || "").include?("instruments")
   require 'test_helper'
 
-  require 'scout_apm/instruments/redis'
+  require 'scout_apm/instruments/redis5'
 
   require 'redis'
 
   class RedisTest < Minitest::Test
     def setup
       @context = ScoutApm::AgentContext.new
-      @instance = ScoutApm::Instruments::Redis.new(@context)
+      @instance = ScoutApm::Instruments::Redis5.new(@context)
       @instrument_manager = ScoutApm::InstrumentManager.new(@context)
       @instance.install(prepend: @instrument_manager.prepend_for_instrument?(@instance.class))
     end
 
     def test_installs_using_proper_method
       if @instrument_manager.prepend_for_instrument?(@instance.class) == true
-        assert ::Redis::Client.ancestors.include?(ScoutApm::Instruments::RedisClientInstrumentationPrepend)
+        assert ::Redis::Client.ancestors.include?(ScoutApm::Instruments::Redis5ClientInstrumentationPrepend)
       else
-        assert_equal false, ::Redis::Client.ancestors.include?(ScoutApm::Instruments::RedisClientInstrumentationPrepend)
+        assert_equal false, ::Redis::Client.ancestors.include?(ScoutApm::Instruments::Redis5ClientInstrumentationPrepend)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 5.3.2
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-16 00:00:00.000000000 Z
+date: 2022-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -319,6 +319,7 @@ files:
 - lib/scout_apm/instruments/process/process_memory.rb
 - lib/scout_apm/instruments/rails_router.rb
 - lib/scout_apm/instruments/redis.rb
+- lib/scout_apm/instruments/redis5.rb
 - lib/scout_apm/instruments/resque.rb
 - lib/scout_apm/instruments/samplers.rb
 - lib/scout_apm/instruments/sinatra.rb