newrelic_rpm 3.4.0 → 3.4.0.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+v3.4.0.1
+ * Prevent the agent from resolving the collector address when disabled.
+ * Fix for error collector configuration that was introduced during beta.
+
 v3.4.0
  * Major refactor of data transmission mechanism.  This enabled child processes to send data to parent processes, which then send the data to the New Relic service.  This should only affect Resque users, dramatically improving their experience.
  * Moved Resque instrumentation from rpm_contrib to main agent.  Resque users should discontinue use of rpm_contrib or upgrade to 2.1.11.

data/lib/new_relic/agent/agent.rb

@@ -30,7 +30,10 @@ module NewRelic
         @obfuscator = lambda {|sql| NewRelic::Agent::Database.default_sql_obfuscator(sql) }
         @forked = false
 
-        @service = NewRelic::Agent::NewRelicService.new(control.license_key, control.server)
+        # FIXME: temporary work around for RUBY-839
+        if control.monitor_mode?
+          @service = NewRelic::Agent::NewRelicService.new(control.license_key, control.server)
+        end
       end
 
       # contains all the class-level methods for NewRelic::Agent::Agent
@@ -866,7 +869,7 @@ module NewRelic
             config_transaction_tracer
             log_connection!(config_data)
             configure_transaction_tracer!(config_data['collect_traces'], config_data['sample_rate'])
-            configure_error_collector!(config_data['error_collector.enabled'])
+            configure_error_collector!(config_data['collect_errors'])
           end
           
           # Logs when we connect to the server, for debugging purposes
@@ -1006,6 +1009,8 @@ module NewRelic
         # transmission later
         def harvest_and_send_timeslice_data
           now = Time.now
+          NewRelic::Agent.instance.stats_engine.get_stats_no_scope('Supportability/invoke_remote').record_data_point(0.0)
+          NewRelic::Agent.instance.stats_engine.get_stats_no_scope('Supportability/invoke_remote/metric_data').record_data_point(0.0)
           harvest_timeslice_data(now)
           # In this version of the protocol, we get back an assoc array of spec to id.            
           metric_specs_and_ids = @service.metric_data(@last_harvest_time.to_f,

data/lib/new_relic/control/server_methods.rb

@@ -53,7 +53,10 @@ module NewRelic
         return host if verify_certificate?
         return nil if host.nil? || host.downcase == "localhost"
         ip = resolve_ip_address(host)
-        log.info "Resolved #{host} to #{ip}"
+
+        # FIXME: commented out to squelch STDOUT output for RUBY-839
+        # should bring it back when logging / startup is fixed
+        # log.info "Resolved #{host} to #{ip}"
         ip
       end
 

data/lib/new_relic/version.rb

@@ -4,7 +4,7 @@ module NewRelic
     MAJOR = 3
     MINOR = 4
     TINY  = 0
-    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

@@ -1,18 +1,18 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = "newrelic_rpm"
-  s.version = "3.4.0"
+  s.version = "3.4.0.1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  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-14"
+  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.email = "support@newrelic.com"
-  s.executables = ["newrelic_cmd", "mongrel_rpm", "newrelic"]
+  s.executables = ["mongrel_rpm", "newrelic", "newrelic_cmd"]
   s.extra_rdoc_files = [
     "CHANGELOG",
     "LICENSE",
@@ -296,9 +296,8 @@ Gem::Specification.new do |s|
   ]
   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 = ["--line-numbers", "--inline-source", "--title", "New Relic Ruby Agent"]
+  s.rdoc_options = ["--charset=UTF-8", "--line-numbers", "--inline-source", "--title", "New Relic Ruby Agent"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.21"
   s.summary = "New Relic Ruby Agent"
 
   if s.respond_to? :specification_version then

data/test/new_relic/agent/agent/connect_test.rb

@@ -363,7 +363,7 @@ class NewRelic::Agent::Agent::ConnectTest < Test::Unit::TestCase
       'data_report_period' => 'pasta sauce',
       'url_rules' => 'tamales',
       'collect_traces' => true,
-      'error_collector.enabled' => true,
+      'collect_errors' => true,
       'sample_rate' => 10
     }
     NewRelic::Control.instance.settings['transaction_tracer'] = {'enabled' => true}

metadata

@@ -1,15 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: newrelic_rpm
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 3.4.0.1
   prerelease: 
-  segments: 
-  - 3
-  - 4
-  - 0
-  version: 3.4.0
 platform: ruby
-authors: 
+authors:
 - Bill Kayser
 - Jon Guymon
 - Justin George
@@ -17,72 +12,66 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-14 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: jeweler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2158373720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2158373720
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &2158373160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2158373160
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &2158372660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-description: |
-  New Relic is a performance management system, developed by New Relic,
+  prerelease: false
+  version_requirements: *2158372660
+description: ! '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/
 
+'
 email: support@newrelic.com
-executables: 
-- newrelic_cmd
+executables:
 - mongrel_rpm
 - newrelic
+- newrelic_cmd
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - CHANGELOG
 - LICENSE
 - README.rdoc
 - newrelic.yml
-files: 
+files:
 - CHANGELOG
 - LICENSE
 - README.rdoc
@@ -358,60 +347,39 @@ files:
 - vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/web_transaction.rb
 homepage: http://www.github.com/newrelic/rpm
 licenses: []
-
-post_install_message: |
-  
-  PLEASE NOTE:
-  
-  Developer Mode is now a Rack middleware.
-  
-  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 version 3.4 of the Ruby Agent.
-    
-
-rdoc_options: 
+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"
+rdoc_options:
+- --charset=UTF-8
 - --line-numbers
 - --inline-source
 - --title
 - New Relic Ruby Agent
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: New Relic Ruby Agent
 test_files: []
-