ghazel-newrelic_rpm 3.4.0.2 → 3.5.4

data/lib/new_relic/transaction_sample/segment.rb

@@ -1,4 +1,5 @@
 require 'new_relic/transaction_sample'
+
 module NewRelic
   class TransactionSample
     class Segment
@@ -15,13 +16,13 @@ module NewRelic
         @metric_name = metric_name || '<unknown>'
         @segment_id = segment_id || object_id
       end
-      
+
       # sets the final timestamp on a segment to indicate the exit
       # point of the segment
       def end_trace(timestamp)
         @exit_timestamp = timestamp
       end
-      
+
       def add_called_segment(s)
         @called_segments ||= []
         @called_segments << s
@@ -32,18 +33,15 @@ module NewRelic
         to_debug_str(0)
       end
 
-      def to_json(options={})
-        hash = {
-          :entry_timestamp => @entry_timestamp,
-          :exit_timestamp => @exit_timestamp,
-          :metric_name => @metric_name,
-          :segment_id => @segment_id,
-        }
-
-        hash[:called_segments] = called_segments if !called_segments.empty?
-        hash[:params] = @params if @params && !@params.empty?
+      def to_array
+        [ (@entry_timestamp.to_f * 1000).round,
+          (@exit_timestamp.to_f * 1000).round,
+          @metric_name, (@params || {}) ] +
+          [ (@called_segments ? @called_segments.map{|s| s.to_array} : []) ]
+      end
 
-        hash.to_json
+      def to_json
+        JSON.dump(self.to_array)
       end
 
       def path_string
@@ -97,13 +95,13 @@ module NewRelic
         end
         d
       end
-      
+
       def count_segments
         count = 1
         called_segments.each { | seg | count  += seg.count_segments }
         count
       end
-      
+
       # Walk through the tree and truncate the segments in a
       # depth-first manner
       def truncate(max)

data/lib/new_relic/version.rb

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

data/lib/tasks/tests.rake

@@ -1,19 +1,19 @@
-# run unit tests for the NewRelic Agent
 begin
-  require 'rake/test_task'
+  require 'rake/testtask'
 rescue LoadError => e
 end
 
 if defined? Rake::TestTask
+  task :test => 'test:newrelic'
+  task :default => :test
   namespace :test do
-    AGENT_HOME = File.expand_path(File.join(File.dirname(__FILE__), "..",".."))
+    agent_home = File.expand_path(File.join(File.dirname(__FILE__),'..','..'))
+
     Rake::TestTask.new(:newrelic) do |t|
-      t.libs << "#{AGENT_HOME}/test"
-      t.libs << "#{AGENT_HOME}/lib"
-      t.pattern = "#{AGENT_HOME}/test/**/*_test.rb"
+      t.libs << "#{agent_home}/test"
+      t.libs << "#{agent_home}/lib"
+      t.pattern = "#{agent_home}/test/new_relic/**/*_test.rb"
       t.verbose = true
     end
-    Rake::Task['test:newrelic'].comment = "Run the unit tests for the Agent"
-    task :newrelic => :environment
   end
 end

data/newrelic.yml

@@ -1,7 +1,7 @@
 #
 # This file configures the New Relic Ruby Agent, New Relic monitors
-# Rails applications with deep visibility and low overhead.  For more
-# information, visit www.newrelic.com
+# Rails applications with deep visibility and low overhead. For more
+# information, visit www.newrelic.com.
 #
 # Generated <%= Time.now.strftime('%B %d, %Y') %>, for version <%= NewRelic::VERSION::STRING %>
 #
@@ -21,7 +21,7 @@ common: &default_settings
   # Use this setting to force the agent to run or not run.
   # Default is 'auto' which means the agent will install and run only
   # if a valid dispatcher such as Mongrel is running.  This prevents
-  # it from running with Rake or the console.  Set to false to
+  # it from running with Rake or the console. Set to false to
   # completely turn the agent off regardless of the other settings.
   # Valid values are true, false and auto.
   #
@@ -47,7 +47,7 @@ common: &default_settings
   # When "true", the agent collects performance data about your 
   # application and reports this data to the New Relic service at 
   # newrelic.com. This global switch is normally overridden for each 
-  # environment below. (formerly called 'enabled')
+  # environment below (formerly called 'enabled').
   monitor_mode: true
 
   # Developer mode should be off in every environment but
