wd_newrelic_rpm 3.3.4.1 → 3.5.5

data/test/new_relic/transaction_sample_test.rb

@@ -5,6 +5,8 @@ class NewRelic::TransactionSampleTest < Test::Unit::TestCase
   ::SQL_STATEMENT = "SELECT * from sandwiches"
 
   def setup
+    @test_config = { :developer_mode => true }
+    NewRelic::Agent.config.apply_config(@test_config)
     @connection_stub = Mocha::Mockery.instance.named_mock('connection')
     @connection_stub.stubs(:execute).returns([['QUERY RESULT']])
 
@@ -12,6 +14,10 @@ class NewRelic::TransactionSampleTest < Test::Unit::TestCase
     @t = make_sql_transaction(::SQL_STATEMENT, ::SQL_STATEMENT)
   end
 
+  def teardown
+    NewRelic::Agent.config.remove_config(@test_config)
+  end
+
   def test_be_recorded
     assert_not_nil @t
   end
@@ -78,7 +84,7 @@ class NewRelic::TransactionSampleTest < Test::Unit::TestCase
 
   def test_have_explains
     s = @t.prepare_to_send(:record_sql => :obfuscated, :explain_sql => 0.00000001)
-    
+
     s.each_segment do |segment|
       if segment.params[:explain_plan]
         explanation = segment.params[:explain_plan]
@@ -138,7 +144,7 @@ class NewRelic::TransactionSampleTest < Test::Unit::TestCase
       s.to_s
     end
   end
-  
+
   def test_to_s_includes_keys
     s = @t.prepare_to_send(:explain_sql => 0.1)
     s.params[:fake_key] = 'a fake param'
@@ -174,4 +180,43 @@ class NewRelic::TransactionSampleTest < Test::Unit::TestCase
     end
     assert_equal 6, transaction.count_segments
   end
+
+  def test_to_array
+    expected_array = [@t.start_time.to_f,
+                      @t.params[:request_params],
+                      @t.params[:custom_params],
+                      @t.root_segment.to_array]
+    assert_equal expected_array, @t.to_array
+  end
+
+  if RUBY_VERSION >= '1.9.2'
+    def test_to_json
+      expected_string = JSON.dump([@t.start_time.to_f,
+                                   @t.params[:request_params],
+                                   @t.params[:custom_params],
+                                   @t.root_segment.to_array])
+      assert_equal expected_string, @t.to_json
+    end
+  end
+
+  def test_to_collector_array
+    if NewRelic::Agent::NewRelicService::JsonMarshaller.is_supported?
+      marshaller = NewRelic::Agent::NewRelicService::JsonMarshaller.new
+      trace_tree = compress(@t.to_json)
+    else
+      marshaller = NewRelic::Agent::NewRelicService::PrubyMarshaller.new
+      trace_tree = @t.to_array
+    end
+    expected_array = [(@t.start_time.to_f * 1000).round,
+                      (@t.duration * 1000).round,
+                      @t.params[:path], @t.params[:uri],
+                      trace_tree,
+                      @t.guid, nil, !!@t.force_persist]
+
+    assert_equal expected_array, @t.to_collector_array(marshaller.default_encoder)
+  end
+
+  def compress(string)
+    Base64.encode64(Zlib::Deflate.deflate(string, Zlib::DEFAULT_COMPRESSION))
+  end
 end

data/test/new_relic/version_number_test.rb

@@ -86,4 +86,36 @@ class NewRelic::VersionNumberTest < Test::Unit::TestCase
     assert_equal '1.2.0', NewRelic::VersionNumber.new('1.2.0').to_s
     assert_equal '1.2', NewRelic::VersionNumber.new('1.2').to_s
   end
+
+  def test_gemspec_version_parsing
+    gemspec_contents = File.read(File.join(File.dirname(__FILE__), '..', '..', 'newrelic_rpm.gemspec'))
+    gemspec_contents =~ /s\.version\s*=\s*"(.*)"/
+    real_version = $1
+    assert_equal real_version, NewRelic::VERSION::STRING
+  end
+
+  def test_gemspec_parse_no_build
+    version = NewRelic::VERSION.parse_build_from_gemspec(NewRelic.fixture_path('gemspec_no_build.rb'))
+    assert_nil version
+  end
+
+  def test_gemspec_parse_with_build
+    version = NewRelic::VERSION.parse_build_from_gemspec(NewRelic.fixture_path('gemspec_with_build.rb'))
+    assert_equal '123', version
+  end
+
+  def test_gemspec_parse_with_build_and_stage
+    version = NewRelic::VERSION.parse_build_from_gemspec(NewRelic.fixture_path('gemspec_with_build_and_stage.rb'))
+    assert_equal '123.dev', version
+  end
+
+  def test_gemspec_parse_no_rubygems
+    Kernel.stubs(:const_defined?).with(:Gem).returns(false)
+    version = NewRelic::VERSION.parse_build_from_gemspec(NewRelic.fixture_path('gemspec_with_build_and_stage.rb'))
+    assert_equal '123.dev', version
+  end
+
+  def test_gemspec_parse_nonexistent
+    assert_nil NewRelic::VERSION.parse_build_from_gemspec('/really/not/a/real/path')
+  end
 end

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,55 +1,75 @@
 #!/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 3 environment variables:
