lib/fiveruns/json.rb lib/fiveruns/json/add/core.rb lib/fiveruns/json/add/rails.rb lib/fiveruns/json/common.rb lib/fiveruns/json/pure.rb lib/fiveruns/json/pure/generator.rb lib/fiveruns/json/pure/parser.rb lib/fiveruns/json/version.rb @@ -19,7 +19,6 @@ begin s.description = "Provides an API to send metrics to the FiveRuns Dash service" s.authors = ["FiveRuns Development Team"] s.files = FileList['README.rdoc', 'Rakefile', 'version.yml', "{lib,test,recipes,examples}/**/*", ] - s.add_dependency 'json' end rescue LoadError puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com" @@ -35,4 +34,4 @@ task :coverage do FileUtils.cp_r 'coverage', ccout end system "open coverage/index.html" if PLATFORM['darwin'] -end \ No newline at end of file +end Rakefile @@ -6,10 +6,10 @@ Gem::Specification.new do |s| s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["FiveRuns Development Team"] - s.date = %q{2009-02-26} + s.date = %q{2009-03-03} s.description = %q{Provides an API to send metrics to the FiveRuns Dash service} s.email = %q{dev@fiveruns.com} - s.files = ["README.rdoc", "Rakefile", "version.yml", "lib/fiveruns", "lib/fiveruns/dash", "lib/fiveruns/dash/configuration.rb", "lib/fiveruns/dash/exception_recorder.rb", "lib/fiveruns/dash/host.rb", "lib/fiveruns/dash/instrument.rb", "lib/fiveruns/dash/metric.rb", "lib/fiveruns/dash/recipe.rb", "lib/fiveruns/dash/reporter.rb", "lib/fiveruns/dash/scm.rb", "lib/fiveruns/dash/session.rb", "lib/fiveruns/dash/store", "lib/fiveruns/dash/store/file.rb", "lib/fiveruns/dash/store/http.rb", "lib/fiveruns/dash/threads.rb", "lib/fiveruns/dash/trace.rb", "lib/fiveruns/dash/typable.rb", "lib/fiveruns/dash/update.rb", "lib/fiveruns/dash/util.rb", "lib/fiveruns/dash/version.rb", "lib/fiveruns/dash.rb", "test/collector_communication_test.rb", "test/configuration_test.rb", "test/exception_recorder_test.rb", "test/file_store_test.rb", "test/fixtures", "test/fixtures/http_store_test", "test/fixtures/http_store_test/response.json", "test/http_store_test.rb", "test/metric_test.rb", "test/recipe_test.rb", "test/reliability_test.rb", "test/reporter_test.rb", "test/scm_test.rb", "test/session_test.rb", "test/test_helper.rb", "test/tracing_test.rb", "test/update_test.rb", "recipes/jruby.rb", "recipes/ruby.rb"] + s.files = ["README.rdoc", "Rakefile", "version.yml", "lib/fiveruns", "lib/fiveruns/dash", "lib/fiveruns/dash/configuration.rb", "lib/fiveruns/dash/exception_recorder.rb", "lib/fiveruns/dash/host.rb", "lib/fiveruns/dash/instrument.rb", "lib/fiveruns/dash/metric.rb", "lib/fiveruns/dash/recipe.rb", "lib/fiveruns/dash/reporter.rb", "lib/fiveruns/dash/scm.rb", "lib/fiveruns/dash/session.rb", "lib/fiveruns/dash/store", "lib/fiveruns/dash/store/file.rb", "lib/fiveruns/dash/store/http.rb", "lib/fiveruns/dash/threads.rb", "lib/fiveruns/dash/trace.rb", "lib/fiveruns/dash/typable.rb", "lib/fiveruns/dash/update.rb", "lib/fiveruns/dash/util.rb", "lib/fiveruns/dash/version.rb", "lib/fiveruns/dash.rb", "lib/fiveruns/json", "lib/fiveruns/json/add", "lib/fiveruns/json/add/core.rb", "lib/fiveruns/json/add/rails.rb", "lib/fiveruns/json/common.rb", "lib/fiveruns/json/pure", "lib/fiveruns/json/pure/generator.rb", "lib/fiveruns/json/pure/parser.rb", "lib/fiveruns/json/pure.rb", "lib/fiveruns/json/version.rb", "lib/fiveruns/json.rb", "test/collector_communication_test.rb", "test/configuration_test.rb", "test/exception_recorder_test.rb", "test/file_store_test.rb", "test/fixtures", "test/fixtures/http_store_test", "test/fixtures/http_store_test/response.json", "test/http_store_test.rb", "test/metric_test.rb", "test/recipe_test.rb", "test/reliability_test.rb", "test/reporter_test.rb", "test/scm_test.rb", "test/session_test.rb", "test/test_helper.rb", "test/tracing_test.rb", "test/update_test.rb", "recipes/jruby.rb", "recipes/ruby.rb"] s.has_rdoc = true s.homepage = %q{http://github.com/fiveruns/dash-ruby} s.rdoc_options = ["--inline-source", "--charset=UTF-8"] @@ -23,11 +23,8 @@ Gem::Specification.new do |s| s.specification_version = 2 if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then - s.add_runtime_dependency(%q<json>, [">= 0"]) else - s.add_dependency(%q<json>, [">= 0"]) end else - s.add_dependency(%q<json>, [">= 0"]) end end dash-ruby.gemspec @@ -1,5 +1,10 @@ require 'rubygems' +module Fiveruns; end + +# Pull in our forked copy of the pure JSON gem +require 'fiveruns/json' + require 'pathname' require 'thread' require 'time' @@ -9,9 +14,6 @@ $:.unshift(File.dirname(__FILE__)) # NB: Pre-load ALL Dash files here so we do not accidentally # use ActiveSupport's autoloading. - -module Fiveruns; end - require 'dash/version' require 'dash/util' require 'dash/configuration' lib/fiveruns/dash.rb @@ -51,7 +51,7 @@ module Fiveruns::Dash def send_trace(trace) if trace.data payload = TracePayload.new(trace) - Fiveruns::Dash.logger.debug "Sending trace: #{payload.to_json}" + Fiveruns::Dash.logger.debug "Sending trace: #{payload.to_fjson}" Thread.new { Update.new(payload).store(*update_locations) } else Fiveruns::Dash.logger.debug "No trace to send" @@ -135,11 +135,8 @@ module Fiveruns::Dash def send_info_update @info_update_sent ||= begin - # Pull in JSON at the last minute, to work around Rails incompatabilities - # http://groups.google.com/group/rubyonrails-core/browse_thread/thread/54e5453eaac6687b# - require 'json' payload = InfoPayload.new(@session.info, @started_at) - Fiveruns::Dash.logger.debug "Sending info: #{payload.to_json}" + Fiveruns::Dash.logger.debug "Sending info: #{payload.to_fjson}" result = Update.new(payload).store(*update_locations) send_fake_info(payload) result @@ -153,7 +150,7 @@ module Fiveruns::Dash Fiveruns::Dash.logger.debug "No exceptions for this interval" else payload = ExceptionsPayload.new(data) - Fiveruns::Dash.logger.debug "Sending exceptions: #{payload.to_json}" + Fiveruns::Dash.logger.debug "Sending exceptions: #{payload.to_fjson}" Update.new(payload).store(*update_locations) end else @@ -167,7 +164,7 @@ module Fiveruns::Dash if @info_update_sent data = @session.data payload = DataPayload.new(data) - Fiveruns::Dash.logger.debug "Sending data: #{payload.to_json}" + Fiveruns::Dash.logger.debug "Sending data: #{payload.to_fjson}" result = Update.new(payload).store(*update_locations) send_fake_data(payload) result @@ -189,7 +186,7 @@ module Fiveruns::Dash def send_fake_data(payload) fake_host_count.times do |idx| payload.params[:process_id] = Fiveruns::Dash.process_ids[idx+1] - Fiveruns::Dash.logger.debug "Sending data: #{payload.to_json}" + Fiveruns::Dash.logger.debug "Sending data: #{payload.to_fjson}" Update.new(payload).store(*update_locations) end end @@ -199,7 +196,7 @@ module Fiveruns::Dash fake_host_count.times do |idx| payload.params[:mac] += idx.to_s payload.params[:hostname] = host + idx.to_s - Fiveruns::Dash.logger.debug "Sending info: #{payload.to_json}" + Fiveruns::Dash.logger.debug "Sending info: #{payload.to_fjson}" Update.new(payload).store(*update_locations) end end lib/fiveruns/dash/reporter.rb @@ -10,7 +10,7 @@ module Fiveruns::Dash::Store end def write_to(path) - ::File.open(path, 'w') { |f| f.write @payload.to_json } + ::File.open(path, 'w') { |f| f.write @payload.to_fjson } end def filename(directory) lib/fiveruns/dash/store/file.rb @@ -68,7 +68,7 @@ module Fiveruns::Dash::Store end case response.code.to_i when 201 - data = JSON.load(response.body) + data = FiverunsJSON.load(response.body) set_trace_contexts(data) true when 400..499 @@ -78,9 +78,9 @@ module Fiveruns::Dash::Store Fiveruns::Dash.logger.debug "Received unknown response from Dash service (#{response.inspect})" false end - rescue JSON::ParserError => e + rescue FiverunsJSON::ParserError => e puts response.body - Fiveruns::Dash.logger.error "Received non-JSON response (#{response.inspect})" + Fiveruns::Dash.logger.error "Received non-FiverunsJSON response (#{response.inspect})" false end lib/fiveruns/dash/store/http.rb @@ -27,10 +27,10 @@ module Fiveruns::Dash end end - def to_json + def to_fjson { :context => context, :data => (@data || {}) - }.to_json + }.to_fjson end private @@ -51,11 +51,11 @@ module Fiveruns::Dash @children ||= [] end - def to_json + def to_fjson { :metrics => metrics, :children => children, - }.to_json + }.to_fjson end end lib/fiveruns/dash/trace.rb @@ -27,7 +27,7 @@ module Fiveruns::Dash response = http.post("/apps/#{token}/ping", multipart.to_s, "Content-Type" => multipart.content_type) case response.code.to_i when 201 - data = JSON.load(response.body) + data = ::Fiveruns::JSON.load(response.body) [:success, "Found application '#{data['name']}'"] else # Error message @@ -133,8 +133,8 @@ module Fiveruns::Dash {} end - def to_json - @data.to_json + def to_fjson + @data.to_fjson end ####### @@ -146,7 +146,7 @@ module Fiveruns::Dash end def compressed - Zlib::Deflate.deflate(to_json) + Zlib::Deflate.deflate(to_fjson) end end lib/fiveruns/dash/update.rb @@ -37,7 +37,7 @@ module Fiveruns::Dash::Store::HTTP Fiveruns::Dash.logger.debug "Received unknown response from Dash service (#{response.inspect})" false end - rescue JSON::ParserError => e + rescue ::Fiveruns::JSON::ParserError => e puts response.body Fiveruns::Dash.logger.error "Received non-JSON response (#{response.inspect})" false test/collector_communication_test.rb 78035b2bc92ade23e5d3a822b88294543f0ee947 Mike Perham mperham@gmail.com http://github.com/fiveruns/dash-ruby/commit/e945949c41fc9b91993b76f470cbb892e1c846a0 e945949c41fc9b91993b76f470cbb892e1c846a0 2009-03-03T12:56:58-08:00 2009-03-03T12:56:58-08:00 Add our own private version of JSON. All json methods are now called "fjson", so "to_fjson" and "fjson_create". All JSON classes and constants have moved to Fiveruns::JSON 2e7499e610cc4316edfd05a915ba213c39797527 Mike Perham mperham@gmail.com