newrelic_rpm 3.6.6.147 → 3.6.7.152

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

@@ -97,14 +97,7 @@ module NewRelic
             begin
               require 'new_relic/rack/developer_mode'
               rails_config.middleware.use NewRelic::Rack::DeveloperMode
-
-              # inform user that the dev edition is available if we are running inside
-              # a webserver process
-              if @local_env.dispatcher_instance_id
-                port = @local_env.dispatcher_instance_id.to_s =~ /^\d+/ ? ":#{local_env.dispatcher_instance_id}" : ":port"
-                ::NewRelic::Agent.logger.debug("NewRelic Agent Developer Mode enabled.")
-                ::NewRelic::Agent.logger.debug("To view performance information, go to http://localhost#{port}/newrelic")
-              end
+              ::NewRelic::Agent.logger.info("New Relic Agent Developer Mode enabled.")
             rescue => e
               ::NewRelic::Agent.logger.warn("Error installing New Relic Developer Mode", e)
             end

data/lib/new_relic/control/instance_methods.rb

@@ -64,14 +64,13 @@ module NewRelic
 
         # Merge the stringified options into the config as overrides:
         environment_name = options.delete(:env) and self.env = environment_name
-        dispatcher_instance_id = options.delete(:dispatcher_instance_id) and @local_env.dispatcher_instance_id = dispatcher_instance_id
 
         NewRelic::Agent::PipeChannelManager.listener.start if options.delete(:start_channel_listener)
 
         # An artifact of earlier implementation, we put both #add_method_tracer and #trace_execution
         # methods in the module methods.
         Module.send :include, NewRelic::Agent::MethodTracer::ClassMethods
-        Module.send :include, NewRelic::Agent::MethodTracer::InstanceMethods
+        Module.send :include, NewRelic::Agent::MethodTracer
         init_config(options)
         NewRelic::Agent.agent = NewRelic::Agent::Agent.instance
         if Agent.config[:agent_enabled] && !NewRelic::Agent.instance.started?

data/lib/new_relic/helper.rb

@@ -32,6 +32,15 @@ module NewRelic
       end
     end
 
+    def instance_methods_include?(klass, method_name)
+      method_name_sym = method_name.to_sym
+      (
+        klass.instance_methods.map{ |s| s.to_sym }.include?(method_name_sym)          ||
+        klass.protected_instance_methods.map{ |s|s.to_sym }.include?(method_name_sym) ||
+        klass.private_instance_methods.map{ |s|s.to_sym }.include?(method_name_sym)
+      )
+    end
+
     def time_to_millis(time)
       (time.to_f * 1000).round
     end

data/lib/new_relic/local_environment.rb

@@ -6,26 +6,21 @@ require 'set'
 require 'new_relic/version'
 
 module NewRelic
-  # An instance of LocalEnvironment is responsible for determining
-  # three things:
+  # An instance of LocalEnvironment is responsible for determining the 'dispatcher'
+  # in use by the current process.
   #
-  # * Dispatcher - A supported dispatcher, or nil (:mongrel, :thin, :passenger, :webrick, etc)
-  # * Dispatcher Instance ID, which distinguishes agents on a single host from each other
+  # A dispatcher might be a recognized web server such as unicorn or passenger,
+  # a background job processor such as resque or sidekiq, or nil for unknown.
   #
-  # If the environment can't be determined, it will be set to
-  # nil and dispatcher_instance_id will have nil.
+  # If the environment can't be determined, it will be set to nil.
   #
   # NewRelic::LocalEnvironment should be accessed through NewRelic::Control#env (via the NewRelic::Control singleton).
   class LocalEnvironment
-    # mongrel, thin, webrick, or possibly nil
     def discovered_dispatcher
       discover_dispatcher unless @discovered_dispatcher
       @discovered_dispatcher
     end
 
-    # used to distinguish instances of a dispatcher from each other, may be nil
-    attr_writer :dispatcher_instance_id
-
     def initialize
       # Extend self with any any submodules of LocalEnvironment.  These can override
       # the discover methods to discover new framworks and dispatchers.
@@ -37,18 +32,6 @@ module NewRelic
       discover_dispatcher
     end
 
-
-    # An instance id pulled from either @dispatcher_instance_id or by
-    # splitting out the first part of the running file
-    def dispatcher_instance_id
-      if @dispatcher_instance_id.nil?
-        if @discovered_dispatcher.nil?
-          @dispatcher_instance_id = File.basename($0).split(".").first
-        end
-      end
-      @dispatcher_instance_id
-    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)
@@ -70,6 +53,12 @@ module NewRelic
       @mongrel
     end
 
+    # Setter for testing
+    def mongrel=(m)
+      @looked_for_mongrel = true
+      @mongrel = m
+    end
+
     private
 
     # Although you can override the dispatcher with NEWRELIC_DISPATCHER this
@@ -107,11 +96,6 @@ module NewRelic
     def check_for_webrick
       return unless defined?(::WEBrick) && defined?(::WEBrick::VERSION)
       @discovered_dispatcher = :webrick
-      if defined?(::OPTIONS) && OPTIONS.respond_to?(:fetch)
-        # OPTIONS is set by script/server
-        @dispatcher_instance_id = OPTIONS.fetch(:port)
-      end
-      @dispatcher_instance_id = default_port unless @dispatcher_instance_id
     end
 
     def check_for_fastcgi
@@ -126,19 +110,8 @@ module NewRelic
 
       # Get the port from the server if it's started
       if mongrel && mongrel.respond_to?(:port)
-        @dispatcher_instance_id = mongrel.port.to_s
       end
 
-      # Get the port from the configurator if one was created
-      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
-      end
-
-      # Still can't find the port.  Let's look at ARGV to fall back
-      @dispatcher_instance_id = default_port if @dispatcher_instance_id.nil?
-
       # Might not have server yet, so allow one more check later on first request
       @looked_for_mongrel = false
     end
@@ -168,7 +141,11 @@ module NewRelic
         defined?(::Resque) &&
         (ENV['QUEUE'] || ENV['QUEUES']) &&
         (File.basename($0) == 'rake' && ARGV.include?('resque:work'))
+      ) || (
+        defined?(::Resque::Pool) &&
+        (File.basename($0) == 'resque-pool')
       )
+
       @discovered_dispatcher = :resque if using_resque
     end
 
@@ -184,21 +161,10 @@ module NewRelic
         # Same issue as above- we assume only one instance per process
         ObjectSpace.each_object(Thin::Server) do |thin_dispatcher|
           @discovered_dispatcher = :thin
-          backend = thin_dispatcher.backend
-          # We need a way to uniquely identify and distinguish agents.  The port
-          # works for this.  When using sockets, use the socket file name.
-          if backend.respond_to? :port
-            @dispatcher_instance_id = backend.port
-          elsif backend.respond_to? :socket
-            @dispatcher_instance_id = backend.socket
-          else
-            raise "Unknown thin backend: #{backend}"
-          end
-        end # each thin instance
+        end
       end
       if defined?(::Thin) && defined?(::Thin::VERSION) && !@discovered_dispatcher
         @discovered_dispatcher = :thin
-        @dispatcher_instance_id = default_port
       end
     end
 
@@ -214,24 +180,11 @@ module NewRelic
       end
     end
 
-
-    def default_port
-      require 'optparse'
-      # If nothing else is found, use the 3000 default
-      default_port = 3000
-      OptionParser.new do |opts|
-        opts.on("-p", "--port=port", String) { | p | default_port = p }
-        opts.parse(ARGV.clone) rescue nil
-      end
-      default_port
-    end
-
     public
     # outputs a human-readable description
     def to_s
       s = "LocalEnvironment["
       s << ";dispatcher=#{@discovered_dispatcher}" if @discovered_dispatcher
-      s << ";instance=#{@dispatcher_instance_id}" if @dispatcher_instance_id
       s << "]"
     end
 

data/lib/new_relic/rack/browser_monitoring.rb

@@ -39,6 +39,8 @@ module NewRelic::Rack
         !headers['Content-Disposition'].to_s.include?('attachment')
     end
 
+    X_UA_COMPATIBLE_RE = /<\s*meta[^>]+http-equiv=['"]x-ua-compatible['"][^>]*>/im.freeze
+
     def autoinstrument_source(response, headers)
       source = nil
       response.each {|fragment| source ? (source << fragment.to_s) : (source = fragment.to_s)}
@@ -53,12 +55,13 @@ module NewRelic::Rack
         footer = NewRelic::Agent.browser_timing_footer
         header = NewRelic::Agent.browser_timing_header
 
-        x_ua_compatible_found = beginning_of_source.include?('X-UA-Compatible')
+        match = X_UA_COMPATIBLE_RE.match(beginning_of_source)
+        x_ua_compatible_position = match.end(0) if match
 
-        head_pos = if x_ua_compatible_found
-          # put at end of header if X-UA-Compatible meta tag found
-          ::NewRelic::Agent.logger.debug "Detected X-UA-Compatible meta tag. Attempting to insert RUM header at end of head."
-          beginning_of_source.index("</head>")
+        head_pos = if x_ua_compatible_position
+          # put after X-UA-Compatible meta tag if found
+          ::NewRelic::Agent.logger.debug "Detected X-UA-Compatible meta tag. Attempting to insert RUM header after meta tag."
+          x_ua_compatible_position
         elsif head_open = beginning_of_source.index("<head")
           ::NewRelic::Agent.logger.debug "Attempting to insert RUM header at beginning of head."
           # put at the beginning of the header

data/lib/new_relic/recipes.rb

@@ -21,37 +21,20 @@ make_notify_task = Proc.new do
     task :notice_deployment, :roles => :app, :except => {:no_release => true } do
       rails_env = fetch(:newrelic_rails_env, fetch(:rails_env, "production"))
 
-      require File.join(File.dirname(__FILE__), 'command.rb')
+      require File.join(File.dirname(__FILE__), 'cli', 'command.rb')
 
       begin
         # allow overrides to be defined for revision, description, changelog, appname, and user
-        rev         = fetch(:newrelic_revision)  if exists?(:newrelic_revision)
-        description = fetch(:newrelic_desc)      if exists?(:newrelic_desc)
-        changelog   = fetch(:newrelic_changelog) if exists?(:newrelic_changelog)
-        appname     = fetch(:newrelic_appname)   if exists?(:newrelic_appname)
-        user        = fetch(:newrelic_user)      if exists?(:newrelic_user)
-
-        if !changelog
-          logger.debug "Getting log of changes for New Relic Deployment details"
-          from_revision = source.next_revision(current_revision)
-
-          if scm == :git
-            log_command = "git log --no-color --pretty=format:'  * %an: %s' " +
-              "--abbrev-commit --no-merges #{previous_revision}..#{real_revision}"
-          else
-            log_command = "#{source.log(from_revision)}"
-          end
-
-          changelog = `#{log_command}`
-        end
-
-        if rev.nil?
-          rev = source.query_revision(source.head()) do |cmd|
-            logger.debug "executing locally: '#{cmd}'"
-            `#{cmd}`
-          end
-
-          rev = rev[0..6] if scm == :git
+        rev         = fetch(:newrelic_revision)    if exists?(:newrelic_revision)
+        description = fetch(:newrelic_desc)        if exists?(:newrelic_desc)
+        changelog   = fetch(:newrelic_changelog)   if exists?(:newrelic_changelog)
+        appname     = fetch(:newrelic_appname)     if exists?(:newrelic_appname)
+        user        = fetch(:newrelic_user)        if exists?(:newrelic_user)
+        license_key = fetch(:newrelic_license_key) if exists?(:newrelic_license_key)
+
+        unless scm == :none
+          changelog = lookup_changelog(changelog)
+          rev       = lookup_rev(rev)
         end
 
         new_revision = rev
@@ -61,15 +44,16 @@ make_notify_task = Proc.new do
           :changelog   => changelog,
           :description => description,
           :appname     => appname,
-          :user        => user
+          :user        => user,
+          :license_key => license_key
         }
 
         logger.debug "Uploading deployment to New Relic"
-        deployment = NewRelic::Command::Deployments.new deploy_options
+        deployment = NewRelic::Cli::Deployments.new deploy_options
         deployment.run
         logger.info "Uploaded deployment information to New Relic"
 
-      rescue NewRelic::Command::CommandFailure => e
+      rescue NewRelic::Cli::Command::CommandFailure => e
         logger.info e.message
 
       rescue Capistrano::CommandError
@@ -84,6 +68,35 @@ make_notify_task = Proc.new do
       #   run(...)
       # end
     end
