newrelic_rpm 3.14.1.311 → 3.14.2.312

data/test/new_relic/marshalling_test_cases.rb

@@ -119,7 +119,7 @@ module MarshallingTestCases
     result = $collector.calls_for('error_event_data')
 
     assert_equal 1, result.length
-    events = result.first.error_events
+    events = result.first.events
     assert_equal 1, events.length
 
     expected_event = [

data/test/nullverse/default_source_require_test.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
+require File.expand_path(File.join(File.dirname(__FILE__), 'nullverse_helper'))
+
+# this test exists to ensure that default source doesn't depend on specific parts
+# of the agent having been previously required when default_source is required.
+
+class DefaultSourceRequireTest < Minitest::Test
+  def test_require_default_source_doesnt_raise
+    exception = nil
+    begin
+      require 'new_relic/agent/configuration/default_source'
+    rescue => e
+      exception = e
+    end
+
+    assert_nil exception, "Expected not to raise when requiring default source without the agent"
+  end
+end

data/test/nullverse/nullverse_helper.rb

@@ -0,0 +1,10 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+require 'minitest/autorun'
+
+unless defined?(Minitest::Test)
+  Minitest::Test = MiniTest::Unit::TestCase
+end
+
+$:.unshift File.expand_path('../../lib', File.dirname(__FILE__))

data/test/performance/suites/active_record.rb

@@ -7,7 +7,7 @@ class ActiveRecordTest < Performance::TestCase
   def setup
     require 'new_relic/agent/instrumentation/active_record_helper'
 
-    const_set(:ActiveRecordHelper, NewRelic::Agent::Instrumentation::ActiveRecordHelper) unless defined?(ActiveRecordHelper)
+    ActiveRecordTest.const_set(:ActiveRecordHelper, NewRelic::Agent::Instrumentation::ActiveRecordHelper) unless defined?(ActiveRecordHelper)
 
     if ActiveRecordHelper.respond_to?(:metrics_for)
       @run = ActiveRecordHelper.method(:metrics_for)

data/test/performance/suites/sql_obfuscation.rb

@@ -5,13 +5,14 @@
 class SqlObfuscationTests < Performance::TestCase
   def setup
     require 'new_relic/agent/database'
-    @long_query  = NewRelic::Agent::Database::Statement.new("SELECT DISTINCT table0.* FROM `table0` INNER JOIN `table1` ON `table1`.`metric_id` = `table0`.`id` LEFT JOIN `table3` ON table3.id_column = table0.id_column AND table3.metric_id = table0.id WHERE `table1`.`other_id` IN (92776, 49992, 61710, 84911, 90744, 40647) AND `table0`.`id_column` = 81067 AND `table0`.`col12` = '' AND ((table0.id_column=81067 )) AND ((table3.timestamp IS NULL OR table3.timestamp > 1406810459)) AND (((table0.name LIKE 'WebTransaction/%') OR ((table0.name LIKE 'OtherTransaction/%/%') AND (table0.name NOT LIKE '%/all')))) LIMIT 2250")
-    @short_query = NewRelic::Agent::Database::Statement.new("SELECT * FROM `table` WHERE id=2540250 AND name LIKE 'OtherTransaction/%/%'")
+    long_query = "SELECT DISTINCT table0.* FROM `table0` INNER JOIN `table1` ON `table1`.`metric_id` = `table0`.`id` LEFT JOIN `table3` ON table3.id_column = table0.id_column AND table3.metric_id = table0.id WHERE `table1`.`other_id` IN (92776, 49992, 61710, 84911, 90744, 40647) AND `table0`.`id_column` = 81067 AND `table0`.`col12` = '' AND ((table0.id_column=81067 )) AND ((table3.timestamp IS NULL OR table3.timestamp > 1406810459)) AND (((table0.name LIKE 'WebTransaction/%') OR ((table0.name LIKE 'OtherTransaction/%/%') AND (table0.name NOT LIKE '%/all')))) LIMIT 2250"
+    short_query = "SELECT * FROM `table` WHERE id=2540250 AND name LIKE 'OtherTransaction/%/%'"
 
-    @long_query_pg = @long_query.dup
-    @long_query_pg.adapter = 'postgresql'
-    @short_query_pg = @short_query.dup
-    @short_query_pg.adapter = 'postgresql'
+    @long_query  = NewRelic::Agent::Database::Statement.new(long_query)
+    @short_query = NewRelic::Agent::Database::Statement.new(short_query)
+
+    @long_query_pg = NewRelic::Agent::Database::Statement.new(long_query, {:adapter => 'postgresql'})
+    @short_query_pg = NewRelic::Agent::Database::Statement.new(short_query, {:adapter => 'postgresql'})
   end
 
   def test_obfuscate_sql

data/test/script/ci.sh

@@ -1,170 +1,15 @@
 #!/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 its dependencies)
-# and executing them.
-#
-# It relies on 2 environment variables:
-#
-# RUBY_VERSION - 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)
-#
-# Example usage:
-# RUBY_VERSION=ree BRANCH=rails20 test/script/ci.sh
-#
-# RUBY_VERSION=ree BRANCH=rails20 test/script/ci.sh
-#
-# RUBY_VERSION=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
-# fail if any command fails
 set -e
 
-# check for require environment variables
-if [ "x$RUBY_VERSION" == "x" ]; then
-  echo '$RUBY_VERSION is undefined'
-  echo 'defaulting to 1.9.3'
-  export RUBY_VERSION=1.9.3-p374
-fi
-if [ "x$BRANCH" == "x" ]; then
-  echo '$BRANCH is undefined'
-  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_VERSION//" | 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_VERSION
-if [ "x$(rbenv version-name)" = "x$RUBY_VERSION" ]; then
-  echo "switched to ruby $RUBY_VERSION"
-else
-  rbenv install $RUBY_VERSION
-  rbenv shell $RUBY_VERSION
-  if [ "x$(rbenv version-name)" = "x$RUBY_VERSION" ]; then
-    echo "switched to ruby $RUBY_VERSION"
-  else
-    echo "failed to install ruby $RUBY_VERSION"
-    exit 1
-  fi
-fi
-
-echo `which ruby`
-ruby -v
-gem --version
-
-# 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
-
-
-if [ "x$BRANCH" == "xnorails" ]; then
-  if [ "x$RUBY_VERSION" == "x1.8.6" ]; then
-    # Bundler 1.1 dropped support for ruby 1.8.6
-    bundle -h > /dev/null || gem install bundler -v'~>1.0.0' --no-rdoc --no-ri
-  else
-    bundle -h > /dev/null || gem install bundler --no-rdoc --no-ri
-  fi
-
-  bundle -v
-  bundle --local || bundle
-  NO_RAILS=true bundle exec rake --trace test || bundle exec rake --trace test
-  exit
-fi
-
-#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 fetch || true
-)
+unset MERB_ENV
+unset RUBY_ENV
+unset RACK_ENV
+unset RAILS_ENV
 
