wd_newrelic_rpm 3.5.5 → 3.5.6

data/lib/new_relic/control/server_methods.rb

@@ -7,20 +7,20 @@ module NewRelic
     end
 
     ProxyServer = Struct.new :name, :port, :user, :password #:nodoc:
-    
+
     # Contains methods that deal with connecting to the server
     module ServerMethods
-      
+
       def server
         @remote_server ||= server_from_host(nil)
       end
-      
+
       # the server we should contact for api requests, like uploading
       # deployments and the like
       def api_server
         @api_server ||= NewRelic::Control::Server.new(Agent.config[:api_host], Agent.config[:api_port], nil)
       end
-      
+
       # a new instances of the proxy server - this passes through if
       # there is no proxy, otherwise it has proxy configuration
       # information pulled from the config file
@@ -30,7 +30,7 @@ module NewRelic
                                                              Agent.config[:proxy_user],
                                                              Agent.config[:proxy_pass])
       end
-      
+
       # turns a hostname into an ip address and returns a
       # NewRelic::Control::Server that contains the configuration info
       def server_from_host(hostname=nil)
@@ -72,38 +72,6 @@ module NewRelic
           nil
         end
       end
-      
-      # The path to the certificate file used to verify the SSL
-      # connection if verify_peer is enabled
-      def cert_file_path
-        File.expand_path(File.join(newrelic_root, 'cert', 'cacert.pem'))
-      end
-
-      # Return the Net::HTTP with proxy configuration given the NewRelic::Control::Server object.
-      # Default is the collector but for api calls you need to pass api_server
-      #
-      # Experimental support for SSL verification:
-      # swap 'VERIFY_NONE' for 'VERIFY_PEER' line to try it out
-      # If verification fails, uncomment the 'http.ca_file' line
-      # and it will use the included certificate.
-      def http_connection(host = nil)
-        host ||= server
-        # Proxy returns regular HTTP if @proxy_host is nil (the default)
-        http_class = Net::HTTP::Proxy(proxy_server.name, proxy_server.port,
-                                      proxy_server.user, proxy_server.password)
-        http = http_class.new(host.ip || host.name, host.port)
-        ::NewRelic::Agent.logger.debug("Http Connection opened to #{host.ip||host.name}:#{host.port}")
-        if Agent.config[:ssl]
-          http.use_ssl = true
-          if Agent.config[:verify_certificate]
-            http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-            http.ca_file = cert_file_path
-          else
-            http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-          end
-        end
-        http
-      end
     end
 
     include ServerMethods

data/lib/new_relic/latest_changes.rb

@@ -0,0 +1,31 @@
+#!/usr/bin/ruby
+
+module NewRelic
+  module LatestChanges
+    def self.default_changelog
+      File.join(File.dirname(__FILE__), '..', '..', 'CHANGELOG')
+    end
+
+    def self.read(changelog=default_changelog)
+      footer = <<'EOS'
+See https://github.com/newrelic/rpm/blob/master/CHANGELOG for a full list of
+changes.
+EOS
+
+      return footer unless File.exists?(changelog) 
+
+      version_count = 0
+      changes = []
+      File.read(changelog).each_line do |line|
+        if line.match(/##\s+v[\d.]+\s+##/)
+          version_count += 1
+        end
+        break if version_count >= 2
+        changes << line.chomp
+      end
+
+      changes << footer
+      change_message =  changes.join("\n")
+    end
+  end
+end

data/lib/new_relic/local_environment.rb

@@ -242,7 +242,7 @@ module NewRelic
     # Although you can override the dispatcher with NEWRELIC_DISPATCHER this
     # is not advisable since it implies certain api's being available.
     def discover_dispatcher
-      dispatchers = %w[passenger torquebox glassfish thin mongrel litespeed webrick fastcgi unicorn sinatra]
+      dispatchers = %w[passenger torquebox trinidad glassfish thin mongrel litespeed webrick fastcgi unicorn sinatra]
       while dispatchers.any? && @discovered_dispatcher.nil?
         send 'check_for_'+(dispatchers.shift)
       end

data/lib/new_relic/metric_data.rb

@@ -1,3 +1,5 @@
+require 'new_relic/coerce'
+
 module NewRelic
   class MetricData
     # nil, or a NewRelic::MetricSpec object if we have no cached ID
@@ -49,11 +51,20 @@ module NewRelic
       "#<MetricData metric_spec:#{metric_spec.inspect}, stats:#{stats.inspect}, metric_id:#{metric_id.inspect}>"
     end
 
+    include NewRelic::Coerce
+
     def to_collector_array(encoder=nil)
       stat_key = metric_id || { 'name' => metric_spec.name, 'scope' => metric_spec.scope }
       [ stat_key,
-        [ stats.call_count, stats.total_call_time, stats.total_exclusive_time,
-          stats.min_call_time, stats.max_call_time, stats.sum_of_squares ] ]
+        [
+          int(stats.call_count, stat_key),
+          float(stats.total_call_time, stat_key),
+          float(stats.total_exclusive_time, stat_key),
+          float(stats.min_call_time, stat_key),
+          float(stats.max_call_time, stat_key),
+          float(stats.sum_of_squares, stat_key)
+        ]
+      ]
     end
   end
 end

