rorvswild 1.5.15 → 1.5.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29d23fa806fe2d9547169a35795b4b313bf7510264aba4d0f8f3471ae7acf047
-  data.tar.gz: 681d88bef1fb76ede952387ef1d8ffbdf4bfa4cbf08f990f7964624401ff71a9
+  metadata.gz: 6ce241e0d917e560c8a5683bdc210dbd4f5158cd7bf49444ced9548d85b61e5e
+  data.tar.gz: b354848c0048368c615e4c2dd5231864a164c127af0aaf590fbfcd5c2a1cb36c
 SHA512:
-  metadata.gz: e54dba0143bdb8e94677519698857c7ddc62f91ecb0a876ecc9e0e2fb402e4d11055a59f03cca1c2ca5a2e73b82cf5380574d9e3e4c73d1a66e21c7ea54cfe6c
-  data.tar.gz: 92d4cb2e15015929ccc609b6b81837fb1a78ea12ebe4538555e0a023266fc852001d1aa17d7e620b50dd6ac3f856cbf08bba1d3cb9e4f24f10333b1faa26064d
+  metadata.gz: fc3e48e9328b450bfb3cb7e7e4536e249470bcf7cb1fd2b3c7f67416daa66e1c281e742446a97f868276ac3028a573a84247b80b7f3053fbaeb9f9dfe4209c57
+  data.tar.gz: eab70d88fd705bdd5d679b625a9b6e06b6612cff6eaa6dc5080d6cd80a38f6f28e1a198f475b683cecdb25be7ac98d54a67eecfb8ee8cea230d987248e846823

data/lib/rorvswild/agent.rb

@@ -159,6 +159,17 @@ module RorVsWild
       @os_description = RbConfig::CONFIG["host_os"]
     end
 
+    def hostname
+      if gae_instance = ENV["GAE_INSTANCE"] || ENV["CLOUD_RUN_EXECUTION"]
+        gae_instance
+      elsif dyno = ENV["DYNO"] # Heroku
+        dyno.start_with?("run.") ? "run.*" :
+          dyno.start_with?("release.") ? "release.*" : dyno
+      else
+        Socket.gethostname
+      end
+    end
+
     #######################
     ### Private methods ###
     #######################

data/lib/rorvswild/metrics.rb

@@ -25,7 +25,7 @@ module RorVsWild
 
     def to_h
       {
-        hostname: Socket.gethostname,
+        hostname: RorVsWild.agent.hostname,
         os: RorVsWild.agent.os_description,
         cpu_user: cpu.user,
         cpu_system: cpu.system,

data/lib/rorvswild/plugin/redis.rb

@@ -1,31 +1,45 @@
+# frozen_string_literal: true
+
 module RorVsWild
   module Plugin
     class Redis
       def self.setup
         return if !defined?(::Redis)
-        return if ::Redis::Client.method_defined?(:process_without_rorvswild)
-        ::Redis::Client.class_eval do
-          alias_method :process_without_rorvswild, :process
+        if ::Redis::Client.method_defined?(:process)
+          ::Redis::Client.prepend(V4)
+        else
+          ::Redis.prepend(V5)
+        end
+      end
 
-          def process(commands, &block)
-            string = RorVsWild::Plugin::Redis.commands_to_string(commands)
-            appendable = RorVsWild::Plugin::Redis.appendable_commands?(commands)
-            RorVsWild.agent.measure_section(string, appendable_command: appendable, kind: "redis".freeze) do
-              process_without_rorvswild(commands, &block)
-            end
+      module V4
+        def process(commands, &block)
+          string = commands.map(&:first).join("\n")
+          appendable = APPENDABLE_COMMANDS.include?(commands[0][0])
+          RorVsWild.agent.measure_section(string, appendable_command: appendable, kind: "redis") do
+            super(commands, &block)
           end
         end
       end
 
-      def self.commands_to_string(commands)
-        commands.map { |c| c[0]  }.join("\n".freeze)
-      end
+      module V5
+        def send_command(command, &block)
+          appendable = APPENDABLE_COMMANDS.include?(command)
+          RorVsWild.agent.measure_section(command[0], appendable_command: appendable, kind: "redis") do
+            super(command, &block)
+          end
+        end
 
-      APPENDABLE_COMMANDS = [:auth, :select]
+        def pipelined
+          RorVsWild.agent.measure_section("pipeline", kind: "redis") { super }
+        end
 
-      def self.appendable_commands?(commands)
-        commands.size == 1 && APPENDABLE_COMMANDS.include?(commands.first.first)
+        def multi
+          RorVsWild.agent.measure_section("multi", kind: "redis") { super }
+        end
       end
+
+      APPENDABLE_COMMANDS = [:auth, :select]
     end
   end
 end

data/lib/rorvswild/version.rb

@@ -1,3 +1,3 @@
 module RorVsWild
-  VERSION = "1.5.15".freeze
+  VERSION = "1.5.17".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rorvswild
 version: !ruby/object:Gem::Version
-  version: 1.5.15
+  version: 1.5.17
 platform: ruby
 authors:
 - Alexis Bernard
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-17 00:00:00.000000000 Z
+date: 2022-10-25 00:00:00.000000000 Z
 dependencies: []
 description: Performances and errors insights for rails developers.
 email: