newrelic_rpm 4.0.0.332 → 4.8.0.341

data/lib/new_relic/agent.rb

@@ -29,8 +29,8 @@ module NewRelic
     require 'new_relic/metrics'
     require 'new_relic/metric_spec'
     require 'new_relic/metric_data'
-    require 'new_relic/collection_helper'
     require 'new_relic/noticed_error'
+    require 'new_relic/supportability_helper'
 
     require 'new_relic/agent/encoding_normalizer'
     require 'new_relic/agent/stats'
@@ -48,11 +48,13 @@ module NewRelic
     require 'new_relic/agent/busy_calculator'
     require 'new_relic/agent/sampler'
     require 'new_relic/agent/database'
+    require 'new_relic/agent/datastores'
     require 'new_relic/agent/pipe_channel_manager'
     require 'new_relic/agent/configuration'
     require 'new_relic/agent/rules_engine'
     require 'new_relic/agent/http_clients/uri_util'
     require 'new_relic/agent/system_info'
+    require 'new_relic/agent/external'
 
     require 'new_relic/agent/instrumentation/controller_instrumentation'
 
@@ -65,6 +67,8 @@ module NewRelic
     require 'thread'
     require 'resolv'
 
+    extend NewRelic::SupportabilityHelper
+
     # An exception that is thrown by the server if the agent license is invalid.
     class LicenseException < StandardError; end
 
@@ -120,17 +124,14 @@ module NewRelic
       @logger = log
     end
 
-    # This needs to come after the definition of the logger method above, since
-    # instantiating the config writes to the Logger.
-
-    @config = NewRelic::Agent::Configuration::Manager.new
-
-    attr_reader :config
+    def config
+      @config ||= Configuration::Manager.new
+    end
 
     # For testing
     # Important that we don't change the instance or we orphan callbacks
     def reset_config
-      @config.reset_to_defaults
+      config.reset_to_defaults
     end
 
     # @!group Recording custom metrics
@@ -152,6 +153,8 @@ module NewRelic
     #
     # @api public
     def record_metric(metric_name, value) #THREAD_LOCAL_ACCESS
+      record_api_supportability_metric(:record_metric)
+
       return unless agent
 
       if value.is_a?(Hash)
@@ -179,8 +182,8 @@ module NewRelic
     def increment_metric(metric_name, amount=1) #THREAD_LOCAL_ACCESS
       return unless agent
 
-      agent.stats_engine.tl_record_unscoped_metrics(metric_name) do |stats|
-        stats.increment_count(amount)
+      { 'Supportability/API/increment_metric' => 1,  metric_name => amount }.each do |metric, increment_amount|
+        agent.stats_engine.tl_record_unscoped_metrics(metric) {|stats| stats.increment_count(increment_amount) }
       end
     end
 
@@ -200,6 +203,8 @@ module NewRelic
     # @api public
     #
     def ignore_error_filter(&block)
+      record_api_supportability_metric(:ignore_error_filter)
+
       if block
         NewRelic::Agent::ErrorCollector.ignore_error_filter = block
       else
@@ -212,7 +217,7 @@ module NewRelic
     # @param [Exception] exception Error you wish to send
     # @param [Hash]      options Modify how New Relic processes the error
     # @option options [Hash]    :custom_params Custom parameters to attach to the trace
-    # @option options [Boolean] :trace_only Only record the error trace
+    # @option options [Boolean] :expected Only record the error trace
     #                           (do not affect error rate or Apdex status)
     # @option options [String]  :uri Request path, minus request params or query string
     #                           (usually not needed)
@@ -236,6 +241,14 @@ module NewRelic
     # @api public
     #
     def notice_error(exception, options={})
+      record_api_supportability_metric(:notice_error)
+
+      if options.has_key?(:trace_only)
+        NewRelic::Agent.logger.log_once(:warn, :trace_only_deprecated,
+          'Passing the :trace_only option to NewRelic::Agent.notice_error is deprecated. Please use :expected instead.')
+        options[:expected] = options.delete(:trace_only)
+      end
+
       Transaction.notice_error(exception, options)
       nil # don't return a noticed error datastructure. it can only hurt.
     end
@@ -269,9 +282,12 @@ module NewRelic
     # @api public
     #
     def record_custom_event(event_type, event_attrs)
+      record_api_supportability_metric(:record_custom_event)
+
       if agent && NewRelic::Agent.config[:'custom_insights_events.enabled']
         agent.custom_event_aggregator.record(event_type, event_attrs)
       end
+
       nil
     end
 
@@ -297,6 +313,8 @@ module NewRelic
     # @api public
     #
     def manual_start(options={})
+      record_api_supportability_metric(:manual_start)
+
       raise "Options must be a hash" unless Hash === options
       NewRelic::Control.instance.init_plugin({ :agent_enabled => true, :sync_startup => true }.merge(options))
     end
@@ -327,6 +345,7 @@ module NewRelic
     # @api public
     #
     def after_fork(options={})
+      record_api_supportability_metric(:after_fork)
       agent.after_fork(options) if agent
     end
 
@@ -338,6 +357,7 @@ module NewRelic
     # @api public
     #
     def shutdown(options={})
+      record_api_supportability_metric(:shutdown)
       agent.shutdown if agent
     end
 
@@ -347,6 +367,7 @@ module NewRelic
     # @api public
     def drop_buffered_data
       agent.drop_buffered_data if agent
+      record_api_supportability_metric(:drop_buffered_data)
     end
 
     # Add instrumentation files to the agent.  The argument should be
@@ -359,6 +380,7 @@ module NewRelic
     # @api public
     #
     def add_instrumentation(file_pattern)
+      record_api_supportability_metric(:add_instrumentation)
       NewRelic::Control.instance.add_instrumentation file_pattern
     end
 
@@ -366,6 +388,7 @@ module NewRelic
     #
     # @api public
     def require_test_helper
+      record_api_supportability_metric(:require_test_helper)
       require File.expand_path('../../../test/agent_helper', __FILE__)
     end
 
@@ -386,6 +409,7 @@ module NewRelic
     # @api public
     #
     def set_sql_obfuscator(type = :replace, &block)
+      record_api_supportability_metric(:set_sql_obfuscator)
       NewRelic::Agent::Database.set_sql_obfuscator(type, &block)
     end
 
@@ -400,6 +424,7 @@ module NewRelic
     # @api public
     #
     def ignore_transaction
+      record_api_supportability_metric(:ignore_transaction)
       txn = NewRelic::Agent::Transaction.tl_current
       txn.ignore! if txn
     end
@@ -410,6 +435,7 @@ module NewRelic
     # @api public
     #
     def ignore_apdex
+      record_api_supportability_metric(:ignore_apdex)
       txn = NewRelic::Agent::Transaction.tl_current
       txn.ignore_apdex! if txn
     end
@@ -420,6 +446,7 @@ module NewRelic
     # @api public
     #
     def ignore_enduser
+      record_api_supportability_metric(:ignore_enduser)
       txn = NewRelic::Agent::Transaction.tl_current
       txn.ignore_enduser! if txn
     end
@@ -432,6 +459,8 @@ module NewRelic
     # @api public
     #
     def disable_all_tracing
+      record_api_supportability_metric(:disable_all_tracing)
+
       return yield unless agent
 
       begin
@@ -448,6 +477,8 @@ module NewRelic
     # @api public
     #
     def disable_transaction_tracing
+      record_api_supportability_metric(:disable_transaction_tracing)
+
       return yield unless agent
 
       state = agent.set_record_tt(false)
@@ -470,6 +501,8 @@ module NewRelic
     # @api public
     #
     def disable_sql_recording
+      record_api_supportability_metric(:disable_sql_recording)
+
       return yield unless agent
 
       state = agent.set_record_sql(false)
@@ -512,6 +545,8 @@ module NewRelic
     # @api public
     #
     def add_custom_attributes(params) #THREAD_LOCAL_ACCESS
+      record_api_supportability_metric(:add_custom_attributes)
+
       if params.is_a? Hash
         txn = Transaction.tl_current
         txn.add_custom_attributes(params) if txn
@@ -548,6 +583,7 @@ module NewRelic
     # @api public
     #
     def set_transaction_name(name, options={})
+      record_api_supportability_metric(:set_transaction_name)
       Transaction.set_overriding_transaction_name(name, options[:category])
     end
 
@@ -557,6 +593,8 @@ module NewRelic
     # @api public
     #
     def get_transaction_name #THREAD_LOCAL_ACCESS
+      record_api_supportability_metric(:get_transaction_name)
+
       txn = Transaction.tl_current
       if txn
         namer = Instrumentation::ControllerInstrumentation::TransactionNamer