@@ -55,7 +55,7 @@ common: &default_settings
   developer_mode: false
 
   # The newrelic agent generates its own log file to keep its logging
-  # information separate from that of your application.  Specify its
+  # information separate from that of your application. Specify its
   # log level here.
   log_level: info
 
@@ -87,19 +87,7 @@ common: &default_settings
   # use a non-blocking lookup, so in a worst case, if you have DNS
   # problems, your app may block indefinitely.
   # verify_certificate: true
-  
-  # Set your application's Apdex threshold value with the 'apdex_t'
-  # setting, in seconds. The apdex_t value determines the buckets used
-  # to compute your overall Apdex score. 
-  # Requests that take less than apdex_t seconds to process will be
-  # classified as Satisfying transactions; more than apdex_t seconds
-  # as Tolerating transactions; and more than four times the apdex_t
-  # value as Frustrating transactions. 
-  # For more about the Apdex standard, see
-  # http://newrelic.com/docs/general/apdex
 
-  apdex_t: 0.5
-  
   #============================== Browser Monitoring ===============================
   # New Relic Real User Monitoring gives you insight into the performance real users are
   # experiencing with your website. This is accomplished by measuring the time it takes for
@@ -113,7 +101,7 @@ common: &default_settings
   # Proxy settings for connecting to the service.
   #
   # If a proxy is used, the host setting is required.  Other settings
-  # are optional.  Default port is 8080.
+  # are optional. Default port is 8080.
   #
   # proxy_host: hostname
   # proxy_port: 8080
@@ -153,13 +141,13 @@ common: &default_settings
     # When transaction tracer is on, SQL statements can optionally be
     # recorded. The recorder has three modes, "off" which sends no
     # SQL, "raw" which sends the SQL statement in its original form,
-    # and "obfuscated", which strips out numeric and string literals
+    # and "obfuscated", which strips out numeric and string literals.
     record_sql: obfuscated
     
     # Threshold in seconds for when to collect stack trace for a SQL
     # call. In other words, when SQL statements exceed this threshold,
     # then capture and send the current stack trace. This is
-    # helpful for pinpointing where long SQL calls originate from
+    # helpful for pinpointing where long SQL calls originate from.
     stack_trace_threshold: 0.500
 
     # Determines whether the agent will capture query plans for slow
@@ -172,12 +160,12 @@ common: &default_settings
     # explain_threshold: 0.5
   
   # Error collector captures information about uncaught exceptions and
-  # sends them to the service for viewing
+  # sends them to the service for viewing.
   error_collector:
     
     # Error collector is enabled by default. Set this to false to turn
     # it off. This feature is only available at the Professional and above
-    # product levels
+    # product levels.
     enabled: true
     
     # Rails Only - tells error collector whether or not to capture a 
@@ -188,12 +176,11 @@ common: &default_settings
     # To stop specific errors from reporting to New Relic, set this property
     # to comma separated values.  Default is to ignore routing errors
     # which are how 404's get triggered.
-    #
     ignore_errors: ActionController::RoutingError
 
   # (Advanced) Uncomment this to ensure the cpu and memory samplers
-  # won't run.  Useful when you are using the agent to monitor an
-  # external resource
+  # won't run. Useful when you are using the agent to monitor an
+  # external resource.
   # disable_samplers: true
   
   # If you aren't interested in visibility in these areas, you can
@@ -209,10 +196,6 @@ common: &default_settings
   # overhead slightly on every memcached call, and can have security
   # implications if your memcached keys are sensitive
   # capture_memcache_keys: true
-  
-  # Certain types of instrumentation such as GC stats will not work if 
-  # you are running multi-threaded.  Please let us know.
-  # multi_threaded = false
 
 # Application Environments
 # ------------------------------------------
@@ -248,16 +231,16 @@ test:
   # unit, functional or integration tests or the like.
   monitor_mode: false
 
-# Turn on the agent in production for 24x7 monitoring.  NewRelic
+# Turn on the agent in production for 24x7 monitoring. NewRelic
 # testing shows an average performance impact of < 5 ms per
-# transaction, you you can leave this on all the time without
+# transaction, you can leave this on all the time without
 # incurring any user-visible performance degradation.
 production:
   <<: *default_settings
   monitor_mode: true
 
 # Many applications have a staging environment which behaves
