appsignal 0.6.7 → 0.7.0.alpha.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzU0MjdjNTA0YTU2NjRhOTcyYTI2OWQ0N2NmODJiMzc5MzRiMjM2Ng==
+    MmJjZmJmYThiYzQxNmNkYmY3OTljN2M4MzE3ZmI2NTJiNWExM2QyZA==
   data.tar.gz: !binary |-
-    NmRlZmZlMDAxMDVkMGNmMGVmZWJhYzE4N2NiMTVlZDkyYzU2ZTY5Zg==
+    MDdlY2ZlZDlhN2FlN2Q4MDI0Nzg0NDFiODdmMDAxODRlYjI4NjQwMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZWI0OTIyMzg0YzRhMmU1MTZkNDUzM2ZjMzI3MjZhMmM4OTIwNTYwNWI0M2Fm
-    NjVlYTZiZTQyOWM3ZjE1MThlMTQ2MjAyZmUxZjNjMjMyN2ExMzkyMjdkM2Yz
-    N2FhNmU0OWQxOGMyOTBhNDc1MmZkYTVmZTUyM2Y3Y2UyNjYzZWQ=
+    NjQxMWVmNmI4NThmYzdmMDQ3ZDM1YzNkODAwYTZjNWY2NTJlNzNlNzQzNDRk
+    NGVkYzQwYWZiOGZmN2ZiN2ExMGJhODRmMmFhNGY3N2M0M2VkNjQxNzRiZmRk
+    MmJlMjFmYmRjMmU4NWI0YWNmZDk3NjY0MThkYzVjMDE3MjRjMmE=
   data.tar.gz: !binary |-
-    MjZjYmQyZjFjNmUwNWZhZWYwOTIyZmI3NjBiNTlkYTE1YTU1NDVlY2U1Yjhl
-    MDEzNThjYTBhZGZmNTM5NmFlMTgxOTE5ZGUxZTVkYWE1ZWI3ZjY0MDhiNmZj
-    YmU3NTU0YTU3Yzk4MjI5YmYxY2YxZDRiYjg5MGZjZWJmNTZhOGY=
+    ZDUwNTQ3ZGQyZmUwMmQ1OWE1YzcxNTQ4NzNkYWJjNDUwZmQ0OGEyMDY2ODgy
+    NDExNWQyMGRlZjc3MTMwMzk1MjFkYTdkMzBkZDNjOTNiNTI2YTEyNzdiMWEz
+    NWMzYzY2MTkyMjg2YzY0NDVmNjBmOTM3ZDkwZjU3ZGNjYmY1MTQ=

data/.gitignore

@@ -3,14 +3,15 @@
 .sass-cache
 capybara-*.html
 .rspec
