newrelic_rpm 3.3.3.beta2 → 3.3.3

data/lib/new_relic/agent/instrumentation/sinatra.rb

@@ -58,7 +58,7 @@ module NewRelic
             name = '(unknown)'
             verb = http_verb(request)
             
-            routes[verb].each do |pattern, keys, conditions, block|
+            Array(routes[verb]).each do |pattern, keys, conditions, block|
               if pattern = yield(pattern, keys, conditions)
                 name = pattern
               end

data/lib/new_relic/agent/transaction_sample_builder.rb

@@ -38,8 +38,9 @@ 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.")
+          if @sample.count_segments == @segment_limit
+            NewRelic::Control.instance.log.debug("Segment limit of #{@segment_limit} reached, ceasing collection.")
+          end
         end
       end
 

data/lib/new_relic/version.rb

@@ -4,7 +4,7 @@ module NewRelic
     MAJOR = 3
     MINOR = 3
     TINY  = 3
-    BUILD = 'beta2' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
+    BUILD = nil # 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.beta2"
+  s.version = "3.3.3"
 
   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-15"
+  s.date = "2012-03-28"
   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", "mongrel_rpm", "newrelic_cmd"]
+  s.executables = ["mongrel_rpm", "newrelic", "newrelic_cmd"]
   s.extra_rdoc_files = [
     "CHANGELOG",
     "LICENSE",
@@ -203,6 +203,7 @@ Gem::Specification.new do |s|
     "test/new_relic/version_number_test.rb",
     "test/script/build_test_gem.sh",
     "test/script/ci.sh",
+    "test/script/ci_bench.sh",
     "test/test_contexts.rb",
     "test/test_helper.rb",
     "ui/helpers/developer_mode_helper.rb",

data/test/new_relic/agent/transaction_sample_builder_test.rb

@@ -167,6 +167,14 @@ class NewRelic::Agent::TransationSampleBuilderTest < Test::Unit::TestCase
     8.times {|i| build_segment i.to_s }
     assert_equal 3, @builder.sample.count_segments
   end
+
+  # regression
+  def test_trace_should_log_segment_reached_once
+    @builder.segment_limit = 3
+    NewRelic::Control.instance.log.expects(:debug).once
+    8.times {|i| build_segment i.to_s }
+  end
+  
   
   def validate_builder(check_names = true)
     validate_segment @builder.sample.root_segment, check_names

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
+
+

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic_rpm
 version: !ruby/object:Gem::Version 
-  hash: -3606956778
-  prerelease: 6
+  hash: 13
+  prerelease: 
   segments: 
   - 3
   - 3
   - 3
-  - beta
-  - 2
-  version: 3.3.3.beta2
+  version: 3.3.3
 platform: ruby
 authors: 
 - Bill Kayser
@@ -20,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-15 00:00:00 Z
+date: 2012-03-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: jeweler
@@ -74,8 +72,8 @@ description: |
 
 email: support@newrelic.com
 executables: 
-- newrelic
 - mongrel_rpm
+- newrelic
 - newrelic_cmd
 extensions: []
 
@@ -268,6 +266,7 @@ files:
 - test/new_relic/version_number_test.rb
 - test/script/build_test_gem.sh
 - test/script/ci.sh
+- test/script/ci_bench.sh
 - test/test_contexts.rb
 - test/test_helper.rb
 - ui/helpers/developer_mode_helper.rb