data/lib/new_relic/noticed_error.rb

@@ -1,3 +1,5 @@
+require 'new_relic/helper'
+
 # This class encapsulates an error that was noticed by New Relic in a managed app.
 class NewRelic::NoticedError
   extend NewRelic::CollectionHelper
@@ -45,8 +47,13 @@ class NewRelic::NoticedError
     end
   end
 
+  include NewRelic::Coerce
+
   def to_collector_array(encoder=nil)
-    [ (@timestamp.to_f * 1000).round, @path, @message, @exception_class,
+    [ NewRelic::Helper.time_to_millis(@timestamp),
+      string(@path),
+      string(@message),
+      string(@exception_class),
       @params ]
   end
 end

data/lib/new_relic/rack/agent_hooks.rb

@@ -0,0 +1,20 @@
+require 'new_relic/agent/event_listener'
+
+module NewRelic::Rack
+  class AgentHooks
+    def initialize(app, options = {})
+      @app = app
+    end
+
+    # method required by Rack interface
+    # [status, headers, response]
+    def call(env)
+      events = NewRelic::Agent.instance.events
+      events.notify(:before_call, env)
+      result = @app.call(env)
+      events.notify(:after_call, env, result)
+      result
+    end
+  end
+end
+

data/lib/new_relic/rack/error_collector.rb

@@ -7,12 +7,22 @@ module NewRelic::Rack
     def call(env)
       @app.call(env)
     rescue Exception => exception
+      NewRelic::Agent.logger.debug "collecting %p: %s" % [ exception.class, exception.message ]
       request = Rack::Request.new(env)
+
       if !should_ignore_error?(exception, request)
+        params = begin
+          request.params
+        rescue => err
+          warning = "failed to capture request parameters: %p: %s" % [ err.class, err.message ]
+          NewRelic::Agent.logger.warn(warning)
+          {'error' => warning}
+        end
+
         NewRelic::Agent.instance.error_collector.notice_error(exception,
                                                               :uri => request.path,
                                                           :referer => request.referer,
-                                                   :request_params => request.params)
+                                                   :request_params => params)
       end
       raise exception
     end

data/lib/new_relic/recipes.rb

@@ -16,47 +16,65 @@ make_notify_task = Proc.new do
     desc "Record a deployment in New Relic (newrelic.com)"
     task :notice_deployment, :roles => :app, :except => {:no_release => true } do
       rails_env = fetch(:newrelic_rails_env, fetch(:rails_env, "production"))
+
       require File.join(File.dirname(__FILE__), 'command.rb')
+
       begin
