@@ -10,6 +10,7 @@ begin s.description = "Provides an API to send metrics from Merb 1.0+ applications to the FiveRuns Dash service" s.authors = ["FiveRuns Development Team"] s.add_dependency('fiveruns-dash-ruby', '>= 0.8.0') + s.add_dependency('merb-core', '>= 1.0.0') end rescue LoadError puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com" Rakefile @@ -2,7 +2,7 @@ Gem::Specification.new do |s| s.name = %q{dash-merb} - s.version = "0.6.1" + s.version = "0.6.2" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["FiveRuns Development Team"] @@ -23,10 +23,13 @@ Gem::Specification.new do |s| if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then s.add_runtime_dependency(%q<fiveruns-dash-ruby>, [">= 0.8.0"]) + s.add_runtime_dependency(%q<merb-core>, [">= 1.0.0"]) else s.add_dependency(%q<fiveruns-dash-ruby>, [">= 0.8.0"]) + s.add_dependency(%q<merb-core>, [">= 1.0.0"]) end else s.add_dependency(%q<fiveruns-dash-ruby>, [">= 0.8.0"]) + s.add_dependency(%q<merb-core>, [">= 1.0.0"]) end end dash-merb.gemspec @@ -1,7 +1,7 @@ # Depends on non-ActiveSupport fiveruns-dash-ruby (>= 0.8.0) dependency 'fiveruns-dash-ruby', '>= 0.8.0', :require_as => 'fiveruns/dash', :immediate => true -Merb::Config[:dash] = { +Merb::Config[:dash] ||= { :token => nil, :recipes => [ # This recipe can be removed, if desired @@ -12,5 +12,7 @@ Merb::Config[:dash] = { Merb::BootLoader.after_app_loads do Fiveruns::Dash.logger = Merb.logger require 'fiveruns/dash/merb' - Fiveruns::Dash::Merb.start if Merb::Config[:dash][:token] + if Merb::Config[:adapter] != 'irb' && Merb::Config[:dash][:token] + Fiveruns::Dash::Merb.start + end end \ No newline at end of file lib/dash-merb.rb @@ -1,5 +1,28 @@ Fiveruns::Dash.register_recipe :merb, :url => 'http://dash.fiveruns.com' do |recipe| - recipe.time 'response_time', :method => 'Merb::Request#dispatch_action' - recipe.counter 'requests', :incremented_by => 'Merb::Request#dispatch_action' - recipe.time 'render_time', :method => 'Merb::RenderMixin#render' + recipe.time :response_time, :method => 'Merb::Request#dispatch_action' + recipe.counter :requests, :incremented_by => 'Merb::Request#dispatch_action' + recipe.time :render_time, :method => 'Merb::RenderMixin#render' + merb_exceptions = Merb::ControllerExceptions.constants.map do |name| + "Merb::ControllerExceptions::#{name}" + end + recipe.ignore_exceptions do |ex| + merb_exceptions.include?(ex.class.name) + end + recipe.add_exceptions_from 'Merb::Request#dispatch_action' do |ex, request| + info = {:name => "#{ex.class.name} in #{request.controller}##{request.params[:action]}"} + # TODO: We shouldn't need to double-serialize to_json -- BW + begin + info[:params] = request.params.to_json + rescue + Merb.logger.warn "Could not capture request params for exception" + end + begin + info[:environment] = request.env.to_json + rescue + Merb.logger.warn "Could not capture request env for exception" + end + # TODO: capture session + # TODO: capture headers + info + end end \ No newline at end of file lib/fiveruns/dash/merb/recipe.rb LICENSE d783a35956a75e8334abc578aaa1d88945a04643 Bruce Williams bruce@codefluency.com http://github.com/fiveruns/dash-merb/commit/d4d32bfbfdc83dea70af7e215d17b03a6cdd4ae3 d4d32bfbfdc83dea70af7e215d17b03a6cdd4ae3 2009-02-17T09:16:24-08:00 2009-02-17T09:16:24-08:00 Capture non-Merb::ControllerException exceptions & send to service Add Merb gem dependency, increment version number for build 0a4fa3f535666e46affa57d7fe2ec16cea039961 Bruce Williams bruce@codefluency.com