appsignal 1.2.3 → 1.2.4.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cabf1f598a6b8a65589fcaffe602b070ccf109d7
-  data.tar.gz: 4bbb9154d9add1f427f97b8fc4038b2a54d72a34
+  metadata.gz: 3bc6224da35640f9af8d9af3ec9576c4d8b81e4d
+  data.tar.gz: 7c4a79901f8c603407eaf5d6819fcb35d0bda50d
 SHA512:
-  metadata.gz: f699c46e71f726587c7207fa2d732b92722ae1699bfc890b19d3ef2766255605f7e1792d5db2c2e9eec0bab2f4e5a19201ba7a256f7b6fbd38ce081c282da8fc
-  data.tar.gz: 0c77fc1ca85b9f3304ad28fcb6fa5db159f912fcab381495f43b221f4ba5640c324e36caa6a9849c2d7560bfc4cd98c403589ac68138807e55bc9040fa42a512
+  metadata.gz: 96bd1c57323d23de57ab504526952d5fbc0e0478d6edbe0fad38f4a3821bbe21623647ce335a75dfba3dce7bfe814dc6fc13f393abacedafc52e303746f74b1f
+  data.tar.gz: 3632480d9d4ecd9b135084166bf51e35c246a1f2c176d7a0468fa77aebe2a8d055ed57360e2892714189faf167faa89630814653bcd05cbdd475583b7f7af1e7

data/.travis.yml

@@ -3,7 +3,6 @@ sudo: false
 language: ruby
 
 rvm:
-  - "1.9.3"
   - "2.0.0"
   - "2.1.8"
   - "2.2.4"
@@ -28,8 +27,6 @@ gemfile:
 
 matrix:
   exclude:
-    - rvm: "1.9.3"
-      gemfile: "gemfiles/rails-5.0.gemfile"
     - rvm: "2.0.0"
       gemfile: "gemfiles/rails-5.0.gemfile"
     - rvm: "2.1.8"

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.2.4
+* Support for adding a namespace when mounting Sinatra apps in Rails
+
 # 1.2.3
 * Catch nil config for installer and diag
 * Minor performance improvements

data/README.md