-/log/*.log
+*.log
 /.bundle
 /vendor/bundle
 /tmp/*
 /db/*.sqlite3
 /public/system/*
 /coverage/
-/spec/tmp/*
+/spec/tmp
+/spec/support/project_fixture/log/*.log
 **.orig
 rerun.txt
 pickle-email-*.html

data/.travis.yml

@@ -1,20 +1,20 @@
 language: ruby
 
 rvm:
-  - 1.8.7
-  - 1.9.3
-  - 2.0.0
-  - jruby-19mode
+  - "1.9.3"
+  - "2.0.0"
+  - "jruby-19mode"
+  - "rbx-2.1.1"
 
 gemfile:
-  - gemfiles/3.0.gemfile
-  - gemfiles/3.1.gemfile
-  - gemfiles/3.2.gemfile
-  - gemfiles/4.0.gemfile
+  - "gemfiles/rack.gemfile"
+  - "gemfiles/rails-3.0.gemfile"
+  - "gemfiles/rails-3.1.gemfile"
+  - "gemfiles/rails-3.2.gemfile"
+  - "gemfiles/rails-4.0.gemfile"
 
 matrix:
   allow_failures:
-    - rvm: 1.8.7
-    - rvm: jruby-19mode
+    - rvm: "jruby-19mode"
 
-script: RAILS_ENV=test bundle exec rspec spec
+script: "RAILS_ENV=test bundle exec rspec spec"

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.7.0
+* Mayor refactor and cleanup
+* New easier onboarding process
+* Support for Rack apps, including experimental Sinatra integration
+* Monitor HTTP queue times
+
 # 0.6.7
 * Send HTTP_X_FORWARDED_FOR env var
 

data/README.md

@@ -52,3 +52,29 @@ class RemoveBoringPayload
   end
 end
 ```
+
+## Development
+
+Run rake bundle or, or run bundle install for all Gemfiles:
+
+```
+bundle --gemfile gemfiles/no_dependencies.gemfile
+bundle --gemfile gemfiles/rails-3.0.gemfile
+bundle --gemfile gemfiles/rails-3.1.gemfile
+bundle --gemfile gemfiles/rails-3.2.gemfile
+bundle --gemfile gemfiles/rails-4.0.gemfile
+bundle --gemfile gemfiles/sinatra.gemfile
+```
+
+To run the spec suite with a specific Gemfile:
+
+```
+BUNDLE_GEMFILE=gemfiles/no_dependencies.gemfile bundle exec rspec
+BUNDLE_GEMFILE=gemfiles/rails-3.0.gemfile bundle exec rspec
+BUNDLE_GEMFILE=gemfiles/rails-3.1.gemfile bundle exec rspec
+BUNDLE_GEMFILE=gemfiles/rails-3.2.gemfile bundle exec rspec
+BUNDLE_GEMFILE=gemfiles/rails-4.0.gemfile bundle exec rspec
+BUNDLE_GEMFILE=gemfiles/sinatra.gemfile bundle exec rspec
+```
+
+Or run `rake spec` to run specs for all Gemfiles. Travis will run specs for these Gemfiles as well.

data/Rakefile

@@ -1,6 +1,6 @@
-require 'appsignal/version'
-
 task :publish do
+  require 'appsignal/version'
+
   NAME = 'appsignal'
   VERSION_FILE = 'lib/appsignal/version.rb'
   CHANGELOG_FILE = 'CHANGELOG.md'
@@ -29,7 +29,7 @@ task :publish do
   end
 
   def changes
-    git_status_to_array(`git status -s -u `)
+    git_status_to_array(`git status -s -u`)
   end
 
   def gem_version
@@ -57,3 +57,32 @@ task :publish do
     raise "Actually change the version in: #{VERSION_FILE}"
   end
 end
+
+task :bundle do
+  puts `bundle --gemfile gemfiles/no_dependencies.gemfile`
+  puts `bundle --gemfile gemfiles/rails-3.0.gemfile`
+  puts `bundle --gemfile gemfiles/rails-3.1.gemfile`
+  puts `bundle --gemfile gemfiles/rails-3.2.gemfile`
+  puts `bundle --gemfile gemfiles/rails-4.0.gemfile`
+  puts `bundle --gemfile gemfiles/sinatra.gemfile`
+end
+
+task :spec do
+  puts 'Running no dependencies'
+  puts `env BUNDLE_GEMFILE=gemfiles/no_dependencies.gemfile bundle exec rspec`
+
+  puts 'Running rails-3.0'
+  puts `env BUNDLE_GEMFILE=gemfiles/rails-3.0.gemfile bundle exec rspec`
+
+  puts 'Running rails-3.1'
+  puts `env BUNDLE_GEMFILE=gemfiles/rails-3.1.gemfile bundle exec rspec`
+
+  puts 'Running rails-3.2'
+  puts `env BUNDLE_GEMFILE=gemfiles/rails-3.2.gemfile bundle exec rspec`
+
+  puts 'Running rails-4.0'
+  puts `env BUNDLE_GEMFILE=gemfiles/rails-4.0.gemfile bundle exec rspec`
+
+  puts 'Running sinatra'
+  puts `env BUNDLE_GEMFILE=gemfiles/sinatra.gemfile bundle exec rspec`
+end

data/appsignal.gemspec

@@ -9,26 +9,35 @@ Gem::Specification.new do |gem|
     'Ron Cadier',
     'Jacob Vosmaer'
   ]
-  gem.email         = ['contact@appsignal.com']
-  gem.description   = 'The official appsignal.com gem'
-  gem.summary       = 'Logs performance and exception data from your app to'\
-                      'appsignal.com'
-  gem.homepage      = 'http://github.com/appsignal/appsignal'
-  gem.license       = 'MIT'
+  gem.email                 = ['support@appsignal.com']
+  gem.description           = 'The official appsignal.com gem'
+  gem.summary               = 'Logs performance and exception data from your app to'\
+                              'appsignal.com'
+  gem.homepage              = 'https://github.com/appsignal/appsignal'
+  gem.license               = 'MIT'
 
-  gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = 'appsignal'
-  gem.require_paths = ['lib']
-  gem.version       = Appsignal::VERSION
+  gem.files                 = `git ls-files`.split($\)
+  gem.executables           = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files            = gem.files.grep(%r{^(test|spec|features)/})
+  gem.name                  = 'appsignal'
+  gem.require_paths         = ['lib']
+  gem.version               = Appsignal::VERSION
+  gem.required_ruby_version = '>= 1.9.3'
 
-  gem.add_dependency 'rails', '>= 3.0'
-  gem.add_dependency 'rake'
-  gem.add_dependency 'json'
+  gem.add_dependency 'activesupport', '>= 3.0'
+  gem.add_dependency 'rack'
+  gem.add_dependency 'thread_safe'
 
+  gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'capistrano', '< 3.0'
-  gem.add_development_dependency 'generator_spec'
   gem.add_development_dependency 'pry'
+
+  if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
+    gem.add_development_dependency 'racc'
+    gem.add_development_dependency 'rubysl-enumerator'
+    gem.add_development_dependency 'rubysl-net-http'
+    gem.add_development_dependency 'rubysl-rexml'
+    gem.add_development_dependency 'rubysl-test-unit'
+  end
 end

data/gemfiles/no_dependencies.gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec :path => '../'

data/gemfiles/{3.0.gemfile → rails-3.0.gemfile}

@@ -1,6 +1,7 @@
-# encoding: utf-8
 source 'https://rubygems.org'
 
 gem 'rails', '~> 3.0.20'
 
+gem 'generator_spec'
+
 gemspec :path => '../'

data/gemfiles/{3.1.gemfile → rails-3.1.gemfile}

@@ -1,6 +1,7 @@
-# encoding: utf-8
 source 'https://rubygems.org'
 
 gem 'rails', '~> 3.1.12'
 
+gem 'generator_spec'
+
 gemspec :path => '../'

data/gemfiles/{3.2.gemfile → rails-3.2.gemfile}

@@ -1,6 +1,7 @@
-# encoding: utf-8
 source 'https://rubygems.org'
 
 gem 'rails', '~> 3.2.14'
 
+gem 'generator_spec'
+
 gemspec :path => '../'

data/gemfiles/{4.0.gemfile → rails-4.0.gemfile}

@@ -1,6 +1,7 @@
-# encoding: utf-8
 source 'https://rubygems.org'
 
 gem 'rails', '~> 4.0.0'
 
+gem 'generator_spec'
+
 gemspec :path => '../'

data/gemfiles/sinatra.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'sinatra'
+
+gemspec :path => '../'

data/lib/appsignal.rb

@@ -1,14 +1,27 @@
-begin
-  require "rails" unless defined?(Rails)
-rescue
-  raise 'This appsignal gem only works with rails'
-end
+require 'logger'
+require 'rack'
+require 'thread_safe'
+require 'active_support/json'
 
 module Appsignal
   class << self
-    attr_accessor :subscriber
+    attr_accessor :config, :logger, :agent
     attr_reader :in_memory_log
 
+    def start
+      if config
+        if config[:debug]
+          logger.level = Logger::DEBUG
+        else
+          logger.level = Logger::INFO
+        end
+        logger.info("Starting appsignal-#{Appsignal::VERSION}")
+        @agent = Appsignal::Agent.new
+      else
+        logger.error("Can't start, no config loaded")
+      end
+    end
+
     # Convenience method for adding a transaction to the queue. This queue is
     # managed and is periodically pushed to Appsignal.
     #
@@ -51,10 +64,6 @@ module Appsignal
       @transactions ||= {}
     end
 
-    def agent
-      @agent ||= Appsignal::Agent.new
-    end
-
     def logger
       @in_memory_log = StringIO.new unless @in_memory_log
       @logger ||= Logger.new(@in_memory_log).tap do |l|
@@ -71,16 +80,8 @@ module Appsignal
       ActiveSupport::JSON
     end
 
-    def logger=(l)
-      @logger = l
-    end
-
-    def config
-      @config ||= Appsignal::Config.new(Rails.root, Rails.env).load
-    end
-
     def post_processing_middleware
-      @post_processing_chain ||= PostProcessor.default_middleware
+      @post_processing_chain ||= Appsignal::Aggregator::PostProcessor.default_middleware
       yield @post_processing_chain if block_given?
       @post_processing_chain
     end
@@ -90,21 +91,25 @@ module Appsignal
     end
 
     def is_ignored_exception?(exception)
-      Array.wrap(Appsignal.config[:ignore_exceptions]).
-        include?(exception.class.name)
+      Appsignal.config[:ignore_exceptions].include?(exception.class.name)
     end
   end
 end
 
 require 'appsignal/agent'
 require 'appsignal/aggregator'
+require 'appsignal/aggregator/post_processor'
+require 'appsignal/aggregator/middleware'
 require 'appsignal/auth_check'
 require 'appsignal/config'
-require 'appsignal/integrations/passenger'
-require 'appsignal/listener'
 require 'appsignal/marker'
-require 'appsignal/middleware'
-require 'appsignal/railtie'
+require 'appsignal/rack/listener'
+require 'appsignal/rack/instrumentation'
 require 'appsignal/transaction'
+require 'appsignal/transaction/formatter'
+require 'appsignal/transaction/params_sanitizer'
 require 'appsignal/transmitter'
 require 'appsignal/version'
+
+require 'appsignal/integrations/passenger'
+require 'appsignal/integrations/rails'

data/lib/appsignal/agent.rb

@@ -2,44 +2,64 @@ module Appsignal
   class Agent
     ACTION = 'log_entries'.freeze
 
-    attr_reader :aggregator, :thread, :active, :sleep_time, :transmitter, :aggregator_semaphore
+    attr_reader :aggregator, :thread, :active, :sleep_time, :transmitter, :subscriber
 
     def initialize
       return unless Appsignal.active?
-      @sleep_time = 60.0
+      if Appsignal.config.env == 'development'
+        @sleep_time = 10.0
+      else
+        @sleep_time = 60.0
+      end
       @aggregator = Aggregator.new
-      @aggregator_semaphore = Mutex.new
-      @retry_request = true
+      @transmitter = Transmitter.new(ACTION)
+      subscribe
+      start_thread
+      # Shutdown at exit. This does not work in passenger, see integrations/passenger
+      #at_exit { Appsignal.agent.shutdown(true) }
+      Appsignal.logger.info('Started Appsignal agent')
+    end
+
+    def start_thread
+      Appsignal.logger.debug('Starting agent thread')
       @thread = Thread.new do
-        Appsignal.logger.debug('Starting agent thread')
-        while true do
+        loop do
           send_queue if aggregator.has_transactions?
           Appsignal.logger.debug("Sleeping #{sleep_time}")
           sleep(sleep_time)
         end
       end
-      @transmitter = Transmitter.new(
-        Appsignal.config.fetch(:endpoint),
-        ACTION,
-        Appsignal.config.fetch(:api_key)
-      )
-      Appsignal.logger.info('Started Appsignal agent')
+    end
+
+    def subscribe
+      Appsignal.logger.debug('Subscribing to notifications')
+      # Subscribe to notifications that don't start with a !
+      @subscriber = ActiveSupport::Notifications.subscribe(/^[^!]/) do |*args|
+        if Appsignal::Transaction.current
+          event = ActiveSupport::Notifications::Event.new(*args)
+          if event.name.start_with?('process_action')
+            Appsignal::Transaction.current.set_process_action_event(event)
+          end
+          Appsignal::Transaction.current.add_event(event)
+        end
+      end
     end
 
     def enqueue(transaction)
       Appsignal.logger.debug('Enqueueing transaction')
-      aggregator_semaphore.synchronize do
-        aggregator.add(transaction)
-      end
+      aggregator.add(transaction)
     end
 
     def send_queue
       Appsignal.logger.debug('Sending queue')
+      # Replace aggregator while making sure no thread
+      # is adding to it's queue
       aggregator_to_be_sent = nil
-      aggregator_semaphore.synchronize do
+      Thread.exclusive do
         aggregator_to_be_sent = aggregator
         @aggregator = Aggregator.new
       end
+
       begin
         handle_result(
           transmitter.transmit(aggregator_to_be_sent.post_processed_queue!)
@@ -62,7 +82,7 @@ module Appsignal
 
     def shutdown(send_current_queue=false)
       Appsignal.logger.info('Shutting down the agent')
-      ActiveSupport::Notifications.unsubscribe(Appsignal.subscriber)
+      ActiveSupport::Notifications.unsubscribe(subscriber)
       Thread.kill(thread) if thread
       send_queue if send_current_queue && @aggregator.has_transactions?
     end