-git clone $rpm_test_app_cache rpm_test_app
-cd rpm_test_app
-
-git fetch || true
-git checkout -t origin/$BRANCH || git checkout $BRANCH
-if [ -x $HOME/.rbenv/plugins/rbenv-gemsets ]; then
-  echo "$RUBY_VERSION-$BRANCH" > .rbenv-gemsets
+if [ "$TYPE" = "UNIT" ]; then
+  bundle exec rake test:env[$ENVIRONMENT]
+elif [ "$TYPE" = "FUNCTIONAL" ]; then
+  bundle exec rake test:multiverse[group=$GROUP,verbose,nocache]
+elif [ "$TYPE" = "NULLVERSE" ]; then
+  bundle exec rake test:nullverse
 fi
-
-# 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
-  echo "Warning: Rails 2.0 support in progress. This probably only works in CI"
-  mkdir -p vendor/plugins
-  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
-
-if [ "x$RUBY_VERSION" == "x1.8.6" ]; then
-  # Bundler 1.1 dropped support for ruby 1.8.6
-  bundle -h > /dev/null || gem install bundler -v'~>1.0.0' --no-rdoc --no-ri
-else
-  bundle -h > /dev/null || gem install bundler --no-rdoc --no-ri
-fi
-
-bundle -v
-
-export RAILS_ENV=test
-bundle --local || bundle
-bundle exec rake --trace db:create:all test:newrelic