-        # allow overrides to be defined for revision, description, changelog and appname
-        rev = fetch(:newrelic_revision) if exists?(:newrelic_revision)
-        description = fetch(:newrelic_desc) if exists?(:newrelic_desc)
-        changelog = fetch(:newrelic_changelog) if exists?(:newrelic_changelog)
-        appname = fetch(:newrelic_appname) if exists?(:newrelic_appname)
+        # allow overrides to be defined for revision, description, changelog, appname, and user
+        rev         = fetch(:newrelic_revision)  if exists?(:newrelic_revision)
+        description = fetch(:newrelic_desc)      if exists?(:newrelic_desc)
+        changelog   = fetch(:newrelic_changelog) if exists?(:newrelic_changelog)
+        appname     = fetch(:newrelic_appname)   if exists?(:newrelic_appname)
+        user        = fetch(:newrelic_user)      if exists?(:newrelic_user)
+
         if !changelog
           logger.debug "Getting log of changes for New Relic Deployment details"
           from_revision = source.next_revision(current_revision)
+
           if scm == :git
-            log_command = "git log --no-color --pretty=format:'  * %an: %s' --abbrev-commit --no-merges #{previous_revision}..#{real_revision}"
+            log_command = "git log --no-color --pretty=format:'  * %an: %s' " +
+              "--abbrev-commit --no-merges #{previous_revision}..#{real_revision}"
           else
             log_command = "#{source.log(from_revision)}"
           end
+
           changelog = `#{log_command}`
         end
+
         if rev.nil?
           rev = source.query_revision(source.head()) do |cmd|
             logger.debug "executing locally: '#{cmd}'"
             `#{cmd}`
           end
+
           rev = rev[0..6] if scm == :git
         end
+
         new_revision = rev
-        deploy_options = { :environment => rails_env,
-          :revision => new_revision,
-          :changelog => changelog,
+        deploy_options = {
+          :environment => rails_env,
+          :revision    => new_revision,
+          :changelog   => changelog,
           :description => description,
-          :appname => appname }
+          :appname     => appname,
+          :user        => user
+        }
+
         logger.debug "Uploading deployment to New Relic"
         deployment = NewRelic::Command::Deployments.new deploy_options
         deployment.run
         logger.info "Uploaded deployment information to New Relic"
+
       rescue NewRelic::Command::CommandFailure => e
         logger.info e.message
+
       rescue Capistrano::CommandError
         logger.info "Unable to notify New Relic of the deployment... skipping"
+
       rescue => e
         logger.info "Error creating New Relic deployment (#{e})\n#{e.backtrace.join("\n")}"
       end
+
       # WIP: For rollbacks, let's update the deployment we created with an indication of the failure:
       # on_rollback do
       #   run(...)
@@ -64,14 +82,18 @@ make_notify_task = Proc.new do
     end
   end
 end
+
 require 'capistrano/version'
+
 if defined?(Capistrano::Version::MAJOR) && Capistrano::Version::MAJOR < 2
   STDERR.puts "Unable to load #{__FILE__}\nNew Relic Capistrano hooks require at least version 2.0.0"
 else
   instance = Capistrano::Configuration.instance
+
   if instance
     instance.load &make_notify_task
   else
     make_notify_task.call
   end
 end
+

data/lib/new_relic/transaction_sample.rb

@@ -57,15 +57,24 @@ module NewRelic
       JSON.dump(self.to_array)
     end
 
+    include NewRelic::Coerce
+
     def to_array