-# identically to production.  Support for that environment is provided
+# identically to production. Support for that environment is provided
 # here.  By default, the staging environment has the agent turned on.
 staging:
   <<: *default_settings

data/newrelic_rpm.gemspec

@@ -1,34 +1,49 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
+#-*- coding: utf-8 -*-
+# GITSHA: 789bc22f9280603ed8507f4b1f5c49b51f586821
 
 Gem::Specification.new do |s|
   s.name = "ghazel-newrelic_rpm"
-  s.version = "3.4.0.2"
-
+  s.version = "3.5.4"
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Bill Kayser", "Jon Guymon", "Justin George", "Darin Swanson"]
-  s.date = "2012-06-25"
-  s.description = "New Relic is a performance management system, developed by New Relic,\nInc (http://www.newrelic.com).  New Relic provides you with deep\ninformation about the performance of your web application as it runs\nin production. The New Relic Ruby Agent is dual-purposed as a either a\nGem or plugin, hosted on\nhttp://github.com/newrelic/rpm/\n"
+  s.authors = [ "Jason Clark", "Sam Goldstein", "Jon Guymon" ]
+  s.date = "2012-12-06"
+  s.description = <<-EOS
+New Relic is a performance management system, developed by New Relic,
+Inc (http://www.newrelic.com).  New Relic provides you with deep
+information about the performance of your web application as it runs
+in production. The New Relic Ruby Agent is dual-purposed as a either a
+Gem or plugin, hosted on
+http://github.com/newrelic/rpm/
+EOS
   s.email = "support@newrelic.com"
-  s.executables = ["mongrel_rpm", "newrelic", "newrelic_cmd"]
+  s.executables = [ "mongrel_rpm", "newrelic_cmd", "newrelic" ]
   s.extra_rdoc_files = [
     "CHANGELOG",
     "LICENSE",
-    "README.rdoc",
+    "README.md",
+    "GUIDELINES_FOR_CONTRIBUTING.md",
     "newrelic.yml"
   ]
   s.files = [
+    ".gitignore",
+    ".project",
+    ".travis.yml",
     "CHANGELOG",
+    "GUIDELINES_FOR_CONTRIBUTING.md",
+    "Gemfile",
+    "InstallationNotes.md",
     "LICENSE",
-    "README.rdoc",
+    "README.md",
+    "Rakefile",
     "bin/mongrel_rpm",
     "bin/newrelic",
     "bin/newrelic_cmd",
     "cert/cacert.pem",
     "cert/oldsite.pem",
     "cert/site.pem",
+    "config.dot",
+    "config/database.yml",
+    "init.rb",
     "install.rb",
     "lib/conditional_vendored_dependency_detection.rb",
     "lib/conditional_vendored_metric_parser.rb",
@@ -38,6 +53,12 @@ Gem::Specification.new do |s|
     "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/configuration.rb",
+    "lib/new_relic/agent/configuration/defaults.rb",
+    "lib/new_relic/agent/configuration/environment_source.rb",
+    "lib/new_relic/agent/configuration/manager.rb",
+    "lib/new_relic/agent/configuration/server_source.rb",
+    "lib/new_relic/agent/configuration/yaml_source.rb",
     "lib/new_relic/agent/database.rb",
     "lib/new_relic/agent/error_collector.rb",
     "lib/new_relic/agent/instrumentation.rb",
@@ -62,11 +83,11 @@ Gem::Specification.new do |s|
     "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/rainbows_instrumentation.rb",
     "lib/new_relic/agent/instrumentation/resque.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/instrumentation/rainbows_instrumentation.rb",
     "lib/new_relic/agent/method_tracer.rb",
     "lib/new_relic/agent/new_relic_service.rb",
     "lib/new_relic/agent/pipe_channel_manager.rb",
@@ -83,6 +104,8 @@ Gem::Specification.new do |s|
     "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/thread.rb",
+    "lib/new_relic/agent/thread_profiler.rb",
     "lib/new_relic/agent/transaction_info.rb",
     "lib/new_relic/agent/transaction_sample_builder.rb",
     "lib/new_relic/agent/transaction_sampler.rb",
@@ -93,7 +116,6 @@ Gem::Specification.new do |s|
     "lib/new_relic/commands/install.rb",
     "lib/new_relic/control.rb",
     "lib/new_relic/control/class_methods.rb",
-    "lib/new_relic/control/configuration.rb",
     "lib/new_relic/control/frameworks.rb",
     "lib/new_relic/control/frameworks/external.rb",
     "lib/new_relic/control/frameworks/merb.rb",
@@ -115,8 +137,10 @@ Gem::Specification.new do |s|
     "lib/new_relic/metric_spec.rb",
     "lib/new_relic/metrics.rb",
     "lib/new_relic/noticed_error.rb",
+    "lib/new_relic/rack.rb",
     "lib/new_relic/rack/browser_monitoring.rb",
     "lib/new_relic/rack/developer_mode.rb",
+    "lib/new_relic/rack/error_collector.rb",
     "lib/new_relic/recipes.rb",
     "lib/new_relic/stats.rb",
     "lib/new_relic/timer_lib.rb",
@@ -134,12 +158,93 @@ Gem::Specification.new do |s|
     "lib/tasks/install.rake",
     "lib/tasks/tests.rake",
     "newrelic.yml",
-    "newrelic_rpm.gemspec",
+    "newrelic_rpm.gemspec.erb",
     "recipes/newrelic.rb",
     "test/active_record_fixtures.rb",
     "test/config/newrelic.yml",
     "test/config/test_control.rb",
     "test/fixtures/proc_cpuinfo.txt",
+    "test/intentional_fail.rb",
+    "test/multiverse/.gitignore",
+    "test/multiverse/README.md",
+    "test/multiverse/Rakefile",
+    "test/multiverse/lib/multiverse/color.rb",
+    "test/multiverse/lib/multiverse/envfile.rb",
+    "test/multiverse/lib/multiverse/environment.rb",
+    "test/multiverse/lib/multiverse/output_collector.rb",
+    "test/multiverse/lib/multiverse/runner.rb",
+    "test/multiverse/lib/multiverse/suite.rb",
+    "test/multiverse/script/run_one",
+    "test/multiverse/script/runner",
+    "test/multiverse/suites/active_record/Envfile",
+    "test/multiverse/suites/active_record/ar_method_aliasing.rb",
+    "test/multiverse/suites/active_record/config/newrelic.yml",
+    "test/multiverse/suites/active_record/encoding_test.rb",
+    "test/multiverse/suites/agent_only/Envfile",
+    "test/multiverse/suites/agent_only/config/newrelic.yml",
+    "test/multiverse/suites/agent_only/http_response_code_test.rb",
+    "test/multiverse/suites/agent_only/marshaling_test.rb",
+    "test/multiverse/suites/agent_only/method_visibility_test.rb",
+    "test/multiverse/suites/agent_only/pipe_manager_test.rb",
+    "test/multiverse/suites/agent_only/service_timeout_test.rb",
+    "test/multiverse/suites/agent_only/test_trace_method_with_punctuation.rb",
+    "test/multiverse/suites/agent_only/test_trace_transaction_with_punctuation.rb",
+    "test/multiverse/suites/agent_only/thread_profiling_test.rb",
+    "test/multiverse/suites/datamapper/Envfile",
+    "test/multiverse/suites/datamapper/config/newrelic.yml",
+    "test/multiverse/suites/datamapper/encoding_test.rb",
+    "test/multiverse/suites/monitor_mode_false/Envfile",
+    "test/multiverse/suites/monitor_mode_false/config/newrelic.yml",
+    "test/multiverse/suites/monitor_mode_false/no_dns_resolv.rb",
+    "test/multiverse/suites/no_load/Envfile",
+    "test/multiverse/suites/no_load/config/newrelic.yml",
+    "test/multiverse/suites/no_load/start_up_test.rb",
+    "test/multiverse/suites/rails_3_error_tracing/Envfile",
+    "test/multiverse/suites/rails_3_error_tracing/config/newrelic.yml",
+    "test/multiverse/suites/rails_3_error_tracing/error_tracing_test.rb",
+    "test/multiverse/suites/rails_3_gc/Envfile",
+    "test/multiverse/suites/rails_3_gc/config/newrelic.yml",
+    "test/multiverse/suites/rails_3_gc/instrumentation_test.rb",
+    "test/multiverse/suites/rails_3_queue_time/Envfile",
+    "test/multiverse/suites/rails_3_queue_time/config/newrelic.yml",
+    "test/multiverse/suites/rails_3_queue_time/queue_time_test.rb",
+    "test/multiverse/suites/rails_3_views/.gitignore",
+    "test/multiverse/suites/rails_3_views/Envfile",
+    "test/multiverse/suites/rails_3_views/app/views/foos/_foo.html.haml",
+    "test/multiverse/suites/rails_3_views/app/views/test/_a_partial.html.erb",
+    "test/multiverse/suites/rails_3_views/app/views/test/_mid_partial.html.erb",
+    "test/multiverse/suites/rails_3_views/app/views/test/_top_partial.html.erb",
+    "test/multiverse/suites/rails_3_views/app/views/test/deep_partial.html.erb",
+    "test/multiverse/suites/rails_3_views/app/views/test/haml_view.html.haml",
+    "test/multiverse/suites/rails_3_views/app/views/test/index.html.erb",
+    "test/multiverse/suites/rails_3_views/config/newrelic.yml",
+    "test/multiverse/suites/rails_3_views/view_instrumentation_test.rb",
+    "test/multiverse/suites/resque/Envfile",
+    "test/multiverse/suites/resque/config/newrelic.yml",
+    "test/multiverse/suites/resque/dump.rdb",
+    "test/multiverse/suites/resque/instrumentation_test.rb",
+    "test/multiverse/suites/rum_auto_instrumentation/Envfile",
+    "test/multiverse/suites/rum_auto_instrumentation/config/newrelic.yml",
+    "test/multiverse/suites/rum_auto_instrumentation/problem_response.html",
+    "test/multiverse/suites/rum_auto_instrumentation/responses/worst_case_small.html",
+    "test/multiverse/suites/rum_auto_instrumentation/sanity_test.rb",
+    "test/multiverse/suites/sinatra/Envfile",
+    "test/multiverse/suites/sinatra/config/newrelic.yml",
+    "test/multiverse/suites/sinatra/sinatra_metric_explosion_test.rb",
+    "test/multiverse/suites/sinatra/sinatra_routes_test.rb",
+    "test/multiverse/test/multiverse_test.rb",
+    "test/multiverse/test/suite_examples/one/a/Envfile",
+    "test/multiverse/test/suite_examples/one/a/a_test.rb",
+    "test/multiverse/test/suite_examples/one/a/config/newrelic.yml",
+    "test/multiverse/test/suite_examples/one/b/Envfile",
+    "test/multiverse/test/suite_examples/one/b/b_test.rb",
+    "test/multiverse/test/suite_examples/one/b/config/newrelic.yml",
+    "test/multiverse/test/suite_examples/three/a/Envfile",
+    "test/multiverse/test/suite_examples/three/a/fail_test.rb",
+    "test/multiverse/test/suite_examples/three/b/Envfile",
+    "test/multiverse/test/suite_examples/three/b/win_test.rb",
+    "test/multiverse/test/suite_examples/two/a/Envfile",
+    "test/multiverse/test/suite_examples/two/a/fail_test.rb",
     "test/new_relic/agent/agent/connect_test.rb",
     "test/new_relic/agent/agent/start_test.rb",
     "test/new_relic/agent/agent/start_worker_thread_test.rb",
@@ -150,6 +255,10 @@ Gem::Specification.new do |s|
     "test/new_relic/agent/beacon_configuration_test.rb",
     "test/new_relic/agent/browser_monitoring_test.rb",
     "test/new_relic/agent/busy_calculator_test.rb",
+    "test/new_relic/agent/configuration/environment_source_test.rb",
+    "test/new_relic/agent/configuration/manager_test.rb",
+    "test/new_relic/agent/configuration/server_source_test.rb",
+    "test/new_relic/agent/configuration/yaml_source_test.rb",
     "test/new_relic/agent/database_test.rb",
     "test/new_relic/agent/error_collector/notice_error_test.rb",
     "test/new_relic/agent/error_collector_test.rb",
@@ -178,6 +287,9 @@ Gem::Specification.new do |s|
     "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_test.rb",
+    "test/new_relic/agent/thread_profiler_test.rb",
+    "test/new_relic/agent/thread_test.rb",
+    "test/new_relic/agent/threaded_test.rb",
     "test/new_relic/agent/transaction_info_test.rb",
     "test/new_relic/agent/transaction_sample_builder_test.rb",
     "test/new_relic/agent/transaction_sampler_test.rb",
@@ -186,20 +298,23 @@ Gem::Specification.new do |s|
     "test/new_relic/collection_helper_test.rb",
     "test/new_relic/command/deployments_test.rb",
     "test/new_relic/control/class_methods_test.rb",
-    "test/new_relic/control/configuration_test.rb",
+    "test/new_relic/control/frameworks/rails_test.rb",
     "test/new_relic/control/logging_methods_test.rb",
     "test/new_relic/control_test.rb",
     "test/new_relic/delayed_job_injection_test.rb",
     "test/new_relic/fake_collector.rb",
     "test/new_relic/fake_service.rb",
+    "test/new_relic/load_test.rb",
     "test/new_relic/local_environment_test.rb",
     "test/new_relic/metric_data_test.rb",
     "test/new_relic/metric_parser/metric_parser_test.rb",
     "test/new_relic/metric_spec_test.rb",
+    "test/new_relic/noticed_error_test.rb",
     "test/new_relic/rack/all_test.rb",
     "test/new_relic/rack/browser_monitoring_test.rb",
     "test/new_relic/rack/developer_mode_helper_test.rb",
     "test/new_relic/rack/developer_mode_test.rb",
+    "test/new_relic/rack/error_collector_test.rb",
     "test/new_relic/stats_test.rb",
     "test/new_relic/transaction_analysis/segment_summary_test.rb",
     "test/new_relic/transaction_analysis_test.rb",
@@ -251,6 +366,7 @@ Gem::Specification.new do |s|
     "vendor/gems/dependency_detection-0.0.1.build/LICENSE",
     "vendor/gems/dependency_detection-0.0.1.build/lib/dependency_detection.rb",
     "vendor/gems/dependency_detection-0.0.1.build/lib/dependency_detection/version.rb",
+    "vendor/gems/metric_parser-0.1.0.pre1/.specification",
     "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",
@@ -282,6 +398,7 @@ Gem::Specification.new do |s|
     "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/servlet_init.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",
@@ -293,30 +410,33 @@ Gem::Specification.new do |s|
     "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"
+    "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/web_transaction.rb",
+    "newrelic_rpm.gemspec",
   ]
   s.homepage = "http://www.github.com/newrelic/rpm"
-  s.post_install_message = "\nPLEASE NOTE:\n\nDeveloper Mode is now a Rack middleware.\n\nDeveloper Mode is no longer available in Rails 2.1 and earlier.\nHowever, starting in version 2.12 you can use Developer Mode in any\nRack based framework, in addition to Rails.  To install developer mode\nin a non-Rails application, just add NewRelic::Rack::DeveloperMode to\nyour middleware stack.\n\nIf you are using JRuby, we recommend using at least version 1.4 or \nlater because of issues with the implementation of the timeout library.\n\nRefer to the README.md file for more information.\n\nPlease see http://github.com/newrelic/rpm/blob/master/CHANGELOG\nfor a complete description of the features and enhancements available\nin version 3.4 of the Ruby Agent.\n  \n"
-  s.rdoc_options = ["--charset=UTF-8", "--line-numbers", "--inline-source", "--title", "New Relic Ruby Agent"]
-  s.require_paths = ["lib"]
-  s.summary = "New Relic Ruby Agent"
+  s.post_install_message = <<-EOS
+PLEASE NOTE:
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+Developer Mode is now a Rack middleware.
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<mocha>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-    else
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<mocha>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<mocha>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-  end
-end
+Developer Mode is no longer available in Rails 2.1 and earlier.
+However, starting in version 2.12 you can use Developer Mode in any
+Rack based framework, in addition to Rails.  To install developer mode
+in a non-Rails application, just add NewRelic::Rack::DeveloperMode to
+your middleware stack.
+
+If you are using JRuby, we recommend using at least version 1.4 or
+later because of issues with the implementation of the timeout library.
+
+Refer to the README.md file for more information.
+
+Please see http://github.com/newrelic/rpm/blob/master/CHANGELOG
+for a complete description of the features and enhancements available
+in this version of the Ruby Agent.
 
+EOS
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "New Relic Ruby Agent"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.3.6"
+  s.summary = "New Relic Ruby Agent"
+end