newrelic_rpm 3.7.2.195 → 3.7.3.199

data/lib/new_relic/agent/vm/rubinius_vm.rb

@@ -0,0 +1,40 @@
+# 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 'thread'
+
+module NewRelic
+  module Agent
+    module VM
+      class RubiniusVM
+        def snapshot
+          snap = Snapshot.new
+          gather_stats(snap)
+          snap
+        end
+
+        def gather_stats(snap)
+          snap.gc_runs = GC.count
+
+          gc_stats = GC.stat[:gc]
+          snap.major_gc_count = gc_stats[:full][:count] if gc_stats[:full]
+          snap.minor_gc_count = gc_stats[:young][:count] if gc_stats[:young]
+
+          snap.thread_count = Thread.list.size
+        end
+
+        SUPPORTED_KEYS = [
+          :gc_runs,
+          :major_gc_count,
+          :minor_gc_count,
+          :thread_count
+        ].freeze
+
+        def supports?(key)
+          SUPPORTED_KEYS.include?(key)
+        end
+      end
+    end
+  end
+end

data/lib/new_relic/agent/vm/snapshot.rb

@@ -0,0 +1,16 @@
+# 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.
+
+module NewRelic
+  module Agent
+    module VM
+      class Snapshot
+        attr_accessor :gc_total_time, :gc_runs, :major_gc_count, :minor_gc_count,
+                      :total_allocated_object, :heap_live, :heap_free,
+                      :method_cache_invalidations, :constant_cache_invalidations,
+                      :thread_count
+      end
+    end
+  end
+end

data/lib/new_relic/control.rb

@@ -16,7 +16,6 @@ require 'socket'
 require 'net/https'
 require 'logger'
 require 'new_relic/control/frameworks'
-require 'new_relic/control/profiling'
 require 'new_relic/control/server_methods'
 require 'new_relic/control/instrumentation'
 require 'new_relic/control/class_methods'
@@ -25,7 +24,6 @@ require 'new_relic/control/instance_methods'
 require 'new_relic/agent'
 require 'new_relic/delayed_job_injection'
 
-
 module NewRelic
 
   # The Control is a singleton responsible for the startup and
@@ -39,12 +37,8 @@ module NewRelic
     # done in a subfile for load order purposes
     # extend ClassMethods
     # include InstanceMethods
-    # include Profiling
     # include Configuration
     # include ServerMethods
     # include Instrumentation
-
-
-
   end
 end

data/lib/new_relic/language_support.rb

@@ -64,6 +64,22 @@ module NewRelic::LanguageSupport
     end
   end
 
+  def gc_profiler_usable?
+    if defined?(::GC::Profiler) && !jruby?
+      true
+    else
+      false
+    end
+  end
+
+  def gc_profiler_enabled?
+    if gc_profiler_usable? && ::GC::Profiler.enabled?
+      true
+    else
+      false
+    end
+  end
+
   def object_space_usable?
     if defined?(::JRuby) && JRuby.respond_to?(:runtime)
       JRuby.runtime.is_object_space_enabled
@@ -74,6 +90,10 @@ module NewRelic::LanguageSupport
     end
   end
 
+  def jruby?
+    defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+  end
+
   def rubinius?
     defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
   end

data/lib/new_relic/latest_changes.rb

@@ -1,35 +1,64 @@
-#!/usr/bin/ruby
 # 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.
 
-
 module NewRelic
   module LatestChanges
     def self.default_changelog
       File.join(File.dirname(__FILE__), '..', '..', 'CHANGELOG')
     end
 
-    def self.read(changelog=default_changelog)
-      footer = <<'EOS'
-See https://github.com/newrelic/rpm/blob/master/CHANGELOG for a full list of
-changes.
+    FOOTER = <<'EOS'
+    See https://github.com/newrelic/rpm/blob/master/CHANGELOG for a full list of
+    changes.
 EOS
 
-      return footer unless File.exists?(changelog)
+    def self.read(changelog=default_changelog)
+      changes = extract_latest_changes(File.read(changelog))
+      changes << FOOTER
 
