rorvswild 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34fc75a952dcdd5b7291e2227f2f59da531413338f0fb91ea64a61245b9368af
-  data.tar.gz: daab97444a9876ef871ca0c2832afd667cfb986fc1e101c36c97f3880f700b1a
+  metadata.gz: 3d75bdcf83d7aa718c5055d7860d870a79d815901d627e9829f60cc93f5288d2
+  data.tar.gz: 3b6d6e61cff88594c4d6d888a9597c8f2db4a600d8d260514d93c5a4e1ff7b04
 SHA512:
-  metadata.gz: 3986c7c35162a29f6f4173fa4ce6728fea1eac8d2c4293fc275f850b885fb0eb472c4a3be85a473761295322aa10c490f2ad1e4ae198b4528075033eb8c977db
-  data.tar.gz: 94ecd7c5f04ecbf7608f5fd37467ebfa5d49e8f6f5e50d2be4822d4cb695c65e15daa325c8843a2f04b6c841803040dfdb020e055bb961f6122101119e1e04df
+  metadata.gz: 7157d2f6925a01ebac1e54fb08db8017405cd00df633a736b7fcbbdfd11a9886b708ec9680c499540b36b22130744338efd1fab7159bc38fea19f333704cd619
+  data.tar.gz: ee290b637cba8ff57439ca673ea681d2d32fa9823127b66cf6418cbe298525c9a873bf941c40a8d37586e132df036628fdcf3c4d7d53a4e4e78ee3b2522ed061

data/lib/rorvswild/agent.rb

@@ -36,7 +36,6 @@ module RorVsWild
       RorVsWild.logger.debug("Start RorVsWild #{RorVsWild::VERSION}")
       setup_plugins
       cleanup_data
-      send_deployment
     end
 
     def load_features
@@ -160,10 +159,6 @@ module RorVsWild
       config[:ignore_exceptions].any? { |str_or_regex| str_or_regex === exception.class.to_s }
     end
 
-    def send_deployment
-      client.post("/deployments", deployment: Deployment.to_h)
-    end
-
     #######################
     ### Private methods ###
     #######################

data/lib/rorvswild/client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "set"
 require "uri"
 require "json/ext"
@@ -27,6 +29,7 @@ module RorVsWild
         "X-Ruby-Version" => RUBY_VERSION,
       }
       @headers["X-Rails-Version"] = Rails.version if defined?(Rails)
+      @http_unauthorized = false
     end
 
     def post(path, data)
@@ -60,8 +63,10 @@ module RorVsWild
     end
 
     def transmit(request)
-      if http = take_or_create_connection
-        http.request(request)
+      if !@http_unauthorized && http = take_or_create_connection
+        response = http.request(request)
+        @http_unauthorized = true if response.code == "401"
+        response
       end
     rescue Exception => ex
       RorVsWild.logger.error(ex.full_message)

data/lib/rorvswild/deployment.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "open3"
+
 module RorVsWild
   module Deployment
     def self.load_config(config)
@@ -57,15 +59,13 @@ module RorVsWild
     end
 
     def self.read_from_scalingo
-      return unless ENV["SOURCE_VERSION"]
       @revision = ENV["SOURCE_VERSION"]
     end
 
     def self.read_from_git
-      @revision = normalize_string(`git rev-parse HEAD`) rescue nil
-      return unless @revision
-      lines = `git log -1 --pretty=%an%n%ae%n%B`.lines rescue nil
-      return unless lines
+      return unless @revision = normalize_string(shell("git rev-parse HEAD"))
+      return @revision unless log_stdout = shell("git log -1 --pretty=%an%n%ae%n%B")
+      lines = log_stdout.lines
       @author = normalize_string(lines[0])
       @email = normalize_string(lines[1])
       @description = lines[2..-1] && normalize_string(lines[2..-1].join)
@@ -75,8 +75,8 @@ module RorVsWild
     def self.read_from_capistrano
       return unless File.readable?("REVISION")
       return unless @revision = File.read("REVISION")
-      lines = `git --git-dir ../../repo log --format=%an%n%ae%n%B -n 1 #{@revision}`.lines rescue nil
-      return unless lines
+      return unless stdout = shell("git --git-dir ../../repo log --format=%an%n%ae%n%B -n 1 #{@revision}")
+      lines = stdout.lines
       @author = normalize_string(lines[0])
       @email = normalize_string(lines[1])
       @description = lines[2..-1] && normalize_string(lines[2..-1].join)
