newrelic_rpm 2.13.4.rum6 → 2.13.4

data/CHANGELOG

@@ -1,7 +1,3 @@
-v2.13.4.eum1
-  * Add preliminary work on end user monitoring
-  * Moved the API helper to the gihtub newrelic_api gem.
-
 v2.13.4
   * Update DNS lookup code to remove hardcoded IP addresses
 

data/README.rdoc

@@ -1,7 +1,5 @@
 = New Relic RPM
 
-
-
 New Relic RPM is a Ruby performance management system, developed by
 New Relic, Inc (http://www.newrelic.com).  RPM provides you with deep
 information about the performance of your Ruby on Rails or Merb

data/lib/new_relic/agent.rb

@@ -72,7 +72,6 @@ module NewRelic
     require 'new_relic/timer_lib'
 
     require 'new_relic/agent/chained_call'
-    require 'new_relic/agent/browser_monitoring'
     require 'new_relic/agent/agent'
     require 'new_relic/agent/shim_agent'
     require 'new_relic/agent/method_tracer'
@@ -378,30 +377,5 @@ module NewRelic
     def record_transaction(response_sec, options = {})
       agent.record_transaction(response_sec, options)
     end
-    
-    # PRE-RELEASE
-    # Returns a Javascript string which should be injected into the very top of the response body
-    #
-    def browser_timing_header
-      agent.browser_timing_header
-    end
-        
-    # PRE-RELEASE
-    # Returns a Javascript string which should be injected into the very bottom of the response body
-    #
-    def browser_timing_footer
-      agent.browser_timing_footer
-    end
-    
-    # FOR BACKWARD COMPATIBILITY (REMOVE BEFORE GA)
-    def browser_instrumentation_header(options={})
-      agent.browser_timing_header
-    end
-
-    # FOR BACKWARD COMPATIBILITY (REMOVE BEFORE GA)
-    def browser_instrumentation_footer(options={})
-      agent.browser_timing_footer
-    end
-    
   end
 end

data/lib/new_relic/agent/agent.rb

@@ -61,7 +61,6 @@ module NewRelic
         attr_reader :histogram
         attr_reader :metric_ids
         attr_reader :url_rules
-        attr_reader :beacon_configuration
 
         def record_transaction(duration_seconds, options={})
           is_error = options['is_error'] || options['error_message'] || options['exception']
@@ -434,7 +433,6 @@ module NewRelic
             @agent_id = connect_data['agent_run_id']
             @report_period = connect_data['data_report_period']
             @url_rules = connect_data['url_rules']
-            @beacon_configuration = BeaconConfiguration.new(connect_data)
 
             control.log! "Connected to NewRelic Service at #{@collector}"
             log.debug "Agent Run       = #{@agent_id}."
@@ -738,7 +736,6 @@ module NewRelic
 
       extend ClassMethods
       include InstanceMethods
-      include BrowserMonitoring
     end
   end
 end

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

@@ -394,7 +394,6 @@ module NewRelic
       if http_entry_time
         queue_stat = NewRelic::Agent.agent.stats_engine.get_stats_no_scope 'WebFrontend/Mongrel/Average Queue Time'
         total_time = (now - http_entry_time)
-        Thread.current[:queue_time] = total_time    # HACK ALERT - this is used to communicate with the browser monitoring code
         queue_stat.trace_call(total_time.to_f) unless total_time.to_f <= 0.0 # using remote timestamps could lead to negative queue time
       end
       return http_entry_time ? Time.at(http_entry_time) : now

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

@@ -138,7 +138,7 @@ module NewRelic
               NewRelic::Agent.instance.transaction_sampler.notice_scope_empty
             end
             NewRelic::Agent.instance.stats_engine.end_transaction
-#            Thread.current[:newrelic_metric_frame] = nil
+            Thread.current[:newrelic_metric_frame] = nil
           else # path stack not empty
             # change the transaction name back to whatever was on the stack.
             NewRelic::Agent.instance.stats_engine.scope_name = metric_name

data/lib/new_relic/agent/instrumentation/rails/action_controller.rb

@@ -16,13 +16,6 @@ if defined? ActionController
     ActionView::Template.class_eval do
       add_method_tracer :render, 'View/#{(path_without_extension || @view.controller.newrelic_metric_path)[%r{^(/.*/)?(.*)$},2]}.#{@view.template_format}.#{extension}/Rendering'
     end
-#    ActionView::Template.class_eval do
-#      alias_method :source_without_newrelic, :source
-#      
-#      def source
-#        "text/html" == mime_type ? NewRelic::Agent.autoinstrument_source(source_without_newrelic) : source_without_newrelic
-#      end
-#    end if NewRelic::Control.instance['auto_enable_real_user_monitoring']
 
     when /^2\./   # Rails 2.2-2.*
     ActionView::RenderablePartial.module_eval do
@@ -31,14 +24,6 @@ if defined? ActionController
     ActionView::Template.class_eval do
       add_method_tracer :render, 'View/#{path[%r{^(/.*/)?(.*)$},2]}/Rendering'
     end
-#    ActionView::Template.class_eval do
-#      alias_method :source_without_newrelic, :source
-#      
-#      def source
-#        "text/html" == mime_type ? NewRelic::Agent.autoinstrument_source(source_without_newrelic) : source_without_newrelic
-#      end
-#    end if NewRelic::Control.instance['auto_enable_real_user_monitoring']
-    
   end unless NewRelic::Control.instance['disable_view_instrumentation']
 
   ActionController::Base.class_eval do

data/lib/new_relic/agent/shim_agent.rb

@@ -20,8 +20,6 @@ module NewRelic
       def shutdown; end
       def push_trace_execution_flag(*args); end
       def pop_trace_execution_flag(*args); end
-      def browser_timing_header; "" end
-      def browser_timing_footer; "" end
     end
   end
 end

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

@@ -105,6 +105,7 @@ module Agent
 
         if stack && stack.empty?
           Thread::current[:newrelic_scope_stack] = nil
+          Thread::current[:newrelic_scope_name] = nil
         end
       end
 

data/lib/new_relic/control.rb

@@ -42,7 +42,7 @@ module NewRelic
       def instance
         @instance ||= new_instance
       end
-      
+
       # Create the concrete class for environment specific behavior:
       def new_instance
         @local_env = NewRelic::LocalEnvironment.new

data/lib/new_relic/control/configuration.rb

@@ -79,16 +79,9 @@ module NewRelic
         fetch('developer_mode', fetch('developer'))
       end
 
-      def browser_monitoring_auto_instrument?
-        bm = fetch('browser_monitoring')
-        
-        if bm.nil?
-          false
-        else
-          bm.fetch('auto_instrument', false)
-        end
+      def episodes_enabled?
+        fetch('episodes_enabled', true)
       end
-      
       # True if the app runs in multi-threaded mode
       def multi_threaded?
         fetch('multi_threaded')

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

@@ -21,16 +21,19 @@ class NewRelic::Control::Frameworks::Rails < NewRelic::Control
     else
       log! "Starting the New Relic Agent."
       install_developer_mode rails_config if developer_mode?
-      install_browser_monitoring rails_config
+      install_episodes rails_config
     end
   end
 
-  def install_browser_monitoring(config)
-    return if config.nil? || !config.respond_to?(:middleware) || !browser_monitoring_auto_instrument?
-    
-    require 'new_relic/rack/browser_monitoring'
-    config.middleware.use NewRelic::Rack::BrowserMonitoring
-    ::RAILS_DEFAULT_LOGGER.info "Installed browser monitoring middleware"
+  def install_episodes(config)
+    return if config.nil? || !config.respond_to?(:middleware) || !episodes_enabled?
+    config.after_initialize do
+      if defined?(NewRelic::Rack::Episodes)
+        config.middleware.use NewRelic::Rack::Episodes
+        log! "Installed episodes middleware"
+        ::RAILS_DEFAULT_LOGGER.info "Installed episodes middleware"
+      end
+    end
   end
 
   def install_developer_mode(rails_config)

data/lib/new_relic/stats.rb

@@ -135,9 +135,6 @@ module NewRelic
       end_time - begin_time
     end
 
-    def midpoint
-      begin_time + (duration/2)
-    end
     def calls_per_minute
       if duration.zero?
         0

data/lib/new_relic/transaction_analysis.rb

@@ -47,7 +47,7 @@ module TransactionAnalysis
       @total_time / @sample.duration
     end
 
-    def ui_name
+    def developer_name
       return @metric_name if @metric_name == 'Remainder'
       NewRelic::MetricParser::MetricParser.parse(@metric_name).developer_name
     end

data/lib/new_relic/version.rb

@@ -4,7 +4,7 @@ module NewRelic
     MAJOR = 2
     MINOR = 13
     TINY  = 4
-    BUILD = 'rum6' #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
+    BUILD = nil #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end
 

data/lib/new_relic_api.rb

@@ -0,0 +1,276 @@
+# == REST API Helpers
+#
+# Ruby lib for working with the New Relic API's XML interface.  Requires Rails 2.0 or later to be loaded.
+#
+# Can also be used as a script using script/runner
+#
+# Authentication is handled using your agent license key or HTTP Basic Authentication.  To authenticate
+# using your license key your newrelic.yml configuration file must be in your application config directory
+# and contain your license key.  The New Relic account associated with the license key must allow api access.
+# Log into RPM, click Account at the top of the page and check the "Make my account data accessible" checkbox.
+#
+# Basic authentication uses your site credentials to authenticate.
+#
+#   # To authenticate using basic authentication, make this call with your username and password:
+#   NewRelicApi.authenticate('user@example.com', 'test')
+#
+# This API does not have any agent dependencies.  It can be used independent of the agent by copying it into your application.
+#
+# == Examples
+#
+#   # Fetching the list of applications for an account
+#   NewRelicApi::Account.find(:first).applications
+#
+#   # Fetching the health values for all account applications
+#   NewRelicApi::Account.application_health
+#
+#   # Fetching the health values for an application
+#   NewRelicApi::Account.find(:first).applications.first.threshold_values
+#
+#   # Finding an application by name
+#   NewRelicApi::Account.find(:first).applications(:params => {:conditions => {:name => 'My App'}})
+#
+
+module NewRelicApi
+
+  # This mixin defines ActiveRecord style associations (like has_many) for ActiveResource objects.
+  # ActiveResource objects using this mixin must define the method 'query_params'.
+  module ActiveResourceAssociations #:nodoc:
+    class << self
+      protected
+      def included(base)
+        class << base
+          # a special activeresource implementation of has_many
+          def has_many(*associations)
+            associations.to_a.each do |association|
+              define_method association do |*args|
+                val = attributes[association.to_s] # if we've already fetched the relationship in the initial fetch, return it
+                return val if val
+
+                options = args.extract_options!
+                type = args.first || :all
+
+                begin
+                  # look for the class definition within the current class
+                  clazz = ( self.class.name + '::' + association.to_s.camelize.singularize).constantize
+                rescue
+                  # look for the class definition in the NRAPI module
+                  clazz = ( 'NewRelicApi::' + association.to_s.camelize.singularize).constantize
+                end
+                params = (options[:params] || {}).update(self.query_params)
+                options[:params] = params
+                clazz.find(type, options)
+
+                #clazz.find(type, :params => options.update(self.query_params))
+              end
+            end
+          end
+        end
+      end
+    end
+
+  end
+  class << self
+    attr_accessor :email, :password, :license_key, :ssl, :host, :port
+
+    # Sets up basic authentication credentials for all the resources.  This is not necessary if you are
+    # using agent license key authentication.
+    def authenticate(email, password)
+      @password = password
+      @email    = email
+    end
+
+    # Resets the base path of all resources.  This should be called when overridding the newrelic.yml settings
+    # using the ssl, host or port accessors.
+    def reset!
+      @classes.each {|klass| klass.reset!} if @classes
+      NewRelicApi::Account.site_url
+    end
+
+
+    def track_resource(klass) #:nodoc:
+      (@classes ||= []) << klass
+    end
+  end
+
+  class BaseResource < ActiveResource::Base #:nodoc:
+    include ActiveResourceAssociations
+
+    class << self
+      def inherited(klass) #:nodoc:
+        NewRelicApi.track_resource(klass)
+      end
+
+      def headers
+        h = {'x-license-key' => NewRelicApi.license_key || NewRelic::Control.instance['license_key']}
+        h['Authorization'] = 'Basic ' + ["#{NewRelicApi.email}:#{NewRelicApi.password}"].pack('m').delete("\r\n") if NewRelicApi.email
+        h
+      end
+
+      def site_url
+        host = NewRelicApi.host || NewRelic::Control.instance.api_server.name
+        port = NewRelicApi.port || NewRelic::Control.instance.api_server.port
+        "#{port == 443 ? 'https' : 'http'}://#{host}:#{port}"
+      end
+
+      def reset!
+        self.site = self.site_url
+      end
+
+      protected
+
+      def fix_fields(*fields)
+        fields.to_a.each do |field|
+          define_method field do
+            yield super
+          end
+        end
+      end
+
+      def fix_integer_fields(*fields)
+        fix_fields(*fields) { |sup| sup.to_i }
+      end
+
+      def fix_float_fields(*fields)
+        fix_fields(*fields) { |sup| sup.to_f }
+      end
+
+    end
+    self.site = self.site_url
+  end
+  ACCOUNT_RESOURCE_PATH = '/accounts/:account_id/' #:nodoc:
+  ACCOUNT_AGENT_RESOURCE_PATH = ACCOUNT_RESOURCE_PATH + 'agents/:agent_id/' #:nodoc:
+  ACCOUNT_APPLICATION_RESOURCE_PATH = ACCOUNT_RESOURCE_PATH + 'applications/:application_id/' #:nodoc:
+
+  module AccountResource #:nodoc:
+    def account_id
+      prefix_options[:account_id]
+    end
+    def account_query_params(extra_params = {})
+      {:account_id => account_id}.merge(extra_params)
+    end
+
+    def query_params#:nodoc:
+      account_query_params
+    end
+  end
+
+  module AgentResource #:nodoc:
+    include ActiveResourceAssociations
+  end
+
+  # An application has many:
+  # +agents+:: the agent instances associated with this app
+  # +threshold_values+:: the health indicators for this application.
+  class Application < BaseResource
+    include AccountResource
+    include AgentResource
+
+    has_many :agents, :threshold_values
+
+    self.prefix = ACCOUNT_RESOURCE_PATH
+
+    def query_params#:nodoc:
+      account_query_params(:application_id => id)
+    end
+
+    class Agent < BaseResource
+      include AccountResource
+      include AgentResource
+
+      self.prefix = ACCOUNT_APPLICATION_RESOURCE_PATH
+
+      def query_params#:nodoc:
+        super.merge(:application_id => cluster_agent_id)
+      end
+    end
+
+  end
+
+  # A threshold value represents a single health indicator for an application such as CPU, memory or response time.
+  #
+  # ==Fields
+  # +name+:: The name of the threshold setting associated with this threshold value.
+  # +threshold_value+:: A value of 0, 1, 2 or 3 representing gray (not reporting), green, yellow and red
+  # +metric_value+:: The metric value associated with this threshold
+  class ThresholdValue < BaseResource
+    self.prefix = ACCOUNT_APPLICATION_RESOURCE_PATH
+    #      attr_reader :name, :begin_time, :metric_value, :threshold_value
+
+    fix_integer_fields :threshold_value
+    fix_float_fields :metric_value
+
+    # Returns the color value for this threshold (Gray, Green, Yellow or Red).
+    def color_value
+      case threshold_value
+        when 3: 'Red'
+        when 2: 'Yellow'
+        when 1: 'Green'
+      else 'Gray'
+      end
+    end
+
+    def to_s #:nodoc:
+      "#{name}: #{color_value} (#{formatted_metric_value})"
+    end
+  end
+
+  # An account contains your basic account information.
+  #
+  # Accounts have many
+  # +applications+:: the applications contained within the account
+  #
+  # Find Accounts
+  #
+  #   NewRelicApi::Account.find(:all) # find all accounts for the current user.
+  #   NewRelicApi::Account.find(44)   # find individual account by ID
+  #
+  class Account < BaseResource
+    has_many :applications
+    has_many :account_views
+
+    def query_params #:nodoc:
+      {:account_id => id}
+    end
+
+    # Returns an account including all of its applications and the threshold values for each application.
+    def self.application_health(type = :first)
+      find(type, :params => {:include => :application_health})
+    end
+
+    class AccountView < BaseResource
+      self.prefix = ACCOUNT_RESOURCE_PATH
+
+      def query_params(extra_params = {}) #:nodoc:
+        {:account_id => account_id}.merge(extra_params)
+      end
+
+      def user
+        @attributes['user']
+      end
+    end
+
+    class AccountUsage < BaseResource
+    end
+  end
+
+  # This model is used to mark production deployments in RPM
+  # Only create is supported.
+  # ==Examples
+  #   # Creating a new deployment
+  #   NewRelicApi::Deployment.create
+  #
+  class Deployment < BaseResource
+  end
+
+  class Subscription < BaseResource
+    def query_params(extra_params = {}) #:nodoc:
+      {:account_id => account_id}.merge(extra_params)
+    end
+  end
+
+  class User < BaseResource
+  end
+
+end
+