ghazel-newrelic_rpm 3.4.0.2 → 3.5.4

data/test/script/build_test_gem.sh

@@ -1,10 +1,15 @@
 #!/bin/bash
 
 # print commands in this script as they're invoked
-set -x
+#set -x
 # fail if any command fails
 set -e
 
+. "$HOME/.rvm/scripts/rvm"
+
+#rvm 1.9.3
+
+
 if [ "x$BUILD_NUMBER" == "x" ]; then
   echo '$BUILD_NUMBER is undefined'
   echo 'setting $BUILD_NUMBER to alpha'
@@ -12,7 +17,7 @@ if [ "x$BUILD_NUMBER" == "x" ]; then
 fi
 
 SHA1=`git log --pretty=format:'%h' -n 1`
-echo "building gem for commit $SHA"
+echo "building gem for commit $SHA1"
 
 if [[ `gem list jeweler | grep [j]eweler | wc -l` -eq 1 ]]; then
   echo "detected jeweler. skipping install"
@@ -28,7 +33,8 @@ mkdir gems
 
 # FIXME: don't include the $SHA1 since some of our builds systems are confused
 # by this.
-BUILD_ID=$BUILD_NUMBER #.$SHA1
+#BUILD_ID="$SHA1.$BUILD_NUMBER" #.$SHA1
+BUILD_ID="$BUILD_NUMBER" #.$SHA1
 
 # rewrite the version file, setting the patch identifier to include the
 # BUILD_ID

data/test/script/ci.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 
 # Script to run test suites in CI or in development mode.  This script handles
-# checking out test dependencies (currently rpm_test_app and it's dependencies)
+# checking out test dependencies (currently rpm_test_app and its dependencies)
 # and executing them.
 #
 # It relies on 2 environment variables:
 #
-# RUBY - The rvm ruby you want to use (e.g. 1.8.7, ree, jruby)
+# RUBY - The rbenv ruby you want to use (e.g. 1.8.7, ree, jruby)
 #
 # BRANCH - The rpm_test_app branch you want to use (e.g. rails20, rails31)
 #
@@ -29,17 +29,47 @@ set -e
 if [ "x$RUBY" == "x" ]; then
   echo '$RUBY is undefined'
   echo 'defaulting to 1.9.3'
-  RUBY=1.9.3
+  export RUBY=1.9.3-p286
 fi
 if [ "x$BRANCH" == "x" ]; then
   echo '$BRANCH is undefined'
   echo 'defaulting to rails31'
-  BRANCH=rails31
+  export BRANCH=rails31
+fi
+
+if [ "x$JOB_NAME" == "x" ]; then
+  echo '$JOB_NAME is undefined'
+  echo 'defaulting to clrun'
+  export PROJECT_NAME=clrun
+else
+  CLEANSED_NAME=`echo $JOB_NAME  | sed "s/label//" | sed "s/Portland//" | sed "s/BRANCH//" | sed "s/RUBY//" | sed "s/[=\/,\._]//g" | sed "s/ReleaseCandidate/RC/"`
+  echo "setting PROJECT_NAME to $CLEANSED_NAME"
+  export PROJECT_NAME="$CLEANSED_NAME"
+fi
+
+eval "$(rbenv init -)" || true
+rbenv shell $RUBY
+if [ "x$(rbenv version-name)" = "x$RUBY" ]; then
+  echo "switched to ruby $RUBY"
+else
+  rbenv install $RUBY
+  rbenv shell $RUBY
+  if [ "x$(rbenv version-name)" = "x$RUBY" ]; then
+    echo "switched to ruby $RUBY"
+  else
+    echo "failed to install ruby $RUBY"
+    exit 1
+  fi
 fi
 
-. "$HOME/.rvm/scripts/rvm"
-rvm use $RUBY || rvm install $RUBY
 echo `which ruby`
+ruby -v
+
+rake -h > /dev/null || gem install rake
+
+echo "generating gemspec"
+rake gemspec
+
 
 # make sure that we're in the project root
 script_dirname=`dirname $0`
@@ -60,7 +90,7 @@ rpm_test_app_cache=~/workspace/.rpm_test_app_cache
 )
 
 git clone $rpm_test_app_cache rpm_test_app
-cd rpm_test_app || true # rvm overrides cd and it's f-ing up the build by exiting 2
+cd rpm_test_app
 
 git checkout -t origin/$BRANCH || git checkout $BRANCH
 
@@ -73,7 +103,7 @@ mysql: &mysql
   socket: <%= (`uname -s` =~ /Linux/ ) ? "" :"/tmp/mysql.sock" %>
   username: root
   host: localhost
-  database: <%= [ 'rails_blog', ENV['BRANCH'], ENV['RUBY'] ].compact.join('_') %>
+  database: <%= ENV['PROJECT_NAME'] %>
 
 # Shared properties for postgres.  This won't work with our schema but
 # Does work with agent tests
@@ -87,7 +117,7 @@ sqlite3: &sqlite3
   pool: 5
   timeout: 5000
   host: localhost
-  
+
 # SQLite version 3.x
 #   gem install sqlite3-ruby (not necessary on OS X Leopard)
 development:
@@ -104,29 +134,25 @@ YAML
 mkdir -p log
 mkdir -p tmp
 if [ "x$BRANCH" == "xrails20" ]; then
-  printf "\e[0;31;49mWarning:\e[0m "
-  echo "Testing against the rails20 branch requires your changes to be committed. Uncommitted changes will not be used."
+  echo "Warning: Rails 2.0 support in progress. This probably only works in CI"
   mkdir -p vendor/plugins
-  git clone ../.. vendor/plugins/newrelic_rpm
+  GEM=`ls ../../../*.gem | tail -n1`
+  (cd vendor/plugins && gem unpack ../../$GEM)
+  mv vendor/plugins/newrelic_rpm* vendor/plugins/newrelic_rpm
 else
   perl -p -i'.bak' -e 's#gem .newrelic_rpm.*$#gem "newrelic_rpm", :path => "\.\.\/\.\.\/"#' Gemfile
 fi
 
-# save time by reusing the gemset if it exists
-
-gemset=ruby_agent_tests_$BRANCH
-rvm gemset use $gemset || ( rvm gemset create $gemset && rvm gemset use $gemset )
-
 if [ "x$RUBY" == "x1.8.6" ]; then
   # Bundler 0.1 dropped support for ruby 1.8.6
-  gem install bundler -v'~>1.0.0' --no-rdoc --no-ri
+  bundle -h > /dev/null || gem install bundler -v'~>1.0.0' --no-rdoc --no-ri
 else
-  gem install bundler --no-rdoc --no-ri
+  bundle -h > /dev/null || gem install bundler --no-rdoc --no-ri
 fi
 
 
 export RAILS_ENV=test
-bundle
+bundle --local || bundle
 
 # FIXME:  Here we actually trigger the tests. Since the agent deals so heavily
 # in units of time we have many tests that assert that durations are measured
@@ -137,4 +163,5 @@ bundle
 # To reduce the noise from these sporardic failures we rerun the test suite if
 # there are failures to see if they are transient (instead of re-running it by
 # hand).  Ultimately we'll move towards a more elegant solution.
-bundle exec rake --trace db:create:all test:newrelic || bundle exec rake --trace test:newrelic || bundle exec rake --trace test:newrelic
+
+bundle exec rake --trace db:create:all test:newrelic || bundle exec rake --trace test:newrelic

data/test/script/ci_multiverse_runner.sh

@@ -9,7 +9,7 @@ echo $PATH
 
 
 if [ "x$RUBY" == "x" ] ; then
-	export RUBY=1.9.3
+  export RUBY=1.9.3
 fi
 
 echo "Tests will be run using $RUBY"
@@ -24,8 +24,8 @@ cd "$script_dirname/../../"
 #pwd 
 
 if [ -x $SCRATH_DIR ] ; then
-	echo "found tmp, deleting"
-	rm -fr $SCRATH_DIR
+  echo "found tmp, deleting"
+  rm -fr $SCRATH_DIR
 fi
 
 mkdir $SCRATH_DIR
@@ -33,9 +33,9 @@ cd $SCRATH_DIR
 
 #pwd 
 if [[ $JOB_NAME =~ "Pangalactic" ]] ; then 
-	AGENT_LOCATION="../../../../../../Ruby_Agent"
+  AGENT_LOCATION="../../../../../../Ruby_Agent"
 else
-	AGENT_LOCATION="../../Ruby_Agent"
+  AGENT_LOCATION="../../Ruby_Agent"
 fi
 
 git clone --depth=1 git@github.com:newrelic/multiverse.git multiverse
@@ -46,10 +46,10 @@ echo "Looking for Ruby Agent at $AGENT_LOCATION"
 #ls -l /home/hudson/workspace/
 
 if [ -x $AGENT_LOCATION ] ; then
-	ln -s $AGENT_LOCATION ./ruby_agent
+  ln -s $AGENT_LOCATION ./ruby_agent
 else
-	echo "*********** Ruby_Agent not found ***********"
-	exit 1
+  echo "*********** Ruby_Agent not found ***********"
+  exit 1
 fi
 
 cd multiverse
@@ -58,6 +58,6 @@ cd multiverse
 #pwd
 #ls -l ../
 
-source ~/.rvm/scripts/rvm
-rvm use $RUBY
-script/runner
+eval "$(rbenv init -)" || true
+rbenv shell $RUBY
+script/runner

data/test/test_helper.rb

@@ -3,46 +3,55 @@ ENV['RAILS_ENV'] = 'test'
 NEWRELIC_PLUGIN_DIR = File.expand_path(File.join(File.dirname(__FILE__),".."))
 $LOAD_PATH << '.'
 $LOAD_PATH << '../../..'
+$LOAD_PATH << File.join(NEWRELIC_PLUGIN_DIR,"lib")
 $LOAD_PATH << File.join(NEWRELIC_PLUGIN_DIR,"test")
 $LOAD_PATH << File.join(NEWRELIC_PLUGIN_DIR,"ui/helpers")
 $LOAD_PATH.uniq!
 
 require 'rubygems'
+require 'rake'
 # We can speed things up in tests that don't need to load rails.
 # You can also run the tests in a mode without rails.  Many tests
 # will be skipped.
 
 begin
   require 'config/environment'
-  # require File.join(File.dirname(__FILE__),'..','..','rpm_test_app','config','environment')
+#   require File.join(File.dirname(__FILE__),'..','..','rpm_test_app','config','environment')
   begin
     require 'test_help'
   rescue LoadError
     # ignore load problems on test help - it doesn't exist in rails 3
   end
-
-rescue LoadError
-  # To run the tests against a standalone agent build, you need to
-  # add a rails app to the load path.  It can be 2.* to 3.*.  It should
-  # referenc newrelic_rpm in the Gemfile with a :path option pointing 
-  # to this work directory.
-  guess = File.expand_path("../../../rpm", __FILE__)
-  if $LOAD_PATH.include? guess
-    puts "Unable to load Rails for New Relic tests.  See note in test_helper.rb"
-    raise
-  else
-    $LOAD_PATH << guess
-    retry
+  require 'newrelic_rpm'
+rescue LoadError => e
+  puts "Running tests in standalone mode."
+  require 'bundler'
+  Bundler.require
+  require 'rails/all'
+  require 'newrelic_rpm'
+
+  # Bootstrap a basic rails environment for the agent to run in.
+  class MyApp < Rails::Application
+    config.active_support.deprecation = :log
+    config.secret_token = "49837489qkuweoiuoqwehisuakshdjksadhaisdy78o34y138974xyqp9rmye8yrpiokeuioqwzyoiuxftoyqiuxrhm3iou1hrzmjk"
+    config.after_initialize do
+      NewRelic::Agent.manual_start
+    end
   end
+  MyApp.initialize!
+
 end
-require 'newrelic_rpm'
 
 require 'test/unit'
 require 'shoulda'
 require 'test_contexts'
 require 'mocha'
-require 'mocha/integration/test_unit'
-require 'mocha/integration/test_unit/assertion_counter'
+
+begin # 1.8.6
+  require 'mocha/integration/test_unit'
+  require 'mocha/integration/test_unit/assertion_counter'
+rescue LoadError
+end
 
 require 'new_relic/fake_service'
 
@@ -118,7 +127,18 @@ def compare_metrics(expected, actual)
   assert_equal(expected.to_a.sort, actual.to_a.sort, "extra: #{(actual - expected).to_a.inspect}; missing: #{(expected - actual).to_a.inspect}")
 end
 
+def with_config(config_hash, level=0)
+  config = NewRelic::Agent::Configuration::DottedHash.new(config_hash)
+  NewRelic::Agent.config.apply_config(config, level)
+  begin
+    yield
+  ensure
+    NewRelic::Agent.config.remove_config(config)
+  end
+end
+
 module TransactionSampleTestHelper
+  module_function
   def make_sql_transaction(*sql)
     sampler = NewRelic::Agent::TransactionSampler.new
     sampler.notice_first_scope_push Time.now.to_f
@@ -153,5 +173,4 @@ module TransactionSampleTestHelper
     sampler.notice_scope_empty
     sampler.samples[0]
   end
-  module_function :run_sample_trace_on
 end

data/ui/helpers/developer_mode_helper.rb

@@ -70,7 +70,7 @@ module NewRelic::DeveloperModeHelper
     rescue
       # catch all other exceptions.  We're going to create an invalid link below, but that's okay.
     end
-    if using_textmate?
+    if NewRelic::Agent.config[:textmate]
       "txmt://open?url=file://#{file}&line=#{line}"
     else
       "show_source?file=#{file}&line=#{line}&anchor=selected_line"
@@ -105,7 +105,7 @@ module NewRelic::DeveloperModeHelper
 
   # write a link to the source for a trace
   def link_to_source(trace)
-    image_url = 'file/images/' + (using_textmate? ? "textmate.png" : "file_icon.png")
+    image_url = 'file/images/' + (NewRelic::Agent.config[:textmate] ? "textmate.png" : "file_icon.png")
 
     link_to "<img src=#{image_url} alt=\"View Source\" title=\"View Source\"/>", url_for_source(application_caller(trace))
   end
@@ -239,11 +239,6 @@ module NewRelic::DeveloperModeHelper
     end
   end
 
-  def using_textmate?
-    NewRelic::Control.instance.use_textmate?
-  end
-
-
   def render_segment_details(segment, depth=0)
     @detail_segment_count ||= 0
     @detail_segment_count += 1
@@ -348,10 +343,25 @@ module NewRelic::DeveloperModeHelper
     parts.join '.'
   end
 
-  def profile_table(profile)
+  SORT_REPLACEMENTS = {
+      "Total" => :total_time,
+      "Self" => :self_time,
+      "Child" => :children_time,
+      "Wait" => :wait_time
+  }
+
+  def profile_table(sample, options)
     out = StringIO.new
-    printer = RubyProf::GraphHtmlPrinter.new(profile)
-    printer.print(out, :min_percent=>0.5)
-    out.string[/<body>(.*)<\/body>/im, 0].gsub('<table>', '<table class=profile>')
+    printer = RubyProf::GraphHtmlPrinter.new(sample.profile)
+    printer.print(out, options)
+    out = out.string[/<body>(.*)<\/body>/im, 0].gsub('<table>', '<table class=profile>')
+    SORT_REPLACEMENTS.each do |text, param|
+      replacement = (options[:sort_method] == param) ?
+          "<th> #{text}&nbsp;&darr;</th>" :
+          "<th>#{link_to text, "show_sample_summary?id=#{sample.sample_id}&sort=#{param}"}</th>"
+
+      out.gsub!(/<th> +#{text}<\/th>/, replacement)
+    end
+    out
   end
 end

data/ui/views/layouts/newrelic_default.rhtml

@@ -2,6 +2,7 @@
     xml:lang="en" lang="en">
 <head>
 <script type="text/javascript" src="/newrelic/file/javascript/jquery-1.4.2.js"></script>
+<meta charset="utf-8" />
 <title>New Relic Developer Mode</title>
 	<link href="/newrelic/file/stylesheets/style.css" 
 				media="screen" rel="stylesheet" type="text/css" />

data/ui/views/newrelic/show_sample.rhtml

@@ -62,7 +62,7 @@
 <br/>
 <div id="view_sample">
 	<% if @sample.profile %>
-	  <%= profile_table(@sample.profile) %> 
+	  <%= profile_table(@sample, @profile_options) %>
 	<% else %>
 	<div align=center width="100%">
 		<%= show_view_link 'Summary', 'show_sample_summary' %>

data/ui/views/newrelic/threads.rhtml

@@ -8,22 +8,18 @@
 		<th class="left">Status</th>
 		<th class="left">Group</th>
 		<th class="left">Priority</th>
-		<th class="left">Locals</th>
 	</thead>
 <%
   main = Thread.main
   threads = Thread.list - [ main ]
   nr_threads = []
-  threads.delete_if { | thread | nr_threads << thread if thread.key? 'newrelic_label' }
+  threads.delete_if { | thread | nr_threads << thread if thread.key?(:newrelic_label) }
   ([ main ] + threads).each_with_index do | thread, i | %>
 <tr class="odd_row">
   <td valign="top"><%= h(thread == main ? 'main' : thread.to_s) %></td>
   <td valign="top"><%= h(thread.status || 'terminated with exception') %></td>
   <td valign="top"><%= h(thread.group || 'none') %></td>
   <td valign="top"><%= h thread.priority %></td>
-  <td class="locals">
-  	<%= thread.keys.map{|k| h k}.join("</br>") %>
-  </td>
 </tr>
           <% end %>
 <% if nr_threads.size > 0 %>
@@ -34,18 +30,14 @@
 		<th class="left">Status</th>
 		<th class="left">Group</th>
 		<th class="left">Priority</th>
-		<th class="left">Locals</th>
 	</thead>
 
 <% nr_threads.each_with_index do | thread, i | %>
 <tr class="odd_row">
-  <td valign="top"><%= h thread['newrelic_label'] %></td>
+  <td valign="top"><%= h thread[:newrelic_label] %></td>
   <td valign="top"><%= h(thread.status || 'terminated with exception') %></td>
   <td valign="top"><%= h(thread.group || 'none') %></td>
   <td valign="top"><%= h thread.priority %></td>
-  <td class="locals">
-  	<%= (thread.keys - ['newrelic_label']).map{|k| h k}.join("</br>") %>
-  </td>
 </tr>
 <% end %>
 <% end %>

data/vendor/gems/metric_parser-0.1.0.pre1/.specification

@@ -0,0 +1,116 @@
+--- !ruby/object:Gem::Specification 
+name: metric_parser
+version: !ruby/object:Gem::Version 
+  hash: 270495464
+  prerelease: true
+  segments: 
+  - 0
+  - 1
+  - 0
+  - pre1
+  version: 0.1.0.pre1
+platform: ruby
+authors: 
+- Justin George
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2010-08-12 00:00:00 +00:00
+default_executable: 
+dependencies: []
+
+description: A standard way to parse New Relic metric names
+email: 
+- support@newrelic.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: []
+
+files: 
+- lib/metric_parser.rb
+- lib/new_relic/metric_parser/action_mailer.rb
+- lib/new_relic/metric_parser/active_merchant.rb
+- lib/new_relic/metric_parser/active_record.rb
+- lib/new_relic/metric_parser/apdex.rb
+- lib/new_relic/metric_parser/background_transaction.rb
+- lib/new_relic/metric_parser/client.rb
+- lib/new_relic/metric_parser/controller.rb
+- lib/new_relic/metric_parser/controller_cpu.rb
+- lib/new_relic/metric_parser/controller_ext.rb
+- lib/new_relic/metric_parser/database.rb
+- lib/new_relic/metric_parser/database_pool.rb
+- lib/new_relic/metric_parser/dot_net.rb
+- lib/new_relic/metric_parser/dot_net_parser.rb
+- lib/new_relic/metric_parser/errors.rb
+- lib/new_relic/metric_parser/external.rb
+- lib/new_relic/metric_parser/frontend.rb
+- lib/new_relic/metric_parser/gc.rb
+- lib/new_relic/metric_parser/hibernate_session.rb
+- lib/new_relic/metric_parser/java.rb
+- lib/new_relic/metric_parser/java_parser.rb
+- lib/new_relic/metric_parser/jsp.rb
+- lib/new_relic/metric_parser/jsp_tag.rb
+- lib/new_relic/metric_parser/mem_cache.rb
+- lib/new_relic/metric_parser/metric_parser.rb
+- lib/new_relic/metric_parser/orm.rb
+- lib/new_relic/metric_parser/other_transaction.rb
+- lib/new_relic/metric_parser/servlet.rb
+- lib/new_relic/metric_parser/servlet_context_listener.rb
+- lib/new_relic/metric_parser/servlet_filter.rb
+- lib/new_relic/metric_parser/servlet_init.rb
+- lib/new_relic/metric_parser/solr.rb
+- lib/new_relic/metric_parser/solr_request_handler.rb
+- lib/new_relic/metric_parser/spring.rb
+- lib/new_relic/metric_parser/spring_controller.rb
+- lib/new_relic/metric_parser/spring_view.rb
+- lib/new_relic/metric_parser/struts_action.rb
+- lib/new_relic/metric_parser/struts_result.rb
+- lib/new_relic/metric_parser/version.rb
+- lib/new_relic/metric_parser/view.rb
+- lib/new_relic/metric_parser/web_frontend.rb
+- lib/new_relic/metric_parser/web_service.rb
+- lib/new_relic/metric_parser/web_transaction.rb
+- lib/new_relic/metric_parser.rb
+- LICENSE
+- README
+has_rdoc: true
+homepage: http://www.newrelic.com
+licenses: []
+
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+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 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 31
+      segments: 
+      - 1
+      - 2
+      - 0
+      version: 1.2.0
+requirements: []
+
+rubyforge_project: 
+rubygems_version: 1.3.7
+signing_key: 
+specification_version: 3
+summary: A standard way to parse New Relic metric names
+test_files: []
+