newrelic_rpm 3.3.3.beta1 → 3.3.3.beta2

data/CHANGELOG

@@ -2,6 +2,9 @@ v3.3.3
   * Improved Sinatra instrumentation
   * Limit the number of nodes collected in long running transactions to prevent leaking memory
 
+v3.3.2.1
+  * [SECURITY] fix for cookie handling by End User Monitoring instrumentation
+
 v3.3.2
   * deployments recipe change: truncate git SHAs to 7 characters
   * Fixes for obfuscation of PostgreSQL and SQLite queries

data/lib/new_relic/agent/transaction_info.rb

@@ -1,3 +1,5 @@
+require 'erb'
+
 module NewRelic
   module Agent
     class TransactionInfo
@@ -48,17 +50,22 @@ module NewRelic
       def self.reset(request=nil)
         clear
         instance = get
+        instance.token = get_token(request)
+      end
 
-        if request
-          agent_flag = request.cookies['NRAGENT']
-          if agent_flag
-            s = agent_flag.split("=")
-            if s.length == 2
-              if s[0] == "tk" && s[1]
-                instance.token = s[1]
-              end
+      def self.get_token(request)
+        return nil unless request
+        
+        agent_flag = request.cookies['NRAGENT']
+        if agent_flag
+          s = agent_flag.split("=")
+          if s.length == 2
+            if s[0] == "tk" && s[1]
+              ERB::Util.h(s[1])
             end
           end
+        else
+          nil
         end
       end
     end

data/lib/new_relic/agent/transaction_sample_builder.rb

@@ -38,6 +38,8 @@ module NewRelic
           segment = @sample.create_segment(time.to_f - @sample_start, metric_name)
           @current_segment.add_called_segment(segment)
           @current_segment = segment
+        elsif @sample.count_segments == @segment_limit
+          NewRelic::Control.instance.log.debug("Segment limit of #{@segment_limit} reached, ceasing collection.")
         end
       end
 

data/lib/new_relic/transaction_sample.rb

@@ -19,35 +19,27 @@ module NewRelic
     def initialize(time = Time.now.to_f, sample_id = nil)
       @sample_id = sample_id || object_id
       @start_time = time
+      @params = { :segment_count => -1, :request_params => {} }
+      @segment_count = -1
       @root_segment = create_segment 0.0, "ROOT"
-      @params = {}
-      @params[:request_params] = {}
 
       @guid = generate_guid
       NewRelic::Agent::TransactionInfo.get.guid = @guid
     end
 
     def count_segments
-      @root_segment.count_segments - 1    # don't count the root segment
+      @segment_count
     end
         
     # Truncates the transaction sample to a maximum length determined
     # by the passed-in parameter. Operates recursively on the entire
     # tree of transaction segments in a depth-first manner
     def truncate(max)
-      count = count_segments
-      return if count < max
+      return if @segment_count < max
       @root_segment.truncate(max + 1)
-
-      ensure_segment_count_set(count)
+      @segment_count = max
     end
     
-    # makes sure that the parameter cache for segment count is set to
-    # the correct value
-    def ensure_segment_count_set(count)
-      params[:segment_count] ||= count
-    end
-
     # offset from start of app
     def timestamp
       @start_time - @@start_time.to_f
@@ -74,6 +66,8 @@ module NewRelic
 
     def create_segment(relative_timestamp, metric_name, segment_id = nil)
       raise TypeError.new("Frozen Transaction Sample") if frozen?
+      @params[:segment_count] += 1
+      @segment_count += 1
       NewRelic::TransactionSample::Segment.new(relative_timestamp, metric_name, segment_id)
     end
 
@@ -115,6 +109,7 @@ module NewRelic
           when Enumerable then v.map(&:to_s).sort.join("; ")
           when String then v
           when Float then '%6.3s' % v
+          when Fixnum then v.to_s
           when nil then ''
         else
           raise "unexpected value type for #{k}: '#{v}' (#{v.class})"
@@ -133,9 +128,10 @@ module NewRelic
       regex = Regexp.new(regex)
 
       sample = TransactionSample.new(@start_time, sample_id)