-      version_count = 0
+      changes.join("\n")
+    end
+
+    # Patches are expected to have the format of our normal item, with the
+    # precise version number included in the line in parens. For example:
+    #
+    # * This is a patch item (3.7.1.188)
+    def self.read_patch(patch_level, changelog=default_changelog)
+      latest = extract_latest_changes(File.read(changelog))
+      changes = ["## v#{patch_level} ##", ""]
+
+      current_item = nil
+      latest.each do |line|
+        if line.match /^\s*\*.*/
+          if line.match /\(#{patch_level}\)/
+            # Found a patch level item, so start tracking the lines!
+            current_item = line
+          else
+            # Found an item that isn't our patch level, so don't grab it
+            current_item = nil
+          end
+        end
+
+        if current_item
+          changes << line
+        end
+      end
+
+      changes.join("\n")
+    end
+
+    def self.extract_latest_changes(contents)
       changes = []
-      File.read(changelog).each_line do |line|
+      version_count = 0
+      contents.each_line do |line|
         if line.match(/##\s+v[\d.]+\s+##/)
           version_count += 1
         end
         break if version_count >= 2
         changes << line.sub(/^  \* /, "* ").chomp
       end
-
-      changes << footer
-      change_message =  changes.join("\n")
+      changes
     end
   end
 end

data/lib/new_relic/rack/developer_mode.rb

@@ -121,8 +121,15 @@ module NewRelic
         render(:explain_sql)
       end
 
+      PROFILE_CONFIG = { :'profiling.enabled' => true }
+
       def profile
-        NewRelic::Control.instance.profiling = params['start'] == 'true'
+        if params['start'] == 'true'
+          NewRelic::Agent.config.apply_config(PROFILE_CONFIG) unless NewRelic::Agent.config[:'profiling.enabled']
+        else
+          NewRelic::Agent.config.remove_config(PROFILE_CONFIG) if NewRelic::Agent.config[:'profiling.enabled']
+        end
+
         index
       end
 

data/lib/new_relic/rack/transaction_reset.rb

@@ -12,7 +12,7 @@ module NewRelic
       def ensure_transaction_reset(env)
         return if env.has_key?(RESET_KEY)
 
-        NewRelic::Agent::TransactionState.reset(nil)
+        NewRelic::Agent::TransactionState.reset
         env[RESET_KEY] = true
       end
     end

data/lib/new_relic/transaction_sample.rb

@@ -31,9 +31,6 @@ module NewRelic
       @segment_count = -1
       @root_segment = create_segment 0.0, "ROOT"
       @prepared = false
-
-      @guid = generate_guid
-      NewRelic::Agent::TransactionState.get.request_guid = @guid
     end
 
     def prepared?
@@ -209,16 +206,6 @@ module NewRelic
 
   private
 
-    HEX_DIGITS = (0..15).map{|i| i.to_s(16)}
-    # generate a random 64 bit uuid
-    def generate_guid
-      guid = ''
-      HEX_DIGITS.each do |a|
-        guid << HEX_DIGITS[rand(16)]
-      end
-      guid
-    end
-
     # This is badly in need of refactoring
     def build_segment_with_omissions(new_sample, time_delta, source_segment, target_segment, regex)
       source_segment.called_segments.each do |source_called_segment|

data/lib/new_relic/version.rb

@@ -12,7 +12,7 @@ module NewRelic
 
     MAJOR = 3
     MINOR = 7
-    TINY  = 2
+    TINY  = 3
 
     begin
       require File.join(File.dirname(__FILE__), 'build')

data/lib/tasks/install.rake

@@ -4,6 +4,11 @@ namespace :newrelic do
     load File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "install.rb"))
   end
 
+  desc "Gratefulness is always appreciated"
+  task :thanks do
+    puts "The Ruby agent team is grateful to Jim Weirich for his kindness and his code. He will be missed."
+  end
+
   namespace :config do
     desc "Describe available New Relic configuration settings."
 

data/newrelic_rpm.gemspec

@@ -9,8 +9,9 @@ Gem::Specification.new do |s|
   s.name = "newrelic_rpm"
   s.version = NewRelic::VERSION::STRING
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = [ "Jason Clark", "Sam Goldstein", "Jonan Scheffler", "Ben Weintraub" ]
+  s.authors = [ "Jason Clark", "Sam Goldstein", "Jonan Scheffler", "Ben Weintraub", "Chris Pine" ]
   s.date = Time.now.strftime('%Y-%m-%d')