+
+    def lookup_changelog(changelog)
+      if !changelog
+        logger.debug "Getting log of changes for New Relic Deployment details"
+        from_revision = source.next_revision(current_revision)
+
+        if scm == :git
+          log_command = "git log --no-color --pretty=format:'  * %an: %s' " +
+            "--abbrev-commit --no-merges #{previous_revision}..#{real_revision}"
+        else
+          log_command = "#{source.log(from_revision)}"
+        end
+
+        changelog = `#{log_command}`
+      end
+      changelog
+    end
+
+    def lookup_rev(rev)
+      if rev.nil?
+        rev = source.query_revision(source.head()) do |cmd|
+          logger.debug "executing locally: '#{cmd}'"
+          `#{cmd}`
+        end
+
+        rev = rev[0..6] if scm == :git
+      end
+      rev
+    end
   end
 end
 

data/lib/new_relic/transaction_sample.rb

@@ -31,7 +31,7 @@ module NewRelic
       @root_segment = create_segment 0.0, "ROOT"
 
       @guid = generate_guid
-      NewRelic::Agent::TransactionInfo.get.guid = @guid
+      NewRelic::Agent::TransactionState.get.request_guid = @guid
     end
 
     def count_segments
@@ -187,6 +187,11 @@ module NewRelic
       @params = params
     end
 
+    def force_persist_sample?
+      NewRelic::Agent::TransactionState.get.request_token &&
+        self.duration > NewRelic::Agent::TransactionState.get.transaction.apdex_t
+    end
+
   private
 
     HEX_DIGITS = (0..15).map{|i| i.to_s(16)}
@@ -268,6 +273,5 @@ module NewRelic
         target_called_segment.end_trace(source_called_segment.exit_timestamp)
       end
     end
-
   end
 end

data/lib/new_relic/version.rb

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

data/lib/tasks/install.rake

@@ -1,7 +1,27 @@
 # run unit tests for the NewRelic Agent
 namespace :newrelic do
-  desc "install a default config/newrelic.yml file"
+  desc "Install a default config/newrelic.yml file"
   task :install do
     load File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "install.rb"))
   end
+
+  namespace :config do
+    desc "Describe available New Relic configuration settings."
+    task :docs do
+      require File.expand_path(File.join(File.dirname(__FILE__), "..", "new_relic", "agent", "configuration", "default_source.rb"))
+
+      NewRelic::Agent::Configuration::DEFAULTS.each do |key, value|
+        if value[:public]
+          puts "Setting:      #{key}"
+          if value[:type] == NewRelic::Agent::Configuration::Boolean
+            puts "Type:         Boolean"
+          else
+            puts "Type:         #{value[:type]}"
+          end
+          puts 'Description:  ' + value[:description]
+          puts "-" * (value[:description].length + 14)
+        end
+      end
+    end
+  end
 end

data/newrelic_rpm.gemspec

@@ -9,7 +9,7 @@ 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", "Michael Granger", "Jon Guymon", "Ben Weintraub" ]
+  s.authors = [ "Jason Clark", "Sam Goldstein", "Michael Granger", "Jonan Scheffler", "Ben Weintraub" ]
   s.date = Time.now.strftime('%Y-%m-%d')
   s.description = <<-EOS
 New Relic is a performance management system, developed by New Relic,
@@ -50,6 +50,10 @@ EOS
   s.add_development_dependency 'activerecord-jdbcsqlite3-adapter' if RUBY_PLATFORM == 'java'
   s.add_development_dependency 'jruby-openssl' if RUBY_PLATFORM == 'java'
   s.add_development_dependency 'sequel', '~> 3.46.0'
+  s.add_development_dependency 'pry'
+  s.add_development_dependency 'guard'
+  s.add_development_dependency 'guard-test'
+  s.add_development_dependency 'rb-fsevent', '~> 0.9.1'
 
   # Only sign with our private key if you can find it
   signing_key_path = File.expand_path('~/.ssh/newrelic_rpm-private_key.pem')

data/test/agent_helper.rb

@@ -295,15 +295,6 @@ ensure
   parent.const_set(const_name, removed_constant) if removed_constant
 end
 
-def internet_connection?
-  if ENV['NO_INTERNET']
-    puts " - No internet connection, skipping"
-    false
-  else
-    true
-  end
-end
-
 def with_debug_logging
   orig_logger = NewRelic::Agent.logger
   $stderr.puts '', '---', ''
@@ -313,3 +304,7 @@ def with_debug_logging
 ensure
   NewRelic::Agent.logger = orig_logger
 end
+
+def create_agent_command(args = {})
+  NewRelic::Agent::Commands::AgentCommand.new([-1, { "name" => "command_name", "arguments" => args}])
+end