-
-      params.each {|k,v| sample.params[k] = v}
-
+      
+      sample.params = params.dup
+      sample.params[:segment_count] = 0
+      
       delta = build_segment_with_omissions(sample, 0.0, @root_segment, sample.root_segment, regex)
       sample.root_segment.end_trace(@root_segment.exit_timestamp - delta)
       sample.profile = self.profile

data/lib/new_relic/transaction_sample/segment.rb

@@ -97,11 +97,13 @@ module NewRelic
         end
         d
       end
+      
       def count_segments
         count = 1
         called_segments.each { | seg | count  += seg.count_segments }
         count
       end
+      
       # Walk through the tree and truncate the segments in a
       # depth-first manner
       def truncate(max)

data/lib/new_relic/version.rb

@@ -4,7 +4,7 @@ module NewRelic
     MAJOR = 3
     MINOR = 3
     TINY  = 3
-    BUILD = 'beta1' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
+    BUILD = 'beta2' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end
 

data/newrelic_rpm.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = "newrelic_rpm"
-  s.version = "3.3.3.beta1"
+  s.version = "3.3.3.beta2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bill Kayser", "Jon Guymon", "Justin George", "Darin Swanson"]
-  s.date = "2012-03-14"
+  s.date = "2012-03-15"
   s.description = "New Relic is a performance management system, developed by New Relic,\nInc (http://www.newrelic.com).  New Relic provides you with deep\ninformation about the performance of your web application as it runs\nin production. The New Relic Ruby Agent is dual-purposed as a either a\nGem or plugin, hosted on\nhttp://github.com/newrelic/rpm/\n"
   s.email = "support@newrelic.com"
