newrelic_rpm 2.13.3 → 2.13.4.eum1

data/CHANGELOG

@@ -1,3 +1,10 @@
+v2.13.4.eum1
+  * Add preliminary work on end user monitoring
+  * Moved the API helper to the gihtub newrelic_api gem.
+
+v2.13.4
+  * Update DNS lookup code to remove hardcoded IP addresses
+
 v2.13.3
   * Dalli instrumentation from Mike Perham (thanks Mike)
   * Datamapper instrumentation from Jordan Ritter (thanks Jordan)

data/README.rdoc

@@ -1,5 +1,7 @@
 = New Relic RPM
 
+
+
 New Relic RPM is a Ruby performance management system, developed by
 New Relic, Inc (http://www.newrelic.com).  RPM provides you with deep
 information about the performance of your Ruby on Rails or Merb

data/lib/new_relic/agent.rb

@@ -72,6 +72,7 @@ module NewRelic
     require 'new_relic/timer_lib'
 
     require 'new_relic/agent/chained_call'
+    require 'new_relic/agent/browser_monitoring'
     require 'new_relic/agent/agent'
     require 'new_relic/agent/shim_agent'
     require 'new_relic/agent/method_tracer'
@@ -377,5 +378,21 @@ module NewRelic
     def record_transaction(response_sec, options = {})
       agent.record_transaction(response_sec, options)
     end
+    
+    # PRE-RELEASE
+    # Returns a Javascript string which should be injected into the very top of the response body
+    # == options
+    # * <tt>:protocol => 'http' or 'https'
+    #
+    def browser_instrumentation_header(options={})
+      agent.browser_instrumentation_header(options)
+    end
+    
+    # PRE-RELEASE
+    # Returns a Javascript string which should be injected into the very bottom of the response body
+    #
+    def browser_instrumentation_footer(options={})
+      agent.browser_instrumentation_footer(options={})
+    end
   end
 end

data/lib/new_relic/agent/agent.rb

@@ -61,6 +61,10 @@ module NewRelic
         attr_reader :histogram
         attr_reader :metric_ids
         attr_reader :url_rules
+        attr_reader :browser_monitoring_key
+        attr_reader :application_id
+        attr_reader :beacon
+        attr_reader :episodes_file
 
         def record_transaction(duration_seconds, options={})
           is_error = options['is_error'] || options['error_message'] || options['exception']
@@ -433,6 +437,10 @@ module NewRelic
             @agent_id = connect_data['agent_run_id']
             @report_period = connect_data['data_report_period']
             @url_rules = connect_data['url_rules']
+            @browser_monitoring_key = connect_data['browser_key']
+            @application_id = connect_data['application_id']
+            @beacon = connect_data['beacon']
+            @episodes_file = connect_data['episodes_file']
 
             control.log! "Connected to NewRelic Service at #{@collector}"
             log.debug "Agent Run       = #{@agent_id}."
@@ -736,6 +744,7 @@ module NewRelic
 
       extend ClassMethods
       include InstanceMethods
+      include BrowserMonitoring
     end
   end
 end

data/lib/new_relic/agent/browser_monitoring.rb

@@ -0,0 +1,45 @@
+module NewRelic
+  module Agent
+    module BrowserMonitoring
+      def browser_instrumentation_header(options={})
+        
+        options = {:protocol => 'https'}.merge(options)
+        
+        license_key = NewRelic::Agent.instance.browser_monitoring_key
+        
+        return "" if license_key.nil?
+
+        application_id = NewRelic::Agent.instance.application_id
+        beacon = NewRelic::Agent.instance.beacon
+        episodes_file = NewRelic::Agent.instance.episodes_file
+ 
+        transaction_name = Thread::current[:newrelic_scope_name] || "<unknown>"
+        
+        # Agents are hard-coded to a particular episodes JS file. This allows for radical future change
+        # to the contents of that file
+        file = "\"#{options[:protocol]}://#{episodes_file}\""
+        
+<<-eos
+<script src=#{file} type="text/javascript"></script><script type="text/javascript" charset="utf-8">NR_RUM.setContext("#{beacon}","#{license_key}","#{application_id}","#{transaction_name}")</script>
+eos
+      end
+      
+      def browser_instrumentation_footer(options={})
+        
+        return "" if NewRelic::Agent.instance.browser_monitoring_key.nil?
+        
+        frame = Thread.current[:newrelic_metric_frame]
+        
+        if frame && frame.start
+          # HACK ALERT - there's probably a better way for us to get the queue-time
+          queue_time = ((Thread.current[:queue_time] || 0).to_f * 1000.0).round
+          app_time = ((Time.now - frame.start).to_f * 1000.0).round
+ 
+<<-eos
+<script type="text/javascript" charset="utf-8">NR_RUM.recordFooter(#{queue_time},#{app_time})</script>
+eos
+        end
+      end
+    end
+  end
+end

data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb

@@ -394,6 +394,7 @@ module NewRelic
       if http_entry_time
         queue_stat = NewRelic::Agent.agent.stats_engine.get_stats_no_scope 'WebFrontend/Mongrel/Average Queue Time'
         total_time = (now - http_entry_time)
+        Thread.current[:queue_time] = total_time    # HACK ALERT - this is used to communicate with the browser monitoring code
         queue_stat.trace_call(total_time.to_f) unless total_time.to_f <= 0.0 # using remote timestamps could lead to negative queue time
       end
       return http_entry_time ? Time.at(http_entry_time) : now

data/lib/new_relic/agent/shim_agent.rb

@@ -20,6 +20,8 @@ module NewRelic
       def shutdown; end
       def push_trace_execution_flag(*args); end
       def pop_trace_execution_flag(*args); end
+      def browser_instrumentation_header(options={}); end
+      def browser_instrumentation_footer(options={}); end
     end
   end
 end

data/lib/new_relic/control.rb

@@ -42,7 +42,7 @@ module NewRelic
       def instance
         @instance ||= new_instance
       end
-
+      
       # Create the concrete class for environment specific behavior:
       def new_instance
         @local_env = NewRelic::LocalEnvironment.new

data/lib/new_relic/control/server_methods.rb

@@ -34,27 +34,37 @@ module NewRelic
         # if the host is not an IP address, turn it into one
         NewRelic::Control::Server.new host, (self['port'] || (use_ssl? ? 443 : 80)).to_i, convert_to_ip_address(host)
       end
-
-      # Look up the ip address of the host using the pure ruby lookup
-      # to prevent blocking.  If that fails, fall back to the regular
-      # IPSocket library.  Return nil if we can't find the host ip
-      # address and don't have a good default.
+      
+      # Check to see if we need to look up the IP address
+      # If it's an IP address already, we pass it through.
+      # If it's nil, or localhost, we don't bother.
+      # Otherwise, use `resolve_ip_address` to find one
       def convert_to_ip_address(host)
         # here we leave it as a host name since the cert verification
         # needs it in host form
         return host if verify_certificate?
         return nil if host.nil? || host.downcase == "localhost"
-        # Fall back to known ip address in the common case
-        ip_address = '65.74.177.195' if host.downcase == 'collector.newrelic.com'
+        ip = resolve_ip_address(host)
+        log.info "Resolved #{host} to #{ip}"
+        ip
+      end
+      
+      # Look up the ip address of the host using the pure ruby lookup
+      # to prevent blocking.  If that fails, fall back to the regular
+      # IPSocket library.  Return nil if we can't find the host ip
+      # address and don't have a good default.
+      def resolve_ip_address(host)
+        Resolv.getaddress(host)
+      rescue Exception => e
+        log.warn("DNS Error caching IP address: #{e}")
+        log.debug(e.backtrace.join("\n   "))
         begin
-          ip_address = Resolv.getaddress(host)
-          log.info "Resolved #{host} to #{ip_address}"
-        rescue => e
-          log.warn "DNS Error caching IP address: #{e}"
-          log.debug e.backtrace.join("\n   ")
-          ip_address = IPSocket::getaddress host rescue ip_address
+          log.info("Trying native DNS lookup since Resolv failed")
+          IPSocket.getaddress(host)
+        rescue Exception => e
+          log.error("Could not look up server address: #{e}")
+          nil
         end
-        ip_address
       end
 
       # Return the Net::HTTP with proxy configuration given the NewRelic::Control::Server object.

data/lib/new_relic/stats.rb

@@ -135,6 +135,9 @@ module NewRelic
       end_time - begin_time
     end
 
+    def midpoint
+      begin_time + (duration/2)
+    end
     def calls_per_minute
       if duration.zero?
         0

data/lib/new_relic/transaction_analysis.rb

@@ -47,7 +47,7 @@ module TransactionAnalysis
       @total_time / @sample.duration
     end
 
-    def developer_name
+    def ui_name
       return @metric_name if @metric_name == 'Remainder'
       NewRelic::MetricParser::MetricParser.parse(@metric_name).developer_name
     end

data/lib/new_relic/version.rb

@@ -3,8 +3,8 @@ module NewRelic
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 13
-    TINY  = 3
-    BUILD = nil #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
+    TINY  = 4
+    BUILD = 'eum1' #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end
 

data/newrelic_rpm.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{newrelic_rpm}
-  s.version = "2.13.3"
+  s.version = "2.13.4.eum1"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bill Kayser", "Justin George"]
-  s.date = %q{2010-11-02}
+  s.date = %q{2011-02-11}
   s.description = %q{New Relic RPM is a Ruby performance management system, developed by
 New Relic, Inc (http://www.newrelic.com).  RPM provides you with deep
 information about the performance of your Ruby on Rails or Merb
@@ -18,218 +18,218 @@ dual-purposed as a either a Rails plugin or a Gem, hosted on
 http://github.com/newrelic/rpm/tree/master.
 }
   s.email = %q{support@newrelic.com}
-  s.executables = ["mongrel_rpm", "newrelic", "newrelic_cmd"]
+  s.executables = ["newrelic_cmd", "newrelic", "mongrel_rpm"]
   s.extra_rdoc_files = [
     "CHANGELOG",
-     "LICENSE",
-     "README.rdoc",
-     "newrelic.yml"
+    "LICENSE",
+    "README.rdoc",
+    "newrelic.yml"
   ]
   s.files = [
     "CHANGELOG",
-     "LICENSE",
-     "README.rdoc",
-     "bin/mongrel_rpm",
-     "bin/newrelic",
-     "bin/newrelic_cmd",
-     "cert/cacert.pem",
-     "install.rb",
-     "lib/conditional_vendored_metric_parser.rb",
-     "lib/new_relic/agent.rb",
-     "lib/new_relic/agent/agent.rb",
-     "lib/new_relic/agent/busy_calculator.rb",
-     "lib/new_relic/agent/chained_call.rb",
-     "lib/new_relic/agent/error_collector.rb",
-     "lib/new_relic/agent/instrumentation/active_merchant.rb",
-     "lib/new_relic/agent/instrumentation/active_record_instrumentation.rb",
-     "lib/new_relic/agent/instrumentation/acts_as_solr.rb",
-     "lib/new_relic/agent/instrumentation/authlogic.rb",
-     "lib/new_relic/agent/instrumentation/controller_instrumentation.rb",
-     "lib/new_relic/agent/instrumentation/data_mapper.rb",
-     "lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb",
-     "lib/new_relic/agent/instrumentation/memcache.rb",
-     "lib/new_relic/agent/instrumentation/merb/controller.rb",
-     "lib/new_relic/agent/instrumentation/merb/errors.rb",
-     "lib/new_relic/agent/instrumentation/metric_frame.rb",
-     "lib/new_relic/agent/instrumentation/net.rb",
-     "lib/new_relic/agent/instrumentation/passenger_instrumentation.rb",
-     "lib/new_relic/agent/instrumentation/rack.rb",
-     "lib/new_relic/agent/instrumentation/rails/action_controller.rb",
-     "lib/new_relic/agent/instrumentation/rails/action_web_service.rb",
-     "lib/new_relic/agent/instrumentation/rails/errors.rb",
-     "lib/new_relic/agent/instrumentation/rails3/action_controller.rb",
-     "lib/new_relic/agent/instrumentation/rails3/errors.rb",
-     "lib/new_relic/agent/instrumentation/sinatra.rb",
-     "lib/new_relic/agent/instrumentation/sunspot.rb",
-     "lib/new_relic/agent/instrumentation/unicorn_instrumentation.rb",
-     "lib/new_relic/agent/method_tracer.rb",
-     "lib/new_relic/agent/sampler.rb",
-     "lib/new_relic/agent/samplers/cpu_sampler.rb",
-     "lib/new_relic/agent/samplers/delayed_job_lock_sampler.rb",
-     "lib/new_relic/agent/samplers/memory_sampler.rb",
-     "lib/new_relic/agent/samplers/object_sampler.rb",
-     "lib/new_relic/agent/shim_agent.rb",
-     "lib/new_relic/agent/stats_engine.rb",
-     "lib/new_relic/agent/stats_engine/metric_stats.rb",
-     "lib/new_relic/agent/stats_engine/samplers.rb",
-     "lib/new_relic/agent/stats_engine/transactions.rb",
-     "lib/new_relic/agent/transaction_sampler.rb",
-     "lib/new_relic/agent/worker_loop.rb",
-     "lib/new_relic/collection_helper.rb",
-     "lib/new_relic/command.rb",
-     "lib/new_relic/commands/deployments.rb",
-     "lib/new_relic/commands/install.rb",
-     "lib/new_relic/control.rb",
-     "lib/new_relic/control/configuration.rb",
-     "lib/new_relic/control/frameworks/external.rb",
-     "lib/new_relic/control/frameworks/merb.rb",
-     "lib/new_relic/control/frameworks/rails.rb",
-     "lib/new_relic/control/frameworks/rails3.rb",
-     "lib/new_relic/control/frameworks/ruby.rb",
-     "lib/new_relic/control/frameworks/sinatra.rb",
-     "lib/new_relic/control/instrumentation.rb",
-     "lib/new_relic/control/logging_methods.rb",
-     "lib/new_relic/control/profiling.rb",
-     "lib/new_relic/control/server_methods.rb",
-     "lib/new_relic/delayed_job_injection.rb",
-     "lib/new_relic/histogram.rb",
-     "lib/new_relic/local_environment.rb",
-     "lib/new_relic/merbtasks.rb",
-     "lib/new_relic/metric_data.rb",
-     "lib/new_relic/metric_spec.rb",
-     "lib/new_relic/metrics.rb",
-     "lib/new_relic/noticed_error.rb",
-     "lib/new_relic/rack/developer_mode.rb",
-     "lib/new_relic/rack/metric_app.rb",
-     "lib/new_relic/rack/mongrel_rpm.ru",
-     "lib/new_relic/rack/newrelic.yml",
-     "lib/new_relic/rack_app.rb",
-     "lib/new_relic/recipes.rb",
-     "lib/new_relic/stats.rb",
-     "lib/new_relic/timer_lib.rb",
-     "lib/new_relic/transaction_analysis.rb",
-     "lib/new_relic/transaction_sample.rb",
-     "lib/new_relic/url_rule.rb",
-     "lib/new_relic/version.rb",
-     "lib/new_relic_api.rb",
-     "lib/newrelic_rpm.rb",
-     "lib/tasks/all.rb",
-     "lib/tasks/install.rake",
-     "lib/tasks/tests.rake",
-     "newrelic.yml",
-     "newrelic_rpm.gemspec",
-     "recipes/newrelic.rb",
-     "test/active_record_fixtures.rb",
-     "test/config/newrelic.yml",
-     "test/config/test_control.rb",
-     "test/new_relic/agent/active_record_instrumentation_test.rb",
-     "test/new_relic/agent/agent_controller_test.rb",
-     "test/new_relic/agent/agent_test_controller.rb",
-     "test/new_relic/agent/busy_calculator_test.rb",
-     "test/new_relic/agent/collection_helper_test.rb",
-     "test/new_relic/agent/error_collector_test.rb",
-     "test/new_relic/agent/memcache_instrumentation_test.rb",
-     "test/new_relic/agent/method_tracer_test.rb",
-     "test/new_relic/agent/metric_data_test.rb",
-     "test/new_relic/agent/metric_frame_test.rb",
-     "test/new_relic/agent/mock_scope_listener.rb",
-     "test/new_relic/agent/net_instrumentation_test.rb",
-     "test/new_relic/agent/rpm_agent_test.rb",
-     "test/new_relic/agent/stats_engine/metric_stats_test.rb",
-     "test/new_relic/agent/stats_engine/samplers_test.rb",
-     "test/new_relic/agent/stats_engine/stats_engine_test.rb",
-     "test/new_relic/agent/task_instrumentation_test.rb",
-     "test/new_relic/agent/testable_agent.rb",
-     "test/new_relic/agent/transaction_sample_builder_test.rb",
-     "test/new_relic/agent/transaction_sample_test.rb",
-     "test/new_relic/agent/transaction_sampler_test.rb",
-     "test/new_relic/agent/worker_loop_test.rb",
-     "test/new_relic/control_test.rb",
-     "test/new_relic/deployments_api_test.rb",
-     "test/new_relic/environment_test.rb",
-     "test/new_relic/metric_spec_test.rb",
-     "test/new_relic/rack/episodes_test.rb",
-     "test/new_relic/shim_agent_test.rb",
-     "test/new_relic/stats_test.rb",
-     "test/new_relic/version_number_test.rb",
-     "test/test_contexts.rb",
-     "test/test_helper.rb",
-     "ui/helpers/developer_mode_helper.rb",
-     "ui/helpers/google_pie_chart.rb",
-     "ui/views/layouts/newrelic_default.rhtml",
-     "ui/views/newrelic/_explain_plans.rhtml",
-     "ui/views/newrelic/_sample.rhtml",
-     "ui/views/newrelic/_segment.rhtml",
-     "ui/views/newrelic/_segment_limit_message.rhtml",
-     "ui/views/newrelic/_segment_row.rhtml",
-     "ui/views/newrelic/_show_sample_detail.rhtml",
-     "ui/views/newrelic/_show_sample_sql.rhtml",
-     "ui/views/newrelic/_show_sample_summary.rhtml",
-     "ui/views/newrelic/_sql_row.rhtml",
-     "ui/views/newrelic/_stack_trace.rhtml",
-     "ui/views/newrelic/_table.rhtml",
-     "ui/views/newrelic/explain_sql.rhtml",
-     "ui/views/newrelic/file/images/arrow-close.png",
-     "ui/views/newrelic/file/images/arrow-open.png",
-     "ui/views/newrelic/file/images/blue_bar.gif",
-     "ui/views/newrelic/file/images/file_icon.png",
-     "ui/views/newrelic/file/images/gray_bar.gif",
-     "ui/views/newrelic/file/images/new-relic-rpm-desktop.gif",
-     "ui/views/newrelic/file/images/new_relic_rpm_desktop.gif",
-     "ui/views/newrelic/file/images/textmate.png",
-     "ui/views/newrelic/file/javascript/jquery-1.4.2.js",
-     "ui/views/newrelic/file/javascript/transaction_sample.js",
-     "ui/views/newrelic/file/stylesheets/style.css",
-     "ui/views/newrelic/index.rhtml",
-     "ui/views/newrelic/sample_not_found.rhtml",
-     "ui/views/newrelic/show_sample.rhtml",
-     "ui/views/newrelic/show_source.rhtml",
-     "ui/views/newrelic/threads.rhtml",
-     "vendor/gems/metric_parser-0.1.0.pre1/LICENSE",
-     "vendor/gems/metric_parser-0.1.0.pre1/README",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/metric_parser.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/action_mailer.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/active_merchant.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/active_record.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/apdex.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/background_transaction.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/client.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/controller.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/controller_cpu.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/controller_ext.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/database.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/database_pool.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/dot_net.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/dot_net_parser.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/errors.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/external.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/frontend.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/gc.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/hibernate_session.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/java.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/java_parser.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/jsp.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/jsp_tag.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/mem_cache.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/metric_parser.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/orm.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/other_transaction.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/servlet.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/servlet_context_listener.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/servlet_filter.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/solr.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/solr_request_handler.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/spring.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/spring_controller.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/spring_view.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/struts_action.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/struts_result.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/version.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/view.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/web_frontend.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/web_service.rb",
-     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/web_transaction.rb"
+    "LICENSE",
+    "README.rdoc",
+    "bin/mongrel_rpm",
+    "bin/newrelic",
+    "bin/newrelic_cmd",
+    "cert/cacert.pem",
+    "install.rb",
+    "lib/conditional_vendored_metric_parser.rb",
+    "lib/new_relic/agent.rb",
+    "lib/new_relic/agent/agent.rb",
+    "lib/new_relic/agent/browser_monitoring.rb",
+    "lib/new_relic/agent/busy_calculator.rb",
+    "lib/new_relic/agent/chained_call.rb",
+    "lib/new_relic/agent/error_collector.rb",
+    "lib/new_relic/agent/instrumentation/active_merchant.rb",
+    "lib/new_relic/agent/instrumentation/active_record_instrumentation.rb",
+    "lib/new_relic/agent/instrumentation/acts_as_solr.rb",
+    "lib/new_relic/agent/instrumentation/authlogic.rb",
+    "lib/new_relic/agent/instrumentation/controller_instrumentation.rb",
+    "lib/new_relic/agent/instrumentation/data_mapper.rb",
+    "lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb",
+    "lib/new_relic/agent/instrumentation/memcache.rb",
+    "lib/new_relic/agent/instrumentation/merb/controller.rb",
+    "lib/new_relic/agent/instrumentation/merb/errors.rb",
+    "lib/new_relic/agent/instrumentation/metric_frame.rb",
+    "lib/new_relic/agent/instrumentation/net.rb",
+    "lib/new_relic/agent/instrumentation/passenger_instrumentation.rb",
+    "lib/new_relic/agent/instrumentation/rack.rb",
+    "lib/new_relic/agent/instrumentation/rails/action_controller.rb",
+    "lib/new_relic/agent/instrumentation/rails/action_web_service.rb",
+    "lib/new_relic/agent/instrumentation/rails/errors.rb",
+    "lib/new_relic/agent/instrumentation/rails3/action_controller.rb",
+    "lib/new_relic/agent/instrumentation/rails3/errors.rb",
+    "lib/new_relic/agent/instrumentation/sinatra.rb",
+    "lib/new_relic/agent/instrumentation/sunspot.rb",
+    "lib/new_relic/agent/instrumentation/unicorn_instrumentation.rb",
+    "lib/new_relic/agent/method_tracer.rb",
+    "lib/new_relic/agent/sampler.rb",
+    "lib/new_relic/agent/samplers/cpu_sampler.rb",
+    "lib/new_relic/agent/samplers/delayed_job_lock_sampler.rb",
+    "lib/new_relic/agent/samplers/memory_sampler.rb",
+    "lib/new_relic/agent/samplers/object_sampler.rb",
+    "lib/new_relic/agent/shim_agent.rb",
+    "lib/new_relic/agent/stats_engine.rb",
+    "lib/new_relic/agent/stats_engine/metric_stats.rb",
+    "lib/new_relic/agent/stats_engine/samplers.rb",
+    "lib/new_relic/agent/stats_engine/transactions.rb",
+    "lib/new_relic/agent/transaction_sampler.rb",
+    "lib/new_relic/agent/worker_loop.rb",
+    "lib/new_relic/collection_helper.rb",
+    "lib/new_relic/command.rb",
+    "lib/new_relic/commands/deployments.rb",
+    "lib/new_relic/commands/install.rb",
+    "lib/new_relic/control.rb",
+    "lib/new_relic/control/configuration.rb",
+    "lib/new_relic/control/frameworks/external.rb",
+    "lib/new_relic/control/frameworks/merb.rb",
+    "lib/new_relic/control/frameworks/rails.rb",
+    "lib/new_relic/control/frameworks/rails3.rb",
+    "lib/new_relic/control/frameworks/ruby.rb",
+    "lib/new_relic/control/frameworks/sinatra.rb",
+    "lib/new_relic/control/instrumentation.rb",
+    "lib/new_relic/control/logging_methods.rb",
+    "lib/new_relic/control/profiling.rb",
+    "lib/new_relic/control/server_methods.rb",
+    "lib/new_relic/delayed_job_injection.rb",
+    "lib/new_relic/histogram.rb",
+    "lib/new_relic/local_environment.rb",
+    "lib/new_relic/merbtasks.rb",
+    "lib/new_relic/metric_data.rb",
+    "lib/new_relic/metric_spec.rb",
+    "lib/new_relic/metrics.rb",
+    "lib/new_relic/noticed_error.rb",
+    "lib/new_relic/rack/developer_mode.rb",
+    "lib/new_relic/rack/metric_app.rb",
+    "lib/new_relic/rack/mongrel_rpm.ru",
+    "lib/new_relic/rack/newrelic.yml",
+    "lib/new_relic/rack_app.rb",
+    "lib/new_relic/recipes.rb",
+    "lib/new_relic/stats.rb",
+    "lib/new_relic/timer_lib.rb",
+    "lib/new_relic/transaction_analysis.rb",
+    "lib/new_relic/transaction_sample.rb",
+    "lib/new_relic/url_rule.rb",
+    "lib/new_relic/version.rb",
+    "lib/newrelic_rpm.rb",
+    "lib/tasks/all.rb",
+    "lib/tasks/install.rake",
+    "lib/tasks/tests.rake",
+    "newrelic.yml",
+    "newrelic_rpm.gemspec",
+    "recipes/newrelic.rb",
+    "test/active_record_fixtures.rb",
+    "test/config/newrelic.yml",
+    "test/config/test_control.rb",
+    "test/new_relic/agent/active_record_instrumentation_test.rb",
+    "test/new_relic/agent/agent_controller_test.rb",
+    "test/new_relic/agent/agent_test_controller.rb",
+    "test/new_relic/agent/busy_calculator_test.rb",
+    "test/new_relic/agent/collection_helper_test.rb",
+    "test/new_relic/agent/error_collector_test.rb",
+    "test/new_relic/agent/memcache_instrumentation_test.rb",
+    "test/new_relic/agent/method_tracer_test.rb",
+    "test/new_relic/agent/metric_data_test.rb",
+    "test/new_relic/agent/metric_frame_test.rb",
+    "test/new_relic/agent/mock_scope_listener.rb",
+    "test/new_relic/agent/net_instrumentation_test.rb",
+    "test/new_relic/agent/rpm_agent_test.rb",
+    "test/new_relic/agent/stats_engine/metric_stats_test.rb",
+    "test/new_relic/agent/stats_engine/samplers_test.rb",
+    "test/new_relic/agent/stats_engine/stats_engine_test.rb",
+    "test/new_relic/agent/task_instrumentation_test.rb",
+    "test/new_relic/agent/testable_agent.rb",
+    "test/new_relic/agent/transaction_sample_builder_test.rb",
+    "test/new_relic/agent/transaction_sample_test.rb",
+    "test/new_relic/agent/transaction_sampler_test.rb",
+    "test/new_relic/agent/worker_loop_test.rb",
+    "test/new_relic/control_test.rb",
+    "test/new_relic/deployments_api_test.rb",
+    "test/new_relic/environment_test.rb",
+    "test/new_relic/metric_spec_test.rb",
+    "test/new_relic/rack/episodes_test.rb",
+    "test/new_relic/shim_agent_test.rb",
+    "test/new_relic/stats_test.rb",
+    "test/new_relic/version_number_test.rb",
+    "test/test_contexts.rb",
+    "test/test_helper.rb",
+    "ui/helpers/developer_mode_helper.rb",
+    "ui/helpers/google_pie_chart.rb",
+    "ui/views/layouts/newrelic_default.rhtml",
+    "ui/views/newrelic/_explain_plans.rhtml",
+    "ui/views/newrelic/_sample.rhtml",
+    "ui/views/newrelic/_segment.rhtml",
+    "ui/views/newrelic/_segment_limit_message.rhtml",
+    "ui/views/newrelic/_segment_row.rhtml",
+    "ui/views/newrelic/_show_sample_detail.rhtml",
+    "ui/views/newrelic/_show_sample_sql.rhtml",
+    "ui/views/newrelic/_show_sample_summary.rhtml",
+    "ui/views/newrelic/_sql_row.rhtml",
+    "ui/views/newrelic/_stack_trace.rhtml",
+    "ui/views/newrelic/_table.rhtml",
+    "ui/views/newrelic/explain_sql.rhtml",
+    "ui/views/newrelic/file/images/arrow-close.png",
+    "ui/views/newrelic/file/images/arrow-open.png",
+    "ui/views/newrelic/file/images/blue_bar.gif",
+    "ui/views/newrelic/file/images/file_icon.png",
+    "ui/views/newrelic/file/images/gray_bar.gif",
+    "ui/views/newrelic/file/images/new-relic-rpm-desktop.gif",
+    "ui/views/newrelic/file/images/new_relic_rpm_desktop.gif",
+    "ui/views/newrelic/file/images/textmate.png",
+    "ui/views/newrelic/file/javascript/jquery-1.4.2.js",
+    "ui/views/newrelic/file/javascript/transaction_sample.js",
+    "ui/views/newrelic/file/stylesheets/style.css",
+    "ui/views/newrelic/index.rhtml",
+    "ui/views/newrelic/sample_not_found.rhtml",
+    "ui/views/newrelic/show_sample.rhtml",
+    "ui/views/newrelic/show_source.rhtml",
+    "ui/views/newrelic/threads.rhtml",
+    "vendor/gems/metric_parser-0.1.0.pre1/LICENSE",
+    "vendor/gems/metric_parser-0.1.0.pre1/README",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/metric_parser.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/action_mailer.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/active_merchant.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/active_record.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/apdex.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/background_transaction.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/client.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/controller.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/controller_cpu.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/controller_ext.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/database.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/database_pool.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/dot_net.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/dot_net_parser.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/errors.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/external.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/frontend.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/gc.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/hibernate_session.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/java.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/java_parser.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/jsp.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/jsp_tag.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/mem_cache.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/metric_parser.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/orm.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/other_transaction.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/servlet.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/servlet_context_listener.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/servlet_filter.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/solr.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/solr_request_handler.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/spring.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/spring_controller.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/spring_view.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/struts_action.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/struts_result.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/version.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/view.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/web_frontend.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/web_service.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/web_transaction.rb"
   ]
   s.homepage = %q{http://www.github.com/newrelic/rpm}
   s.post_install_message = %q{
@@ -258,7 +258,7 @@ Notice: Developer Mode now supports only Rails 2.3+ - refer to README
 for instructions for previous versions
 
 }
-  s.rdoc_options = ["--charset=UTF-8", "--line-numbers", "--inline-source", "--title", "New Relic Ruby Performance Monitoring Agent"]
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "New Relic Ruby Performance Monitoring Agent"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{New Relic Ruby Performance Monitoring Agent}

data/test/new_relic/control_test.rb

@@ -61,9 +61,34 @@ class NewRelic::ControlTest < Test::Unit::TestCase
   def test_resolve_ip
     assert_equal nil, c.send(:convert_to_ip_address, 'localhost')
     assert_equal nil, c.send(:convert_to_ip_address, 'q1239988737.us')
-    # This might fail if you don't have a valid, accessible, DNS server
-    assert_equal '65.74.177.194', c.send(:convert_to_ip_address, 'rpm.newrelic.com')
+    # This will fail if you don't have a valid, accessible, DNS server
+    assert_equal '204.93.223.153', c.send(:convert_to_ip_address, 'collector.newrelic.com')
   end
+  
+  class FakeResolv
+    def self.getaddress(host)
+      raise 'deliberately broken'
+    end
+  end
+  
+  def test_resolve_ip_with_broken_dns
+    # Here be dragons: disable the ruby DNS lookup methods we use so
+    # that it will actually fail to resolve.
+    old_resolv = Resolv
+    old_ipsocket = IPSocket
+    Object.instance_eval { remove_const :Resolv}
+    Object.instance_eval {remove_const:'IPSocket' }
+    assert_equal(nil, c.send(:convert_to_ip_address, 'collector.newrelic.com'), "DNS is down, should be no IP for server")
+    
+    Object.instance_eval {const_set('Resolv', old_resolv); const_set('IPSocket', old_ipsocket)}
+    # these are here to make sure that the constant tomfoolery above
+    # has not broket the system unduly
+    assert_equal old_resolv, Resolv
+    assert_equal old_ipsocket, IPSocket
+  end
+    
+    
+  
   def test_config_yaml_erb
     assert_equal 'heyheyhey', c['erb_value']
     assert_equal '', c['message']

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic_rpm
 version: !ruby/object:Gem::Version 
-  hash: 61
-  prerelease: false
+  hash: -1847304032
+  prerelease: true
   segments: 
   - 2
   - 13
-  - 3
-  version: 2.13.3
+  - 4
+  - eum1
+  version: 2.13.4.eum1
 platform: ruby
 authors: 
 - Bill Kayser
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-02 00:00:00 -07:00
+date: 2011-02-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,9 +72,9 @@ description: |
 
 email: support@newrelic.com
 executables: 
-- mongrel_rpm
-- newrelic
 - newrelic_cmd
+- newrelic
+- mongrel_rpm
 extensions: []
 
 extra_rdoc_files: 
@@ -93,6 +94,7 @@ files:
 - lib/conditional_vendored_metric_parser.rb
 - lib/new_relic/agent.rb
 - lib/new_relic/agent/agent.rb
+- lib/new_relic/agent/browser_monitoring.rb
 - lib/new_relic/agent/busy_calculator.rb
 - lib/new_relic/agent/chained_call.rb
 - lib/new_relic/agent/error_collector.rb
@@ -167,7 +169,6 @@ files:
 - lib/new_relic/transaction_sample.rb
 - lib/new_relic/url_rule.rb
 - lib/new_relic/version.rb
-- lib/new_relic_api.rb
 - lib/newrelic_rpm.rb
 - lib/tasks/all.rb
 - lib/tasks/install.rake
@@ -317,7 +318,6 @@ post_install_message: |+
   for instructions for previous versions
   
 rdoc_options: 
-- --charset=UTF-8
 - --line-numbers
 - --inline-source
 - --title
@@ -336,14 +336,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 

data/lib/new_relic_api.rb

@@ -1,276 +0,0 @@
-# == REST API Helpers
-#
-# Ruby lib for working with the New Relic API's XML interface.  Requires Rails 2.0 or later to be loaded.
-#
-# Can also be used as a script using script/runner
-#
-# Authentication is handled using your agent license key or HTTP Basic Authentication.  To authenticate
-# using your license key your newrelic.yml configuration file must be in your application config directory
-# and contain your license key.  The New Relic account associated with the license key must allow api access.
-# Log into RPM, click Account at the top of the page and check the "Make my account data accessible" checkbox.
-#
-# Basic authentication uses your site credentials to authenticate.
-#
-#   # To authenticate using basic authentication, make this call with your username and password:
-#   NewRelicApi.authenticate('user@example.com', 'test')
-#
-# This API does not have any agent dependencies.  It can be used independent of the agent by copying it into your application.
-#
-# == Examples
-#
-#   # Fetching the list of applications for an account
-#   NewRelicApi::Account.find(:first).applications
-#
-#   # Fetching the health values for all account applications
-#   NewRelicApi::Account.application_health
-#
-#   # Fetching the health values for an application
-#   NewRelicApi::Account.find(:first).applications.first.threshold_values
-#
-#   # Finding an application by name
-#   NewRelicApi::Account.find(:first).applications(:params => {:conditions => {:name => 'My App'}})
-#
-
-module NewRelicApi
-
-  # This mixin defines ActiveRecord style associations (like has_many) for ActiveResource objects.
-  # ActiveResource objects using this mixin must define the method 'query_params'.
-  module ActiveResourceAssociations #:nodoc:
-    class << self
-      protected
-      def included(base)
-        class << base
-          # a special activeresource implementation of has_many
-          def has_many(*associations)
-            associations.to_a.each do |association|
-              define_method association do |*args|
-                val = attributes[association.to_s] # if we've already fetched the relationship in the initial fetch, return it
-                return val if val
-
-                options = args.extract_options!
-                type = args.first || :all
-
-                begin
-                  # look for the class definition within the current class
-                  clazz = ( self.class.name + '::' + association.to_s.camelize.singularize).constantize
-                rescue
-                  # look for the class definition in the NRAPI module
-                  clazz = ( 'NewRelicApi::' + association.to_s.camelize.singularize).constantize
-                end
-                params = (options[:params] || {}).update(self.query_params)
-                options[:params] = params
-                clazz.find(type, options)
-
-                #clazz.find(type, :params => options.update(self.query_params))
-              end
-            end
-          end
-        end
-      end
-    end
-
-  end
-  class << self
-    attr_accessor :email, :password, :license_key, :ssl, :host, :port
-
-    # Sets up basic authentication credentials for all the resources.  This is not necessary if you are
-    # using agent license key authentication.
-    def authenticate(email, password)
-      @password = password
-      @email    = email
-    end
-
-    # Resets the base path of all resources.  This should be called when overridding the newrelic.yml settings
-    # using the ssl, host or port accessors.
-    def reset!
-      @classes.each {|klass| klass.reset!} if @classes
-      NewRelicApi::Account.site_url
-    end
-
-
-    def track_resource(klass) #:nodoc:
-      (@classes ||= []) << klass
-    end
-  end
-
-  class BaseResource < ActiveResource::Base #:nodoc:
-    include ActiveResourceAssociations
-
-    class << self
-      def inherited(klass) #:nodoc:
-        NewRelicApi.track_resource(klass)
-      end
-
-      def headers
-        h = {'x-license-key' => NewRelicApi.license_key || NewRelic::Control.instance['license_key']}
-        h['Authorization'] = 'Basic ' + ["#{NewRelicApi.email}:#{NewRelicApi.password}"].pack('m').delete("\r\n") if NewRelicApi.email
-        h
-      end
-
-      def site_url
-        host = NewRelicApi.host || NewRelic::Control.instance.api_server.name
-        port = NewRelicApi.port || NewRelic::Control.instance.api_server.port
-        "#{port == 443 ? 'https' : 'http'}://#{host}:#{port}"
-      end
-
-      def reset!
-        self.site = self.site_url
-      end
-
-      protected
-
-      def fix_fields(*fields)
-        fields.to_a.each do |field|
-          define_method field do
-            yield super
-          end
-        end
-      end
-
-      def fix_integer_fields(*fields)
-        fix_fields(*fields) { |sup| sup.to_i }
-      end
-
-      def fix_float_fields(*fields)
-        fix_fields(*fields) { |sup| sup.to_f }
-      end
-
-    end
-    self.site = self.site_url
-  end
-  ACCOUNT_RESOURCE_PATH = '/accounts/:account_id/' #:nodoc:
-  ACCOUNT_AGENT_RESOURCE_PATH = ACCOUNT_RESOURCE_PATH + 'agents/:agent_id/' #:nodoc:
-  ACCOUNT_APPLICATION_RESOURCE_PATH = ACCOUNT_RESOURCE_PATH + 'applications/:application_id/' #:nodoc:
-
-  module AccountResource #:nodoc:
-    def account_id
-      prefix_options[:account_id]
-    end
-    def account_query_params(extra_params = {})
-      {:account_id => account_id}.merge(extra_params)
-    end
-
-    def query_params#:nodoc:
-      account_query_params
-    end
-  end
-
-  module AgentResource #:nodoc:
-    include ActiveResourceAssociations
-  end
-
-  # An application has many:
-  # +agents+:: the agent instances associated with this app
-  # +threshold_values+:: the health indicators for this application.
-  class Application < BaseResource
-    include AccountResource
-    include AgentResource
-
-    has_many :agents, :threshold_values
-
-    self.prefix = ACCOUNT_RESOURCE_PATH
-
-    def query_params#:nodoc:
-      account_query_params(:application_id => id)
-    end
-
-    class Agent < BaseResource
-      include AccountResource
-      include AgentResource
-
-      self.prefix = ACCOUNT_APPLICATION_RESOURCE_PATH
-
-      def query_params#:nodoc:
-        super.merge(:application_id => cluster_agent_id)
-      end
-    end
-
-  end
-
-  # A threshold value represents a single health indicator for an application such as CPU, memory or response time.
-  #
-  # ==Fields
-  # +name+:: The name of the threshold setting associated with this threshold value.
-  # +threshold_value+:: A value of 0, 1, 2 or 3 representing gray (not reporting), green, yellow and red
-  # +metric_value+:: The metric value associated with this threshold
-  class ThresholdValue < BaseResource
-    self.prefix = ACCOUNT_APPLICATION_RESOURCE_PATH
-    #      attr_reader :name, :begin_time, :metric_value, :threshold_value
-
-    fix_integer_fields :threshold_value
-    fix_float_fields :metric_value
-
-    # Returns the color value for this threshold (Gray, Green, Yellow or Red).
-    def color_value
-      case threshold_value
-        when 3: 'Red'
-        when 2: 'Yellow'
-        when 1: 'Green'
-      else 'Gray'
-      end
-    end
-
-    def to_s #:nodoc:
-      "#{name}: #{color_value} (#{formatted_metric_value})"
-    end
-  end
-
-  # An account contains your basic account information.
-  #
-  # Accounts have many
-  # +applications+:: the applications contained within the account
-  #
-  # Find Accounts
-  #
-  #   NewRelicApi::Account.find(:all) # find all accounts for the current user.
-  #   NewRelicApi::Account.find(44)   # find individual account by ID
-  #
-  class Account < BaseResource
-    has_many :applications
-    has_many :account_views
-
-    def query_params #:nodoc:
-      {:account_id => id}
-    end
-
-    # Returns an account including all of its applications and the threshold values for each application.
-    def self.application_health(type = :first)
-      find(type, :params => {:include => :application_health})
-    end
-
-    class AccountView < BaseResource
-      self.prefix = ACCOUNT_RESOURCE_PATH
-
-      def query_params(extra_params = {}) #:nodoc:
-        {:account_id => account_id}.merge(extra_params)
-      end
-
-      def user
-        @attributes['user']
-      end
-    end
-
-    class AccountUsage < BaseResource
-    end
-  end
-
-  # This model is used to mark production deployments in RPM
-  # Only create is supported.
-  # ==Examples
-  #   # Creating a new deployment
-  #   NewRelicApi::Deployment.create
-  #
-  class Deployment < BaseResource
-  end
-
-  class Subscription < BaseResource
-    def query_params(extra_params = {}) #:nodoc:
-      {:account_id => account_id}.merge(extra_params)
-    end
-  end
-
-  class User < BaseResource
-  end
-
-end
-