newrelic_rpm 3.6.8.168 → 3.6.9.171

data/lib/new_relic/version.rb

@@ -12,7 +12,7 @@ module NewRelic
 
     MAJOR = 3
     MINOR = 6
-    TINY  = 8
+    TINY  = 9
 
     begin
       require File.join(File.dirname(__FILE__), 'build')

data/lib/tasks/install.rake

@@ -7,9 +7,8 @@ namespace :newrelic do
 
   namespace :config do
     desc "Describe available New Relic configuration settings."
-    task :docs do
-      require File.expand_path(File.join(File.dirname(__FILE__), "..", "new_relic", "agent", "configuration", "default_source.rb"))
 
+    def output_text
       NewRelic::Agent::Configuration::DEFAULTS.each do |key, value|
         if value[:public]
           puts "Setting:      #{key}"
@@ -18,10 +17,53 @@ namespace :newrelic do
           else
             puts "Type:         #{value[:type]}"
           end
+          puts "Default:      #{format_default_value(value)}"
+
           puts 'Description:  ' + value[:description]
           puts "-" * (value[:description].length + 14)
         end
       end
     end
+
+    def format_default_value(spec)
+      if spec[:default].is_a?(Proc)
+        '(Dynamic)'
+      else
+        spec[:default].inspect
+      end
+    end
+
+    def output_html
+      puts "<table>"
+      puts "<thead>"
+      puts "  <th>Setting</th>"
+      puts "  <th style='width: 15%'>Type</th>"
+      puts "  <th>Description</th>"
+      puts "</thead>"
+
+      NewRelic::Agent::Configuration::DEFAULTS.each do |key, value|
+        if value[:public]
+          puts "<tr>"
+          puts "  <td><a name='#{key}'></a>#{key}</td>"
+          puts "  <td>#{value[:type].to_s.gsub("NewRelic::Agent::Configuration::", "")}</td>"
+          puts "  <td>#{format_default_value(value)}</td>"
+          puts "  <td>#{value[:description]}</td>"
+          puts "</tr>"
+        end
+      end
+
+      puts "</table>"
+    end
+
+    task :docs, [:format] => [] do |t, args|
+      require File.expand_path(File.join(File.dirname(__FILE__), "..", "new_relic", "agent", "configuration", "default_source.rb"))
+
+      format = args[:format]
+      if format.nil? || format == "text"
+        output_text
+      else
+        output_html
+      end
+    end
   end
 end

data/lib/tasks/versions.html.erb

@@ -0,0 +1,31 @@
+<h2 id="<%= anchor %>"><%= title %></h2>
+<table>
+  <thead>
+    <th>Name</th>
+    <% unless suppress_versions %>
+    <th>Supported</th>
+    <th>Deprecated</th>
+    <th>Experimental</th>
+    <% end %>
+  </thead>
+  <% for version in versions %>
+    <tr>
+      <td><b><%= version.name %></b></td>
+      <% unless suppress_versions %>
+      <td><%= version_list(version.supported) %></td>
+      <td><%= version_list(version.deprecated) %></td>
+      <td><%= version_list(version.experimental) %></td>
+      <% end %>
+    </tr>
+    <% if version.notes %>
+    <tr>
+      <td></td>
+      <td colspan=3>
+        <% for note in version.notes %>
+          <%= note %><br/>
+        <% end %>
+      </td>
+    </tr>
+    <% end %>
+  <% end %>
+</table>

data/lib/tasks/versions.rake

@@ -0,0 +1,52 @@
+namespace :newrelic do
+  desc "Lists information on supported versions of frameworks for this agent"
+
+  require File.join(File.dirname(__FILE__), '..', 'new_relic', 'agent', 'supported_versions')
+
+  task :supported_versions, [:format] => [] do |t, args|
+
+    def version_list(list)
+      return "-" if list.nil? || list.empty?
+      list.join(", ")
+    end
+
+    def versions_for_type(type)
+      NewRelic::Agent::SUPPORTED_VERSIONS.
+        select {|_,v| v[:type] == type}.
+        map    do |key,values|
+          VersionStruct.new(
+            values[:name] || key,
+            values[:supported],
+            values[:deprecated],
+            values[:experimental],
+            values[:notes])
+        end
+    end
+
+    def build_erb(format)
+      require 'erb'
+      path = File.join(File.dirname(__FILE__), "versions.#{format}.erb")
+      template = File.read(File.expand_path(path))
+      ERB.new(template)
+    end
+
+    def write_versions(title, type, erb, suppress_versions = false)
+      anchor = title.downcase.gsub(" ", "_")
+      versions = versions_for_type(type)
+      puts erb.result(binding)
+    end
+
+    VersionStruct = Struct.new(:name, :supported, :deprecated, :experimental, :notes)
+
+    format = args[:format] || "txt"
+    erb = build_erb(format)
+
+    write_versions("Ruby Versions",   :ruby, erb)
+    write_versions("Web Servers",     :app_server, erb)
+    write_versions("Web Frameworks",  :web, erb)
+    write_versions("Database",        :database, erb)
+    write_versions("Background Jobs", :background, erb)
+    write_versions("HTTP Clients",    :http, erb)
+    write_versions("Other",           :other, erb, true)
+  end
+end

data/lib/tasks/versions.txt.erb

@@ -0,0 +1,14 @@
+=========================================
+<%= title %>
+=========================================
+<% for version in versions %>
+<%= version.name %>
+
+Supported:    <%= version_list(version.supported) %>
+Deprecated:   <%= version_list(version.deprecated) %>
+Experimental: <%= version_list(version.experimental) %>
+<% if version.notes %>Notes:<% for note in version.notes %>
+  <%= note %><% end %>
+<% end %>
+------------------------------------
+<% end %>

data/newrelic_rpm.gemspec

@@ -40,6 +40,8 @@ EOS
   s.rubygems_version = Gem::VERSION
   s.summary = "New Relic Ruby Agent"
   s.post_install_message = NewRelic::LatestChanges.read
+  s.add_development_dependency 'rubysl' if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
+  s.add_development_dependency 'racc' if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
   s.add_development_dependency 'rake', '10.1.0'
   s.add_development_dependency 'minitest', '~> 4.7.5'
   s.add_development_dependency 'mocha', '~> 0.13.0'
@@ -51,8 +53,8 @@ EOS
   s.add_development_dependency 'jruby-openssl' if RUBY_PLATFORM == 'java'
   s.add_development_dependency 'sequel', '~> 3.46.0'
   s.add_development_dependency 'pry'
-  s.add_development_dependency 'guard'
-  s.add_development_dependency 'guard-test'
+  s.add_development_dependency 'guard', '~> 1.8.3' # Guard 2.0 is Ruby 1.9 only
+  s.add_development_dependency 'guard-test', '~> 1.0.0'
   s.add_development_dependency 'rb-fsevent', '~> 0.9.1'
 
   # Only sign with our private key if you can find it

data/test/agent_helper.rb

@@ -138,7 +138,11 @@ def assert_metrics_recorded(expected)
       matches.map! { |m| "  #{m.inspect}" }
       msg = "Did not find stats for spec #{expected_spec.inspect}."
       msg += "\nDid find specs: [\n#{matches.join(",\n")}\n]" unless matches.empty?
-      msg += "\nAll specs in there were: [\n#{all_specs.map {|s| s.name}.join(",\n")}\n]"
+
+      msg += "\nAll specs in there were: [\n#{all_specs.map do |s|
+        "#{s.name} (#{s.scope.empty? ? '<unscoped>' : s.scope})"
+      end.join(",\n")}\n]"
+
       assert(actual_stats, msg)
     end
     expected_attrs.each do |attr, expected_value|
@@ -319,3 +323,19 @@ end
 def create_agent_command(args = {})
   NewRelic::Agent::Commands::AgentCommand.new([-1, { "name" => "command_name", "arguments" => args}])
 end
+
+def wait_for_backtrace_service_poll(opts={})
+  defaults = {
+    :timeout => 5.0,
+    :service => NewRelic::Agent.agent.agent_command_router.backtrace_service,
+    :iterations => 1
+  }
+  opts = defaults.merge(opts)
+  deadline = Time.now + opts[:timeout]
+  until opts[:service].worker_loop.iterations > opts[:iterations]
+    sleep(0.01)
+    if Time.now > deadline
+      raise "Timed out waiting #{timeout} s for backtrace service poll"
+    end
+  end
+end

data/test/environments/lib/environments/runner.rb

@@ -18,8 +18,9 @@ module Environments
       "1.9.2"       => ["rails21", "rails22", "rails40"],
       "1.9.3"       => ["rails21", "rails22"],
       "2.0.0"       => ["rails21", "rails22", "rails23"],
-      "jruby-1.6.8" => ["rails40"],
-      "jruby-1.7.3" => ["rails21", "rails22", "rails23", "rails40"],
+      "jruby-1.6"   => ["rails40"],
+      "jruby-1.7"   => ["rails21", "rails22", "rails23"],
+      "rbx-2.0"     => ["rails21", "rails22", "rails23", "rails30", "rails31", "rails32"],
     }
 
     attr_reader :envs
@@ -42,6 +43,7 @@ module Environments
           dir = File.expand_path(dir)
           puts "", yellow("Running tests for #{dir}")
           bundle(dir)
+          create_database(dir)
           status = run(dir)
           if !status.success?
             overall_status += 1
@@ -64,7 +66,8 @@ module Environments
 
       version = RUBY_VERSION
       version = "ree" if defined?(RUBY_DESCRIPTION) && RUBY_DESCRIPTION =~ /Ruby Enterprise Edition/
-      version = "jruby-#{JRUBY_VERSION}" if defined?(JRUBY_VERSION)
+      version = "jruby-#{JRUBY_VERSION[0..2]}" if defined?(JRUBY_VERSION)
+      version = "rbx-2.0" if defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx"
 
       blacklist = BLACKLIST[version] || []
       blacklist.each do |blacklisted|
@@ -86,13 +89,24 @@ module Environments
     end
 
     def bundle(dir)
-      puts "Bundling..."
+      puts "Bundling in #{dir}..."
       bundling = `cd #{dir} && bundle install --local`
       unless $?.success?
         puts "Failed local bundle, trying again with full bundle..."
         bundling = `cd #{dir} && bundle install`
       end
-      puts red(bundling) unless $?.success?
+
+      bundling = red(bundling) unless $?.success?
+      puts bundling
+    end
+
+    # Would be nice to get our unit tests decoupled from the actual DB, but
+    # until then this is necessary
+    def create_database(dir)
+      return if File.basename(dir) == "norails"
+
+      puts "Making sure the database is there for '#{File.basename(dir)}'..."
+      result = `cd #{dir} && RAILS_ENV=test bundle exec rake --trace db:create`
     end
 
     def run(dir)

data/test/environments/norails/Gemfile

@@ -6,6 +6,9 @@ gem "mocha", '~>0.13.0', :require => false
 gem 'rack'
 gem 'rack-test'
 
-gem 'sequel', '~> 3.46.0'
+platforms :rbx do
+  gem "rubysl"
+  gem "racc"  # https://github.com/rubinius/rubinius/issues/2632
+end
 
 gem "newrelic_rpm", :path => "../../.."

data/test/environments/rails21/Gemfile

@@ -1,12 +1,12 @@
-# A sample Gemfile
-source :gemcutter
+source 'http://rubygems.org'
 
-gem "rails", "2.1.2"
+gem "rails", "~>2.1.2"
 
 gem "ci_reporter", "1.6.0"
 gem "mocha", "0.9.8"
 gem "jeweler", "1.4.0"
 gem "gemcutter", "0.5.0"
+gem "rdoc"
 
 gem 'rack'
 gem 'rack-test'
@@ -17,8 +17,6 @@ if (RUBY_PLATFORM == 'java')
   gem "activerecord-jdbcsqlite3-adapter", "~>1.2.9"
   gem "jruby-openssl"
 else
-  gem "mysql", RUBY_VERSION == '1.8.6' ? '2.7' : '2.8.1'
+  gem "mysql", "~>2.9.1"
   gem "sqlite3-ruby", "1.2.5"
 end
-
-gem 'sequel', '~> 3.46.0' unless RUBY_VERSION == '1.8.6'

data/test/environments/rails21/Rakefile

@@ -5,8 +5,12 @@ require(File.join(File.dirname(__FILE__), 'config', 'boot'))
 
 require 'rake'
 require 'rake/testtask'
+require 'rdoc/task'
 
 gem 'newrelic_rpm'
+
+require 'tasks/rails'
 require 'tasks/all'
 
+Rake::Task["default"].clear
 task :default => [:'test:newrelic']

data/test/environments/rails21/config/database.yml

@@ -1,13 +1,10 @@
-# Shared properties for mysql db
 mysql: &mysql
   adapter: mysql
   socket: <%= (`uname -s` =~ /Linux/ ) ? "" :"/tmp/mysql.sock" %>
   username: root
   host: localhost
-  database: rails_blog
+  database: <%= db = "#{ENV['RUBY_VERSION']}#{ENV['BRANCH']}"; db.empty? ? "rails_blog" : db %>
 
-# Shared properties for postgres.  This won't work with our schema but
-# Does work with agent tests
 sqlite3: &sqlite3
 <% if defined?(JRuby) %>
   adapter: jdbcsqlite3
@@ -18,9 +15,7 @@ sqlite3: &sqlite3
   pool: 5
   timeout: 5000
   host: localhost
-  
-# SQLite version 3.x
-#   gem install sqlite3-ruby (not necessary on OS X Leopard)
+
 development:
   <<: *mysql
 

data/test/environments/rails22/Gemfile

@@ -1,12 +1,13 @@
-# A sample Gemfile
-source :gemcutter
+source 'http://rubygems.org'
 
-gem "rails", "2.2.2"
+gem "rails", "~>2.2.3"
 
 gem "ci_reporter", "1.6.0"
 gem "mocha", "0.9.8"
 gem "jeweler", "1.4.0"
 gem "gemcutter", "0.5.0"
+gem "rdoc"
+
 gem 'rack'
 gem 'rack-test'
 gem 'newrelic_rpm', :path => '../../..'
@@ -16,14 +17,6 @@ if (RUBY_PLATFORM == 'java')
   gem "activerecord-jdbcsqlite3-adapter", "~>1.2.9"
   gem "jruby-openssl"
 else
-  gem "sqlite3-ruby", "1.2.5"
-end
-
-if RUBY_VERSION == '1.8.6'
-  gem "mysql", '2.7' unless RUBY_PLATFORM == 'java'
-  gem 'shoulda', '~> 2.11.3'
-else
-  gem "mysql", '2.8.1' unless RUBY_PLATFORM == 'java'
-  gem 'shoulda', '~> 3.0.0'
-  gem 'sequel', '~> 3.46.0'
+  gem "mysql", "~>2.9.1"
+  gem "sqlite3"
 end

data/test/environments/rails22/Rakefile

@@ -5,8 +5,12 @@ require(File.join(File.dirname(__FILE__), 'config', 'boot'))
 
 require 'rake'
 require 'rake/testtask'
+require 'rdoc/task'
 
 gem 'newrelic_rpm'
+
+require 'tasks/rails'
 require 'tasks/all'
 
+Rake::Task["default"].clear
 task :default => [:'test:newrelic']

data/test/environments/rails22/config/database.yml

@@ -1,13 +1,10 @@
-# Shared properties for mysql db
 mysql: &mysql
   adapter: mysql
   socket: <%= (`uname -s` =~ /Linux/ ) ? "" :"/tmp/mysql.sock" %>
   username: root
   host: localhost
-  database: rails_blog
+  database: <%= db = "#{ENV['RUBY_VERSION']}#{ENV['BRANCH']}"; db.empty? ? "rails_blog" : db %>
 
-# Shared properties for postgres.  This won't work with our schema but
-# Does work with agent tests
 sqlite3: &sqlite3
 <% if defined?(JRuby) %>
   adapter: jdbcsqlite3
@@ -18,9 +15,7 @@ sqlite3: &sqlite3
   pool: 5
   timeout: 5000
   host: localhost
-  
-# SQLite version 3.x
-#   gem install sqlite3-ruby (not necessary on OS X Leopard)
+
 development:
   <<: *mysql
 

data/test/environments/rails22/config/environment.rb

@@ -3,7 +3,7 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.2.2' #unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.2.3'
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')