rorvswild 1.6.2 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34fc75a952dcdd5b7291e2227f2f59da531413338f0fb91ea64a61245b9368af
-  data.tar.gz: daab97444a9876ef871ca0c2832afd667cfb986fc1e101c36c97f3880f700b1a
+  metadata.gz: cd38e8268715a48ce8f49f648317660e41a512d80bb445d3f1ae7800ff13c7a8
+  data.tar.gz: 310aac7f6ac148f387e03f690eb7b54bfe8d1a25a0f450ccfdb2ec21245b7d28
 SHA512:
-  metadata.gz: 3986c7c35162a29f6f4173fa4ce6728fea1eac8d2c4293fc275f850b885fb0eb472c4a3be85a473761295322aa10c490f2ad1e4ae198b4528075033eb8c977db
-  data.tar.gz: 94ecd7c5f04ecbf7608f5fd37467ebfa5d49e8f6f5e50d2be4822d4cb695c65e15daa325c8843a2f04b6c841803040dfdb020e055bb961f6122101119e1e04df
+  metadata.gz: 4975dcbaaf1df79282ca4e46277c201bbb21443ab3f59a1c44f3bd96573ca8ed56a25c748f5bd29e38dbe154c11cdae475768229603c9da6e16c2b505bf972c0
+  data.tar.gz: ff0593aa35f2e9352e66f87e9c0a8a6e2d99803b8740325755790b84eb5fc681646fa50f19935595d4534f513dc5113424326f4b180707d288467ff7d3be8293

data/README.md

