newrelic_rpm 3.7.1.180 → 3.7.1.182

data/.travis.yml

@@ -5,6 +5,7 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   - jruby-19mode
   - jruby-18mode
 

data/CHANGELOG

@@ -27,6 +27,12 @@
   outgoing Net::HTTP requests. This has been corrected, and reported HTTP
   timings should now be more accurate.
 
+  * Fix for Mongo ensure_index instrumentation (3.7.1.182)
+
+  The Mongo instrumentation for ensure_index in 3.7.1.180 was not properly
+  calling through to the uninstrumented version of this method. This has been
+  fixed in 3.7.1.182. Thanks to Yuki Miyauchi for the fix!
+
 ## v3.7.0 ##
 
   * Official Rubinius support (for Rubinius >= 2.2.1)

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

@@ -117,12 +117,14 @@ DependencyDetection.defer do
           transaction_state.push_traced(false)
 
           begin
-            result = save_without_new_relic_trace(spec, opts, &block)
+            result = ensure_index_without_new_relic_trace(spec, opts, &block)
           ensure
             transaction_state.pop_traced
           end
 
+          spec = spec.is_a?(Array) ? Hash[spec] : spec.dup
           spec[:operation] = :ensureIndex
+
           statement = NewRelic::Agent::Datastores::Mongo::StatementFormatter.format(spec)
           if statement
             NewRelic::Agent.instance.transaction_sampler.notice_nosql_statement(statement, (Time.now - t0).to_f)

data/lib/new_relic/agent/supported_versions.rb

@@ -11,9 +11,8 @@ module NewRelic
       {
         :type        => :ruby,
         :name        => "MRI",
-        :supported   => ["1.8.7", "1.9.2", "1.9.3", "2.0.0"],
+        :supported   => ["1.8.7", "1.9.2", "1.9.3", "2.0.0", "2.1.0"],
         :deprecated  => ["1.8.6"],
-        :experimental=> [">= 2.1.0"],
         :url         => "https://www.ruby-lang.org",
         :feed        => "https://www.ruby-lang.org/en/feeds/news.rss",
         :notes       => [

data/test/environments/rails21/Gemfile

@@ -5,7 +5,6 @@ gem "rails", "~>2.1.2"
 gem "ci_reporter", "1.6.0"
 gem "mocha", "0.9.8"
 gem "jeweler", "1.4.0"
-gem "gemcutter", "0.5.0"
 gem "rdoc"
 
 gem 'rack'

data/test/environments/rails22/Gemfile

@@ -5,7 +5,6 @@ gem "rails", "~>2.2.3"
 gem "ci_reporter", "1.6.0"
 gem "mocha", "0.9.8"
 gem "jeweler", "1.4.0"
-gem "gemcutter", "0.5.0"
 gem "rdoc"
 
 gem 'rack'

data/test/multiverse/suites/mongo/mongo_instrumentation_test.rb

@@ -170,7 +170,7 @@ if NewRelic::Agent::Datastores::Mongo.is_supported_version?
     end
 
     def test_records_metrics_for_ensure_index
-      @collection.ensure_index({unique_field_name => Mongo::ASCENDING})
+      @collection.ensure_index([[unique_field_name, Mongo::ASCENDING]])
 
       metrics = build_test_metrics(:ensureIndex)
       expected = metrics_with_attributes(metrics, { :call_count => 1 })
@@ -179,11 +179,18 @@ if NewRelic::Agent::Datastores::Mongo.is_supported_version?
     end
 
     def test_ensure_index_does_not_record_insert
-      @collection.ensure_index({unique_field_name => Mongo::ASCENDING})
+      @collection.ensure_index([[unique_field_name, Mongo::ASCENDING]])
 
       assert_metrics_not_recorded(['Datastore/operation/MongoDB/insert'])
     end
 
+    def test_ensure_index_does_call_ensure_index
+      options = [[unique_field_name, Mongo::ASCENDING]]
+
+      @collection.expects(:ensure_index_without_new_relic_trace).with(options, any_parameters).once
+      @collection.ensure_index(options)
+    end
+
     def test_records_metrics_for_drop_index
       name =  @collection.create_index([[unique_field_name, Mongo::ASCENDING]])
       NewRelic::Agent.drop_buffered_data
@@ -315,7 +322,7 @@ if NewRelic::Agent::Datastores::Mongo.is_supported_version?
       segment = nil
 
       in_transaction do
-        @collection.ensure_index({unique_field_name => Mongo::ASCENDING})
+        @collection.ensure_index([[unique_field_name, Mongo::ASCENDING]])
         segment = find_last_transaction_segment
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.7.1.180
+  version: 3.7.1.182
   prerelease: 
 platform: ruby
 authors:
@@ -40,7 +40,7 @@ cert_chain:
   cHUySWFQWE92bTNUOEc0TzZxWnZobkxoL1VpZW4rK0RqOGVGQmVjVFBvTThw
   VmpLM3BoNQpuL0V3dVpDY0U2Z2h0Q0NNCi0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2013-12-19 00:00:00.000000000 Z
+date: 2013-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -985,7 +985,10 @@ post_install_message: ! "# New Relic Ruby Agent Release Notes #\n\n## v3.7.1 ##\
   opt-in, but future releases may default it on.\n\n* Fix for missing HTTP time\n\n
   \ The agent previously did not include connection establishment time for\n  outgoing
   Net::HTTP requests. This has been corrected, and reported HTTP\n  timings should
-  now be more accurate.\n\nSee https://github.com/newrelic/rpm/blob/master/CHANGELOG
+  now be more accurate.\n\n* Fix for Mongo ensure_index instrumentation (3.7.1.182)\n\n
+  \ The Mongo instrumentation for ensure_index in 3.7.1.180 was not properly\n  calling
+  through to the uninstrumented version of this method. This has been\n  fixed in
+  3.7.1.182. Thanks to Yuki Miyauchi for the fix!\n\nSee https://github.com/newrelic/rpm/blob/master/CHANGELOG
   for a full list of\nchanges.\n"
 rdoc_options:
 - --line-numbers