@@ -614,6 +652,8 @@ module NewRelic
     # @api public
     #
     def browser_timing_header
+      record_api_supportability_metric(:browser_timing_header)
+
       return "" unless agent
       agent.javascript_instrumentor.browser_timing_header
     end

data/lib/new_relic/build.rb

@@ -1,2 +1,2 @@
-# GITSHA: e859dc169ed0049cfd9eb95cdde892a2a1a97ba8
-module NewRelic; module VERSION; BUILD='332'; end; end
+# GITSHA: efac2ea8d7533dc8f02b552f7e17c2596455876d
+module NewRelic; module VERSION; BUILD='341'; end; end

data/lib/new_relic/collection_helper.rb

@@ -31,24 +31,6 @@ module NewRelic
     end
   end
 
-  # Return an array of strings (backtrace), cleaned up for readability
-  # Return nil if there is no backtrace
-
-  def strip_nr_from_backtrace(backtrace)
-    if backtrace && !Agent.config[:disable_backtrace_cleanup]
-      # this is for 1.9.1, where strings no longer have Enumerable
-      backtrace = backtrace.split("\n") if String === backtrace
-      backtrace = backtrace.map(&:to_s)
-      backtrace = backtrace.reject do |line|
-        line.include?(NewRelic::Control.newrelic_root) or
-        line =~ /^newrelic_rpm\s/
-      end
-      # rename methods back to their original state
-      backtrace = backtrace.collect {|line| line.gsub(/_without_(newrelic|trace)/, "")}
-    end
-    backtrace
-  end
-
   private
 
   # Convert any kind of object to a short string.

data/lib/new_relic/control/frameworks/rails.rb

@@ -12,7 +12,7 @@ module NewRelic
       class Rails < NewRelic::Control::Frameworks::Ruby
 
         def env
-          @env ||= RAILS_ENV.dup
+          @env ||= ( ENV['NEW_RELIC_ENV'] || RAILS_ENV.dup )
         end
 
         # Rails can return an empty string from this method, causing
@@ -58,7 +58,6 @@ module NewRelic
             # is running, if it thinks it's a rake task, or if the agent_enabled is false.
             ::NewRelic::Agent.logger.info("New Relic Agent not running.")
           else
-            install_developer_mode(rails_config) if Agent.config[:developer_mode]
             install_browser_monitoring(rails_config)
             install_agent_hooks(rails_config)
           end
@@ -95,25 +94,6 @@ module NewRelic
           end
         end
 
-        def install_developer_mode(rails_config)
-          return if defined?(@developer_mode_installed) && @developer_mode_installed
-          @developer_mode_installed = true
-          if rails_config && rails_config.respond_to?(:middleware)
-            begin
-              require 'new_relic/rack/developer_mode'
-              rails_config.middleware.use NewRelic::Rack::DeveloperMode
-              ::NewRelic::Agent.logger.info("New Relic Agent Developer Mode enabled.")
-              if env == "production"
-                ::NewRelic::Agent.logger.warn("***New Relic Developer Mode is not intended to be enabled in production environments! We highly recommend setting developer_mode: false for the production environment in your newrelic.yml.")
-              end
-            rescue => e
-              ::NewRelic::Agent.logger.warn("Error installing New Relic Developer Mode", e)
-            end
-          elsif rails_config
-            ::NewRelic::Agent.logger.warn("Developer mode not available for Rails versions prior to 2.2")
-          end
-        end
-
         def rails_version
           @rails_version ||= Gem::Version.new(::Rails::VERSION::STRING)
         end

data/lib/new_relic/control/frameworks/rails3.rb

@@ -15,7 +15,7 @@ module NewRelic
       class Rails3 < NewRelic::Control::Frameworks::Rails
 
         def env
-          @env ||= ::Rails.env.to_s
+          @env ||= ( ENV['NEW_RELIC_ENV'] || ::Rails.env.to_s )
         end
 
         def rails_root

data/lib/new_relic/control/frameworks/ruby.rb

@@ -8,8 +8,8 @@ module NewRelic
       # A control used when no framework is detected - the default.
       class Ruby < NewRelic::Control
         def env
-          @env ||= ENV['NEW_RELIC_ENV'] || ENV['RUBY_ENV'] ||
-                   ENV['RAILS_ENV']     || ENV['RACK_ENV'] || 'development'
+          @env ||= ENV['NEW_RELIC_ENV'] || ENV['RUBY_ENV'] || ENV['RAILS_ENV'] ||
+                   ENV['APP_ENV']       || ENV['RACK_ENV'] || 'development'
         end
 
         def root

data/lib/new_relic/latest_changes.rb

@@ -9,7 +9,7 @@ module NewRelic
     end
 
     FOOTER = <<'EOS'
-    See https://github.com/newrelic/rpm/blob/master/CHANGELOG for a full list of
+    See https://github.com/newrelic/rpm/blob/master/CHANGELOG.md for a full list of
     changes.
 EOS
 

data/lib/new_relic/noticed_error.rb

@@ -4,6 +4,7 @@
 
 require 'new_relic/helper'
 require 'new_relic/agent/attribute_filter'
+require 'new_relic/collection_helper'
 
 # This class encapsulates an error that was noticed by New Relic in a managed app.
 class NewRelic::NoticedError
@@ -11,7 +12,8 @@ class NewRelic::NoticedError
 
   attr_accessor :path, :timestamp, :message, :exception_class_name,
                 :request_uri, :request_port, :file_name, :line_number,
-                :stack_trace, :attributes_from_notice_error, :attributes
+                :stack_trace, :attributes_from_notice_error, :attributes,
+                :expected
 
   attr_reader   :exception_id, :is_internal
 
@@ -44,6 +46,7 @@ class NewRelic::NoticedError
     @attributes_from_notice_error = nil
     @attributes = nil
     @timestamp = timestamp
+    @expected = false
   end
 
   def ==(other)
@@ -84,8 +87,9 @@ class NewRelic::NoticedError
   def processed_attributes
     @processed_attributes ||= begin
       attributes = base_parameters
-      append_attributes(attributes, USER_ATTRIBUTES, merged_custom_attributes)
-      append_attributes(attributes, AGENT_ATTRIBUTES, build_agent_attributes)
+      merged_attributes = NewRelic::Agent::Transaction::Attributes.new(NewRelic::Agent.instance.attribute_filter)
+      append_attributes(attributes, USER_ATTRIBUTES, merged_custom_attributes(merged_attributes))
+      append_attributes(attributes, AGENT_ATTRIBUTES, build_agent_attributes(merged_attributes))
       append_attributes(attributes, INTRINSIC_ATTRIBUTES, build_intrinsic_attributes)
       attributes
     end
@@ -93,10 +97,10 @@ class NewRelic::NoticedError
 
   def base_parameters
     params = {}
-    params[:request_uri] = request_uri if request_uri
-    params[:file_name]   = file_name   if file_name
-    params[:line_number] = line_number if line_number
-    params[:stack_trace] = stack_trace if stack_trace
+    params[:file_name]        = file_name   if file_name
+    params[:line_number]      = line_number if line_number
+    params[:stack_trace]      = stack_trace if stack_trace
+    params[:'error.expected'] = expected
     params
   end
 
@@ -104,9 +108,7 @@ class NewRelic::NoticedError
   # hold in @attributes, or passed options to notice_error which show up in
   # @attributes_from_notice_error. Both need filtering, so merge them together
   # in our Attributes class for consistent handling
-  def merged_custom_attributes
-    merged_attributes = NewRelic::Agent::Transaction::Attributes.new(NewRelic::Agent.instance.attribute_filter)
-
+  def merged_custom_attributes(merged_attributes)
     merge_custom_attributes_from_transaction(merged_attributes)
     merge_custom_attributes_from_notice_error(merged_attributes)
 
@@ -127,12 +129,22 @@ class NewRelic::NoticedError
     end
   end
 
-  def build_agent_attributes
-    if @attributes
+  def build_agent_attributes(merged_attributes)
+    agent_attributes = if @attributes
       @attributes.agent_attributes_for(DESTINATION)
     else
       EMPTY_HASH
     end
+
+    # It's possible to override the request_uri from the transaction attributes
+    # with a uri passed to notice_error. Add it to merged_attributes filter and
+    # merge with the transaction attributes, possibly overriding the request_uri
+    if request_uri
+      merged_attributes.add_agent_attribute(:'request.uri', request_uri, DESTINATION)
+      agent_attributes.merge(merged_attributes.agent_attributes_for(DESTINATION))
+    end
+
+    agent_attributes
   end
 
   def build_intrinsic_attributes
