skylight 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24be9df7072117a45c6e4396a7d164551ca75fc7
-  data.tar.gz: ca45a492d94fdef72c28a3737c873e30a1e6a735
+  metadata.gz: 07ad6f51f16a2685aa613f53a07fdc2f26b7dcb4
+  data.tar.gz: c3ace6d10462ad30f3dec91ea151d6c848ba8009
 SHA512:
-  metadata.gz: cb70e2c9aeb62bb59df1c1070218cdd18301a8d3280d515969b51751fcf9aedbde0af55b772a96eaa0d0a0b53ab8b38dfe3ef87631721b3545ec4b2270aeeb82
-  data.tar.gz: 9d9f034c346ff2ae0c1629092ccdc349d08a598f5ad21c4b78d8fe006bf7ddd641a77a0019b902133867ccb8bb1298f22167cd6d734189df904a1cf948e7cb48
+  metadata.gz: 09b2818afb8bf45d3f712649d5c5cebfc18fb42c8017c6df8c7507e9e70d4c210fafc6c68275a2b55dca60c5a6e3a900ecbcce51bd948e9ae5a50e32dd8f0198
+  data.tar.gz: 3226dd5aba569387393a4e81e3b508135166b45712f894084f13405fffa0060aa669793d8408d7aaf3e406ce7eea4ec8c422f4e6eb33409913a62df8e65c95bb

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.9.0 (November, 6, 2015)
+
+* [FEATURE] Expose Skylight::Helpers.instrument_class_method
+* [BUGFIX] Allow for instrumentation of setters
+* [BUGFIX] Fix an issue where loading some items in the Grape namespace without loading the whole library would cause an exception.
+* [IMPROVEMENT] Switch to Rust SQL lexer by default
+* [IMPROVEMENT] Add support for Redis pipelined and multi
+* [IMPROVEMENT] Updated Rust internals
+* [IMPROVEMENT] Agent should now work on current Rails master
+* [IMPROVEMENT] Better disabling of development mode warning
+
 ## 0.8.1 (October 1, 2015)
 
 * [BUGFIX] Fix agent on OS X El Capitan.

data/CONTRIBUTING.md

@@ -1 +1,9 @@
-Before contributing, please [sign the CLA](https://docs.google.com/spreadsheet/viewform?usp=drive_web&formkey=dHJVY1M5bzNzY0pwN2dRZjMxV0dXSkE6MA#gid=0).
+## Bug Reports and Feature Requests
+
+If you've got a bug report or have a feature you'd like to request, please contact us at support@skylight.io or use the "?" button in the Skylight web interface. We'll be much quicker to respond that way :)
+
+## Pull Requests
+
+Before contributing, please [sign the CLA](https://docs.google.com/spreadsheet/viewform?usp=drive_web&formkey=dHJVY1M5bzNzY0pwN2dRZjMxV0dXSkE6MA#gid=0).
+
+In general, we recommend that you speak with us about any new features you'd like to add so we can make sure we're on the same page.

data/README.md

@@ -5,4 +5,9 @@ servers.
 
 Sign up at https://skylight.io.
 
-For more documentation see https://docs.skylight.io/.
+For more documentation see https://docs.skylight.io/.
+
+
+## Bug Reports and Feature Requests
+
+If you've got a bug report or have a feature you'd like to request, please contact us at support@skylight.io or use the "?" button in the Skylight web interface. We'll be much quicker to respond that way :)

data/ext/libskylight.yml

@@ -1,6 +1,6 @@
 ---
-version: "0.7.0-6aad54d"
+version: "0.7.0-1630bf6"
 checksums:
-  x86-linux:     "a3a16d2de1070d455dae8e46f95c8fa3621adfb062f7b23d629df870d6d7b385"
-  x86_64-linux:  "c62bcb68c124c5664cf22254c17db68b7f7a3fe6da9148a3f49c546449a9e766"
-  x86_64-darwin: "bb42c08044a94332a69c7d343273488d44ed7c85d3f1e2f37834f4ed6cdd178d"
+  x86-linux:     "74692e77f1fbfd7fdf0e948ab9a189a3485e9f65759a59500c73a8dba040980f"
+  x86_64-linux:  "f18b2f0c872cfc59ad21bee2f490c211fdbe0bde85777228aad16219e9fd0555"
+  x86_64-darwin: "466cb1adb917858972f7180b92b0043323a3c905598081746a362869d1c84368"

data/lib/skylight/cli.rb

@@ -53,6 +53,14 @@ you should set the `SKYLIGHT_AUTHENTICATION` variable to:
     rescue Interrupt
     end
 
+    desc "disable_dev_warning", "Disables warning about running Skylight in development mode for all local apps"
+    def disable_dev_warning
+      user_config.disable_dev_warning = true
+      user_config.save
+
+      say "Development mode warning disabled", :green
+    end
+
   private
 
     def app_name
@@ -142,5 +150,9 @@ you should set the `SKYLIGHT_AUTHENTICATION` variable to:
       @config ||= Config.load
     end
 
+    def user_config
+      UserConfig.instance
+    end
+
   end
 end

data/lib/skylight/config.rb

@@ -84,7 +84,7 @@ module Skylight
     DEFAULTS = {
       :'version'              => VERSION,
       :'auth_url'             => 'https://auth.skylight.io/agent',
-      :'sql_mode'             => 'ruby',
+      :'sql_mode'             => 'rust',
       :'daemon.lazy_start'    => true,
 
       # == Legacy ==
@@ -105,7 +105,6 @@ module Skylight
       :'accounts.port'           => 443,
       :'accounts.ssl'            => true,
       :'accounts.deflate'        => false,
-      :'me.credentials_path'     => '~/.skylight',
       :'metrics.report_interval' => 60
     }
 

data/lib/skylight/core.rb

@@ -16,6 +16,7 @@ module Skylight
 
   # Require VM specific things
   require 'skylight/config'
+  require 'skylight/user_config'
   require 'skylight/gc'
   require 'skylight/helpers'
   require 'skylight/instrumenter'

data/lib/skylight/helpers.rb

@@ -15,8 +15,7 @@ module Skylight
 
         if opts = @__sk_instrument_next_method
           @__sk_instrument_next_method = nil
-          title = "#{to_s}##{name}"
-          __sk_instrument_method_on(self, name, title, opts)
+          instrument_method(name, opts)
         end
       end
 
@@ -26,8 +25,7 @@ module Skylight
 
         if opts = @__sk_instrument_next_method
           @__sk_instrument_next_method = nil
-          title = "#{to_s}.#{name}"
-          __sk_instrument_method_on(__sk_singleton_class, name, title, opts)
+          instrument_class_method(name, opts)
         end
       end
 
@@ -91,6 +89,46 @@ module Skylight
         end
       end
 
+      # @overload instrument_class_method([name], opts={})
+      #   @param [Symbol|String] [name]
+      #   @param [Hash] opts
+      #   @option opts [String] :category ('app.method')
+      #   @option opts [String] :title (ClassName#method_name)
+      #   @option opts [String] :description
+      #
+      #   You may also declare the methods to instrument at any time by passing the name
+      #   of the method as the first argument to `instrument_method`.
+      #
+      #   @example With name
+      #     class MyClass
+      #       include Skylight::Helpers
+      #
+      #       def self.my_method
+      #         do_expensive_stuff
+      #       end
+      #
+      #       instrument_class_method :my_method
+      #     end
+      #
+      #   By default, the event will be titled using the name of the class and the
+      #   method. For example, in our previous example, the event name will be:
+      #   +MyClass.my_method+. You can customize this by passing using the *:title* option.
+      #
+      #   @example With title
+      #     class MyClass
+      #       include Skylight::Helpers
+      #
+      #       def self.my_method
+      #         do_expensive_stuff
+      #       end
+      #
+      #       instrument_class_method :my_method, title: 'Expensive work'
+      #     end
+      def instrument_class_method(name, opts = {})
+        title = "#{to_s}.#{name}"
+        __sk_instrument_method_on(__sk_singleton_class, name, title, opts || {})
+      end
+
     private
 
       def __sk_instrument_method_on(klass, name, title, opts)
@@ -108,7 +146,7 @@ module Skylight
               description: #{desc.inspect})
 
             begin
-              before_instrument_#{name}(*args, &blk)
+              send(:before_instrument_#{name}, *args, &blk)
             ensure
               Skylight.done(span) if span
             end

data/lib/skylight/probes/action_view.rb

@@ -15,7 +15,17 @@ module Skylight
             alias render_with_layout_without_sk render_with_layout
 
             def render_with_layout(path, locals, *args, &block) #:nodoc:
-              layout  = path && find_layout(path, locals.keys)
+              layout = nil
+
+              if path
+                if method(:find_layout).arity == 3
+                  # Rails 5
+                  layout = find_layout(path, locals.keys, [formats.first])
+                else
+                  # Rails 3, 4
+                  layout = find_layout(path, locals.keys)
+                end
+              end
 
               if layout
                 instrument(:template, :identifier => layout.identifier) do

data/lib/skylight/probes/grape.rb

@@ -81,6 +81,6 @@ module Skylight
       end
     end
 
-    register("Grape", "grape", Grape::Probe.new)
+    register("Grape::Endpoint", "grape/endpoint", Grape::Probe.new)
   end
 end

data/lib/skylight/probes/redis.rb

@@ -3,6 +3,15 @@ module Skylight
     module Redis
       class Probe
         def install
+          version = defined?(::Redis::VERSION) ? Gem::Version.new(::Redis::VERSION) : nil
+
+          if !version || version < Gem::Version.new("3.0.0")
+            # Using $stderr here isn't great, but we don't have a logger accessible
+            $stderr.puts "[SKYLIGHT] [#{Skylight::VERSION}] The installed version of Redis doesn't " \
+                          "support Middlewares. At least version 3.0.0 is required."
+            return
+          end
+
           ::Redis::Client.class_eval do
             alias call_without_sk call
 
@@ -22,6 +31,38 @@ module Skylight
             end
           end
         end
+
+        # Unfortunately, because of the nature of pipelining, there's no way for us to
+        # give a time breakdown on the individual items.
+
+        PIPELINED_OPTS = {
+          category: "db.redis.pipelined".freeze,
+          title:    "PIPELINE".freeze
+        }.freeze
+
+        MULTI_OPTS = {
+          category: "db.redis.multi".freeze,
+          title:    "MULTI".freeze
+        }.freeze
+
+        ::Redis.class_eval do
+          alias pipelined_without_sk pipelined
+
+          def pipelined(&block)
+            Skylight.instrument(PIPELINED_OPTS) do
+              pipelined_without_sk(&block)
+            end
+          end
+
+
+          alias multi_without_sk multi
+
+          def multi(&block)
+            Skylight.instrument(MULTI_OPTS) do
+              multi_without_sk(&block)
+            end
+          end
+        end
       end
     end
 

data/lib/skylight/railtie.rb

@@ -33,8 +33,10 @@ module Skylight
           end
         end
       elsif Rails.env.development?
-        log_warning config, "[SKYLIGHT] [#{Skylight::VERSION}] Running Skylight in development mode. No data will be reported until you deploy your app.\n" \
-                              "(To disable this message, set `alert_log_file` in your config.)"
+        unless UserConfig.instance.disable_dev_warning?
+          log_warning config, "[SKYLIGHT] [#{Skylight::VERSION}] Running Skylight in development mode. No data will be reported until you deploy your app.\n" \
+                                "(To disable this message for all local apps, run `skylight disable_dev_warning`.)"
+        end
       elsif !Rails.env.test?
         log_warning config, "[SKYLIGHT] [#{Skylight::VERSION}] You are running in the #{Rails.env} environment but haven't added it to config.skylight.environments, so no data will be sent to skylight.io."
       end

data/lib/skylight/user_config.rb

@@ -0,0 +1,43 @@
+require 'yaml'
+
+module Skylight
+  class UserConfig
+
+    attr_accessor :disable_dev_warning
+
+    def self.instance
+      @instance ||= new
+    end
+
+    def initialize
+      reload
+    end
+
+    def file_path
+      File.expand_path("~/.skylight")
+    end
+
+    def disable_dev_warning?
+      disable_dev_warning
+    end
+
+    def reload
+      config = File.exist?(file_path) ? YAML.load_file(file_path) : {}
+      self.disable_dev_warning = !!config['disable_dev_warning']
+    end
+
+    def save
+      FileUtils.mkdir_p(File.dirname(file_path))
+      File.open(file_path, 'w') do |f|
+        f.puts YAML.dump(to_hash)
+      end
+    end
+
+    def to_hash
+      {
+        'disable_dev_warning' => disable_dev_warning
+      }
+    end
+
+  end
+end

data/lib/skylight/version.rb

@@ -1,4 +1,4 @@
 module Skylight
-  VERSION = '0.8.1'
+  VERSION = '0.9.0'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-02 00:00:00.000000000 Z
+date: 2015-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -95,6 +95,7 @@ files:
 - lib/skylight/sinatra.rb
 - lib/skylight/subscriber.rb
 - lib/skylight/trace.rb
+- lib/skylight/user_config.rb
 - lib/skylight/util.rb
 - lib/skylight/util/allocation_free.rb
 - lib/skylight/util/clock.rb
@@ -178,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Skylight is a smart profiler for Rails apps