data/test/script/install_mongodb.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz -O /tmp/mongodb.tgz
+mkdir -p /tmp/mongodb/data
+tar -xvf /tmp/mongodb.tgz -C /tmp/mongodb
+/tmp/mongodb/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath /tmp/mongodb/data --bind_ip 127.0.0.1 --noauth &> /dev/null &

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.14.1.311
+  version: 3.14.2.312
 platform: ruby
 authors:
 - Tim Krajcar
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2016-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -269,6 +269,7 @@ files:
 - lib/new_relic/agent/error_collector.rb
 - lib/new_relic/agent/error_event_aggregator.rb
 - lib/new_relic/agent/error_trace_aggregator.rb
+- lib/new_relic/agent/event_aggregator.rb
 - lib/new_relic/agent/event_buffer.rb
 - lib/new_relic/agent/event_listener.rb
 - lib/new_relic/agent/event_loop.rb
@@ -375,6 +376,7 @@ files:
 - lib/new_relic/agent/stats_engine/samplers.rb
 - lib/new_relic/agent/stats_engine/stats_hash.rb
 - lib/new_relic/agent/supported_versions.rb
+- lib/new_relic/agent/synthetics_event_aggregator.rb
 - lib/new_relic/agent/synthetics_event_buffer.rb
 - lib/new_relic/agent/synthetics_monitor.rb
 - lib/new_relic/agent/system_info.rb
@@ -393,12 +395,16 @@ files:
 - lib/new_relic/agent/transaction/trace_node.rb
 - lib/new_relic/agent/transaction/transaction_sample_buffer.rb
 - lib/new_relic/agent/transaction/xray_sample_buffer.rb
+- lib/new_relic/agent/transaction_error_primitive.rb
 - lib/new_relic/agent/transaction_event_aggregator.rb
+- lib/new_relic/agent/transaction_event_primitive.rb
+- lib/new_relic/agent/transaction_event_recorder.rb
 - lib/new_relic/agent/transaction_metrics.rb
 - lib/new_relic/agent/transaction_sample_builder.rb
 - lib/new_relic/agent/transaction_sampler.rb
 - lib/new_relic/agent/transaction_state.rb
 - lib/new_relic/agent/transaction_timings.rb
+- lib/new_relic/agent/transction_event_recorder.rb
 - lib/new_relic/agent/utilization_data.rb
 - lib/new_relic/agent/vm.rb
 - lib/new_relic/agent/vm/jruby_vm.rb
@@ -464,6 +470,8 @@ files:
 - lib/tasks/newrelic.rb
 - lib/tasks/tests.rake
 - lib/tasks/versions.html.erb
+- lib/tasks/versions.postface.html
+- lib/tasks/versions.preface.html
 - lib/tasks/versions.rake
 - lib/tasks/versions.txt.erb
 - newrelic.yml
@@ -783,6 +791,7 @@ files:
 - test/multiverse/suites/agent_only/synthetics_test.rb
 - test/multiverse/suites/agent_only/testing_app.rb
 - test/multiverse/suites/agent_only/thread_profiling_test.rb
+- test/multiverse/suites/agent_only/transaction_events_test.rb
 - test/multiverse/suites/agent_only/transaction_ignoring_test.rb
 - test/multiverse/suites/agent_only/utilization_data_collection_test.rb
 - test/multiverse/suites/agent_only/xray_sessions_test.rb
@@ -866,6 +875,7 @@ files:
 - test/multiverse/suites/rack/Envfile
 - test/multiverse/suites/rack/before_suite.rb
 - test/multiverse/suites/rack/builder_map_test.rb
+- test/multiverse/suites/rack/config/newrelic.yml
 - test/multiverse/suites/rack/example_app.rb
 - test/multiverse/suites/rack/http_response_code_test.rb
 - test/multiverse/suites/rack/nested_non_rack_app_test.rb
@@ -940,6 +950,7 @@ files:
 - test/multiverse/suites/sidekiq/log/.gitkeep
 - test/multiverse/suites/sidekiq/sidekiq_instrumentation_test.rb
 - test/multiverse/suites/sidekiq/sidekiq_server.rb
+- test/multiverse/suites/sidekiq/test_model.rb
 - test/multiverse/suites/sidekiq/test_worker.rb
 - test/multiverse/suites/sinatra/Envfile
 - test/multiverse/suites/sinatra/config/newrelic.yml
