newrelic_rpm 3.6.4.122 → 3.6.5.130

data/lib/new_relic/agent/stats_engine/stats_hash.rb

@@ -31,7 +31,7 @@ module NewRelic
         Hash[self] == Hash[other]
       end
 
-      def record(metric_specs, value=nil)
+      def record(metric_specs, value=nil, aux=nil)
         Array(metric_specs).each do |metric_spec|
           stats = self[metric_spec]
           if block_given?
@@ -39,7 +39,10 @@ module NewRelic
           else
             case value
             when Numeric
-              stats.record_data_point(value)
+              aux ||= value
+              stats.record_data_point(value, aux)
+            when :apdex_s, :apdex_t, :apdex_f
+              stats.record_apdex(value, aux)
             when NewRelic::Agent::Stats
               stats.merge!(value)
             end
@@ -58,16 +61,11 @@ module NewRelic
         self
       end
 
-      def resolve_scopes(resolved_scope)
-        new_stats = self.class.new
-        self.each do |spec, stats|
-          if spec.scope != '' &&
-              spec.scope.to_sym == StatsEngine::SCOPE_PLACEHOLDER
-            spec.scope = resolved_scope
-          end
-          new_stats[spec] = stats
+      def resolve_scopes!(resolved_scope)
+        placeholder = StatsEngine::SCOPE_PLACEHOLDER.to_s
+        each_pair do |spec, stats|
+          spec.scope = resolved_scope if spec.scope == placeholder
         end
-        return new_stats
       end
     end
   end

data/lib/new_relic/agent/transaction.rb

@@ -96,6 +96,7 @@ module NewRelic
       def initialize(type=:controller, options={})
         @type = type
         @start_time = Time.now
+        @apdex_start = @start_time
         @jruby_cpu_start = jruby_cpu_time
         @process_cpu_start = process_cpu
         @filtered_params = options[:filtered_params] || {}
@@ -201,8 +202,8 @@ module NewRelic
       end
 
       def merge_stats_hash
-        stats = stats_hash.resolve_scopes(@name)
-        NewRelic::Agent.instance.stats_engine.merge!(stats)
+        stats_hash.resolve_scopes!(@name)
+        NewRelic::Agent.instance.stats_engine.merge!(stats_hash)
       end
 
       def record_exceptions
@@ -213,17 +214,17 @@ module NewRelic
       end
 
       OVERVIEW_SPECS = [
-        [:web_duration,      MetricSpec.new('HttpDispatcher')],
-        [:queue_duration,    MetricSpec.new('WebFrontend/QueueTime')],
-        [:external_duration, MetricSpec.new('External/allWeb')],
-        [:database_duration, MetricSpec.new('ActiveRecord/all')],
-        [:gc_cumulative,     MetricSpec.new("GC/cumulative")],
-        [:memcache_duration, MetricSpec.new('Memcache/allWeb')]
+        [:webDuration,      MetricSpec.new('HttpDispatcher')],
+        [:queueDuration,    MetricSpec.new('WebFrontend/QueueTime')],
+        [:externalDuration, MetricSpec.new('External/allWeb')],
+        [:databaseDuration, MetricSpec.new('ActiveRecord/all')],
+        [:gcCumulative,     MetricSpec.new("GC/cumulative")],
+        [:memcacheDuration, MetricSpec.new('Memcache/allWeb')]
       ]
 
       def transaction_overview_metrics
         metrics = {}
-        stats = agent.stats_engine.transaction_stats_hash
+        stats = @stats_hash
         OVERVIEW_SPECS.each do |(dest_key, spec)|
           metrics[dest_key] = stats[spec].total_call_time if stats.key?(spec)
         end
@@ -283,12 +284,23 @@ module NewRelic
         (current) ? current.user_attributes : {}
       end
 
-      def record_apdex(metric_name, end_time=Time.now)
+      APDEX_METRIC_SPEC = NewRelic::MetricSpec.new('Apdex').freeze
+
+      def record_apdex(end_time=Time.now, is_error=nil)
         return unless recording_web_transaction? && NewRelic::Agent.is_execution_traced?
-        metric_parser = NewRelic::MetricParser::MetricParser \
-          .for_metric_named(metric_name)
 
-        self.class.record_apdex(metric_parser, end_time - start_time, end_time - apdex_start, exceptions.any?)
+        freeze_name
+        apdex_t = TransactionInfo.get.apdex_t
+        action_duration = end_time - start_time
+        total_duration  = end_time - apdex_start
+        is_error = is_error.nil? ? !exceptions.empty? : is_error
+
+        apdex_bucket_global = self.class.apdex_bucket(total_duration,  is_error, apdex_t)
+        apdex_bucket_txn    = self.class.apdex_bucket(action_duration, is_error, apdex_t)
+
+        @stats_hash.record(APDEX_METRIC_SPEC, apdex_bucket_global, apdex_t)
+        txn_apdex_metric = NewRelic::MetricSpec.new(@name.gsub(/^[^\/]+\//, 'Apdex/'))
+        @stats_hash.record(txn_apdex_metric, apdex_bucket_txn, apdex_t)
       end
 
       # Yield to a block that is run with a database metric name context.  This means
@@ -364,34 +376,23 @@ module NewRelic
         return approximate_uri[%r{^(https?://.*?)?(/[^?]*)}, 2] || '/' if approximate_uri # '
       end
 
-      def self.record_apdex(current_metric, action_duration, total_duration, is_error)
-        agent.stats_engine.record_metrics('Apdex') do |stat|
-          update_apdex(stat, total_duration, is_error)
-        end
-        agent.stats_engine.record_metrics(current_metric.apdex_metric_path) do |stat|
-          update_apdex(stat, action_duration, is_error)
-        end
+
+
+      def self.record_apdex(end_time, is_error)
+        current && current.record_apdex(end_time, is_error)
       end
 
-      # Record an apdex value for the given stat.  when `failed`
-      # the apdex should be recorded as a failure regardless of duration.
-      def self.update_apdex(stat, duration, failed)
-        apdex_t = TransactionInfo.get.apdex_t
-        duration = duration.to_f
+      def self.apdex_bucket(duration, failed, apdex_t)
         case
         when failed
-          stat.record_apdex_f
+          :apdex_f
         when duration <= apdex_t
-          stat.record_apdex_s
+          :apdex_s
         when duration <= 4 * apdex_t
-          stat.record_apdex_t
+          :apdex_t
         else
-          stat.record_apdex_f
+          :apdex_f
         end
-        # Apdex min and max values should be initialized to the
-        # current apdex_t
-        stat.min_call_time = apdex_t
-        stat.max_call_time = apdex_t
       end
 
       private

data/lib/new_relic/agent/transaction_sampler.rb

@@ -313,16 +313,25 @@ module NewRelic
       # duration is seconds, float value.
       def notice_sql(sql, config, duration, &explainer)
         if NewRelic::Agent.is_sql_recorded?
-          statement = Database::Statement.new(self.class.truncate_message(sql))
-          if config
-            statement.adapter = config[:adapter]
-            statement.config = config
-          end
-          statement.explainer = explainer
+          statement = build_database_statement(sql, config, explainer)
           notice_extra_data(statement, duration, :sql)
         end
       end
 
+      def build_database_statement(sql, config, explainer)
+        statement = Database::Statement.new(self.class.truncate_message(sql))
+        if config
+          statement.adapter = config[:adapter]
+          statement.config = config
+        end
+        if Agent.config[:override_sql_obfuscation_adapter]
+          statement.adapter = Agent.config[:override_sql_obfuscation_adapter]
+        end
+        statement.explainer = explainer
+
+        statement
+      end
+
       # Adds non-sql metadata to a segment - generally the memcached
       # key
       #

data/lib/new_relic/language_support.rb

@@ -64,6 +64,14 @@ module NewRelic::LanguageSupport
     end
   end
 
+  def object_space_enabled?
+    if defined?(::JRuby) && JRuby.respond_to?(:runtime)
+      JRuby.runtime.is_object_space_enabled
+    else
+      defined?(::ObjectSpace) ? true : false
+    end
+  end
+
   def using_version?(version)
     numbers = version.split('.')
     numbers == ::RUBY_VERSION.split('.')[0, numbers.size]

data/lib/new_relic/local_environment.rb

@@ -49,17 +49,13 @@ module NewRelic
       @dispatcher_instance_id
     end
 
-    # it's a working jruby if it has the runtime method, and object
-    # space is enabled
-    def working_jruby?
-      !(defined?(::JRuby) && JRuby.respond_to?(:runtime) && !JRuby.runtime.is_object_space_enabled)
-    end
-
     # Runs through all the objects in ObjectSpace to find the first one that
     # match the provided class
     def find_class_in_object_space(klass)
-      ObjectSpace.each_object(klass) do |x|
-        return x
+      if NewRelic::LanguageSupport.object_space_enabled?
+        ObjectSpace.each_object(klass) do |x|
+          return x
+        end
       end
       return nil
     end
@@ -68,7 +64,7 @@ module NewRelic
     def mongrel
       return @mongrel if @looked_for_mongrel
       @looked_for_mongrel = true
-      if defined?(::Mongrel) && defined?(::Mongrel::HttpServer) && working_jruby?
+      if defined?(::Mongrel) && defined?(::Mongrel::HttpServer)
         @mongrel = find_class_in_object_space(::Mongrel::HttpServer)
       end
       @mongrel
@@ -135,10 +131,10 @@ module NewRelic
       end
 
       # Get the port from the configurator if one was created
-      if @dispatcher_instance_id.nil? && defined?(::Mongrel::Configurator)
+      if NewRelic::LanguageSupport.object_space_enabled? && @dispatcher_instance_id.nil? && defined?(::Mongrel::Configurator)
         ObjectSpace.each_object(Mongrel::Configurator) do |mongrel|
           @dispatcher_instance_id = mongrel.defaults[:port] && mongrel.defaults[:port].to_s
-        end unless defined?(::JRuby) && !JRuby.runtime.is_object_space_enabled
+        end
       end
 
       # Still can't find the port.  Let's look at ARGV to fall back
@@ -149,14 +145,14 @@ module NewRelic
     end
 
     def check_for_unicorn
-      if (defined?(::Unicorn) && defined?(::Unicorn::HttpServer)) && working_jruby?
+      if (defined?(::Unicorn) && defined?(::Unicorn::HttpServer)) && NewRelic::LanguageSupport.object_space_enabled?
         v = find_class_in_object_space(::Unicorn::HttpServer)
         @discovered_dispatcher = :unicorn if v 
       end
     end
 
     def check_for_rainbows
-      if (defined?(::Rainbows) && defined?(::Rainbows::HttpServer)) && working_jruby?
+      if (defined?(::Rainbows) && defined?(::Rainbows::HttpServer)) && NewRelic::LanguageSupport.object_space_enabled?
         v = find_class_in_object_space(::Rainbows::HttpServer)
         @discovered_dispatcher = :rainbows if v
       end
@@ -178,7 +174,7 @@ module NewRelic
     end
 
     def check_for_thin
-      if defined?(::Thin) && defined?(::Thin::Server)
+      if defined?(::Thin) && defined?(::Thin::Server) && NewRelic::LanguageSupport.object_space_enabled?
         # This case covers the thin web dispatcher
         # Same issue as above- we assume only one instance per process
         ObjectSpace.each_object(Thin::Server) do |thin_dispatcher|

data/lib/new_relic/version.rb

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

data/test/agent_helper.rb

@@ -187,6 +187,7 @@ def in_transaction(*args)
   name = args.first || 'dummy'
   defaults = { :type => :other }
   options = defaults.merge(opts)
+
   NewRelic::Agent.instance.instance_variable_set(:@transaction_sampler,
                         NewRelic::Agent::TransactionSampler.new)
   NewRelic::Agent.instance.stats_engine.transaction_sampler = \
@@ -205,6 +206,14 @@ def in_web_transaction(name='dummy')
   end
 end
 
+def find_last_transaction_segment
+  builder = NewRelic::Agent.agent.transaction_sampler.builder
+  last_segment = nil
+  builder.current_segment.each_segment {|s| last_segment = s }
+
+  return last_segment
+end
+
 def with_config(config_hash, opts={})
   opts = { :level => 0, :do_not_cast => false }.merge(opts)
   if opts[:do_not_cast]
@@ -222,8 +231,42 @@ end
 
 def freeze_time(now=Time.now)
   Time.stubs(:now).returns(now)
+  now
 end
 
 def advance_time(seconds)
   freeze_time(Time.now + seconds)
 end
+
+def define_constant(constant_symbol, implementation)
+  if Object.const_defined?(constant_symbol)
+    existing_implementation = Object.send(:remove_const, constant_symbol)
+  end
+
+  Object.const_set(constant_symbol, implementation)
+
+  yield
+ensure
+  Object.send(:remove_const, constant_symbol)
+
+  if existing_implementation
+    Object.const_set(constant_symbol, existing_implementation)
+  end
+end
+
+def undefine_constant(constant_symbol)
+  return yield unless Object.const_defined?(constant_symbol)
+  removed_constant = Object.send(:remove_const, constant_symbol)
+  yield
+ensure
+  Object.const_set(constant_symbol, removed_constant) if removed_constant
+end
+
+def internet_connection?
+  if ENV['NO_INTERNET']
+    puts " - No internet connection, skipping"
+    false
+  else
+    true
+  end
+end

data/test/config/test.cert.crt

@@ -0,0 +1,14 @@
+-----BEGIN CERTIFICATE-----
+MIICLzCCAZgCCQCnkGSReKv/pTANBgkqhkiG9w0BAQUFADBcMQswCQYDVQQGEwJV
+UzEPMA0GA1UECBMGT3JlZ29uMREwDwYDVQQHEwhQb3J0bGFuZDESMBAGA1UEChMJ
+TmV3IFJlbGljMRUwEwYDVQQDEwxuZXdyZWxpYy5jb20wHhcNMTMwNjIxMTcxNzEy
+WhcNMjMwNjE5MTcxNzEyWjBcMQswCQYDVQQGEwJVUzEPMA0GA1UECBMGT3JlZ29u
+MREwDwYDVQQHEwhQb3J0bGFuZDESMBAGA1UEChMJTmV3IFJlbGljMRUwEwYDVQQD
+EwxuZXdyZWxpYy5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOsuntDM
+BSdK2YHRYzzqzm5adZspXUrEMZJa/D/vp/xtf3b7WCtKpstvS/wkhvHmpLGbrI+Q
+SnhijZKBVsps1eGDBXD+7ieHLSmI/74VL/PayHn5OKXb9RJ1VmYavM+1AWFNv75A
+akqNL84vykpeqk13nfJGqjzpiqnMg1xg1usNAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+gYEAeG8F0vIQY6nCgUQl/k+JTG40PAQUdASpzkxgINX/CbzReFIp6r29/szjTI0n
+kujAl1XWmIf1Q+xapoW23eWEo0eqlWdjiz+F27VjCraTo1I84+LtGwFZfAAi3wCl
+qwZz9vdk1wUN8Pfo3fSZsnk97//c7+UFPMdyDlSlLbYJ8NI=
+-----END CERTIFICATE-----

data/test/config/test.cert.csr

@@ -0,0 +1,11 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIBnDCCAQUCAQAwXDELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdvbjERMA8G
+A1UEBxMIUG9ydGxhbmQxEjAQBgNVBAoTCU5ldyBSZWxpYzEVMBMGA1UEAxMMbmV3
+cmVsaWMuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDrLp7QzAUnStmB
+0WM86s5uWnWbKV1KxDGSWvw/76f8bX92+1grSqbLb0v8JIbx5qSxm6yPkEp4Yo2S
+gVbKbNXhgwVw/u4nhy0piP++FS/z2sh5+Til2/USdVZmGrzPtQFhTb++QGpKjS/O
+L8pKXqpNd53yRqo86YqpzINcYNbrDQIDAQABoAAwDQYJKoZIhvcNAQEFBQADgYEA
+RQKG4gae3akIGmm0lx+zupp6hsHQCfnR4p0z5TqcEuvKbZ5+hhQD/PgbP/KGg+be
++k1TyoGGaPlmU9hUjOYbw4EdgWIryKEF74/krAeUPkx1nZveAXOUpa8UkWizNXIc
+EleS52kU8iSjcyiqJZlz5H5VBJwQvGFE5kqA9k8saLU=
+-----END CERTIFICATE REQUEST-----

data/test/config/test.cert.key

@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQDrLp7QzAUnStmB0WM86s5uWnWbKV1KxDGSWvw/76f8bX92+1gr
+SqbLb0v8JIbx5qSxm6yPkEp4Yo2SgVbKbNXhgwVw/u4nhy0piP++FS/z2sh5+Til
+2/USdVZmGrzPtQFhTb++QGpKjS/OL8pKXqpNd53yRqo86YqpzINcYNbrDQIDAQAB
+AoGABbLXfk+zQER8CL0+HlfCMMJYXy4daJZgbR9vRU1VULSGhieI92OTrxI/URjB
+fFMOYo9XGxNv+oLI02f25mjEtepGahrD/8/26dPyYWRaOIC9rO7YWxPzlo9QV+z4
+AyNlTfgfO8qUYW3M/egk8rualpSNN9TS5nUdTC+dlbeEhIECQQD4wOWwFm85aJN9
+6Nh7qn7ZW7gx7adECRqnpRve/TsqiAKr+kshCVE7JGrgzqeqAcA9oYLn3B1UZEGm
+KoZaGfdpAkEA8giDYTQpJ+2REYEUO3AKIVDCVuI4lESM8AuwjQH7KlJ1nbVXv0U+
+nHSLGu+Qj7CVGmvuEutBwa7nCQs9qs+mBQJALW4FRMiEHab0sN0SlFtJ+WZf2HZ/
+wtQq0w07btkushDO9ButFuZ9uGBpSI9VXZ4ePuM9Zhz0GlKJDtDbYp81aQJAGl5b
+EegA49y6BVIuxhr6v45w3c5fo6ekQzLC1Vn15zJ8peXv3WLJ43m+/fxDn6P5WpuP
+oHgI/fT0LsQOv+FHkQJBAKn0+5AMaAcQPQRBofT3i9SYQBjZKwshTRni1ktwGu7S
+19BkWaPJR9h9xxnPxC7U8PG0HuZ7jYOt0PgypJU2/No=
+-----END RSA PRIVATE KEY-----

data/test/config/testing-privkey.pem

@@ -0,0 +1,18 @@
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: DES-EDE3-CBC,4534BD2C19948E2F
+
+2OJj77TnPwQ1whh+9HYmeth5qWu9NnitO0/grQfgNhuag4j+KLsRUTjeYbpXaHuT
+iRQ3ik9r4RNUil/uwPPb/cIpYsnYCOWMnpNuj+NSum07TAOFz+trrcw6oMU0SVFz
+m5jOeMuUwrc1Gvc6tRfqI+kNUtT8mRfNINiato1ATnkzXSHiR4kStldkqQZVO7cr
+pa2r03VJCik1yICxay7Q2fZgwvuuGrdM61cOQms3s07TLXIOF+IezzYPRsWcZFV1
+M9lrIGX2jR6lAhx2NOOvNlpW4Z8GYzNn2TGWDuld9Ou6qEG9i++GP3TuwOM/rpTP
+al826dwKpeN3tF1L5CPMsvca/G6hPRjiCw/bs1JvIo+hqdqVOhYoJBwvDmP+j/VW
+iArK8/VJCAETspcm5FQDuzqH02ZqMAxMz2kIdKYo2w/+dgNvaJaUGvH1yT5X+x9M
+8AvcMDkh8X3HPJDmCLNZufDafmvT/m0dhJ8JPlGP7QXFKQaNSC7f03JR3RN6Xqtb
+a2tidGmcrNI8/OfE3FFLvs0hudnScqdHoxJLHQapeZQe7/0l6xBmauF8MDPW5Ylx
+5mjBfkDcyE77qxJwvuTOuaEA+Pj/G7Gc31oDFtroFG8dTNnUyNiUf5yOWame5j+V
+GJUIuWmj2wS9Zhn834bXL5hmClvblMXgErsfwpqe1F8RwdZaatws4dZD/BEi0/Ua
+PW1ej4e7fGe8S6Gf0oK6Wb7/Rz29MGt9djm9MGIsCDKJdu0RC6Cb22HlcsAhzJ8s
+KQie9XWhR5k1iluzc1QuJW18tgeRC5avOrCOhSeSlq+iX/giryENhw==
+-----END RSA PRIVATE KEY-----

data/test/multiverse/lib/multiverse/color.rb

@@ -4,14 +4,20 @@
 
 module Multiverse
   module Color
+    def colorize(color_code, content)
+      STDOUT.tty? ? "\e[#{color_code}m#{content}\e[0m" : content
+    end
+
     def red(string)
-      "\e[0;31;49m#{string}\e[0m "
+      colorize("0;31;49", string)
     end
+
     def green(string)
-      "\e[0;32;49m#{string}\e[0m "
+      colorize("0;32;49", string)
     end
+
     def yellow(string)
-      "\e[0;33;49m#{string}\e[0m "
+      colorize("0;33;49", string)
     end
   end
 end

data/test/multiverse/lib/multiverse/suite.rb

@@ -53,8 +53,8 @@ module Multiverse
       require 'rubygems'
       require 'bundler'
       bundler_out = `bundle`
+      puts bundler_out if verbose? || $? != 0
       raise "bundle command failed with (#{$?})" unless $? == 0
-      puts bundler_out if verbose?
       Bundler.require
 
       # Ensure mocha is loaded after the test framework by deferring until here
@@ -74,6 +74,7 @@ module Multiverse
         f.puts '  source :rubygems' unless local
         f.print gemfile_text
         f.puts newrelic_gemfile_line unless gemfile_text =~ /^\s*gem .newrelic_rpm./
+        f.puts jruby_openssl_line unless gemfile_text =~ /^\s*gem .jruby-openssl./
         if RUBY_VERSION > '1.8.7'
           f.puts "  gem 'test-unit', :require => 'test/unit'"
           f.puts "  gem 'debugger'" if include_debugger
@@ -95,6 +96,10 @@ module Multiverse
       line
     end
 
+    def jruby_openssl_line
+      "gem 'jruby-openssl', :require => false, :platforms => [:jruby]"
+    end
+
     def print_environment
       puts yellow("Environment loaded with:") if verbose?
       gems = Bundler.definition.specs.inject([]) do |m, s|
@@ -133,7 +138,9 @@ module Multiverse
 
     def execute_with_pipe(env)
       OutputCollector.buffers.push('')
+      puts yellow("Running #{directory.inspect} for Envfile entry #{env}")
       IO.popen("#{__FILE__} #{directory} #{env}") do |io|
+        puts yellow("Starting tests in child PID #{io.pid}")
         while chars = io.read(8) do
           OutputCollector.buffers.last << chars
           print chars
@@ -183,5 +190,8 @@ end
 # Exectute the suite.  We need this if we want to execute a suite by spawning a
 # new process instead of forking.
 if $0 == __FILE__
+  # Redirect stderr to stdout so that we can capture both in the popen that
+  # feeds into the OutputCollector above.
+  $stderr.reopen($stdout)
   Multiverse::Suite.new(ARGV[0], ARGV[2]).execute_child_environment(ARGV[1].to_i)
 end