+  s.licenses    = ['New Relic', 'MIT', 'Ruby']
   s.description = <<-EOS
 New Relic is a performance management system, developed by New Relic,
 Inc (http://www.newrelic.com).  New Relic provides you with deep

data/test/active_record_fixtures.rb

@@ -19,9 +19,12 @@ module ActiveRecordFixtures
     rescue => e
     end
   end
+
   class Order < ActiveRecord::Base
     self.table_name = 'newrelic_test_orders'
-    has_and_belongs_to_many :shipments, :class_name => 'ActiveRecordFixtures::Shipment'
+    has_and_belongs_to_many :shipments, :class_name => 'ActiveRecordFixtures::Shipment',
+                                        :join_table => 'orders_shipments'
+
     def self.setup
       unless check_for_table
         connection.create_table self.table_name, :force => true do |t|
@@ -38,13 +41,6 @@ module ActiveRecordFixtures
       false
     end
 
-    def self.add_delay
-      # Introduce a 5 ms delay into db operations on Orders
-      def connection.log_info *args
-        sleep 0.005
-        super *args
-      end
-    end
     def self.teardown
       def connection.log_info *args
         super *args
@@ -54,7 +50,9 @@ module ActiveRecordFixtures
 
   class Shipment < ActiveRecord::Base
     self.table_name = 'newrelic_test_shipment'
-    has_and_belongs_to_many :orders, :class_name => 'ActiveRecordFixtures::Order'
+    has_and_belongs_to_many :orders, :class_name => 'ActiveRecordFixtures::Order',
+                                     :join_table => 'orders_shipments'
+
     def self.setup
       unless check_for_table
         connection.create_table self.table_name, :force => true do |t|

data/test/agent_helper.rb

@@ -13,56 +13,6 @@ def assert_in_delta(expected, actual, delta)
   assert_between((expected - delta), (expected + delta), actual)
 end
 
-def check_metric_time(metric, value, delta)
-  time = NewRelic::Agent.get_stats(metric).total_call_time
-  assert_in_delta(value, time, delta)
-end
-
-def check_metric_count(metric, value)
-  count = NewRelic::Agent.get_stats(metric).call_count
-  assert_equal(value, count, "should have the correct number of calls")
-end
-
-def check_unscoped_metric_count(metric, value)
-  count = NewRelic::Agent.get_stats_unscoped(metric).call_count
-  assert_equal(value, count, "should have the correct number of calls")
-end
-
-def generate_unscoped_metric_counts(*metrics)
-  metrics.inject({}) do |sum, metric|
-    sum[metric] = NewRelic::Agent.get_stats_no_scope(metric).call_count
-    sum
-  end
-end
-
-def generate_metric_counts(*metrics)
-  metrics.inject({}) do |sum, metric|
-    sum[metric] = NewRelic::Agent.get_stats(metric).call_count
-    sum
-  end
-end
-
-def assert_does_not_call_metrics(*metrics)
-  first_metrics = generate_metric_counts(*metrics)
-  yield
-  last_metrics = generate_metric_counts(*metrics)
-  assert_equal first_metrics, last_metrics, "should not have changed these metrics"
-end
-
-def assert_calls_metrics(*metrics)
-  first_metrics = generate_metric_counts(*metrics)
-  yield
-  last_metrics = generate_metric_counts(*metrics)
-  refute_equal first_metrics, last_metrics, "should have changed these metrics"
-end
-
-def assert_calls_unscoped_metrics(*metrics)
-  first_metrics = generate_unscoped_metric_counts(*metrics)
-  yield
-  last_metrics = generate_unscoped_metric_counts(*metrics)
-  refute_equal first_metrics, last_metrics, "should have changed these metrics"
-end
-
 def assert_has_error(error_class)
   assert \
     NewRelic::Agent.instance.error_collector.errors.find {|e| e.exception_class_constant == error_class} != nil, \
@@ -264,6 +214,17 @@ def find_last_transaction_segment(transaction_sample=nil)
   return last_segment
 end
 
+def find_segment_by_name(transaction_sample, name)
+  first_segment = nil
+  transaction_sample.root_segment.each_segment do |s|
+    if s.metric_name == name
+      first_segment = s
+      break
+    end
+  end
+  first_segment
+end
+
 def with_config(config_hash, opts={})
   opts = { :level => 0, :do_not_cast => false }.merge(opts)
   if opts[:do_not_cast]

data/test/environments/lib/environments/runner.rb

@@ -11,15 +11,13 @@ module Environments
     include Multiverse::Color
 
     BLACKLIST = {
-      "1.8.6"       => ["rails30", "rails31", "rails32", "rails40", "norails"],
-      "1.8.7"       => ["rails40"],
-      "ree"         => ["rails40"],
-      "1.9.1"       => ["rails21", "rails22", "rails30", "rails31", "rails32", "rails40", "norails"],
+      "1.8.7"       => ["rails40", "rails41"],
+      "ree"         => ["rails40", "rails41"],
       "1.9.2"       => ["rails21", "rails22", "rails40"],
       "1.9.3"       => ["rails21", "rails22"],
       "2.0.0"       => ["rails21", "rails22", "rails23"],
       "2.1.0"       => ["rails21", "rails22", "rails23"],
-      "jruby-1.6"   => ["rails40"],
+      "jruby-1.6"   => ["rails40", "rails41"],
       "jruby-1.7"   => ["rails21", "rails22", "rails23"],
       "rbx-2.0"     => ["rails21", "rails22", "rails23", "rails30", "rails31", "rails32"],
     }

data/test/environments/rails40/Gemfile

@@ -4,7 +4,15 @@ gem 'rake'
 
 gem 'rails', '~>4.0.1'
 
-gem 'minitest', '~>4.7.5'
+# Do not automatically require minitest, since this will break with rbx-2.2.5.
+# rbx-2.2.5 helpfully bundles minitest-5.3.0.
+# Our tests don't work with minitest-5.3.0.
+# minitest-4.7.5 is the version we want to use here, but if you just do
+# a require 'minitest' on rbx-2.2.5, you'll get 5.3.0 (since 4.7.5 doesn't
+# actually have a minitest.rb file under lib/). The :require => false prevents
+# us from inadvertently loading minitest 5.3.0 on rbx (we'll require
+# minitest/unit instead via a different path).
+gem 'minitest', '~>4.7.5', :require => false
 gem 'mocha', :require => false
 gem 'rack'
 gem 'rack-test'
@@ -17,8 +25,9 @@ end
 
 platforms :ruby do
   gem "mysql"
-  gem "sqlite3-ruby"
-  gem "sqlite3"
+  # Lock at 1.3.8 to work around:
+  # https://github.com/sparklemotion/sqlite3-ruby/issues/122
+  gem "sqlite3", '1.3.8'
 end
 
 platforms :rbx do