newrelic_rpm 3.4.2 → 3.4.2.1

data/CHANGELOG

@@ -1,21 +1,37 @@
- 
+
 # New Relic Ruby Agent Release Notes #
 
+### Next Up ###
+## v3.4.3 ##
+
 ### current version ###
+## v3.4.2.1 ##
+
+* Fix issue when app_name is nil
+
+  If the app_name setting ends up being nil an exception got generated and the application
+  wouldn't run. This would notably occur when running a Heroku app locally without the
+  NEW_RELIC_APP_NAME environment variable set. A nil app_name is now detected and an
+  error logged specifying remediation.
+
+### previous versions ###
 ## v3.4.2 ##
 
- * The RUM NRAGENT tk value gets sanitized to prevent potential XSS vulnerabilities
+ * The RUM NRAGENT tk value gets more robustly sanitized to prevent potential XSS vulnerabilities
 
-   There was the potential for malicious code to be inserted into the token used
-   in Real User Monitoring and have it echoed back to a browser as an XSS exploit. 
-   The token now gets scrubbed to remove this potential problem.
+   The code that scrubes the token used in Real User Monitoring has been enhanced to be
+   more robust. 
+
+ * Support for Apdex T in server side configuration
+
+   For those using server side configuration the Ruby Agent now supports setting
+   the Apdex T value via the New Relic UI.
 
  * Refactoring of agent config code
 
    The code that reads the configuration information and confirgures the agent
    got substantially reorganized, consolidated, simplified, and made more robust.
- 
-### previous versions ###
+
 ## v3.4.1 ##
 #### Bug Fixes ####
  * Fix edge case in RUM auto instrumentation where X-UA-Compatible meta tag is 
@@ -55,7 +71,6 @@
    is only a problem if GC could happen *between* transactions, as in, for 
    example, out-of-band GC in Unicorn. fixed.
 
-
 v3.4.0.1
  * Prevent the agent from resolving the collector address when disabled.
  * Fix for error collector configuration that was introduced during beta.

data/LICENSE

@@ -25,7 +25,7 @@ See https://github.com/jquery/jquery/blob/master/MIT-LICENSE.txt
 
 
 All other components of this product are
-Copyright (c) 2008-2011 New Relic, Inc.  All rights reserved.
+Copyright (c) 2008-2012 New Relic, Inc.  All rights reserved.
 
 Certain inventions disclosed in this file may be claimed within
 patents owned or patent applications filed by New Relic, Inc. or third

data/lib/new_relic/agent/agent.rb

@@ -315,7 +315,12 @@ module NewRelic
 
           # Logs the configured application names
           def log_app_names
-            log.info "Application: #{Agent.config.app_names.join(", ")}"
+            names = Agent.config.app_names
+            if names.respond_to?(:any?) && names.any?
+              log.info "Application: #{names.join(", ")}"
+            else
+              log.error 'Unable to determine application name. Please set the application name in your newrelic.yml or in a NEW_RELIC_APP_NAME environment variable.'
+            end
           end
           
           # Connecting in the foreground blocks further startup of the

data/lib/new_relic/agent/configuration.rb

@@ -9,6 +9,11 @@ module NewRelic
         def config
           @@manager ||= Manager.new
         end
+
+        # for testing
+        def reset_config
+          @@manager = Manager.new
+        end
       end
 
       class DottedHash < ::Hash

data/lib/new_relic/agent/configuration/manager.rb

@@ -89,6 +89,7 @@ module NewRelic
           case self[:app_name]
           when Array then self[:app_name]
           when String then self[:app_name].split(';')
+          else []
           end
         end
 

data/lib/new_relic/version.rb

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

data/newrelic_rpm.gemspec

@@ -5,10 +5,10 @@
 
 Gem::Specification.new do |s|
   s.name = "newrelic_rpm"
-  s.version = "3.4.2"
+  s.version = "3.4.2.1"
 
   s.authors = ["Bill Kayser", "Jon Guymon", "Justin George", "Darin Swanson", "Rob Saul"]
-  s.date = "2012-09-06"
+  s.date = "2012-09-12"
   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.email = "support@newrelic.com"
   s.executables = ["newrelic_cmd", "newrelic", "mongrel_rpm"]

data/test/new_relic/agent/agent/start_test.rb

@@ -3,6 +3,16 @@ class NewRelic::Agent::Agent::StartTest < Test::Unit::TestCase
   require 'new_relic/agent/agent'
   include NewRelic::Agent::Agent::Start
 
+  def setup
+    ENV['NEW_RELIC_APP_NAME'] = 'start_test'
+    NewRelic::Agent.reset_config
+  end
+
+  def teardown
+    ENV['NEW_RELIC_APP_NAME'] = nil
+    NewRelic::Agent.reset_config
+  end
+
   def test_already_started_positive
     control = mocked_control
     control.expects(:log!).with("Agent Started Already!", :error)
@@ -43,7 +53,7 @@ class NewRelic::Agent::Agent::StartTest < Test::Unit::TestCase
     end
   end
 
-  def test_log_app_names
+  def test_log_app_names_string
     with_config(:app_name => 'zam;zam;zabam') do
       log = mocked_log
       log.expects(:info).with("Application: zam, zam, zabam")
@@ -51,6 +61,31 @@ class NewRelic::Agent::Agent::StartTest < Test::Unit::TestCase
     end
   end
 
+  def test_log_app_names_array
+    with_config(:app_name => ['zam', 'zam', 'zabam']) do
+      log = mocked_log
+      log.expects(:info).with("Application: zam, zam, zabam")
+      log_app_names
+    end
+  end
+
+  def test_log_app_names_with_env_var
+    # bad app name after env - used to cover the yaml config
+    with_config({:app_name => false}, 1) do
+      log = mocked_log
+      log.expects(:info).with("Application: start_test") # set in setup
+      log_app_names
+    end
+  end
+
+  def test_log_app_names_with_unknown
+    with_config(:app_name => false) do
+      log = mocked_log
+      log.expects(:error).with('Unable to determine application name. Please set the application name in your newrelic.yml or in a NEW_RELIC_APP_NAME environment variable.')
+      log_app_names
+    end
+  end
+
   def test_check_config_and_start_agent_disabled
     self.expects(:monitoring?).returns(false)
     check_config_and_start_agent

data/test/new_relic/agent/configuration/manager_test.rb

@@ -123,6 +123,23 @@ module NewRelic::Agent::Configuration
         .index(NewRelic::Agent::Configuration::ManualSource)
     end
 
+    def test_app_names_single
+      @manager.apply_config(:app_name => 'test')
+      assert_equal ['test'], @manager.app_names
+    end
+
+    def test_app_names_list
+      @manager.apply_config(:app_name => 'test0;test1;test2')
+      assert_equal ['test0', 'test1', 'test2'], @manager.app_names
+    end
+
+    def test_app_names_nil
+      # nil has special meaning, so we emulate with an object that
+      # will not respond as expected
+      @manager.apply_config(:app_name => Object.new)
+      assert_equal [], @manager.app_names
+    end
+
     class TestSource < ::Hash
       def test_config_accessor
         'some value'

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic_rpm
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 85
   prerelease: 
   segments: 
   - 3
   - 4
   - 2
-  version: 3.4.2
+  - 1
+  version: 3.4.2.1
 platform: ruby
 authors: 
 - Bill Kayser
@@ -19,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-06 00:00:00 Z
+date: 2012-09-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: jeweler