@@ -4,7 +4,7 @@ AppSignal agent
 This gem collects error and performance data from your Rails
 applications and sends it to [AppSignal](https://appsignal.com)
 
-[![Build Status](https://travis-ci.org/appsignal/appsignal.png?branch=master)](https://travis-ci.org/appsignal/appsignal-ruby)
+[![Build Status](https://travis-ci.org/appsignal/appsignal-ruby.png?branch=master)](https://travis-ci.org/appsignal/appsignal-ruby)
 [![Gem Version](https://badge.fury.io/rb/appsignal.svg)](http://badge.fury.io/rb/appsignal)
 [![Code Climate](https://codeclimate.com/github/appsignal/appsignal.png)](https://codeclimate.com/github/appsignal/appsignal)
 

data/Rakefile

@@ -2,6 +2,7 @@ require 'rspec/core/rake_task'
 GEMFILES = %w(
   capistrano2
   capistrano3
+  grape
   no_dependencies
   padrino
   rails-3.2
@@ -13,11 +14,9 @@ GEMFILES = %w(
   sequel
   sequel-435
   sinatra
-  grape
 )
 
 RUBY_VERSIONS = %w(
-  1.9.3-p551
   2.0.0-p648
   2.1.8
   2.2.4
@@ -25,7 +24,7 @@ RUBY_VERSIONS = %w(
 )
 
 EXCLUSIONS = {
-  'rails-5.0' => %w( 1.9.3 2.0.0 2.1.8)
+  'rails-5.0' => %w(2.0.0 2.1.8)
 }
 
 VERSION_MANAGERS = {

data/gemfiles/capistrano2.gemfile

@@ -2,6 +2,6 @@ source 'https://rubygems.org'
 
 gem 'capistrano', '< 3.0'
 gem 'net-ssh', '2.9.2'
-gem 'rack', '~> 1.6.4'
+gem 'rack', '~> 1.6'
 
 gemspec :path => '../'

data/gemfiles/capistrano3.gemfile

@@ -2,6 +2,6 @@ source 'https://rubygems.org'
 
 gem 'capistrano', '3.4.0'
 gem 'net-ssh', '2.9.2'
-gem 'rack', '~> 1.6.4'
+gem 'rack', '~> 1.6'
 
 gemspec :path => '../'

data/gemfiles/grape.gemfile

@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'grape', '0.14.0'
-gem 'rack', '~> 1.6.4'
+gem 'rack', '~> 1.6'
+gem 'activesupport', '~> 4.2'
 
 gemspec :path => '../'

data/gemfiles/no_dependencies.gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'rack', '~> 1.6.4'
+gem 'rack', '~> 1.6'
 
 gemspec :path => '../'

data/gemfiles/padrino.gemfile

@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'padrino', '~> 0.12.0'
-gem 'rack', '~> 1.6.4'
+gem 'rack', '~> 1.6'
+gem 'activesupport', '~> 4.2'
 
 gemspec :path => '../'

data/gemfiles/rails-3.2.gemfile

@@ -1,7 +1,6 @@
 source 'https://rubygems.org'
 
 gem 'rails', '~> 3.2.14'
-gem 'rack', '~> 1.6.4'
 gem 'test-unit'
 
 gemspec :path => '../'

data/gemfiles/rails-4.0.gemfile

@@ -1,7 +1,6 @@
 source 'https://rubygems.org'
 
 gem 'rails', '~> 4.0.0'
-gem 'rack', '~> 1.6.4'
 gem 'mime-types', '~> 2.6'
 
 gemspec :path => '../'

data/gemfiles/rails-4.1.gemfile

@@ -1,7 +1,6 @@
 source 'https://rubygems.org'
 
 gem 'rails', '~> 4.1.0'
-gem 'rack', '~> 1.6.4'
 gem 'mime-types', '~> 2.6'
 
 gemspec :path => '../'

data/gemfiles/rails-4.2.gemfile

@@ -1,7 +1,6 @@
 source 'https://rubygems.org'
 
 gem 'rails', '~> 4.2.0'
-gem 'rack', '~> 1.6.4'
 gem 'mime-types', '~> 2.6'
 
 gemspec :path => '../'

data/gemfiles/resque.gemfile

@@ -3,6 +3,5 @@ source 'https://rubygems.org'
 gem 'resque'
 gem 'rails', '~> 4.2.0'
 gem 'mime-types', '~> 2.6'
-gem 'rack', '~> 1.6.4'
 
 gemspec :path => '../'

data/gemfiles/sequel-435.gemfile

@@ -2,6 +2,6 @@ source 'https://rubygems.org'
 
 gem 'sequel', '~> 4.35'
 gem 'sqlite3'
-gem 'rack', '~> 1.6.4'
+gem 'rack', '~> 1.6'
 
 gemspec :path => '../'

data/gemfiles/sequel.gemfile

@@ -2,6 +2,6 @@ source 'https://rubygems.org'
 
 gem 'sequel', '< 4.35'
 gem 'sqlite3'
-gem 'rack', '~> 1.6.4'
+gem 'rack', '~> 1.6'
 
 gemspec :path => '../'

data/gemfiles/sinatra.gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
 gem 'sinatra'
-gem 'rack', '~> 1.6.4'
+gem 'rack', '~> 1.6'
 
 gemspec :path => '../'

data/lib/appsignal.rb

@@ -131,7 +131,7 @@ module Appsignal
     def monitor_single_transaction(name, env={}, &block)
       monitor_transaction(name, env, &block)
     ensure
-      stop
+      stop('monitor_single_transaction')
     end
 
     def listen_for_error(&block)
@@ -232,7 +232,11 @@ module Appsignal
           "appsignal: #{msg}\n"
         end
       end
-      @logger.level = Logger::INFO
+      if config && config[:debug]
+        @logger.level = Logger::DEBUG
+      else
+        @logger.level = Logger::INFO
+      end
       @logger << @in_memory_log.string if @in_memory_log
 
       if path_arg

data/lib/appsignal/rack/sinatra_instrumentation.rb

@@ -27,7 +27,8 @@ module Appsignal
         transaction = Appsignal::Transaction.create(
           SecureRandom.uuid,
           Appsignal::Transaction::HTTP_REQUEST,
-          request
+          request,
+          {:force => @options.include?(:force) && @options[:force]}
         )
         begin
           ActiveSupport::Notifications.instrument('process_action.sinatra') do
@@ -42,13 +43,23 @@ module Appsignal
           if !@raise_errors_on && env['sinatra.error'] && !env['sinatra.skip_appsignal_error']
             transaction.set_error(env['sinatra.error'])
           end
-          transaction.set_action(env['sinatra.route'])
+          transaction.set_action(action_name(env))
           transaction.set_metadata('path', request.path)
           transaction.set_metadata('method', request.request_method)
           transaction.set_http_or_background_queue_start
           Appsignal::Transaction.complete_current!
         end
       end
+
+
+      def action_name(env)
+        if @options.fetch(:mounted_at, nil)
+          method, route = env['sinatra.route'].split(" ")
+          "#{method} #{@options.fetch(:mounted_at, nil)}#{route}"
+        else
+          env['sinatra.route']
+        end
+      end
     end
   end
 end

data/lib/appsignal/transaction.rb

@@ -28,6 +28,11 @@ module Appsignal
 
     class << self
       def create(id, namespace, request, options={})
+        # Allow middleware to force a new transaction
+        if options.include?(:force) && options[:force]
+          Thread.current[:appsignal_transaction] = nil
+        end
+
         # Check if we already have a running transaction
         if Thread.current[:appsignal_transaction] != nil
           # Log the issue and return the current transaction

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 require 'yaml'
 
 module Appsignal
-  VERSION = '1.2.3'
+  VERSION = '1.2.4.beta.1'
 end

data/spec/lib/appsignal/rack/sinatra_instrumentation_spec.rb

@@ -51,7 +51,8 @@ if defined?(::Sinatra)
         Appsignal::Transaction.should_receive(:create).with(
           kind_of(String),
           Appsignal::Transaction::HTTP_REQUEST,
-          kind_of(Sinatra::Request)
+          kind_of(Sinatra::Request),
+          kind_of(Hash)
         ).and_return(double(:set_action => nil, :set_http_or_background_queue_start => nil, :set_metadata => nil))
       end
 
@@ -122,6 +123,13 @@ if defined?(::Sinatra)
         end
       end
 
+      context "with option to set path prefix" do
+        let(:options) {{ :mounted_at  => "/api/v2" }}
+        it "should call set_action with a prefix path" do
+          Appsignal::Transaction.any_instance.should_receive(:set_action).with("GET /api/v2/")
+        end
+      end
+
       after { middleware.call(env) rescue VerySpecificError }
     end
   end

data/spec/lib/appsignal/transaction_spec.rb

@@ -57,6 +57,16 @@ describe Appsignal::Transaction do
 
           Appsignal::Transaction.create('1', namespace, request, options)
         end
+
+        context "with option to force a new transaction" do
+          let(:options) { {:force => true} }
+          it "should not create a new transaction" do
+            expect(
+              Appsignal::Transaction.create('1', namespace, request, options)
+            ).to_not eq(running_transaction)
+          end
+        end
+
       end
     end
 

data/spec/lib/appsignal_spec.rb

@@ -521,6 +521,7 @@ describe Appsignal do
       context "when the log path is writable" do
         it "should log to file" do
           Appsignal.start_logger
+          Appsignal.logger.level.should == Logger::INFO
           Appsignal.logger.error('Log to file')
           File.exists?(log_file).should be_true
           File.open(log_file).read.should include 'Log to file'
@@ -536,6 +537,7 @@ describe Appsignal do
 
         it "should log to stdout" do
           Appsignal.start_logger
+          Appsignal.logger.level.should == Logger::INFO
           Appsignal.logger.error('Log to stdout')
           out_stream.string.should include 'appsignal: Log to stdout'
           out_stream.string.should include 'Log something'
@@ -548,6 +550,22 @@ describe Appsignal do
           Appsignal.start_logger
         end
       end
+
+      context "when there is no config and debug is on" do
+        it "should set the log level to info" do
+          Appsignal.config = nil
+          Appsignal.start_logger
+          Appsignal.logger.level.should == Logger::INFO
+        end
+      end
+
+      context "when there is a config and debug is on" do
+        it "should set the log level to debug" do
+          Appsignal.config.config_hash[:debug] = true
+          Appsignal.start_logger
+          Appsignal.logger.level.should == Logger::DEBUG
+        end
+      end
     end
 
     describe ".log_formatter" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4.beta.1
 platform: ruby
 authors:
 - Robert Beekman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-18 00:00:00.000000000 Z
+date: 2016-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -300,9 +300,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5