@@ -89,5 +89,10 @@ module RorVsWild
         string.empty? ? nil : string
       end
     end
+
+    def self.shell(command)
+      stdout, stderr, process = Open3.capture3(command) rescue nil
+      stdout if process && process.success?
+    end
   end
 end

data/lib/rorvswild/local/local.html.erb

@@ -55,8 +55,7 @@
       {{/currentRequest}}
     </div>
     <div class="rorvswild-local-panel__footer">
-      This data is not sent to rorvswild.com. To Monitor your production environment,
-      <a href="https://www.rorvswild.com" class="rorvswild-local-panel__footer__link">create an account</a>.
+      This data is not sent to rorvswild.com. <a href="https://www.rorvswild.com" class="rorvswild-local-panel__footer__link">Create an account</a> to monitor your production environment.
     </div>
   </div>
 

data/lib/rorvswild/local/stylesheet/local.css

@@ -3,10 +3,11 @@
 /********************************************/
 
 .rorvswild-local-toggler {
-  background: #1d242f !important;
-  color: #80abe3 !important;
-  box-shadow: 0 0 0 1px rgba(159, 169, 187, 0.3), 0 1px 4px 0px rgba(25, 32, 42, 0.9) !important;
-  border-radius: 4px !important;
+  background: rgb(16, 20, 28) !important;
+  color: rgb(135,173,250) !important;
+  font-weight: 700 !important;
+  box-shadow: 0 0 0 1px rgba(69,74,84,1) inset, 0 1px 4px 0px rgba(14,18,26,0.96) !important;
+  border-radius: 2px !important;
   font-family: SF Mono, Menlo, Consolas, DejaVu Sans Mono, monospace !important;
   font-size: 15px !important;
   line-height: 24px !important;
@@ -19,8 +20,9 @@
 }
 
 .rorvswild-local-toggler small {
-  color: #9fa9bb !important;
-  font-size: 12px !important;
+  color: rgb(133,139,150) !important;
+  font-weight: 400 !important;
+  font-size: 10px !important;
   margin-left: 4px !important;
   display: inline-block !important;
 }
@@ -54,9 +56,10 @@
 /********************************************/
 
 .rorvswild-local-panel {
-  background: #1d242f !important;
-  box-shadow: 0 0 0 48px rgba(25, 32, 42, 0.9) !important;
-  color: #eceef1 !important;
+  background: rgb(16,20,28) !important;
+  box-shadow: 0 0 0 48px rgba(69,74,84, 0.95),
+    0 1px 16px 2px rgba(14,18,26,0.96) !important;
+  color: rgb(168,174,186) !important;
   font-family: SF Mono, Menlo, Consolas, DejaVu Sans Mono, monospace !important;
   font-size: 15px !important;
   line-height: 24px !important;
@@ -88,34 +91,35 @@
 }
 
 .rorvswild-local-panel ::-moz-selection {
-  background: #eceef1 !important;
-  color: #222835 !important;
+  background: rgb(69,74,84) !important;
+  color: rgb(219,234,241) !important;
 }
 
 .rorvswild-local-panel ::selection {
-  background: #eceef1 !important;
-  color: #222835 !important;
+  background: rgb(69,74,84) !important;
+  color: rgb(219,234,241) !important;
 }
 
 .rorvswild-local-panel small {
-  color: #9fa9bb !important;
-  font-size: 12px !important;
-  margin-left: 4px !important;
+  color: rgb(133,139,150) !important;
+  font-size: 10px !important;
+  font-weight: 400 !important;
+  margin-left: 2px !important;
 }
 
 /* Panel Header */
 .rorvswild-local-panel__header {
-  background: #212834 !important;
+  background: rgb(24,28,36) !important;
   z-index: 100000000000000005 !important;
   padding: 12px !important;
-  box-shadow: 0 1px 2px 0 rgba(25, 32, 42, .8) !important;
+  box-shadow: 0 1px 2px 0 rgba(14,18,26, .8) !important;
   display: -webkit-box;
   display: -ms-flexbox;
   display: flex;
 }
 
 .rorvswild-local-panel__header__title {
-  color: #9fa9bb !important;
+  color: rgb(168,174,186) !important;
   text-transform: uppercase !important;
   font-size: 12px !important;
   letter-spacing: 2px !important;
@@ -131,13 +135,13 @@
   stroke-width: 2 !important;
   fill: none !important;
   stroke-linecap: square !important;
-  stroke: #9fa9bb !important;
+  stroke: rgb(133,139,150) !important;
   stroke-miterlimit: 10 !important;
   vertical-align: middle !important;
 }
 
 .rorvswild-local-panel svg:hover {
-  stroke: #eceef1 !important;
+  stroke: rgb(193,204,214) !important;
 }
 
 .rorvswild-local-panel__logo {
@@ -161,12 +165,12 @@
 
 .rorvswild-local-panel__github svg {
   stroke: none !important;
-  fill: #9fa9bb !important;
+  fill: rgb(133,139,150) !important;
 }
 
 .rorvswild-local-panel__github svg:hover {
   stroke: none !important;
-  fill: #eceef1 !important;
+  fill: rgb(193,204,214) !important;
 }
 
 /* Panel Content */
@@ -179,7 +183,7 @@
   overflow-x: auto !important;
 }
 