@@ -164,7 +176,7 @@ class NewRelic::NoticedError
       @exception_class_name = UNKNOWN_ERROR_CLASS_NAME
       @message = NIL_ERROR_MESSAGE
     else
-      if defined?(Rails) && Rails::VERSION::MAJOR < 5 && exception.respond_to?(:original_exception)
+      if defined?(Rails::VERSION::MAJOR) && Rails::VERSION::MAJOR < 5 && exception.respond_to?(:original_exception)
         exception = exception.original_exception || exception
       end
       @exception_class_name = exception.is_a?(Exception) ? exception.class.name : UNKNOWN_ERROR_CLASS_NAME

data/lib/new_relic/supportability_helper.rb

@@ -0,0 +1,68 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
+module NewRelic
+  module SupportabilityHelper
+
+    API_SUPPORTABILITY_PREFIX = 'Supportability/API/'.freeze
+
+    # pre-instantiate these strings as they may be used multiple times per
+    # transaction, just to eke out a bit less performance hit
+    #
+    API_SUPPORTABILITY_METRICS = [
+      :add_custom_attributes,
+      :add_instrumentation,
+      :add_method_tracer,
+      :add_transaction_tracer,
+      :after_fork,
+      :browser_timing_header,
+      :disable_all_tracing,
+      :disable_sql_recording,
+      :disable_transaction_tracing,
+      :drop_buffered_data,
+      :get_request_metadata,
+      :get_response_metadata,
+      :get_transaction_name,
+      :ignore_apdex,
+      :ignore_enduser,
+      :ignore_error_filter,
+      :ignore_transaction,
+      :increment_metric,
+      :manual_start,
+      :newrelic_ignore,
+      :newrelic_ignore_apdex,
+      :newrelic_ignore_enduser,
+      :notice_error,
+      :notice_sql,
+      :notice_statement,
+      :perform_action_with_newrelic_trace,
+      :process_request_metadata,
+      :process_response_metadata,
+      :record_custom_event,
+      :record_metric,
+      :recording_web_transaction?,
+      :require_test_helper,
+      :set_sql_obfuscator,
+      :set_transaction_name,
+      :shutdown,
+      :start_segment,
+      :trace,
+      :trace_execution_scoped,
+      :trace_execution_unscoped,
+      :wrap
+    ].reduce({}) do |h,o|
+      h[o] = API_SUPPORTABILITY_PREFIX + o.to_s
+      h
+    end
+
+    def record_api_supportability_metric(method_name)
+      agent = NewRelic::Agent.agent or return
+      if metric = API_SUPPORTABILITY_METRICS[method_name]
+        agent.stats_engine.tl_record_unscoped_metrics metric, &:increment_count
+      else
+        NewRelic::Agent.logger.debug "API supportability metric not found for :#{method_name}"
+      end
+    end
+  end
+end

data/lib/new_relic/version.rb

@@ -11,7 +11,7 @@ module NewRelic
     end
 
     MAJOR = 4
-    MINOR = 0
+    MINOR = 8
     TINY  = 0
 
     begin

data/lib/newrelic_rpm.rb

@@ -37,7 +37,7 @@ elsif defined?(Rails::VERSION)
     module NewRelic
       class Railtie < Rails::Railtie
 
-        initializer "newrelic_rpm.start_plugin" do |app|
+        initializer "newrelic_rpm.start_plugin", before: :load_config_initializers do |app|
           NewRelic::Control.instance.init_plugin(:config => app.config)
         end
       end

data/lib/sequel/extensions/newrelic_instrumentation.rb

@@ -47,26 +47,44 @@ module Sequel
 
       product = NewRelic::Agent::Instrumentation::SequelHelper.product_name_from_adapter(self.class.adapter_scheme)
       operation = NewRelic::Agent::Datastores::MetricHelper.operation_from_sql(sql)
-      segment = NewRelic::Agent::Transaction.start_datastore_segment product, operation
+      segment = NewRelic::Agent::Transaction.start_datastore_segment(
+        product: product,
+        operation: operation
+      )
 
       begin
         super(*args, &blk)
       ensure
-        notice_sql(sql, segment.name, segment.start_time, Time.now)
-        segment.finish
+        notice_sql(sql)
+        segment.finish if segment
       end
     end
 