@@ -1017,6 +1028,7 @@ files:
 - test/new_relic/agent/error_collector_test.rb
 - test/new_relic/agent/error_event_aggregator_test.rb
 - test/new_relic/agent/error_trace_aggregator_test.rb
+- test/new_relic/agent/event_aggregator_test.rb
 - test/new_relic/agent/event_buffer_test_cases.rb
 - test/new_relic/agent/event_listener_test.rb
 - test/new_relic/agent/event_loop_test.rb
@@ -1073,6 +1085,7 @@ files:
 - test/new_relic/agent/stats_engine/stats_hash_test.rb
 - test/new_relic/agent/stats_engine_test.rb
 - test/new_relic/agent/stats_test.rb
+- test/new_relic/agent/synthetics_event_aggregator_test.rb
 - test/new_relic/agent/synthetics_event_buffer_test.rb
 - test/new_relic/agent/synthetics_monitor_test.rb
 - test/new_relic/agent/system_info_test.rb
@@ -1091,7 +1104,10 @@ files:
 - test/new_relic/agent/transaction/trace_node_test.rb
 - test/new_relic/agent/transaction/trace_test.rb
 - test/new_relic/agent/transaction/xray_sample_buffer_test.rb
+- test/new_relic/agent/transaction_error_primitive_test.rb
 - test/new_relic/agent/transaction_event_aggregator_test.rb
+- test/new_relic/agent/transaction_event_primitive_test.rb
+- test/new_relic/agent/transaction_event_recorder_test.rb
 - test/new_relic/agent/transaction_interrobang_test.rb
 - test/new_relic/agent/transaction_metrics_test.rb
 - test/new_relic/agent/transaction_sample_builder_test.rb
@@ -1151,6 +1167,8 @@ files:
 - test/new_relic/rack/error_collector_test.rb
 - test/new_relic/transaction_ignoring_test_cases.rb
 - test/new_relic/version_number_test.rb
+- test/nullverse/default_source_require_test.rb
+- test/nullverse/nullverse_helper.rb
 - test/performance/README.md
 - test/performance/lib/performance.rb
 - test/performance/lib/performance/baseline.rb
@@ -1191,11 +1209,8 @@ files:
 - test/performance/suites/thread_profiling.rb
 - test/performance/suites/trace_execution_scoped.rb
 - test/performance/suites/transaction_tracing.rb
-- test/script/build_test_gem.sh
 - test/script/ci.sh
-- test/script/ci_agent-tests_runner.sh
-- test/script/ci_bench.sh
-- test/script/ci_multiverse_runner.sh
+- test/script/install_mongodb.sh
 - test/script/path_hash.rb
 - test/test_helper.rb
 - ui/helpers/developer_mode_helper.rb

data/test/script/build_test_gem.sh

@@ -1,57 +0,0 @@
-#!/bin/bash
-
-# print commands in this script as they're invoked
-#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'
-  BUILD_NUMBER=alpha
-fi
-
-SHA1=`git log --pretty=format:'%h' -n 1`
-echo "building gem for commit $SHA1"
-
-if [[ `gem list jeweler | grep [j]eweler | wc -l` -eq 1 ]]; then
-  echo "detected jeweler. skipping install"
-else
-  gem install jeweler --no-ri --no-rdoc
-fi
-
-# setup a gems directory as a work area for artifacts
-rm -rf gems/
-mkdir gems
-
-# an identifier including the hudson build number and the git sha1
-
-# FIXME: don't include the $SHA1 since some of our builds systems are confused
-# by this.
-#BUILD_ID="$SHA1.$BUILD_NUMBER" #.$SHA1
-BUILD_ID="$BUILD_NUMBER" #.$SHA1
-
-# rewrite the version file, setting the patch identifier to include the
-# BUILD_ID
-perl -p -i -e "s#BUILD *= *.*\$#BUILD = '$BUILD_ID'#" lib/new_relic/version.rb
-
-# generate the gemspec
-rake gemspec
-
-# build the gem
-gem build *.gemspec
-
-# move artifacts to the gems directory
-cp *.gemspec gems/
-mv *.gem gems/
-
-cd gems
-
-# create a tarfile including the gem and the gemspec
-gem_version=`ls *.gem | sed 's/\.gem$//' | sed 's/newrelic_rpm-//'`
-tar czvf newrelic_rpm_agent-${gem_version}.tar.gz *