-      [ @start_time.to_f, @params[:request_params], @params[:custom_params],
+      [ float(@start_time),
+        @params[:request_params],
+        @params[:custom_params],
         @root_segment.to_array ]
     end
 
     def to_collector_array(encoder)
       trace_tree = encoder.encode(self.to_array)
-      [ Helper.time_to_millis(@start_time), Helper.time_to_millis(duration),
-        @params[:path], @params[:uri], trace_tree, @guid, nil,
+      [ Helper.time_to_millis(@start_time),
+        Helper.time_to_millis(duration),
+        string(@params[:path]),
+        string(@params[:uri]),
+        trace_tree,
+        string(@guid),
+        nil,
         !!@force_persist ]
     end
 

data/lib/new_relic/transaction_sample/segment.rb

@@ -33,10 +33,13 @@ module NewRelic
         to_debug_str(0)
       end
 
+      include NewRelic::Coerce
+
       def to_array
-        [ (@entry_timestamp.to_f * 1000).round,
-          (@exit_timestamp.to_f * 1000).round,
-          @metric_name, (@params || {}) ] +
+        [ NewRelic::Helper.time_to_millis(@entry_timestamp),
+          NewRelic::Helper.time_to_millis(@exit_timestamp),
+          string(@metric_name),
+          (@params || {}) ] +
           [ (@called_segments ? @called_segments.map{|s| s.to_array} : []) ]
       end
 

data/lib/new_relic/version.rb

@@ -2,26 +2,21 @@
 
 module NewRelic
   module VERSION #:nodoc:
-    def self.parse_build_from_gemspec(path)
-      if File.exist?(path)
-        version_string = if Kernel.const_defined?(:Gem)
-          spec = Gem::Specification.load(path)
-          spec.version.to_s if spec
-        else
-          md = File.read(path).match(/s\.version\s*=\s*"(.*)"/)
-          md[1] if md
-        end
-        version_string && version_string.split('.', 4)[3]
-      end
+    def self.build_version_string(*parts)
+      parts.compact.join('.')
     end
 
-    GEMSPEC_PATH = File.join(File.dirname(__FILE__), '..', '..', 'newrelic_rpm.gemspec')
     MAJOR = 3
     MINOR = 5
-    TINY  = 5
-    BUILD = parse_build_from_gemspec(GEMSPEC_PATH)
+    TINY  = 6
+
+    begin
+      require File.join(File.dirname(__FILE__), 'build')
+    rescue LoadError => e
+      BUILD = nil
+    end
 
-    STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
+    STRING = build_version_string(MAJOR, MINOR, TINY, BUILD)
   end
 
   # Helper class for managing version comparisons

data/newrelic.yml

@@ -68,25 +68,12 @@ common: &default_settings
   # Optionally set the name of the log file, defaults to 'newrelic_agent.log'
   # log_file_name: 'newrelic_agent.log'
 
-  # The newrelic agent communicates with the service via http by
-  # default.  If you want to communicate via https to increase
-  # security, then turn on SSL by setting this value to true.  Note,
-  # this will result in increased CPU overhead to perform the
-  # encryption involved in SSL communication, but this work is done
-  # asynchronously to the threads that process your application code,
-  # so it should not impact response times.
-  ssl: false
-
-  # EXPERIMENTAL: enable verification of the SSL certificate sent by
-  # the server. This setting has no effect unless SSL is enabled
-  # above. This may block your application. Only enable it if the data
-  # you send us needs end-to-end verified certificates.
-  #
-  # This means we cannot cache the DNS lookup, so each request to the
-  # service will perform a lookup. It also means that we cannot
-  # use a non-blocking lookup, so in a worst case, if you have DNS
-  # problems, your app may block indefinitely.
-  # verify_certificate: true
+  # The newrelic agent communicates with the service via https by default.  This
+  # prevents eavesdropping on the performance metrics transmitted by the agent.
+  # The encryption required by SSL introduces a nominal amount of CPU overhead,
+  # which is performed asynchronously in a background thread.  If you'd prefer
+  # to send your metrics over http uncomment the following line.
+  # ssl: false
 
   #============================== Browser Monitoring ===============================
   # New Relic Real User Monitoring gives you insight into the performance real users are
@@ -108,6 +95,12 @@ common: &default_settings
   # proxy_user:
   # proxy_pass:
 
+  # The agent can optionally log all data it sends to New Relic servers to a
+  # separate log file for human inspection and auditing purposes. To enable this
+  # feature, change 'enabled' below to true.
+  # See: https://newrelic.com/docs/ruby/audit-log
+  audit_log:
+    enabled: false
   
   # Tells transaction tracer and error collector (when enabled)
   # whether or not to capture HTTP params.  When true, frameworks can

data/newrelic_rpm.gemspec

@@ -1,12 +1,16 @@
 #-*- coding: utf-8 -*-
-# GITSHA: d769e984d9151092265ab37aad04f2f06b6a26ae
+
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'new_relic/version'
+require 'new_relic/latest_changes'
 
 Gem::Specification.new do |s|
   s.name = "wd_newrelic_rpm"
-  s.version = "3.5.5"
+  s.version = NewRelic::VERSION::STRING
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = [ "Jason Clark", "Sam Goldstein", "Jon Guymon", "Ben Weintraub" ]
-  s.date = "2013-01-09"
+  s.authors = [ "Jason Clark", "Sam Goldstein", "Michael Granger", "Jon Guymon", "Ben Weintraub" ]
+  s.date = Time.now.strftime('%Y-%m-%d')
   s.description = <<-EOS
 Weasel Diesel compatible version of rpm.
 New Relic is a performance management system, developed by New Relic,
@@ -25,469 +29,23 @@ EOS
     "GUIDELINES_FOR_CONTRIBUTING.md",
     "newrelic.yml"
   ]
-  s.files = [
-    ".gitignore",
-    ".project",
-    ".travis.yml",
-    "CHANGELOG",
-    "GUIDELINES_FOR_CONTRIBUTING.md",
-    "Gemfile",
-    "LICENSE",
-    "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",
-    "lib/new_relic/agent.rb",
-    "lib/new_relic/agent/agent.rb",
-    "lib/new_relic/agent/agent_logger.rb",
-    "lib/new_relic/agent/audit_logger.rb",
-    "lib/new_relic/agent/beacon_configuration.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/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/mask_defaults.rb",
-    "lib/new_relic/agent/configuration/server_source.rb",
-    "lib/new_relic/agent/configuration/yaml_source.rb",
-    "lib/new_relic/agent/cross_process_monitoring.rb",
-    "lib/new_relic/agent/database.rb",
-    "lib/new_relic/agent/error_collector.rb",
-    "lib/new_relic/agent/instrumentation.rb",
-    "lib/new_relic/agent/instrumentation/active_merchant.rb",
-    "lib/new_relic/agent/instrumentation/active_record.rb",
-    "lib/new_relic/agent/instrumentation/acts_as_solr.rb",
-    "lib/new_relic/agent/instrumentation/authlogic.rb",
-    "lib/new_relic/agent/instrumentation/browser_monitoring_timings.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/metric_frame/pop.rb",
-    "lib/new_relic/agent/instrumentation/net.rb",
-    "lib/new_relic/agent/instrumentation/passenger_instrumentation.rb",
-    "lib/new_relic/agent/instrumentation/queue_time.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/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/method_tracer.rb",
-    "lib/new_relic/agent/new_relic_service.rb",
-    "lib/new_relic/agent/pipe_channel_manager.rb",
-    "lib/new_relic/agent/pipe_service.rb",
-    "lib/new_relic/agent/sampler.rb",
-    "lib/new_relic/agent/samplers/cpu_sampler.rb",
-    "lib/new_relic/agent/samplers/delayed_job_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/sql_sampler.rb",
-    "lib/new_relic/agent/stats_engine.rb",
-    "lib/new_relic/agent/stats_engine/gc_profiler.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/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",
-    "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/class_methods.rb",
-    "lib/new_relic/control/frameworks.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/rails4.rb",
-    "lib/new_relic/control/frameworks/ruby.rb",
-    "lib/new_relic/control/frameworks/sinatra.rb",
-    "lib/new_relic/control/instance_methods.rb",
-    "lib/new_relic/control/instrumentation.rb",
-    "lib/new_relic/control/profiling.rb",
-    "lib/new_relic/control/server_methods.rb",
-    "lib/new_relic/delayed_job_injection.rb",
-    "lib/new_relic/helper.rb",
-    "lib/new_relic/language_support.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.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",
-    "lib/new_relic/transaction_analysis.rb",
-    "lib/new_relic/transaction_analysis/segment_summary.rb",
-    "lib/new_relic/transaction_sample.rb",
-    "lib/new_relic/transaction_sample/composite_segment.rb",
-    "lib/new_relic/transaction_sample/fake_segment.rb",
-    "lib/new_relic/transaction_sample/segment.rb",
-    "lib/new_relic/transaction_sample/summary_segment.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.erb",
-    "recipes/newrelic.rb",
-    "test/active_record_fixtures.rb",
-    "test/config/newrelic.yml",
-    "test/config/test_control.rb",
-    "test/fixtures/gemspec_no_build.rb",
-    "test/fixtures/gemspec_with_build.rb",
-    "test/fixtures/gemspec_with_build_and_stage.rb",
-    "test/fixtures/proc_cpuinfo.txt",
-    "test/intentional_fail.rb",
-    "test/multiverse/.gitignore",
-    "test/multiverse/README.md",
-    "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/audit_log_test.rb",
-    "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/config_file_loading/Envfile",
-    "test/multiverse/suites/config_file_loading/config_file_loading_test.rb",
-    "test/multiverse/suites/datamapper/Envfile",
-    "test/multiverse/suites/datamapper/config/newrelic.yml",
-    "test/multiverse/suites/datamapper/encoding_test.rb",
-    "test/multiverse/suites/logging/Envfile",
-    "test/multiverse/suites/logging/config/newrelic.yml",
-    "test/multiverse/suites/logging/logging_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/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/suites/sinatra/sinatra_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",
-    "test/new_relic/agent/agent_logger_test.rb",
-    "test/new_relic/agent/agent_test.rb",
-    "test/new_relic/agent/agent_test_controller.rb",
-    "test/new_relic/agent/agent_test_controller_test.rb",
-    "test/new_relic/agent/apdex_from_server_test.rb",
-    "test/new_relic/agent/audit_logger_test.rb",
-    "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/cross_process_monitoring_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",
-    "test/new_relic/agent/instrumentation/active_record_instrumentation_test.rb",
-    "test/new_relic/agent/instrumentation/browser_monitoring_timings_test.rb",
-    "test/new_relic/agent/instrumentation/controller_instrumentation_test.rb",
-    "test/new_relic/agent/instrumentation/instrumentation_test.rb",
-    "test/new_relic/agent/instrumentation/metric_frame/pop_test.rb",
-    "test/new_relic/agent/instrumentation/metric_frame_test.rb",
-    "test/new_relic/agent/instrumentation/net_instrumentation_test.rb",
-    "test/new_relic/agent/instrumentation/queue_time_test.rb",
-    "test/new_relic/agent/instrumentation/rack_test.rb",
-    "test/new_relic/agent/instrumentation/sinatra_test.rb",
-    "test/new_relic/agent/instrumentation/task_instrumentation_test.rb",
-    "test/new_relic/agent/memcache_instrumentation_test.rb",
-    "test/new_relic/agent/method_tracer/class_methods/add_method_tracer_test.rb",
-    "test/new_relic/agent/method_tracer/instance_methods/trace_execution_scoped_test.rb",
-    "test/new_relic/agent/method_tracer_test.rb",
-    "test/new_relic/agent/mock_scope_listener.rb",
-    "test/new_relic/agent/new_relic_service_test.rb",
-    "test/new_relic/agent/pipe_channel_manager_test.rb",
-    "test/new_relic/agent/pipe_service_test.rb",
-    "test/new_relic/agent/rpm_agent_test.rb",
-    "test/new_relic/agent/sampler_test.rb",
-    "test/new_relic/agent/shim_agent_test.rb",
-    "test/new_relic/agent/sql_sampler_test.rb",
-    "test/new_relic/agent/stats_engine/metric_stats/harvest_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_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",
-    "test/new_relic/agent/worker_loop_test.rb",
-    "test/new_relic/agent_test.rb",
-    "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/frameworks/rails_test.rb",
-    "test/new_relic/control_test.rb",
-    "test/new_relic/delayed_job_injection_test.rb",
-    "test/new_relic/dispatcher_test.rb",
-    "test/new_relic/fake_collector.rb",
-    "test/new_relic/fake_service.rb",
-    "test/new_relic/fakes_sending_data.rb",
-    "test/new_relic/framework_test.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",
-    "test/new_relic/transaction_sample/composite_segment_test.rb",
-    "test/new_relic/transaction_sample/fake_segment_test.rb",
-    "test/new_relic/transaction_sample/segment_test.rb",
-    "test/new_relic/transaction_sample/summary_segment_test.rb",
-    "test/new_relic/transaction_sample_subtest_test.rb",
-    "test/new_relic/transaction_sample_test.rb",
-    "test/new_relic/version_number_test.rb",
-    "test/script/build_test_gem.sh",
-    "test/script/ci.sh",
-    "test/script/ci_agent-tests_runner.sh",
-    "test/script/ci_bench.sh",
-    "test/script/ci_multiverse_runner.sh",
-    "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/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",
-    "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/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",
-    "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",
-    "newrelic_rpm.gemspec",
-  ]
-  s.homepage = "http://www.github.com/newrelic/rpm"
-
-  
-
-  s.post_install_message = <<'EOS'
-
-# New Relic Ruby Agent Release Notes #
-
-## v3.5.5 ##
-
-  * Add thread profiling support
-
-    Thread profiling performs statistical sampling of backtraces of all threads
-    within your Ruby processes. This feature requires MRI >= 1.9.2, and is
-    controlled via the New Relic web UI. JRuby support (in 1.9.x compat mode) is
-    considered experimental, due to issues with JRuby's Thread#backtrace.
 
-  * Add audit logging capability
+  file_list = `git ls-files`.split
+  build_file_path = 'lib/new_relic/build.rb'
+  file_list << build_file_path if File.exist?(build_file_path)
+  s.files = file_list
 
-    The agent can now log all of the data it sends to the New Relic servers to
-    a special log file for human inspection. This feature is off by default, and
-    can be enabled by setting the audit_log.enabled configuration key to true.
-    You may also control the location of the audit log with the audit_log.path key. 
-
-  * Use config system for dispatcher, framework, and config file detection
-
-    Several aspects of the agent's configuration were not being handled by the
-    configuration system.  Detection/configuration of the dispatcher (e.g. passenger,
-    unicorn, resque), framework (e.g. rails3, sinatra), and newrelic.yml
-    location are now handled via the Agent environment, manual, and default
-    configuration sources.
-
-  * Updates to logging across the agent
-
-    We've carefully reviewed the logging messages that the agent outputs, adding
-    details in some cases, and removing unnecessary clutter. We've also altered
-    the startup sequence to ensure that we don't spam STDOUT with messages
-    during initialization.
-
-  * Fix passing environment to manual_start()
-
-    Thanks to Justin Hannus.  The :env key, when passed to Agent.manual_start,
-    can again be used to specify which section of newrelic.yml is loaded.
-
-  * Rails 4 support
-
-    This release includes preliminary support for Rails 4 as of 4.0.0.beta.
-    Rails 4 is still in development, but the agent should work as expected for
-    people who are experimenting with the beta.
-
-
-See https://github.com/newrelic/rpm/blob/master/CHANGELOG for a full list of
-changes.
-EOS
+  s.homepage = "http://www.github.com/newrelic/rpm"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "New Relic Ruby Agent"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = Gem::VERSION
   s.summary = "New Relic Ruby Agent"
+  s.post_install_message = NewRelic::LatestChanges.read
+
+  # Only sign with our private key if you can find it
+  signing_key_path = File.expand_path('~/.ssh/newrelic_rpm-private_key.pem')
+  if File.exists?(signing_key_path)
+    s.signing_key   = signing_key_path
+    s.cert_chain    = ['gem-public_cert.pem']
+  end
 end