-  s.executables = ["newrelic_cmd", "mongrel_rpm", "newrelic"]
+  s.executables = ["newrelic", "mongrel_rpm", "newrelic_cmd"]
   s.extra_rdoc_files = [
     "CHANGELOG",
     "LICENSE",
@@ -170,6 +170,7 @@ Gem::Specification.new do |s|
     "test/new_relic/agent/stats_engine/metric_stats_test.rb",
     "test/new_relic/agent/stats_engine/samplers_test.rb",
     "test/new_relic/agent/stats_engine_test.rb",
+    "test/new_relic/agent/transaction_info_test.rb",
     "test/new_relic/agent/transaction_sample_builder_test.rb",
     "test/new_relic/agent/transaction_sampler_test.rb",
     "test/new_relic/agent/worker_loop_test.rb",
@@ -200,6 +201,8 @@ Gem::Specification.new do |s|
     "test/new_relic/transaction_sample_subtest_test.rb",
     "test/new_relic/transaction_sample_test.rb",
     "test/new_relic/version_number_test.rb",
+    "test/script/build_test_gem.sh",
+    "test/script/ci.sh",
     "test/test_contexts.rb",
     "test/test_helper.rb",
     "ui/helpers/developer_mode_helper.rb",

data/test/new_relic/agent/agent_test_controller_test.rb

@@ -283,7 +283,7 @@ class NewRelic::Agent::AgentTestControllerTest < ActionController::TestCase
     get :index, 'number' => "001-555-1212"
     s = agent.transaction_sampler.harvest(nil, 0.0)
     assert_equal 1, s.size
-    assert_equal 5, s.first.params.size
+    assert_equal 6, s.first.params.size
   end
 
 

data/test/new_relic/agent/transaction_info_test.rb

@@ -0,0 +1,13 @@
+require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
+require 'ostruct'
+
+class NewRelic::Agent::TransactionInfoTest < Test::Unit::TestCase
+  def setup
+    @request = OpenStruct.new(:cookies => {'NRAGENT' => 'tk=1234<tag>evil</tag>5678'})
+  end
+  
+  def test_get_token_gets_sanitized_token_from_cookie
+    assert_equal('1234&lt;tag&gt;evil&lt;/tag&gt;5678',
+                 NewRelic::Agent::TransactionInfo.get_token(@request))
+  end
+end

data/test/new_relic/agent/transaction_sample_builder_test.rb

@@ -94,8 +94,10 @@ class NewRelic::Agent::TransationSampleBuilderTest < Test::Unit::TestCase
 
     should_be_a_copy = sample.omit_segments_with('OMIT NOTHING')
     validate_segment should_be_a_copy.root_segment, false
-
-    assert sample.to_s == should_be_a_copy.to_s
+    
+    assert_equal sample.params, should_be_a_copy.params
+    assert_equal(sample.root_segment.to_debug_str(0),
+                 should_be_a_copy.root_segment.to_debug_str(0))
 
     without_code_loading = sample.omit_segments_with('Rails/Application Code Loading')
     validate_segment without_code_loading.root_segment, false

data/test/new_relic/transaction_sample_test.rb

@@ -161,4 +161,17 @@ class NewRelic::TransactionSampleTest < Test::Unit::TestCase
     s = @t.prepare_to_send(:explain_sql => 0.1)
     assert(s.timestamp.instance_of?(Float), "s.timestamp should be a Float, but is #{s.timestamp.class.inspect}")
   end
+
+  def test_count_segments
+    transaction = run_sample_trace_on(NewRelic::Agent::TransactionSampler.new) do |sampler|
+      sampler.notice_push_scope "level0"
+      sampler.notice_push_scope "level-1"
+      sampler.notice_push_scope "level-2"
+      sampler.notice_sql(::SQL_STATEMENT, nil, 0)
+      sampler.notice_pop_scope "level-2"
+      sampler.notice_pop_scope "level-1"
+      sampler.notice_pop_scope "level0"
+    end
+    assert_equal 6, transaction.count_segments
+  end
 end

data/test/script/build_test_gem.sh

@@ -0,0 +1,51 @@
+#!/bin/bash
+
+# print commands in this script as they're invoked
+set -x
+# fail if any command fails
+set -e
+
+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 $SHA"
+
+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=$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 *

data/test/script/ci.sh

@@ -0,0 +1,94 @@
+#!/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)
+# and executing them.
+#
+# It relies on 3 environment variables:
+#
+# RUBY - The rvm 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
+# fail if any command fails
+set -e
+
+# check for require environment variables
+if [ "x$RUBY" == "x" ]; then
+  echo '$RUBY is undefined'
+  exit 1
+fi
+if [ "x$BRANCH" == "x" ]; then
+  echo '$BRANCH is undefined'
+  exit 1
+fi
+if [ "x$RPM_TEST_APP_CLONE_URL" == "x" ]; then
+  echo '$RPM_TEST_APP_CLONE_URL 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 $RPM_TEST_APP_CLONE_URL rpm_test_app
+cd rpm_test_app
+git checkout -t origin/$BRANCH || git checkout $BRANCH
+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."
+  mkdir -p vendor/plugins
+  git clone ../.. 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
+else
+  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
+
+
+
+

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic_rpm
 version: !ruby/object:Gem::Version 
-  hash: 748706491
+  hash: -3606956778
   prerelease: 6
   segments: 
   - 3
   - 3
   - 3
   - beta
-  - 1
-  version: 3.3.3.beta1
+  - 2
+  version: 3.3.3.beta2
 platform: ruby
 authors: 
 - Bill Kayser
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-14 00:00:00 Z
+date: 2012-03-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: jeweler
@@ -74,9 +74,9 @@ description: |
 
 email: support@newrelic.com
 executables: 
-- newrelic_cmd
-- mongrel_rpm
 - newrelic
+- mongrel_rpm
+- newrelic_cmd
 extensions: []
 
 extra_rdoc_files: 
@@ -235,6 +235,7 @@ files:
 - test/new_relic/agent/stats_engine/metric_stats_test.rb
 - test/new_relic/agent/stats_engine/samplers_test.rb
 - test/new_relic/agent/stats_engine_test.rb
+- test/new_relic/agent/transaction_info_test.rb
 - test/new_relic/agent/transaction_sample_builder_test.rb
 - test/new_relic/agent/transaction_sampler_test.rb
 - test/new_relic/agent/worker_loop_test.rb
@@ -265,6 +266,8 @@ files:
 - test/new_relic/transaction_sample_subtest_test.rb
 - test/new_relic/transaction_sample_test.rb
 - test/new_relic/version_number_test.rb
+- test/script/build_test_gem.sh
+- test/script/ci.sh
 - test/test_contexts.rb
 - test/test_helper.rb
 - ui/helpers/developer_mode_helper.rb