newrelic_rpm 3.5.8.72 → 3.6.0.74.beta

data/lib/new_relic/agent/samplers/memory_sampler.rb

@@ -1,3 +1,7 @@
+# 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 'new_relic/agent/sampler'
 
 module NewRelic
@@ -49,20 +53,20 @@ module NewRelic
           NewRelic::Agent::Samplers::MemorySampler.platform
         end
 
-        def stats
-          stats_engine.get_stats("Memory/Physical", false)
-        end
         def poll
           sample = @sampler.get_sample
-          stats.record_data_point sample if sample
-          stats
+          if sample
+            NewRelic::Agent.record_metric("Memory/Physical", sample)
+          end
         end
+
         class Base
           def can_run?
             return false if @broken
             m = get_memory rescue nil
             m && m > 0
           end
+
           def get_sample
             return nil if @broken
             begin

data/lib/new_relic/agent/samplers/object_sampler.rb

@@ -1,24 +1,24 @@
+# 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 'new_relic/agent/sampler'
 
 module NewRelic
   module Agent
     module Samplers
       class ObjectSampler < NewRelic::Agent::Sampler
-
         def initialize
           super :objects
         end
 
-        def stats
-          stats_engine.get_stats_no_scope("GC/objects")
-        end
-
         def self.supported_on_this_platform?
           defined?(ObjectSpace) && ObjectSpace.respond_to?(:live_objects)
         end
 
         def poll
-          stats.record_data_point(ObjectSpace.live_objects)
+          live_objects = ObjectSpace.live_objects
+          NewRelic::Agent.record_metric("GC/objects", live_objects)
         end
       end
     end

data/lib/new_relic/agent/shim_agent.rb

@@ -1,3 +1,7 @@
+# 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.
+
 # This agent is loaded by the plug when the plug-in is disabled
 # It recreates just enough of the API to not break any clients that
 # invoke the Agent.

data/lib/new_relic/agent/sql_sampler.rb

@@ -1,3 +1,7 @@
+# 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 'zlib'
 require 'base64'
 require 'digest/md5'

data/lib/new_relic/agent/stats.rb

@@ -1,3 +1,6 @@
+# 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
     class Stats

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

@@ -1,3 +1,7 @@
+# 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.
+
 # -*- coding: utf-8 -*-
 module NewRelic
   module Agent
@@ -45,10 +49,10 @@ module NewRelic
             if num_calls > 0
               # GC stats are collected into a blamed metric which allows
               # us to show the stats controller by controller
-              gc_stats = NewRelic::Agent.instance.stats_engine \
-                .get_stats('GC/cumulative', true, false,
-                           NewRelic::Agent::TransactionInfo.get.transaction_name)
-              gc_stats.record_multiple_data_points(elapsed, num_calls)
+              NewRelic::Agent.instance.stats_engine \
+                .record_metrics('GC/cumulative', nil, :scoped => true) do |stat|
+                stat.record_multiple_data_points(elapsed, num_calls)
+              end
             end
           end
 

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

@@ -1,3 +1,7 @@
+# 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 'new_relic/language_support'
 
 module NewRelic
@@ -9,10 +13,10 @@ module NewRelic
         #
         # This method is thead-safe, and is preferred to the lookup / modify
         # method pairs (e.g. get_stats + record_data_point)
-        def record_metric(metric_names_or_specs, value=nil, options={}, &blk)
+        def record_metrics(metric_names_or_specs, value=nil, options={}, &blk)
           defaults = {
             :scoped => false,
-            :scope => default_scope
+            :scope => scope_name
           }
           options = defaults.merge(options)
           effective_scope = options[:scoped] && options[:scope]
@@ -68,22 +72,23 @@ module NewRelic
           end_time = Time.now
           duration = (end_time - start_time).to_f
         ensure
-          record_supportability_metrics(duration, metrics) do |value, metric|
-            metric.record_data_point(value)
+          record_metrics(metrics) do |stat|
+            stat.record_data_point(duration)
           end
         end
 
         # Helper for recording a straight value into the count
         def record_supportability_metrics_count(value, *metrics)
-          record_supportability_metrics(value, *metrics) do |value, metric|
-            metric.call_count = value
+          record_metrics(metrics) do |stat|
+            stat.call_count = value
           end
         end
 
         # Helper method for recording supportability metrics consistently
         def record_supportability_metrics(value, *metrics)
-          metrics.each do |metric|
-              yield(value, get_stats_no_scope("Supportability/#{metric}"))
+          real_names = metrics.map { |name| "Supportability/#{name}" }
+          NewRelic::Agent.agent.record_metric(real_names) do |stat|
+            yield stat
           end
         end
 
@@ -123,11 +128,6 @@ module NewRelic
           renamed_stats
         end
 
-        def default_scope
-          txn = NewRelic::Agent::TransactionInfo.get
-          txn.transaction_name_set? && txn.transaction_name
-        end
-
         def coerce_to_metric_spec_array(metric_names_or_specs, scope)
           specs = []
           Array(metric_names_or_specs).map do |name_or_spec|

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

@@ -1,3 +1,7 @@
+# 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
   class StatsEngine
@@ -34,9 +38,8 @@ module Agent
               sleep POLL_PERIOD
               poll periodic_samplers
             ensure
-              NewRelic::Agent.instance.stats_engine \
-                .get_stats_no_scope('Supportability/Samplers') \
-                .record_data_point((Time.now - now).to_f)
+              duration = (Time.now - now).to_f
+              NewRelic::Agent.record_metric('Supportability/Samplers', duration)
             end
           end
         end

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

@@ -1,3 +1,7 @@
+# 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.
+
 # A Hash-descended class for storing metric data in the NewRelic Agent.
 #
 # Keys are NewRelic::MetricSpec objects.

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

@@ -1,3 +1,7 @@
+# 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.
+
 # -*- coding: utf-8 -*-
 module NewRelic
 module Agent

data/lib/new_relic/agent/stats_engine.rb

@@ -1,3 +1,7 @@
+# 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 'new_relic/agent/stats_engine/metric_stats'
 require 'new_relic/agent/stats_engine/samplers'
 require 'new_relic/agent/stats_engine/transactions'

data/lib/new_relic/agent/thread.rb

@@ -1,3 +1,7 @@
+# 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
 

data/lib/new_relic/agent/thread_profiler.rb

@@ -1,3 +1,7 @@
+# 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 'new_relic/agent/thread'
 require 'new_relic/agent/worker_loop'
 

data/lib/new_relic/agent/transaction_info.rb

@@ -1,3 +1,7 @@
+# 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 'erb'
 
 module NewRelic

data/lib/new_relic/agent/transaction_sample_builder.rb

@@ -1,3 +1,7 @@
+# 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 'new_relic/collection_helper'
 require 'new_relic/transaction_sample'
 require 'new_relic/control'

data/lib/new_relic/agent/transaction_sampler.rb

@@ -1,3 +1,7 @@
+# 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 'new_relic/agent'
 require 'new_relic/control'
 require 'new_relic/agent/transaction_sample_builder'

data/lib/new_relic/agent/worker_loop.rb

@@ -1,3 +1,7 @@
+# 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

data/lib/new_relic/agent.rb

@@ -1,3 +1,7 @@
+# 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 'forwardable'
 require 'new_relic/control'
 
@@ -182,7 +186,7 @@ module NewRelic
         stats.sum_of_squares = value[:sum_of_squares]
         value = stats
       end
-      agent.stats_engine.record_metric(metric_name, value)
+      agent.stats_engine.record_metrics(metric_name, value)
     end
 
     # Increment a simple counter metric.
@@ -194,7 +198,7 @@ module NewRelic
     #
     # @api public
     def increment_metric(metric_name, amount=1)
-      agent.stats_engine.record_metric(metric_name) do |stats|
+      agent.stats_engine.record_metrics(metric_name) do |stats|
         stats.increment_count(amount)
       end
     end
@@ -250,7 +254,7 @@ module NewRelic
     # jobs or other work.  If you are doing this with a web dispatcher
     # that forks worker processes then you will need to force the
     # agent to reconnect, which it won't do by default.  Passenger and
-    # Unicorn are already handled, nothing special needed for them.
+    # Rainbows and Unicorn are already handled, nothing special needed for them.
     #
     # Options:
     # * <tt>:force_reconnect => true</tt> to force the spawned process to

data/lib/new_relic/build.rb

@@ -1,2 +1,2 @@
-# GITSHA: ae77f6da5c13f731d7094786ad451960920936de
-module NewRelic; module VERSION; BUILD='72'; end; end
+# GITSHA: 325732927d189e836f1622124bdec28d299fe32e
+module NewRelic; module VERSION; BUILD='74.beta'; end; end

data/lib/new_relic/coerce.rb

@@ -1,3 +1,7 @@
+# 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
   # We really don't want to send bad values to the collector, and it doesn't
   # accept types like Rational that have occasionally slipped into our data.

data/lib/new_relic/collection_helper.rb

@@ -1,3 +1,7 @@
+# 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 'new_relic/control'
 
 module NewRelic

data/lib/new_relic/command.rb

@@ -1,3 +1,7 @@
+# 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 'optparse'
 
 # Run the command given by the first argument.  Right

data/lib/new_relic/commands/deployments.rb

@@ -1,3 +1,7 @@
+# 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.
+
 # This is a class for executing commands related to deployment
 # events.  It runs without loading the rails environment
 

data/lib/new_relic/commands/install.rb

@@ -1,3 +1,7 @@
+# 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 'fileutils'
 require 'new_relic/version'
 require 'erb'

data/lib/new_relic/control/class_methods.rb

@@ -1,3 +1,7 @@
+# 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
   class Control
     # class-level methods for lazy creation of NewRelic::Control and

data/lib/new_relic/control/frameworks/external.rb

@@ -1,3 +1,7 @@
+# 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 'new_relic/control/frameworks/ruby'
 module NewRelic
   class Control

data/lib/new_relic/control/frameworks/merb.rb

@@ -1,3 +1,7 @@
+# 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
   class Control
     module Frameworks

data/lib/new_relic/control/frameworks/rails.rb

@@ -1,3 +1,7 @@
+# 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 'new_relic/control/frameworks/ruby'
 module NewRelic
   class Control

data/lib/new_relic/control/frameworks/rails3.rb

@@ -1,3 +1,7 @@
+# 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 'new_relic/control/frameworks/rails'
 require 'new_relic/rack/error_collector'
 module NewRelic

data/lib/new_relic/control/frameworks/rails4.rb

@@ -1,3 +1,7 @@
+# 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 'new_relic/control/frameworks/rails3'
 require 'new_relic/rack/error_collector'
 module NewRelic

data/lib/new_relic/control/frameworks/ruby.rb

@@ -1,3 +1,7 @@
+# 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
   class Control
     module Frameworks

data/lib/new_relic/control/frameworks/sinatra.rb

@@ -1,3 +1,7 @@
+# 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 'new_relic/control/frameworks/ruby'
 module NewRelic

data/lib/new_relic/control/frameworks.rb

@@ -1,3 +1,7 @@
+# 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
   class Control
     # Contains subclasses of NewRelic::Control that are used when