-.rorvswild-local-panel__content::-webkit-scrollbar { width: 3px !important; }
+.rorvswild-local-panel__content::-webkit-scrollbar { width: 4px !important; }
 
 .rorvswild-local-panel__content::-webkit-scrollbar-corner { background: transparent !important; }
 
@@ -189,8 +193,8 @@
 }
 
 .rorvswild-local-panel__content::-webkit-scrollbar-thumb {
-  background-color: #9fa9bb !important;
-  outline: 1px solid #9fa9bb !important;
+  background-color: rgb(100,106,116) !important;
+  outline: 1px solid rgb(100,106,116) !important;
 }
 
 /* Panel request summary */
@@ -200,30 +204,36 @@
   display: -ms-flexbox !important;
   display: flex !important;
   padding: 12px 12px 11px !important;
-  border-bottom: 1px solid rgba(25, 32, 42, 1) !important;
+  border-bottom: 1px solid rgb(24,28,36) !important;
   cursor: pointer !important;
   -ms-flex-wrap: wrap !important;
   flex-wrap: wrap !important;
 }
 
-.rorvswild-local-panel__request:hover { background: #222835 !important; }
+.rorvswild-local-panel__request:hover { background: rgb(21,25,34) !important; }
 
 .rorvswild-local-panel__request__name {
   word-break: break-all !important;
   overflow-wrap: break-word !important;
   width: 100% !important;
+  color: rgb(193,204,214) !important;
+  font-weight: 700;
 }
 
 .rorvswild-local-panel__request__path {
-  color: #9fa9bb !important;
+  color: rgb(133,139,150) !important;
+  font-weight: 400;
   display: block !important;
 }
 
 .rorvswild-local-panel__request__started-at {
-  color: #9fa9bb !important;
+  color: rgb(133,139,150) !important;
   margin-left: 12px !important;
 }
-.rorvswild-local-panel__request__runtime { color: #80abe3 !important; }
+.rorvswild-local-panel__request__runtime { 
+  color: rgb(135,173,250) !important; 
+  font-weight: bold !important;
+}
 
 /* Panel request details */
 
@@ -257,12 +267,12 @@ h2.rorvswild-local-panel__request__name__title {
 
 .rorvswild-local-panel__request-details__section {
   padding: 12px 12px 11px !important;
-  border-bottom: 1px solid rgba(25, 32, 42, 1) !important;
+  border-bottom: 1px solid rgb(24,28,36) !important;
   display: block !important;
 }
 
 .rorvswild-local-panel__request-details__section:hover {
-  background: #212834 !important;
+  background: rgb(21,25,34) !important;
   -webkit-transition: all .3s !important;
   transition: all .3s !important;
 }
@@ -281,22 +291,26 @@ h2.rorvswild-local-panel__request__name__title {
   word-break: break-all !important;
   overflow-wrap: break-word !important;
   min-width: 0 !important;
+  color: rgb(193,204,214) !important;
 }
 
 .rorvswild-local-panel__request-details__section__average {
-  color: #80abe3 !important;
+  color: rgb(135,173,250) !important;
+  font-weight: 700 !important;
   width: 48px !important;
   margin:0 12px 0 0 !important;
 }
 
 .rorvswild-local-panel__request-details__section__calls {
-  color: #9fa9bb !important;
+  color: rgb(168,174,186) !important;
   width: 48px !important;
   margin: 0 12px 0 0 !important;
 }
 
 .rorvswild-local-panel__request-details__section__impact {
+  color: rgb(193,204,214) !important;
   width: 48px !important;
+  font-weight: 700 !important;
   margin: 0 12px 0 0 !important;
 }
 
@@ -304,10 +318,12 @@ h2.rorvswild-local-panel__request__name__title {
   display: -webkit-box !important;
   display: -ms-flexbox !important;
   display: flex !important;
+  color: rgb(133,139,150) !important;
+  margin-top: 8px !important;
 }
 
 .rorvswild-local-panel__request-details__section__kind {
-  background: rgba(25, 32, 42, 1) !important;
+  background: rgb(40,44,54) !important;
   font-size: 10px !important;
   text-transform: uppercase !important;
   text-align: center !important;
@@ -318,7 +334,7 @@ h2.rorvswild-local-panel__request__name__title {
 }
 
 .rorvswild-local-panel__request-details__section__command {
-  color: #9fa9bb !important;
+  color: rgb(133,139,150) !important;
   -webkit-box-flex: 1 !important;
   -ms-flex: 1 !important;
   flex: 1 !important;
@@ -331,14 +347,14 @@ h2.rorvswild-local-panel__request__name__title {
 
 .rorvswild-local-panel__footer {
   width: 100% !important;
-  background: #212834 !important;
-  color: #9fa9bb !important;
+  background: rgb(40,44,54) !important;
+  color: rgb(168,174,186) !important;
   padding: 12px !important;
   text-align: center !important;
 }
 
 a.rorvswild-local-panel__footer__link {
-  color: #eceef1 !important;
+  color: rgb(193,204,214) !important;
   text-decoration: underline !important;
   line-height: inherit !important;
 }

data/lib/rorvswild/local/stylesheet/vendor/prism.css

@@ -7,7 +7,7 @@ http://prismjs.com/download.html?themes=prism-twilight&languages=markup+css+clik
  */
 .rorvswild-local-panel code[class*="language-"],
 .rorvswild-local-panel pre[class*="language-"] {
-  color: #9fa9bb !important;
+  color: rgb(133,139,150) !important;
   background: none !important;
   font-family: SF Mono, Menlo, Consolas, DejaVu Sans Mono, monospace !important;
   text-align: left !important;
@@ -60,7 +60,7 @@ http://prismjs.com/download.html?themes=prism-twilight&languages=markup+css+clik
 .rorvswild-local-panel .token.prolog,
 .rorvswild-local-panel .token.doctype,
 .rorvswild-local-panel .token.cdata {
-  color: #9fa9bb !important;
+  color: rgb(133,139,150) !important;
   font-style: italic !important;
   opacity: 0.7 !important;
 }
@@ -77,7 +77,7 @@ http://prismjs.com/download.html?themes=prism-twilight&languages=markup+css+clik
 .rorvswild-local-panel .token.boolean,
 .rorvswild-local-panel .token.number,
 .rorvswild-local-panel .token.deleted {
-  color: #e79199 !important;
+  color: rgb(195,116,112) !important;
 }
 
 .rorvswild-local-panel .token.property,
@@ -85,7 +85,7 @@ http://prismjs.com/download.html?themes=prism-twilight&languages=markup+css+clik
 .rorvswild-local-panel .token.symbol,
 .rorvswild-local-panel .token.builtin,
 .rorvswild-local-panel .token.string {
-  color: #69b3c8 !important;
+  color: rgb(108,138,200) !important;
 }
 
 .rorvswild-local-panel .token.attr-name,
@@ -98,17 +98,17 @@ http://prismjs.com/download.html?themes=prism-twilight&languages=markup+css+clik
 .rorvswild-local-panel .token.atrule,
 .rorvswild-local-panel .token.attr-value,
 .rorvswild-local-panel .token.keyword {
-  color: #e189e2 !important;
+  color: rgb(171,120,176) !important;
 }
 
 .rorvswild-local-panel .token.constant,
 .rorvswild-local-panel .token.regex,
 .rorvswild-local-panel .token.important {
-  color: #bfa661 !important;
+  color: rgb(167,133,61) !important;
 }
 
 .rorvswild-local-panel .token.function {
-  color: #80abe3 !important;
+  color: rgb(30,151,162) !important;
 }
 
 .rorvswild-local-panel .token.important,
@@ -132,5 +132,5 @@ http://prismjs.com/download.html?themes=prism-twilight&languages=markup+css+clik
 .rorvswild-local-panel .language-markup .token.tag,
 .rorvswild-local-panel .language-markup .token.attr-name,
 .rorvswild-local-panel .language-markup .token.punctuation {
-  color: #9fa9bb !important;
+  color: rgb(133,139,150) !important;
 }

data/lib/rorvswild/plugin/active_job.rb

@@ -16,6 +16,8 @@ module RorVsWild
             section.file, section.line = job.method(:perform).source_location
             section.file = RorVsWild.agent.locator.relative_path(section.file)
             block.call
+          rescue Exception => ex
+            job.rescue_with_handler(ex) or raise
           ensure
             RorVsWild::Section.stop
           end

data/lib/rorvswild/plugin/active_record.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RorVsWild
   module Plugin
     class ActiveRecord
@@ -19,8 +21,8 @@ module RorVsWild
         return if IGNORED_QUERIES.include?(payload[:name])
         RorVsWild::Section.start do |section|
           section.appendable_command = APPENDABLE_QUERIES.include?(payload[:sql])
-          section.command = payload[:sql]
-          section.kind = "sql".freeze
+          section.command = normalize_sql_query(payload[:sql])
+          section.kind = "sql"
         end
       end
 
@@ -28,6 +30,24 @@ module RorVsWild
         return if IGNORED_QUERIES.include?(payload[:name])
         RorVsWild::Section.stop
       end
+
+      SQL_STRING_REGEX = /'((?:''|\\'|[^'])*)'/
+      SQL_NUMERIC_REGEX = /(?<!\w)\d+(\.\d+)?(?!\w)/
+      SQL_PARAMETER_REGEX = /\$\d+/
+      SQL_IN_REGEX = /(\bIN\s*\()([^)]+)(\))/i
+      SQL_ONE_LINE_COMMENT_REGEX =/--.*$/
+      SQL_MULTI_LINE_COMMENT_REGEX = /\/\*.*?\*\//m
+
+      def normalize_sql_query(sql)
+        sql = sql.to_s.gsub(SQL_STRING_REGEX, "?")
+        sql.gsub!(SQL_PARAMETER_REGEX, "?")
+        sql.gsub!(SQL_NUMERIC_REGEX, "?")
+        sql.gsub!(SQL_IN_REGEX, '\1?\3')
+        sql.gsub!(SQL_ONE_LINE_COMMENT_REGEX, "")
+        sql.gsub!(SQL_MULTI_LINE_COMMENT_REGEX, "")
+        sql.strip!
+        sql
+      end
     end
   end
 end

data/lib/rorvswild/queue.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RorVsWild
   class Queue
     SLEEP_TIME = 10
@@ -56,6 +58,7 @@ module RorVsWild
     end
 
     def flush_indefinetely
+      client.post("/deployments", deployment: Deployment.to_h)
       sleep(SLEEP_TIME) and flush while true
     rescue Exception => ex
       RorVsWild.logger.error(ex)

data/lib/rorvswild/section.rb

@@ -61,7 +61,7 @@ module RorVsWild
       total_runtime - children_runtime
     end
 
-    COMMAND_MAX_SIZE = 1000
+    COMMAND_MAX_SIZE = 1_000
 
     def command=(value)
       @command = value && value.size > COMMAND_MAX_SIZE ? value[0, COMMAND_MAX_SIZE] + " [TRUNCATED]" : value

data/lib/rorvswild/version.rb

@@ -1,3 +1,3 @@
 module RorVsWild
-  VERSION = "1.6.2".freeze
+  VERSION = "1.6.3".freeze
 end

data/lib/rorvswild.rb

@@ -68,6 +68,7 @@ module RorVsWild
 
   def self.check
     api_key = RorVsWild.agent.config[:api_key]
+    agent.client.instance_variable_set(:@http_unauthorized, false)
     return puts "You API key is missing and has to be defined in config/rorvswild.yml." if !api_key || api_key.empty?
     puts case response = agent.client.post("/jobs", jobs: [{sections: [], name: "RorVsWild.check", runtime: 0}])
     when Net::HTTPOK then "Connection to RorVsWild works fine !"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rorvswild
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Alexis Bernard
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-23 00:00:00.000000000 Z
+date: 2023-11-17 00:00:00.000000000 Z
 dependencies: []
 description: Performances and errors insights for rails developers.
 email: