ghazel-newrelic_rpm 3.1.0.1 → 3.4.0.2

data/test/script/ci_agent-tests_runner.sh

@@ -0,0 +1,82 @@
+#!/bin/bash -e
+
+SCRATH_DIR=./agent-tests_tmp
+#git pull git@github.com:newrelic/ruby_agent-tests.git
+
+#echo $PWD 
+script_dirname=`dirname $0`
+#echo $script_dirname
+#echo $0
+
+# make sure that we're in the project root
+script_dirname=`dirname $0`
+cd "$script_dirname/../../"
+
+
+
+if [ -x $SCRATH_DIR ] ; then
+	echo "found tmp, deleting"
+	rm -fr $SCRATH_DIR
+fi 
+
+mkdir $SCRATH_DIR
+cd $SCRATH_DIR
+
+git clone --depth=1 git@github.com:newrelic/ruby_agent-tests.git ruby_agent-tests
+git clone --depth=1 git@github.com:newrelic/rpm_contrib.git rpm_contrib
+
+if [ -x ../../Ruby_Agent ] ; then
+	ln -s ../../Ruby_Agent ./ruby_agent
+else 
+	echo "*********** Ruby_Agent can't be found ***********"
+	exit 1
+fi
+
+#exit 0
+
+cd ruby_agent-tests
+./ci_run.sh 
+
+#echo "creating tmp dir"
+#mkdir tmp
+#echo "cd'ing to tmp"
+# cd tmp
+# echo $PWD
+
+
+# exit 0
+#env
+#ls -al /home/hudson/.rvm/bin
+# source ~/.rvm/scripts/rvm
+#rvm 1.9.2
+#ruby -v
+
+# rvm --force gemset delete ruby_agent-tests
+
+# rvm gemset create ruby_agent-tests
+
+# rvm gemset use ruby_agent-tests
+# gem install bundler
+# bundle update
+# bundle
+
+##
+# bundle exec ruby fake_collector.rb
+# bundle exec ruby sinatra_metric_explosion_test.rb
+
+########
+# clear out gemset for next test set
+#
+
+# cd rails3viewfedex
+# rvm --force gemset delete ruby_agent-tests
+
+# rvm gemset create ruby_agent-tests
+
+# rvm gemset use ruby_agent-tests
+
+# gem install bundler
+# bundle update
+# bundle
+# bundle exec ruby view_instrumentation_test.rb
+#exit 0

data/test/script/ci_bench.sh

@@ -0,0 +1,52 @@
+#!/bin/bash
+
+# Script to benchmark the ruby agent under various versions of ruby in ci.
+
+echo "Executing $0"
+echo "Running in $(pwd)"
+
+# print commands in this script as they're invoked
+# set -x
+# fail if any command fails
+set -e
+
+# check for require environment variables
+if [ "x$RUBY" == "x" ]; then
+  echo '$RUBY is undefined'
+  exit 1
+fi
+
+
+. "$HOME/.rvm/scripts/rvm"
+rvm use $RUBY || rvm install $RUBY
+echo `which ruby`
+
+# make sure that we're in the project root
+script_dirname=`dirname $0`
+cd "$script_dirname/../../"
+pwd
+
+rm -rf tmp
+mkdir -p tmp
+cd tmp
+git clone --depth=1 git@github.com:newrelic/agent_prof.git agent_prof
+cd agent_prof
+
+perl -p -i'.bak' -e 's#gem +.newrelic_rpm.*$#gem "newrelic_rpm", :path => "\.\.\/\.\.\/"#' Gemfile
+
+rvm --force gemset delete ruby_bench_$RUBY
+rvm gemset create ruby_bench_$RUBY
+rvm gemset use ruby_bench_$RUBY
+
+if [ "x$RUBY" == "x1.8.6" ]; then
+  # Bundler 1.1 dropped support for ruby 1.8.6
+  gem install bundler -v'~>1.0.0' --no-rdoc --no-ri
+else
+  gem install bundler --no-rdoc --no-ri
+fi
+
+bundle
+script/run
+bundle exec script/post_log_to_dashboard
+
+

data/test/script/ci_multiverse_runner.sh

@@ -0,0 +1,63 @@
+#!/bin/bash -e
+
+export PATH=$PATH:$HOME/bin
+
+echo $HOME
+echo $PATH
+#ls $HOME/bin
+
+
+
+if [ "x$RUBY" == "x" ] ; then
+	export RUBY=1.9.3
+fi
+
+echo "Tests will be run using $RUBY"
+#uname -a
+
+SCRATH_DIR=./multiverse_tmp
+script_dirname=`dirname $0`
+
+# make sure that we're in the project root
+cd "$script_dirname/../../"
+
+#pwd 
+
+if [ -x $SCRATH_DIR ] ; then
+	echo "found tmp, deleting"
+	rm -fr $SCRATH_DIR
+fi
+
+mkdir $SCRATH_DIR
+cd $SCRATH_DIR
+
+#pwd 
+if [[ $JOB_NAME =~ "Pangalactic" ]] ; then 
+	AGENT_LOCATION="../../../../../../Ruby_Agent"
+else
+	AGENT_LOCATION="../../Ruby_Agent"
+fi
+
+git clone --depth=1 git@github.com:newrelic/multiverse.git multiverse
+git clone --depth=1 git@github.com:newrelic/rpm_contrib.git rpm_contrib
+
+echo "Looking for Ruby Agent at $AGENT_LOCATION"
+#ls -l ../../../../../../
+#ls -l /home/hudson/workspace/
+
+if [ -x $AGENT_LOCATION ] ; then
+	ln -s $AGENT_LOCATION ./ruby_agent
+else
+	echo "*********** Ruby_Agent not found ***********"
+	exit 1
+fi
+
+cd multiverse
+#./ci_run.sh
+
+#pwd
+#ls -l ../
+
+source ~/.rvm/scripts/rvm
+rvm use $RUBY
+script/runner

data/test/test_contexts.rb

@@ -7,6 +7,7 @@ module TestContexts
       setup do
         @log_data = StringIO.new
         @log = Logger.new(@log_data)
+        NewRelic::Agent::Agent.instance.service = NewRelic::FakeService.new
         NewRelic::Agent.manual_start :log => @log
         @agent = NewRelic::Agent.instance
         @agent.transaction_sampler.send :clear_builder

data/test/test_helper.rb

@@ -14,6 +14,7 @@ require 'rubygems'
 
 begin
   require 'config/environment'
+  # require File.join(File.dirname(__FILE__),'..','..','rpm_test_app','config','environment')
   begin
     require 'test_help'
   rescue LoadError
@@ -21,8 +22,18 @@ begin
   end
 
 rescue LoadError
-  puts "Unable to load Rails for New Relic tests"
-  raise
+  # 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
+  end
 end
 require 'newrelic_rpm'
 
@@ -33,10 +44,12 @@ require 'mocha'
 require 'mocha/integration/test_unit'
 require 'mocha/integration/test_unit/assertion_counter'
 
+require 'new_relic/fake_service'
+
 class Test::Unit::TestCase
   include Mocha::API
 
-  # FIXME delete this trick when we stop supporting rails2.0.x
+  # we can delete this trick when we stop supporting rails2.0.x
   if ENV['BRANCH'] != 'rails20'
     # a hack because rails2.0.2 does not like double teardowns
     def teardown
@@ -101,7 +114,7 @@ end
 
 
 def compare_metrics(expected, actual)
-  actual.delete('GC/cumulative') # in case we are in REE
+  actual.delete_if {|a| a.include?('GC/cumulative') } # in case we are in REE
   assert_equal(expected.to_a.sort, actual.to_a.sort, "extra: #{(actual - expected).to_a.inspect}; missing: #{(expected - actual).to_a.inspect}")
 end
 
@@ -140,5 +153,5 @@ module TransactionSampleTestHelper
     sampler.notice_scope_empty
     sampler.samples[0]
   end
-
+  module_function :run_sample_trace_on
 end

data/ui/helpers/developer_mode_helper.rb

@@ -27,8 +27,8 @@ module NewRelic::DeveloperModeHelper
   def application_caller(trace)
     trace = strip_nr_from_backtrace(trace) unless params[:show_nr]
     trace.each do |trace_line|
-      file = file_and_line(trace_line).first
-      unless exclude_file_from_stack_trace?(file, false)
+      file, line, gem = file_and_line(trace_line)
+      unless file && exclude_file_from_stack_trace?(file, false, gem)
         return trace_line
       end
     end
@@ -38,8 +38,8 @@ module NewRelic::DeveloperModeHelper
   def application_stack_trace(trace, include_rails = false)
     trace = strip_nr_from_backtrace(trace) unless params[:show_nr]
     trace.reject do |trace_line|
-      file = file_and_line(trace_line).first
-      exclude_file_from_stack_trace?(file, include_rails)
+      file, line, gem = file_and_line(trace_line)
+      file && exclude_file_from_stack_trace?(file, include_rails, gem)
     end
   end
 
@@ -60,7 +60,7 @@ module NewRelic::DeveloperModeHelper
 
   def url_for_source(trace_line)
     file, line = file_and_line(trace_line)
-
+    return "#" if file.nil?
     begin
       file = Pathname.new(file).realpath
     rescue Errno::ENOENT
@@ -70,7 +70,6 @@ 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?
       "txmt://open?url=file://#{file}&line=#{line}"
     else
@@ -230,8 +229,14 @@ module NewRelic::DeveloperModeHelper
   end
 
   private
+  # return three objects, the file path, the line in the file, and the gem the file belongs to 
+  # if found
   def file_and_line(stack_trace_line)
-    stack_trace_line.match(/(.*):(\d+)/)[1..2]
+    if stack_trace_line =~ /^(?:(\w+) \([\d.]*\) )?(.*):(\d+)/
+      return $2, $3, $1
+    else
+      return nil
+    end
   end
 
   def using_textmate?
@@ -262,9 +267,10 @@ module NewRelic::DeveloperModeHelper
     html
   end
 
-  def exclude_file_from_stack_trace?(file, include_rails)
+  def exclude_file_from_stack_trace?(file, include_rails, gem=nil)
     return false if include_rails
     return true if file !~ /\.(rb|java)/
+    return true if %w[rack activerecord activeresource activesupport actionpack railties].include? gem
     %w[/actionmailer/
              /activerecord
              /activeresource

data/ui/helpers/google_pie_chart.rb

@@ -1,6 +1,5 @@
 
 # A wrapper around the google charts service.
-# TODO consider making generic and open sourcing
 class GooglePieChart
   attr_accessor :width, :height, :color
 

data/ui/views/newrelic/index.rhtml

@@ -21,10 +21,10 @@
         </table>
 		</td>
 		<td valign=top>
-                          <% if defined?(Unicorn) || defined?(Passenger) %>
+                          <% if defined?(Unicorn) || defined?(Passenger) || defined?(Rainbows) %>
                           <div class="flash">
                           <p id="errorExplanation">
-                            We've noticed you're running a forking web server, like Unicorn or Passenger. See Below</p><p> Developer mode may be unpredictable, 
+                            We've noticed you're running a forking web server, like Unicorn or Passenger or Rainbows. See Below</p><p> Developer mode may be unpredictable,
                             since those servers run many processes and developer mode is entirely in the process.</p><p> We suggest you try Thin, 
                             Mongrel, or another single-process web server for development mode.</p><p>
                             (You can ignore this message if you're sure that you're running only one process, and it's not being reaped when inactive.)

data/vendor/gems/dependency_detection-0.0.1.build/LICENSE

@@ -1,19 +1,5 @@
-Copyright (c) 2010-2011 Justin George
+Copyright (c) 2010-2011 New Relic, Inc.  All rights reserved.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+This code is, and has always been, copyright New Relic and licensed 
+under our license terms that can be found in master license file 
+located here: ../../../../LICENSE

data/vendor/gems/dependency_detection-0.0.1.build/lib/dependency_detection.rb

@@ -17,8 +17,18 @@ module DependencyDetection
     end
   end
 
+  def dependency_by_name(name)
+    @@items.find {|i| i.name == name }
+  end
+
+  def installed?(name)
+    item = dependency_by_name(name)
+    item && item.executed
+  end
+
   class Dependent
     attr_reader :executed
+    attr_reader :name
     def executed!
       @executed = true
     end

data/vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/mem_cache.rb

@@ -4,13 +4,13 @@ module NewRelic
     class MemCache < NewRelic::MetricParser::MetricParser
       def is_memcache?; true; end
 
-      # for MemCache metrics, the short name is actually
+      # for Memcache metrics, the short name is actually
       # the full name
       def short_name
-        name
+        'Memcache'
       end
       def developer_name
-        "MemCache #{segments[1..-1].join '/'}"
+        "Memcache #{segments[1..-1].join '/'}"
       end
 
       def all?
@@ -22,19 +22,19 @@ module NewRelic
       def legend_name
         case segments[1]
         when 'allWeb'
-          "MemCache"
+          "Memcache"
         when 'allOther'
-          "Non-web MemCache"
+          "Non-web Memcache"
         else
-          "MemCache #{operation} operations"
+          "Memcache #{operation} operations"
         end
       end
       def tooltip_name
         case segments[1]
         when 'allWeb'
-          "MemCache calls from web transactions"
+          "Memcache calls from web transactions"
         when 'allOther'
-          "MemCache calls from non-web transactions"
+          "Memcache calls from non-web transactions"
         else
           "MemCache #{operation} operations"
         end
@@ -43,11 +43,11 @@ module NewRelic
       def developer_name
         case segments[1]
         when 'allWeb'
-          "Web MemCache"
+          "Web Memcache"
         when 'allOther'
-          "Non-web MemCache"
+          "Non-web Memcache"
         else
-          "MemCache #{operation}"
+          "Memcache #{operation}"
         end
       end
     end