+# 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)
 #
-# RPM_TEST_APP_CLONE_URL - where to clone the test app from (e.g.
-# git://github.com/newrelic/rpm_test_app.git, /path/in/my/filesystem)
-#
 # Example usage:
-# RPM_TEST_APP_CLONE_URL=git://github.com/newrelic/rpm_test_app.git \
 # RUBY=ree BRANCH=rails20 test/script/ci.sh
 #
-# RPM_TEST_APP_CLONE_URL=git://github.com/newrelic/rpm_test_app.git \
 # RUBY=ree BRANCH=rails20 test/script/ci.sh
 #
-# RPM_TEST_APP_CLONE_URL=~/dev/rpm_test_app/ \
 # RUBY=jruby BRANCH=rails22 test/script/ci.sh
 
 echo "Executing $0"
 echo "Running in $(pwd)"
 
-
-
 # print commands in this script as they're invoked
-# set -x
+#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
+  echo 'defaulting to 1.9.3'
+  export RUBY=1.9.3-p286
 fi
 if [ "x$BRANCH" == "x" ]; then
   echo '$BRANCH is undefined'
-  exit 1
+  echo 'defaulting to 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
-if [ "x$RPM_TEST_APP_CLONE_URL" == "x" ]; then
-  echo '$RPM_TEST_APP_CLONE_URL is undefined'
-  exit 1
+
+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`
@@ -59,36 +79,89 @@ pwd
 rm -rf tmp
 mkdir -p tmp
 cd tmp
-git clone --depth=1 $RPM_TEST_APP_CLONE_URL rpm_test_app
+
+
+#rpm_test_app_cache=~/.rpm_test_app_cache
+rpm_test_app_cache=~/workspace/.rpm_test_app_cache
+(
+  echo "updating local cache of rpm_test_app in $rpm_test_app_cache"
+  git clone --mirror git://github.com/newrelic/rpm_test_app.git $rpm_test_app_cache || true
+  cd $rpm_test_app_cache
+)
+
+git clone $rpm_test_app_cache rpm_test_app
 cd rpm_test_app
+
 git checkout -t origin/$BRANCH || git checkout $BRANCH
+
+
+# Re-write database.yml to this here doc
+( cat << "YAML" ) > config/database.yml
+# Shared properties for mysql db
+mysql: &mysql
+  adapter: mysql
+  socket: <%= (`uname -s` =~ /Linux/ ) ? "" :"/tmp/mysql.sock" %>
+  username: root
+  host: localhost
+  database: <%= ENV['PROJECT_NAME'] %>
+
+# Shared properties for postgres.  This won't work with our schema but
+# Does work with agent tests
+sqlite3: &sqlite3
+<% if defined?(JRuby) %>
+  adapter: jdbcsqlite3
+<% else %>
+  adapter: sqlite3
+<% end %>
+  database: db/all.sqlite3
+  pool: 5
+  timeout: 5000
+  host: localhost
+
+# SQLite version 3.x
+#   gem install sqlite3-ruby (not necessary on OS X Leopard)
+development:
+  <<: *sqlite3
+
+test:
+  <<: *mysql
+
+production:
+  <<: *mysql
+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
 
-rvm --force gemset delete ruby_agent_tests_$BRANCH
-rvm gemset create ruby_agent_tests_$BRANCH
-rvm gemset use ruby_agent_tests_$BRANCH
-
 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
+  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 exec rake --trace db:create:all ci:setup:testunit test:newrelic
-
-
-
-
+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
+# correctly.  These almost always pass, but as the CI machine has come under
+# heavier load there tend to be discrepencies between the duration measured in
+# the test and the duration the agent measures.  This is due to lags in CPU
+# scheduling since many processes are running on the box simultaneously.
+# 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

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_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 ../
+
+eval "$(rbenv init -)" || true
+rbenv shell $RUBY
+script/runner