+    # We notice sql through the current_segment due to the disable_all_tracing
+    # block in the sequel Plugin instrumentation. A simple ORM operation from the Plugin
+    # instrumentation may trigger a number of calls to this method. We want to append
+    # the statements that come from the disable_all_tracing block into this node's
+    # statement, otherwise we would end up ovewriting the sql statement with the
+    # last one executed.
+    def notice_sql sql
+      return unless txn = NewRelic::Agent::TransactionState.tl_get.current_transaction
+
+      current_segment = txn.current_segment
+      return unless current_segment.is_a?(NewRelic::Agent::Transaction::DatastoreSegment)
+
+      if current_segment.sql_statement
+        current_segment.sql_statement.append_sql sql
+      else
+        current_segment._notice_sql sql, self.opts, explainer_for(sql)
+      end
+    end
 
     THREAD_SAFE_CONNECTION_POOL_CLASSES = [
       (defined?(::Sequel::ThreadedConnectionPool) && ::Sequel::ThreadedConnectionPool)
     ].freeze
 
-    def notice_sql(sql, metric_name, start, finish)
-      state    = NewRelic::Agent::TransactionState.tl_get
-      duration = finish - start
-
-      explainer = Proc.new do |*|
+    def explainer_for sql
+      Proc.new do |*|
         if THREAD_SAFE_CONNECTION_POOL_CLASSES.include?(self.pool.class)
           self[ sql ].explain
         else
@@ -74,10 +92,7 @@ module Sequel
           nil
         end
       end
-      NewRelic::Agent.instance.transaction_sampler.notice_sql(sql, self.opts, duration, state, explainer)
-      NewRelic::Agent.instance.sql_sampler.notice_sql(sql, metric_name, self.opts, duration, state, explainer)
     end
-
   end # module NewRelicInstrumentation
 
   NewRelic::Agent.logger.debug "Registering the :newrelic_instrumentation extension."

data/lib/sequel/plugins/newrelic_instrumentation.rb

@@ -23,12 +23,16 @@ module Sequel
           define_method(method_name) do |*args, &block|
             klass = self.is_a?(Class) ? self : self.class
             product = NewRelic::Agent::Instrumentation::SequelHelper.product_name_from_adapter(db.adapter_scheme)
-            segment = NewRelic::Agent::Transaction.start_datastore_segment(product, operation_name, klass.name)
+            segment = NewRelic::Agent::Transaction.start_datastore_segment(
+              product: product,
+              operation: operation_name,
+              collection: klass.name
+            )
 
             begin
               NewRelic::Agent.disable_all_tracing { super(*args, &block) }
             ensure
-              segment.finish
+              segment.finish if segment
             end
           end
         end

data/newrelic.yml

@@ -1,6 +1,6 @@
 #
 # This file configures the New Relic Agent.  New Relic monitors Ruby, Java,
-# .NET, PHP, Python and Node applications with deep visibility and low
+# .NET, PHP, Python, Node, and Go applications with deep visibility and low
 # overhead.  For more information, visit www.newrelic.com.
 #
 # Generated <%= Time.now.strftime('%B %d, %Y') %><%= ", for version #{@agent_version}" if @agent_version %>
@@ -30,10 +30,6 @@ development:
   <<: *default_settings
   app_name: <%= app_name %> (Development)
 
-  # NOTE: There is substantial overhead when running in developer mode.
-  # Do not use for production or load testing.
-  developer_mode: true
-
 test:
   <<: *default_settings
   # It doesn't make sense to report to New Relic from automated test runs.

data/newrelic_rpm.gemspec

@@ -10,9 +10,9 @@ Gem::Specification.new do |s|
   s.version = NewRelic::VERSION::STRING
   s.required_ruby_version = '>= 2.0.0'
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = [ "Tim Krajcar", "Matthew Wear", "Katherine Wu", "Kenichi Nakamura" ]
+  s.authors = [ "Matthew Wear", "Chris Pine", "Dana Scheider" ]
   s.date = Time.now.strftime('%Y-%m-%d')
-  s.licenses    = ['New Relic', 'MIT', 'Ruby']
+  s.licenses    = ['New Relic']
   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
@@ -31,7 +31,7 @@ EOS
     "newrelic.yml"
   ]
 
-  file_list = `git ls-files`.split
+  file_list = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/(?!agent_helper.rb)}) }
   build_file_path = 'lib/new_relic/build.rb'
   file_list << build_file_path if File.exist?(build_file_path)
   s.files = file_list