@@ -4,28 +4,29 @@
 [![Gem Version](https://badge.fury.io/rb/rorvswild.svg)](https://badge.fury.io/rb/rorvswild)
 [![Maintainability](https://api.codeclimate.com/v1/badges/2c4805cf658d7af794fe/maintainability)](https://codeclimate.com/github/BaseSecrete/rorvswild/maintainability)
 
-<img align="right" src="./images/rorvswild_logo.jpg">
+<img align="right" width="120px" src="./images/rorvswild_logo.jpg">
 
 *RoRvsWild* is a ruby gem to monitor performances and exceptions in Ruby on Rails applications.
 
-This gem has a double mode, development and production.
-It can be used without an account to monitor your requests performances in your development environment.
+This gem has a double mode, **development** and **production**.  
+It can be used without an account to monitor your requests performances in your development environment.  
 It can also be used in your production and staging environments with an account on https://rorvswild.com. With such an account you also get extra benefits such as 30 day trace, background jobs monitoring, exceptions monitoring and notifications.
 
+## Development mode
 
-## Installation
-
-#### Install the gem
+### Install the gem
 
 * Add in your Gemfile `gem "rorvswild"`
 * Run `bundle install` in you terminal
 * Restart your local server and you’ll see a small button in the bottom left corner of your page.
 
-![RoRvsWild Local Button](./images/rorvswild_local_button.jpg)
+<img width="166px" src="./images/rorvswild_local_button.png">
+
+Click on the button, or navigate to http://localhost:3000/rorvswild to see the details panel:
 
-This is all what you need to do to monitor your local environment requests.
+![RoRvsWild Local](./images/rorvswild_local.png)
 
-#### API key
+## Production mode
 
 **To monitor your production or staging environment, you need an API key.**
 Signup on https://www.rorvswild.com and create an app to get one.
@@ -36,260 +37,10 @@ Signup on https://www.rorvswild.com and create an app to get one.
 * Deploy/Restart your app
 * Make a few requests and refresh your app page on rorvswild.com to view the dashboard.
 
-The `rorvswild-install` command creates a `config/rorvswild.yml` file.
-
-If you prefer to use an initializer, you can do the following:
-
-```ruby
-# config/initializers/rorvswild.rb
-RorVsWild.start(api_key: API_KEY)
-```
-
-You can create unlimited apps on *rorvswild.com*. If you want to monitor your staging environment, create a new app and edit your rorvswild.yml to add the API key.
-
-In case there is no data in the dashboard, you can run in a rails console : `RorVsWild.check`.
-
-## Development mode: *RoRvsWild Local*
-
-![RoRvsWild Local](./images/rorvswild_local.jpg)
-
-*RorVsWild Local* monitors the performances of requests in development environment.
-It shows most of the requests performances insights *RoRvsWild.com* displays. **A big difference is everything works locally and no data is sent and recorded on our servers**. You don’t even need an account to use it.
-
-*RoRvsWild Local* renders a small button in the bottom left corner of your page showing the runtime of the current request. If you click on it, you get all the profiled sections ordered by impact, which is depending on the sections average runtime and the calls count. As on RoRvsWild.com, the bottleneck is always on the top of the list.
-
-You may want to hide or change the widget position like in the example below with the `widget` option :
-
-```yaml
-# config/rorvswild.yml
-
-development:
-  widget: top-right 
-  
-#accepted values : top-left, top-right, bottom-right, bottom-left (default), hidden
-```
-
-You can still access the profiler at http://localhost:3000/rorvswild if you choose to hide the widget.
-
-Be aware that the performances on your development machine may vary from the production server. Obviously because of the different hardware and database size. Also, Rails is reloading all the code in development environment and this takes quite a lot of time.
-To prevent this behaviour and better match the production, turn on cache_classes in your config/environments/development.rb:
-
-```
-Rails.application.configure do
-  config.cache_classes = true
-end
-```
-
-If you are using `Rack::Deflater` middleware you won't see the small button in the corner. Because of the compression it is not possible to inject some JavaScript into the page. In that case visit http://localhost:3000/rorvswild to see the profiler.
-
-## Production mode: *RoRvsWild.com*
-
-![RoRvsWild.com](./images/rorvswild_prod.jpg)
-
-*RoRvsWild.com* makes it easy to monitor requests, background jobs and errors in your production and staging environment.
-It also comes with some extra options listed below.
-
-#### Measure any section of code
-
-RorVsWild measures a lot of events such as SQL queries. But it might not be enough for you. There is a solution to measure any section of code to help you find the most hidden bottlenecks.
-
-```ruby
-# Measure a code given as a string
-RorVsWild.measure("bubble_sort(array)")
-
-# Measure a code given as a block
-RorVsWild.measure { bubble_sort(array) }
-
-# Measure a code given as a block with an optional description
-RorVsWild.measure("Optional description") { bubble_sort(array) }
-```
-
-For each custom measure, a section is added with the file name and line number where it has been called.
-
-#### Send errors manually
-
-When you already have a begin / rescue block, this manner suits well:
-
-```ruby
-begin
-  # Your code ...
-rescue => exception
-  RorVsWild.record_error(exception)
-end
-```
-
-If you prefer to be concise, just run the code from a block:
-
-```ruby
-RorVsWild.catch_error { 1 / 0 }  # => #<ZeroDivisionError: divided by 0>
-```
-
-Moreover, you can provide extra details when capturing errors:
-
-```ruby
-RorVsWild.record_error(exception, {something: "important"})
-```
-
-```ruby
-RorVsWild.catch_error(something: "important") { 1 / 0 }
-```
-
-It is also possible to pre-fill this context data at the begining of each request or job :
-
-```ruby
-class ApplicationController < ActionController::Base
-  before_action :prefill_error_context
-
-  def prefill_error_context
-    RorVsWild.merge_error_context(something: "important")
-  end
-end
-```
-
-#### Ignore requests, jobs, exceptions and plugins
-
-From the configuration file, you can tell RorVsWild to skip monitoring some requests, jobs, exceptions and plugins.
-
-```yaml
-# config/rorvswild.yml
-production:
-  api_key: API_KEY
-  ignore_requests:
-    - HeartbeatController#show
-    - !ruby/regexp /SecretController/ # Ignore the entire controller
-  ignore_jobs:
-    - SecretJob
-    - !ruby/regexp /Secret::/ # Ignore the entire Secret namespace
-  ignore_exceptions:
-    - ActionController::RoutingError  # Ignore by default any 404
-    - ZeroDivisionError
-    - !ruby/regexp /Secret::/ # Ignore all secret errors
-  ignore_plugins:
-    - Sidekiq # If you don't want to monitor your Sidekiq jobs
-```
-
-Here is the equivalent if you prefer initialising RorVsWild manually.
-
-```ruby
-# config/initializers/rorvswild.rb
-RorVsWild.start(
-  api_key: "API_KEY",
-  ignore_requests: ["ApplicationController#heartbeat", /SecretController/],
-  ignore_jobs: ["SecretJob", /Secret::/],
-  ignore_exceptions: ["ActionController::RoutingError", "ZeroDivisionError", /Secret::/],
-  ignore_plugins: ["Sidekiq"])
-```
-
-Finally here is the list of all plugins you can ignore :
-
-  - ActionController
-  - ActionMailer
-  - ActionView
-  - ActiveJob
-  - ActiveRecord
-  - DelayedJob
-  - Elasticsearch
-  - Mongo
-  - NetHttp
-  - Redis
-  - Resque
-  - Sidekiq
-
-#### Change logger
-
-By default RorVsWild uses `Rails.logger` or standard output. However in some cases you want to isolate RorVsWild's logs.
-To do that, you have to specifiy the log destination via the `logger` option :
-
-```yaml
-# config/rorvswild.yml
-production:
-  api_key: API_KEY
-  logger: log/rorvswild.yml
-```
-
-Here is the equivalent if you prefer initialising RorVsWild manually :
-
-```ruby
-# config/initializers/rorvswild.rb
-RorVsWild.start(api_key: "API_KEY", logger: "log/rorvswild.log")
-```
-
-In the case you want a custom logger such as Syslog, you can only do it by initialising it manually :
-
-```ruby
-# config/initializers/rorvswild.rb
-RorVsWild.start(api_key: "API_KEY", logger: Logger::Syslog.new)
-```
-
-### Deployment tracking
-
-Since version 1.6.0, RorVsWild compares performances between each deployment.
-That is convenient to detect quickly a performance deterioration.
-
-It is working without any actions from your part if the application is :
-
-- Deployed via Capistrano
-- Inside a Git repositoriy
-- Hosted on Heroku if [Dyno metadata](https://devcenter.heroku.com/articles/dyno-metadata) is enabled
-- Hosted on Scalingo
-
-Because we are not aware of all cloud hosting providers, there is a generic method to provide these data via the configuration :
-
-```yaml
-# config/rorvswild.yml
-production:
-  api_key: API_KEY
-  deployment:
-    revision: <%= "Anything that will return the deployment version" %> # Mandatory
-    description: <%= "Eventually if you have a description such as a Git message" %>
-    author: <%= "Author's name of the deployment" %>
-    email: <%= "emailOf@theAuthor.com" %>
-```
-
-Here is the equivalent if you prefer initialising RorVsWild manually :
-
-```ruby
-# config/initializers/rorvswild.rb
-RorVsWild.start(api_key: "API_KEY", deployment: {
-  revision: "Unique version number such as Git commit ID",
-  description: "Message such as in Git",
-  author: "Deployer's name",
-  email: "Deployer's email"
-})
-```
-
-Only the revision is mandatory, but it's better if you are able to provide more information.
-
-
-#### Server metrics monitoring
-
-Since version 1.6.0 RorVsWild monitors server metrics such as load average, CPU, memory, swap and disk space.
-For now, only Linux is supported.
-The data are available in a server tab beside requests and jobs.
-
-Metrics are grouped by hostnames.
-Cloud providers give random hostnames which change on every deployment.
-You can manually define them:
-
-```yaml
-# config/rorvswild.yml
-production:
-  api_key: API_KEY
-  server:
-    name: <%= "Some code that return a relevant hostname" %>
-```
-
-Here is the equivalent if you prefer initialising RorVsWild manually :
+![RoRvsWild Production](./images/rorvswild_prod.png)
 
-```ruby
-# config/initializers/rorvswild.rb
-RorVsWild.start(api_key: "API_KEY", server: {name: "host.name"})
-```
+## Full documentation
 
-## Contributing
+- [Installation](https://www.rorvswild.com/docs/get-started/installation)
+- [Configuration](https://www.rorvswild.com/docs/get-started/configuration)
 
-1. Fork it ( https://github.com/[my-github-username]/rorvswild/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request

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"
@@ -7,7 +9,7 @@ module RorVsWild
   class Client
     HTTPS = "https".freeze
     CERTIFICATE_AUTHORITIES_PATH = File.expand_path("../../../cacert.pem", __FILE__)
-    DEFAULT_TIMEOUT = 3
+    DEFAULT_TIMEOUT = 10
 
     attr_reader :api_url, :api_key, :timeout, :threads
 
@@ -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/installer.rb

@@ -17,6 +17,16 @@ module RorVsWild
 
     def self.template(api_key)
       <<YAML
+development:
+  # Widget position
+  # widget: top-left, top-right, bottom-left, bottom-right or hidden
+
+  # Open files in your text editor by clicking from the local widget.
+  # VSCode: vscode://file${path}:${line}
+  # Sublime: subl://${path}:${line}
+  # It should be set with an env variable when developers are not using the same editor.
+  editor_url: <%= ENV.fetch("RORVSWILD_EDITOR_URL", "vscode://file${path}:${line}") %>
+
 production:
   api_key: #{api_key}
   # ignore_requests: # Do not monitor the following actions
@@ -46,7 +56,7 @@ production:
   #   revision: <%= "Anything that will return the deployment version" %> # Mandatory
   #   description: <%= "Eventually if you have a description such as a Git message" %>
   #   author: <%= "Author's name of the deployment" %>
-    #   email: <%= "emailOf@theAuthor.com" %>
+  #   email: <%= "emailOf@theAuthor.example" %>
 YAML
     end
   end

data/lib/rorvswild/local/javascript/local.js

@@ -3,6 +3,7 @@ var RorVsWild = this.RorVsWild = {};
 RorVsWild.Local = function(container) {
   this.root = container
   this.embedded = !(this.active = location.pathname == "/rorvswild")
+  RorVsWild.Local.editorUrl = container.getAttribute("data-editor-url")
   this.fetchData()
 }
 
@@ -44,6 +45,7 @@ RorVsWild.Local.prototype.expand = function() {
   this.currentRequest = this.requests[0]
   this.active = true
   this.render()
+  window.addEventListener("keydown", this.keydown.bind(this))
 }
 
 RorVsWild.Local.prototype.collapse = function() {
@@ -51,6 +53,11 @@ RorVsWild.Local.prototype.collapse = function() {
   this.render()
 }
 
+RorVsWild.Local.prototype.keydown = function(event) {
+  if (event.key == "Escape")
+    this.collapse()
+}
+
 RorVsWild.Local.formatRuntime = function(runtime) {
   return runtime > 0 && runtime < 1 ? "<1" : Math.round(runtime)
 }
@@ -112,7 +119,7 @@ RorVsWild.Local.Request.prototype.runtime = function() {
 RorVsWild.Local.Request.prototype.sections = function() {
   return this.data.sections.map(function(section) {
     var runtime = (section.total_runtime - section.children_runtime)
-    return {
+    var object = {
       impact: RorVsWild.Local.formatImpact(runtime * 100 / this.data.runtime),
       averageRuntime: RorVsWild.Local.formatRuntime(runtime / section.calls),
       command: section.kind != "view" ? section.command : null,
@@ -123,5 +130,10 @@ RorVsWild.Local.Request.prototype.sections = function() {
       runtime: runtime,
       language: RorVsWild.Local.kindToLanguage(section.kind),
     }
+    if (RorVsWild.Local.editorUrl) {
+      var path = section.file[0] == "/" ? section.file : this.data.environment.cwd + "/" + section.file
+      object.url = RorVsWild.Local.editorUrl.replace("${path}", path).replace("${line}", section.line)
+    }
+    return object
   }.bind(this)).sort(function(a, b) { return b.runtime - a.runtime })
 }

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

@@ -1,5 +1,5 @@
 <div id="RorVsWild.Local" class="<%= widget_css %>">
-  <div data-barber="RorVsWild.Local">
+  <div data-barber="RorVsWild.Local" data-editor-url="<%= editor_url %>">
   </div>
 </div>
 
@@ -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>
 
@@ -102,7 +101,12 @@
   <div class="rorvswild-local-panel__request-details__section">
     <div class="rorvswild-local-panel__request-details__section__main">
       <span class="rorvswild-local-panel__request-details__section__file">
-        {{file}}:{{line}}
+        {{#url}}
+          <a href="{{url}}" class="rorvswild-local-panel__request-details__section__file__name" title="Open in your editor">{{file}}<span>:{{line}}</span></a>
+        {{/url}}
+        {{^url}}
+          <span class="rorvswild-local-panel__request-details__section__file__name">{{file}}<span>:{{line}}</span></span>
+        {{/url}}
         <div class="rorvswild-local-panel__request-details__section__code">
           <span class="rorvswild-local-panel__request-details__section__kind">{{kind}}</span>
           <span class="rorvswild-local-panel__request-details__section__command">

data/lib/rorvswild/local/middleware.rb

@@ -61,6 +61,10 @@ module RorVsWild
         config && config[:widget] && "is-#{config[:widget]}"
       end
 
+      def editor_url
+        RorVsWild.agent.config[:editor_url]
+      end
+
       def inject_into(html)
         if index = html.index("</body>")
           markup = File.read(File.join(LOCAL_FOLDER, "local.html.erb"))

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

@@ -1,12 +1,10 @@
-/********************************************/
-/************* TOGGLER **********************/
-/********************************************/
-
+/* TOGGLER */
 .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(17 20 27) !important;
+  color: rgb(182 202 255) !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;
@@ -15,18 +13,18 @@
   left: 12px !important;
   padding: 0 12px !important;
   cursor: pointer !important;
-  z-index: 100000000000000003 !important;
+  z-index: 99999999999999999 !important;
 }
 
 .rorvswild-local-toggler small {
-  color: #9fa9bb !important;
-  font-size: 12px !important;
+  color: rgb(146 149 159) !important;
+  font-weight: 400 !important;
+  font-size: 10px !important;
   margin-left: 4px !important;
   display: inline-block !important;
 }
 
-/************* TOGGLER POSITION OPTION(default bottom-left)**********************/
-
+/* TOGGLER POSITION OPTION (default bottom-left) */
 .is-top-right .rorvswild-local-toggler {
   bottom: auto !important;
   left: auto !important;
@@ -45,38 +43,29 @@
   right: 12px !important;
 }
 
-.is-hidden .rorvswild-local-toggler {
-  display: none;
-}
-
-/********************************************/
-/*************** PANEL **********************/
-/********************************************/
+.is-hidden .rorvswild-local-toggler { display: none; }
 
+/* PANEL */
 .rorvswild-local-panel {
-  background: #1d242f !important;
-  box-shadow: 0 0 0 48px rgba(25, 32, 42, 0.9) !important;
-  color: #eceef1 !important;
+  background: rgb(17 20 27) !important;
+  color: rgb(199 203 214) !important;
   font-family: SF Mono, Menlo, Consolas, DejaVu Sans Mono, monospace !important;
   font-size: 15px !important;
   line-height: 24px !important;
   position: fixed !important;
-  top: 12px !important;
-  left: 12px !important;
-  right: 12px !important;
-  bottom: 48px !important;
+  top: 0 !important;
+  left: 0 !important;
+  right: 0 !important;
+  bottom: 0 !important;
   z-index: 100000000000000000 !important;
-  overflow: hidden !important;
-  display: -webkit-box !important;
-  display: -ms-flexbox !important;
   display: flex !important;
-  -webkit-box-orient: vertical !important;
-  -webkit-box-direction: normal !important;
-      -ms-flex-direction: column !important;
-          flex-direction: column !important;
+  flex-direction: column !important;
+  overflow: hidden;
+  height: 100dvh;
 }
 
-.rorvswild-local-panel.is-hidden {
+.rorvswild-local-panel.is-hidden,
+.rorvswild-local-panel:not(.is-hidden) + .rorvswild-local-toggler {
   display: none !important;
 }
 
@@ -88,41 +77,37 @@
 }
 
 .rorvswild-local-panel ::-moz-selection {
-  background: #eceef1 !important;
-  color: #222835 !important;
+  background: rgb(71 75 83) !important;
+  color: rgb(224 228 239) !important;
 }
 
 .rorvswild-local-panel ::selection {
-  background: #eceef1 !important;
-  color: #222835 !important;
+  background: rgb(71 75 83) !important;
+  color: rgb(224 228 239) !important;
 }
 
 .rorvswild-local-panel small {
-  color: #9fa9bb !important;
-  font-size: 12px !important;
-  margin-left: 4px !important;
+  color: rgb(146 149 159) !important;
+  font-size: 10px !important;
+  font-weight: 400 !important;
+  margin-left: 2px !important;
 }
 
 /* Panel Header */
 .rorvswild-local-panel__header {
-  background: #212834 !important;
-  z-index: 100000000000000005 !important;
+  background: rgb(26 29 36) !important;
   padding: 12px !important;
-  box-shadow: 0 1px 2px 0 rgba(25, 32, 42, .8) !important;
-  display: -webkit-box;
-  display: -ms-flexbox;
+  box-shadow: 0 1px 2px 0 rgba(14,18,26, .8) !important;
   display: flex;
 }
 
 .rorvswild-local-panel__header__title {
-  color: #9fa9bb !important;
+  color: rgb(199 203 214) !important;
   text-transform: uppercase !important;
   font-size: 12px !important;
   letter-spacing: 2px !important;
   text-align: center !important;
-  -webkit-box-flex: 1;
-      -ms-flex: 1;
-          flex: 1;
+  flex: 1;
 }
 
 .rorvswild-local-panel svg {
@@ -131,26 +116,18 @@
   stroke-width: 2 !important;
   fill: none !important;
   stroke-linecap: square !important;
-  stroke: #9fa9bb !important;
+  stroke: rgb(146 149 159) !important;
   stroke-miterlimit: 10 !important;
   vertical-align: middle !important;
 }
 
-.rorvswild-local-panel svg:hover {
-  stroke: #eceef1 !important;
-}
+.rorvswild-local-panel svg:hover { stroke: rgb(199 203 214) !important; }
 
-.rorvswild-local-panel__logo {
-  width: 60px !important;
-}
+.rorvswild-local-panel__logo { width: 60px !important; }
 
 .rorvswild-local-panel__header__icons {
   width: 60px !important;
-  display: -webkit-box !important;
-  display: -ms-flexbox !important;
   display: flex !important;
-  -webkit-box-pack: end !important;
-  -ms-flex-pack: end !important;
   justify-content: flex-end !important;
 }
 
@@ -161,25 +138,23 @@
 
 .rorvswild-local-panel__github svg {
   stroke: none !important;
-  fill: #9fa9bb !important;
+  fill: rgb(146 149 159) !important;
 }
 
 .rorvswild-local-panel__github svg:hover {
   stroke: none !important;
-  fill: #eceef1 !important;
+  fill: rgb(199 203 214) !important;
 }
 
 /* Panel Content */
-
 .rorvswild-local-panel__content {
-  -webkit-box-flex: 1 !important;
-  -ms-flex: 1 !important;
   flex: 1 !important;
   height: calc(100% - 48px) !important;
-  overflow-x: auto !important;
+  overflow-y: auto;
+  overscroll-behavior: contain;
 }
 
-.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,44 +164,46 @@
 }
 
 .rorvswild-local-panel__content::-webkit-scrollbar-thumb {
-  background-color: #9fa9bb !important;
-  outline: 1px solid #9fa9bb !important;
+  background-color: rgb(146 149 159) !important;
+  outline: 1px solid rgb(146 149 159) !important;
 }
 
 /* Panel request summary */
-
 .rorvswild-local-panel__request {
-  display: -webkit-box !important;
-  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(26 29 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(26 29 36) !important; }
 
 .rorvswild-local-panel__request__name {
   word-break: break-all !important;
   overflow-wrap: break-word !important;
   width: 100% !important;
+  color: rgb(199 203 214) !important;
+  font-weight: 700;
 }
 
 .rorvswild-local-panel__request__path {
-  color: #9fa9bb !important;
+  color: rgb(146 149 159) !important;
+  font-weight: 400;
   display: block !important;
 }
 
 .rorvswild-local-panel__request__started-at {
-  color: #9fa9bb !important;
+  color: rgb(146 149 159) !important;
   margin-left: 12px !important;
 }
-.rorvswild-local-panel__request__runtime { color: #80abe3 !important; }
 
-/* Panel request details */
+.rorvswild-local-panel__request__runtime { 
+  color: rgb(182 202 255) !important; 
+  font-weight: 700 !important;
+}
 
+/* Panel request details */
 .rorvswild-local-panel__back-button {
   margin: 24px 12px 18px !important;
   cursor: pointer !important;
@@ -234,12 +211,9 @@
 }
 
 .rorvswild-local-panel__request-details__request {
-  display: -webkit-box !important;
-  display: -ms-flexbox !important;
   display: flex !important;
   margin-bottom: 48px !important;
   padding: 12px 12px 0 !important;
-  -ms-flex-wrap: wrap !important;
   flex-wrap: wrap !important;
 }
 
@@ -254,26 +228,21 @@ h2.rorvswild-local-panel__request__name__title {
 }
 
 /* details sections */
-
 .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(26 29 36) !important;
   display: block !important;
 }
 
 .rorvswild-local-panel__request-details__section:hover {
-  background: #212834 !important;
-  -webkit-transition: all .3s !important;
+  background: rgb(26 29 36) !important;
   transition: all .3s !important;
 }
 
 .rorvswild-local-panel__request-details__section__main {
-  display: -webkit-box !important;
-  display: -ms-flexbox !important;
   display: flex !important;
   width: 100% !important;
-  -ms-flex-wrap: wrap !important;
-      flex-wrap: wrap !important;
+  flex-wrap: wrap !important;
 }
 
 .rorvswild-local-panel__request-details__section__file {
@@ -281,33 +250,62 @@ h2.rorvswild-local-panel__request__name__title {
   word-break: break-all !important;
   overflow-wrap: break-word !important;
   min-width: 0 !important;
+  color: rgb(199 203 214) !important;
+}
+
+a.rorvswild-local-panel__request-details__section__file__name {
+  text-decoration-color: rgb(146 149 159);
+  font-weight: 700;
+}
+
+a.rorvswild-local-panel__request-details__section__file__name:hover { 
+  text-decoration-color: rgb(199 203 214);
+}
+
+a.rorvswild-local-panel__request-details__section__file__name::after {
+  content: '↗';
+  text-decoration: none;
+  display: inline-block;
+  margin-left: 4px;
+  opacity: 0.5;
+}
+
+a.rorvswild-local-panel__request-details__section__file__name:hover::after { opacity: 1; }
+
+.rorvswild-local-panel__request-details__section__file__name span {
+  background: rgb(38 41 49);
+  text-decoration: none;
+  display: inline-block;
 }
 
 .rorvswild-local-panel__request-details__section__average {
-  color: #80abe3 !important;
+  color: rgb(182 202 255) !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(199 203 214) !important;
   width: 48px !important;
   margin: 0 12px 0 0 !important;
 }
 
 .rorvswild-local-panel__request-details__section__impact {
+  color: rgb(199 203 214) !important;
   width: 48px !important;
+  font-weight: 700 !important;
   margin: 0 12px 0 0 !important;
 }
 
 .rorvswild-local-panel__request-details__section__code {
-  display: -webkit-box !important;
-  display: -ms-flexbox !important;
   display: flex !important;
+  color: rgb(146 149 159) !important;
+  margin-top: 8px !important;
 }
 
 .rorvswild-local-panel__request-details__section__kind {
-  background: rgba(25, 32, 42, 1) !important;
+  background: rgb(38 41 49) !important;
   font-size: 10px !important;
   text-transform: uppercase !important;
   text-align: center !important;
@@ -318,9 +316,7 @@ h2.rorvswild-local-panel__request__name__title {
 }
 
 .rorvswild-local-panel__request-details__section__command {
-  color: #9fa9bb !important;
-  -webkit-box-flex: 1 !important;
-  -ms-flex: 1 !important;
+  color: rgb(146 149 159) !important;
   flex: 1 !important;
   margin-left: 12px !important;
   opacity: 1;
@@ -328,55 +324,32 @@ h2.rorvswild-local-panel__request__name__title {
 }
 
 /* Panel Footer */
-
 .rorvswild-local-panel__footer {
   width: 100% !important;
-  background: #212834 !important;
-  color: #9fa9bb !important;
+  background: rgb(38 41 49) !important;
+  color: rgb(182 202 255) !important;
   padding: 12px !important;
   text-align: center !important;
 }
 
 a.rorvswild-local-panel__footer__link {
-  color: #eceef1 !important;
+  color: rgb(199 203 214) !important;
   text-decoration: underline !important;
   line-height: inherit !important;
 }
 
-/* MEDIA QUERIES */
-
 @media screen and (min-width: 720px) {
-  .rorvswild-local-panel__request-details__section__main {
-    -ms-flex-wrap: nowrap !important;
-    flex-wrap: nowrap !important;
-  }
+  .rorvswild-local-panel__request-details__section__main { flex-wrap: nowrap !important; }
 
-  .rorvswild-local-panel__request__name {
-    -webkit-box-flex: 1 !important;
-    -ms-flex: 1 !important;
-    flex: 1 !important;
-  }
+  .rorvswild-local-panel__request__name,
+  .rorvswild-local-panel__request-details__section__file { flex: 1 !important; }
 
   .rorvswild-local-panel__request__runtime { margin-left: 12px !important; }
 
-  .rorvswild-local-panel__request-details__section__file {
-    -webkit-box-flex: 1 !important;
-    -ms-flex: 1 !important;
-    flex: 1 !important;
-  }
-
-  .rorvswild-local-panel__request-details__section__average {
-    text-align: right !important;
-    margin: 0 0 0 12px !important;
-  }
-
-  .rorvswild-local-panel__request-details__section__calls {
-    text-align: right !important;
-    margin: 0 0 0 12px !important;
-  }
-
+  .rorvswild-local-panel__request-details__section__average,
+  .rorvswild-local-panel__request-details__section__calls,
   .rorvswild-local-panel__request-details__section__impact {
     text-align: right !important;
     margin: 0 0 0 12px !important;
   }
-}
+}

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

@@ -7,15 +7,16 @@ 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(199 203 214) !important;
   background: none !important;
   font-family: SF Mono, Menlo, Consolas, DejaVu Sans Mono, monospace !important;
   text-align: left !important;
   text-shadow: 0 0 0 !important;
   word-spacing: normal !important;
 
-  font-size: 15px !important;
+  font-size: 14px !important;
   line-height: 24px !important;
+  font-weight: 300 !important;
 
   white-space: pre-line !important;
   word-wrap: break-word !important;
@@ -60,7 +61,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(146 149 159) !important;
   font-style: italic !important;
   opacity: 0.7 !important;
 }
@@ -77,7 +78,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(255 185 173) !important;
 }
 
 .rorvswild-local-panel .token.property,
@@ -85,7 +86,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(182 202 255) !important;
 }
 
 .rorvswild-local-panel .token.attr-name,
@@ -98,17 +99,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(248 185 227) !important;
 }
 
 .rorvswild-local-panel .token.constant,
 .rorvswild-local-panel .token.regex,
 .rorvswild-local-panel .token.important {
-  color: #bfa661 !important;
+  color: rgb(227 201 134) !important;
 }
 
 .rorvswild-local-panel .token.function {
-  color: #80abe3 !important;
+  color: rgb(124 218 210) !important;
 }
 
 .rorvswild-local-panel .token.important,
@@ -132,5 +133,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(146 149 159) !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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RorVsWild
   class Section
     attr_reader :started_at
@@ -30,7 +32,7 @@ module RorVsWild
       @calls = 1
       @total_runtime = 0
       @children_runtime = 0
-      @kind = "code".freeze
+      @kind = "code"
       @started_at = RorVsWild.clock_milliseconds
       location = RorVsWild.agent.locator.find_most_relevant_location(caller_locations)
       @file = RorVsWild.agent.locator.relative_path(location.path)
@@ -61,7 +63,7 @@ module RorVsWild
       total_runtime - children_runtime
     end
 
-    COMMAND_MAX_SIZE = 1000
+    COMMAND_MAX_SIZE = 5_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.4".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.4
 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: 2024-01-12 00:00:00.000000000 Z
 dependencies: []
 description: Performances and errors insights for rails developers.
 email: