skylight 0.10.3 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5021a4b7363610a4fa2e75f06fb604f8bbd6291
-  data.tar.gz: fdf81108e04bec3720d605ad0f01a5dd829596d7
+  metadata.gz: a76099fda886af0e74d06bed09f512715705be0a
+  data.tar.gz: 7f926a22b2da10ecc498995ada0ddc5b48d2b510
 SHA512:
-  metadata.gz: 20c12468eb05d79d92d79000eb6135f1dd639ee959a5c136a0dfa90e46d856abab725e31a55c264b3bc9220a3fab794283e01cd137dc50a98c096f7bbe2ad317
-  data.tar.gz: 170ebfb0801b1a976562bc77facbf435b8a4d56f5a9dcae2fb3020cf26cdc222f08d16c8c7dedb8d8056ddbbb77b033c074e8104f97286923bb2e4744e55084c
+  metadata.gz: c054668e4feec17241dbbcfbc6ddb1bf8808d7d718f10a1449940c056ecfdb3d26a2ddfe805e0d0c81d880eb949b699f517687e3cf13eda242bba4e287a5a1c0
+  data.tar.gz: 35516e9b5e0cec82a57d1e04e759787a301123b223c9a00d0ae829d2e116f1a1d85154bd79ed962e2229e92757ed36919d25efe55bea5ac608fc640ea51e6771

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 0.10.4 (June 3, 2016)
+
+* [BUGFIX] Sinatra instrumenation now works for latest master
+* [BUGFIX] Sequel support for 4.35.0
+* [BUGFIX] Handle latest ActiveModel::Serializers version
+* [BUGFIX] More precise check for existence of Rails
+* [BREAKING] Drop official support for Sinatra 1.2 (it likely never worked correctly)
+* [IMPROVEMENT] On Heroku, logs are now written to STDOUT
+* [IMPROVEMENT] Allow Skylight to raise on logged errors, useful for testing and debugging
+* [IMPROVEMENT] Finish Rack::Responses in Middleware
+* [IMRPOVEMENT] Better message when config/skylight.yml already exists
+* [IMPROVEMENT] Update Rust Agent with SQL improvements
+
 ## 0.10.3 (February 2, 2016)
 
 * [BUGFIX] Don't validate configuration on disabled environments.
@@ -22,7 +35,7 @@
 
 ## 0.9.4 (November 23, 2015)
 
-* [FEATURE] Added instrumentation for official Mongo Ruby Driver (utilized by Mongoid 5+). Add 'mongo' to probes list to enable. 
+* [FEATURE] Added instrumentation for official Mongo Ruby Driver (utilized by Mongoid 5+). Add 'mongo' to probes list to enable.
 * [BUGFIX] SQL lexer now handles indentifiers beginning with underscores.
 * [BUGFIX] Excon instrumentation now works correctly.
 * [BUGFIX] Graceful handling of native agent failures on old OS X versions.

data/LICENSE.md

@@ -1,5 +1,5 @@
 All other components of this product, except where otherwise noted, are
-Copyright (c) 2013-2014 Tilde, Inc.
+Copyright (c) 2013-2016 Tilde, Inc.
 All rights reserved.
 
 Certain inventions disclosed in this file may be claimed within patents

data/ext/libskylight.yml

@@ -1,6 +1,6 @@
 ---
-version: "0.7.0-b2a5f4b"
+version: "1.0.0-4a74d28"
 checksums:
-  x86-linux:     "4ea1f0382dbbba12454d5121a4b400278b2b515b79b676e7d4a2655cdc088bfe"
-  x86_64-linux:  "42a958e6fe7f5d9b459e10ffc62c336c44f00e46c253b7f466a72f2902e8e130"
-  x86_64-darwin: "7958533c605d98f43fbe54cdd7f7a6e39d6c8fee30acd29494465213afd123ef"
+  x86-linux:     "66e1b9fd8c9223febf8e7febb56a2ad71714ab61193d153e2bf0f462409cb4f7"
+  x86_64-linux:  "40d7e0822610244d916df5488a83af5bdc7b2aa8b2410abc672a42cfab629f3f"
+  x86_64-darwin: "1484612b150317f1debdcaeab9bea806749d8be9ac132b8cd1b92781d1972b46"

data/lib/skylight/cli.rb

@@ -13,7 +13,12 @@ module Skylight
     desc "setup TOKEN", "Sets up a new app using the provided token"
     def setup(token=nil)
       if File.exist?(config_path)
-        say "Your app is already on Skylight. http://www.skylight.io", :green
+        say <<-OUT, :green
+A config/skylight.yml already exists for your application.
+
+Visit your app at https://www.skylight.io/app or remove config/skylight.yml
+to set it up as a new app in Skylight.
+        OUT
         return
       end
 
@@ -39,7 +44,7 @@ The next step is for you to deploy your application to production. The
 easiest way is to just commit the config file to your source control
 repository and deploy from there. You can learn more about the process at:
 
-  http://docs.skylight.io/getting-started/#deploy
+  http://docs.skylight.io/getting-set-up/#deployment
 
 If you want to specify the authentication token as an environment variable,
 you should set the `SKYLIGHT_AUTHENTICATION` variable to:

data/lib/skylight/config.rb

@@ -504,6 +504,10 @@ authentication: #{self[:authentication]}
       @alert_logger = logger
     end
 
+    def on_heroku?
+      File.exist?(get(:'heroku.dyno_info_path'))
+    end
+
     def deploy_id
       @deploy_id = Util::Deploy.detect_id(self)
     end

data/lib/skylight/core.rb

@@ -7,7 +7,9 @@ module Skylight
   # Load the native agent
   require 'skylight/native'
 
-  if defined?(Rails)
+  # Specifically check for Railtie since we've had at least one case of a
+  #   customer having Rails defined without having all of Rails loaded.
+  if defined?(Rails::Railtie)
     require 'skylight/railtie'
   end
 

data/lib/skylight/middleware.rb

@@ -59,6 +59,13 @@ module Skylight
           t { "middleware beginning trace" }
           trace = Skylight.trace "Rack", 'app.rack.request'
           resp = @app.call(env)
+
+          # Responses should be finished but in some situations they aren't
+          #   e.g. https://github.com/ruby-grape/grape/issues/1041
+          if resp.respond_to?(:finish)
+            resp = resp.finish
+          end
+
           resp[2] = BodyProxy.new(resp[2]) { trace.submit } if trace
           resp
         rescue Exception

data/lib/skylight/normalizers/active_model_serializers/render.rb

@@ -12,7 +12,9 @@ module Skylight
           title = serializer_class.name.sub(/^ActiveModel::(Serializer::)?/, '')
 
           if adapter_instance = payload[:adapter]
-            adapter_name = adapter_instance.class.name.sub(/^ActiveModel::Serializer::Adapter::/, '')
+            adapter_name = adapter_instance.class.name
+                              .sub(/^ActiveModel::Serializer::Adapter::/, '')
+                              .sub(/^ActiveModelSerializers::Adapter::/, '')
             desc = "Adapter: #{adapter_name}"
           end
 

data/lib/skylight/probes/sequel.rb

@@ -5,11 +5,14 @@ module Skylight
       class Probe
         def install
           require 'sequel/database/logging'
-          ::Sequel::Database.class_eval do
-            alias log_yield_without_sk log_yield
 
-            def log_yield(sql, args=nil, &block)
-              log_yield_without_sk(sql, *args) do
+          method_name = ::Sequel::Database.method_defined?(:log_connection_yield) ? 'log_connection_yield' : 'log_yield'
+
+          ::Sequel::Database.class_eval <<-end_eval
+            alias #{method_name}_without_sk #{method_name}
+
+            def #{method_name}(sql, *args, &block)
+              #{method_name}_without_sk(sql, *args) do
                 ::ActiveSupport::Notifications.instrument(
                   "sql.sequel",
                   sql: sql,
@@ -20,7 +23,7 @@ module Skylight
                 end
               end
             end
-          end
+          end_eval
         end
       end
     end

data/lib/skylight/probes/sinatra.rb

@@ -8,7 +8,9 @@ module Skylight
             alias compile_without_sk! compile!
 
             def compile!(verb, path, *args, &block)
-              compile_without_sk!(verb, path, *args, &block).tap do |_, _, _, wrapper|
+              compile_without_sk!(verb, path, *args, &block).tap do |_, _, keys_or_wrapper, wrapper|
+                wrapper ||= keys_or_wrapper
+
                 # Deal with the situation where the path is a regex, and the default behavior
                 # of Ruby stringification produces an unreadable mess
                 if path.is_a?(Regexp)

data/lib/skylight/railtie.rb

@@ -88,7 +88,7 @@ module Skylight
         # Configure the log file destination
         if log_file = app.config.skylight.log_file
           config['log_file'] = log_file
-        elsif !config.key?('log_file')
+        elsif !config.key?('log_file') && !config.on_heroku?
           config['log_file'] = File.join(Rails.root, 'log/skylight.log')
         end
 

data/lib/skylight/user_config.rb

@@ -14,7 +14,7 @@ module Skylight
     end
 
     def file_path
-      File.expand_path("~/.skylight")
+      File.expand_path(ENV["SKYLIGHT_USER_CONFIG_PATH"] || "~/.skylight")
     end
 
     def disable_dev_warning?

data/lib/skylight/util/logging.rb

@@ -57,6 +57,7 @@ module Skylight
       end
 
       def error(msg, *args)
+        raise msg if ENV['SKYLIGHT_RAISE_ON_ERROR']
         log :error, msg, *args
       end
 

data/lib/skylight/version.rb

@@ -1,4 +1,4 @@
 module Skylight
-  VERSION = '0.10.3'
+  VERSION = '0.10.4'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.4
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -185,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Skylight is a smart profiler for Rails apps