newrelic_rpm 8.10.0 → 8.10.1

data/lib/tasks/instrumentation_generator/TODO.md

@@ -0,0 +1,33 @@
+# TODO
+
+# - [X] Create instrumentation file
+
+# - [X] Create chain file
+
+# - [X] Create prepend file
+
+# - [X] Create dependency detection file
+
+# - [X] Add config to default source
+
+# - [X] Create multiverse suite
+
+# - [X] Create Envfile
+
+# - [X] Create test file with examples
+
+# - [X] Create option for method names to instrument
+
+# - [X] Add entry to newrelic.yml
+
+# - [ ] Append a new method to instrument to an existing instrumentation class (with tests?)
+
+# - [ ] Documentation: examples of what to add in each gap
+
+# - [ ] Good examples of tests, instrumentation, etc. as comments
+
+# - [ ] Handle multi-word gem names (camel case for classes, handle hyphens, concurrent-ruby as example)
+
+# - [ ] Make sure multiple arguments can be passed to the command line
+
+# - [ ] Add tests

data/lib/tasks/instrumentation_generator/instrumentation.thor

@@ -0,0 +1,96 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
+
+require_relative '../../new_relic/language_support'
+require 'thor'
+
+class Instrumentation < Thor
+  include Thor::Actions
+
+  INSTRUMENTATION_ROOT = 'lib/new_relic/agent/instrumentation/'
+  MULTIVERSE_SUITE_ROOT = 'test/multiverse/suites/'
+  DEFAULT_SOURCE_LOCATION = 'lib/new_relic/agent/configuration/default_source.rb'
+
+  desc('scaffold NAME', 'Scaffold the required files for adding new instrumentation')
+  long_desc <<-LONGDESC
+    `instrumentation scaffold` requires one parameter by default: the name of the
+    library or class you are instrumenting. This task generates the basic
+    file structure needed to add new instrumentation to the Ruby agent.
+  LONGDESC
+
+  source_root(File.dirname(__FILE__))
+
+  option :method,
+    default: 'method_to_instrument',
+    desc: 'The method you would like to prepend or chain instrumentation onto'
+  option :args,
+    default: '*args',
+    desc: 'The arguments associated with the original method'
+
+  def scaffold(name)
+    @name = name
+    @method = options[:method] if options[:method]
+    @args = options[:args] if options[:args]
+    @class_name = ::NewRelic::LanguageSupport.camelize(name)
+    base_path = "#{INSTRUMENTATION_ROOT}#{name.downcase}"
+    empty_directory(base_path)
+
+    ['chain', 'instrumentation', 'prepend'].each do |file|
+      template("templates/#{file}.tt", "#{base_path}/#{file}.rb")
+    end
+
+    template('templates/dependency_detection.tt', "#{base_path}.rb")
+    create_configuration(name)
+    create_tests(name)
+  end
+
+  desc 'add_new_method NAME', 'Inserts a new method into an existing piece of instrumentation'
+
+  option :method, required: true, desc: 'The name of the method to instrument'
+  option :args, default: '*args', desc: 'The arguments associated with the instrumented method'
+
+  def add_new_method(name, method_name)
+    # Verify that existing instrumentation exists
+    # if it doesn't, should we just call the #scaffold method instead since we have all the stuff
+    # otherwise, inject the new method into the instrumentation matching the first arg
+    # add to only chain, instrumentation, prepend
+    # move the method content to a partial
+  end
+
+  private
+
+  def create_tests(name)
+    @name = name
+    @instrumentation_method_global_erb_snippet = '<%= $instrumentation_method %>'
+    base_path = "#{MULTIVERSE_SUITE_ROOT}#{@name.downcase}"
+    empty_directory(base_path)
+    template('templates/Envfile.tt', "#{base_path}/Envfile")
+    template('templates/test.tt', "#{base_path}/#{@name.downcase}_instrumentation_test.rb")
+
+    empty_directory("#{base_path}/config")
+    template('templates/newrelic.yml.tt', "#{base_path}/config/newrelic.yml")
+  end
+
+  def create_configuration(name)
+    config = <<-CONFIG
+        :'instrumentation.#{name.downcase}' => {
+          :default => 'auto',
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => 'Controls auto-instrumentation of the #{name.downcase} library at start up. May be one of [auto|prepend|chain|disabled].'
+        },
+    CONFIG
+    insert_into_file(
+      DEFAULT_SOURCE_LOCATION,
+      config,
+      after: ":description => 'Controls auto-instrumentation of bunny at start up.  May be one of [auto|prepend|chain|disabled].'
+        },\n"
+    )
+  end
+end
+
+Instrumentation.start(ARGV)

data/lib/tasks/instrumentation_generator/templates/Envfile.tt

@@ -0,0 +1,10 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
+
+instrumentation_methods :chain, :prepend
+
+gemfile <<-RB
+  gem '<%= @name.downcase %>'
+RB

data/lib/tasks/instrumentation_generator/templates/chain.tt

@@ -0,0 +1,22 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
+
+module NewRelic::Agent::Instrumentation
+  module <%= @class_name %>
+    def self.instrument!
+      ::<%= @class_name %>.class_eval do
+        include NewRelic::Agent::Instrumentation::<%= @class_name %>
+
+        alias_method(:<%= @method.downcase %>_without_new_relic, :<%= @method.downcase %>)
+
+        def <%= @method.downcase %><%= "(#{@args})" unless @args.empty? %>
+          <%= @method.downcase %>_with_tracing<%= "(#{@args})" unless @args.empty? %> do
+            <%= @method.downcase %>_without_new_relic<%= "(#{@args})" unless @args.empty? %>
+          end
+        end
+      end
+    end
+  end
+end

data/lib/tasks/instrumentation_generator/templates/chain_method.tt

@@ -0,0 +1,7 @@
+alias_method :<%= @method.downcase %>_without_new_relic, :<%= @method.downcase %>
+
+def <%= @method.downcase %><%= "(#{@args})" unless @args.empty? %>
+  <%= @method.downcase %>_with_tracing<%= "(#{@args})" unless @args.empty? %> do
+    <%= @method.downcase %>_without_new_relic<%= "(#{@args})" unless @args.empty? %>
+  end
+end

data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt

@@ -0,0 +1,30 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
+
+require_relative '<%= @name.downcase %>/instrumentation'
+require_relative '<%= @name.downcase %>/chain'
+require_relative '<%= @name.downcase %>/prepend'
+
+DependencyDetection.defer do
+  named :<%= @name.match?(/\-|\_/) ? "'#{@name.downcase}'" : @name.downcase %>
+
+  depends_on do
+    # The class that needs to be defined to prepend/chain onto. This can be used
+    # to determine whether the library is installed.
+    defined?(::<%= @class_name %>)
+    # Add any additional requirements to verify whether this instrumentation
+    # should be installed
+  end
+
+  executes do
+    ::NewRelic::Agent.logger.info('Installing <%= @name.downcase %> instrumentation')
+
+    if use_prepend?
+      prepend_instrument ::<%= @class_name %>, NewRelic::Agent::Instrumentation::<%= @class_name %>::Prepend
+    else
+      chain_instrument NewRelic::Agent::Instrumentation::<%= @class_name %>
+    end
+  end
+end

data/lib/tasks/instrumentation_generator/templates/instrumentation.tt

@@ -0,0 +1,13 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
+
+module NewRelic::Agent::Instrumentation
+  module <%= @class_name %>
+
+    def <%= @method.downcase %>_with_tracing<%= "(#{@args})" unless @args.empty? %>
+      # add instrumentation content here
+    end
+  end
+end

data/lib/tasks/instrumentation_generator/templates/instrumentation_method.tt

@@ -0,0 +1,3 @@
+def <%= @method.downcase %>_with_tracing<%= "(#{@args})" unless @args.empty? %>
+  # add instrumentation content here
+end

data/lib/tasks/instrumentation_generator/templates/newrelic.yml.tt

@@ -0,0 +1,19 @@
+---
+development:
+  error_collector:
+    enabled: true
+  apdex_t: 0.5
+  monitor_mode: true
+  license_key: bootstrap_newrelic_admin_license_key_000
+  instrumentation:
+    <%= @name.downcase %>: <%= @instrumentation_method_global_erb_snippet %>
+  app_name: test
+  log_level: debug
+  host: 127.0.0.1
+  api_host: 127.0.0.1
+  transaction_trace:
+    record_sql: obfuscated
+    enabled: true
+    stack_trace_threshold: 0.5
+    transaction_threshold: 1.0
+  capture_params: false

data/lib/tasks/instrumentation_generator/templates/prepend.tt

@@ -0,0 +1,14 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
+
+module NewRelic::Agent::Instrumentation
+  module <%= @class_name %>::Prepend
+    include NewRelic::Agent::Instrumentation::<%= @class_name %>
+
+    def <%= @method.downcase %><%= "(#{@args})" unless @args.empty? %>
+      <%= @method.downcase %>_with_tracing<%= "(#{@args})" unless @args.empty? %> { super }
+    end
+  end
+end

data/lib/tasks/instrumentation_generator/templates/prepend_method.tt

@@ -0,0 +1,3 @@
+def <%= @method.downcase %><%= "(#{@args})" unless @args.empty? %>
+  <%= @method.downcase %>_with_tracing<%= "(#{@args})" unless @args.empty? %> { super }
+end

data/lib/tasks/instrumentation_generator/templates/test.tt

@@ -0,0 +1,16 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
+
+class <%= @class_name %>InstrumentationTest < Minitest::Test
+  def setup
+    @stats_engine = NewRelic::Agent.instance.stats_engine
+  end
+
+  def teardown
+    NewRelic::Agent.instance.stats_engine.clear_stats
+  end
+
+  # Add tests Here
+end

data/newrelic_rpm.gemspec

@@ -22,7 +22,7 @@ Gem or plugin, hosted on
 https://github.com/newrelic/newrelic-ruby-agent/
   EOS
   s.email = "support@newrelic.com"
-  s.executables = ["mongrel_rpm", "newrelic_cmd", "newrelic", "nrdebug"]
+  s.executables = ["newrelic_cmd", "newrelic", "nrdebug"]
   s.extra_rdoc_files = [
     "CHANGELOG.md",
     "LICENSE",
@@ -47,23 +47,19 @@ https://github.com/newrelic/newrelic-ruby-agent/
   s.homepage = "https://github.com/newrelic/rpm"
   s.require_paths = ["lib"]
   s.summary = "New Relic Ruby Agent"
-  s.add_development_dependency 'rake', '12.3.3'
-  s.add_development_dependency 'rb-inotify', '0.9.10' # locked to support < Ruby 2.3 (and listen 3.0.8)
-  s.add_development_dependency 'listen', '3.0.8' # locked to support < Ruby 2.3
-  s.add_development_dependency 'minitest', '4.7.5'
-  s.add_development_dependency 'minitest-stub-const', '0.6'
-  s.add_development_dependency 'mocha', '~> 1.9.0'
-  s.add_development_dependency 'yard'
-  s.add_development_dependency 'pry-nav', '~> 0.3.0'
-  s.add_development_dependency 'pry-stack_explorer', '~> 0.4.9'
-  s.add_development_dependency 'guard', '~> 2.16.0'
-  s.add_development_dependency 'guard-minitest', '~> 2.4.0'
   s.add_development_dependency 'bundler'
+  s.add_development_dependency 'feedjira', '3.2.1' unless ENV['CI'] || RUBY_VERSION < '2.5' # for Gabby
+  s.add_development_dependency 'httparty' unless ENV['CI'] # for perf tests and Gabby
+  s.add_development_dependency 'minitest', '5.3.3'
+  s.add_development_dependency 'minitest-stub-const', '0.6'
+  s.add_development_dependency 'mocha', '~> 1.14.0'
+  s.add_development_dependency 'pry' unless ENV['CI']
+  s.add_development_dependency 'rake', '12.3.3'
   s.add_development_dependency 'rubocop'
+  s.add_development_dependency 'rubocop-minitest'
   s.add_development_dependency 'rubocop-performance'
-  if RUBY_VERSION >= '2.7.0'
-    s.add_development_dependency 'simplecov'
-    s.add_development_dependency 'simplecov_json_formatter'
-  end
-  s.add_development_dependency 'httparty'
+  s.add_development_dependency 'rubocop-rake' if RUBY_VERSION >= '2.4.0'
+  s.add_development_dependency 'simplecov' if RUBY_VERSION >= '2.7.0'
+  s.add_development_dependency 'thor'
+  s.add_development_dependency 'yard'
 end

data/test/agent_helper.rb

@@ -14,20 +14,6 @@ rescue LoadError
   # NOP -- Net::HTTP::STATUS_CODES was introduced in Ruby 2.5
 end
 
-module MiniTest
-  module Assertions
-    # The failure message is backwards.  This patch reverses the message
-    # Note: passing +msg+ caused two failure messages to be shown on failure
-    # and was more confusing than patching here.
-    def assert_match(matcher, obj, msg = nil)
-      msg = message(msg) { "Expected #{mu_pp(obj)} to match #{mu_pp(matcher)}" }
-      assert_respond_to matcher, :"=~"
-      matcher = Regexp.new(Regexp.escape(matcher)) if String === matcher
-      assert matcher =~ obj, msg
-    end
-  end
-end
-
 class ArrayLogDevice
   def initialize(array = [])
     @array = array
@@ -125,7 +111,7 @@ end
 
 unless defined? assert_empty
   def assert_empty(collection, msg = nil)
-    assert collection.empty?, msg
+    assert_empty collection, msg
   end
 end
 
@@ -430,9 +416,9 @@ end
 # may be supplied.
 def with_segment(*args, &blk)
   segment = nil
-  txn = in_transaction(*args) do |txn|
-    segment = txn.current_segment
-    yield(segment, txn)
+  txn = in_transaction(*args) do |t|
+    segment = t.current_segment
+    yield(segment, t)
   end
   [segment, txn]
 end
@@ -916,7 +902,7 @@ def assert_event_attributes(event, test_name, expected_attributes, non_expected_
   event_attrs.each do |name, actual_value|
     msg << "  #{name}: #{actual_value.inspect}\n"
   end
-  assert(incorrect_attributes.empty?, msg)
+  assert_empty(incorrect_attributes, msg)
 
   non_expected_attributes.each do |name|
     refute event_attrs[name], "Found value '#{event_attrs[name]}' for attribute '#{name}', but expected nothing in #{test_name}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 8.10.0
+  version: 8.10.1
 platform: ruby
 authors:
 - Tanna McClure
@@ -11,64 +11,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-17 00:00:00.000000000 Z
+date: 2022-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 12.3.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 12.3.3
-- !ruby/object:Gem::Dependency
-  name: rb-inotify
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.10
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.10
-- !ruby/object:Gem::Dependency
-  name: listen
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.8
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.8
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.7.5
+        version: 5.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.7.5
+        version: 5.3.3
 - !ruby/object:Gem::Dependency
   name: minitest-stub-const
   requirement: !ruby/object:Gem::Requirement
@@ -89,86 +61,44 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.14.0
 - !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-nav
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-- !ruby/object:Gem::Dependency
-  name: pry-stack_explorer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.9
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.9
-- !ruby/object:Gem::Dependency
-  name: guard
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.16.0
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.16.0
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
-  name: guard-minitest
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -182,7 +112,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -196,7 +126,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-performance
+  name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -224,7 +154,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov_json_formatter
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -238,7 +168,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -260,7 +190,6 @@ description: |
   https://github.com/newrelic/newrelic-ruby-agent/
 email: support@newrelic.com
 executables:
-- mongrel_rpm
 - newrelic_cmd
 - newrelic
 - nrdebug
@@ -275,6 +204,7 @@ files:
 - ".gitignore"
 - ".project"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".simplecov"
 - ".snyk"
 - ".yardopts"
@@ -289,7 +219,7 @@ files:
 - README.md
 - Rakefile
 - THIRD_PARTY_NOTICES.md
-- bin/mongrel_rpm
+- Thorfile
 - bin/newrelic
 - bin/newrelic_cmd
 - bin/nrdebug
@@ -647,6 +577,19 @@ files:
 - lib/tasks/config.text.erb
 - lib/tasks/coverage_report.rake
 - lib/tasks/install.rake
+- lib/tasks/instrumentation_generator/README.md
+- lib/tasks/instrumentation_generator/TODO.md
+- lib/tasks/instrumentation_generator/instrumentation.thor
+- lib/tasks/instrumentation_generator/templates/Envfile.tt
+- lib/tasks/instrumentation_generator/templates/chain.tt
+- lib/tasks/instrumentation_generator/templates/chain_method.tt
+- lib/tasks/instrumentation_generator/templates/dependency_detection.tt
+- lib/tasks/instrumentation_generator/templates/instrumentation.tt
+- lib/tasks/instrumentation_generator/templates/instrumentation_method.tt
+- lib/tasks/instrumentation_generator/templates/newrelic.yml.tt
+- lib/tasks/instrumentation_generator/templates/prepend.tt
+- lib/tasks/instrumentation_generator/templates/prepend_method.tt
+- lib/tasks/instrumentation_generator/templates/test.tt
 - lib/tasks/multiverse.rake
 - lib/tasks/multiverse.rb
 - lib/tasks/newrelic.rb

data/bin/mongrel_rpm

@@ -1,33 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-require 'rubygems'
-require 'rack'
-require 'rack/handler/mongrel'
-require 'optparse'
-
-port = 3000
-options = {}
-appname = nil
-OptionParser.new do |opts|
-  opts.banner = "Usage: #{File.basename($0)} [options] [app_name]"
-  opts.on("-p", "--port=port", Integer, "default: #{port}") { |port| }
-  opts.on("--[no-]logging", "turn off request logging") { |l| options[:logging] = l }
-  opts.on("--license=license_key", "override license key") { |l| options[:license_key] = l }
-  opts.on("--install", "install a newrelic.yml template") { |l| options[:install] = true }
-  opts.separator("")
-  opts.separator("app_name is the name of the application where the metrics will be stored")
-  opts.separator("")
-  # The rackup file references this var
-  appname = opts.parse!(ARGV.clone).first
-end
-
-options[:app_name] = appname if appname
-
-ru_file = File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "new_relic", "rack", "mongrel_rpm.ru"))
-rackup_code = File.read(ru_file)
-builder = Rack::Builder.new { eval(rackup_code, binding, ru_file) }
-
-options = {:Host => '127.0.0.1', :Port => port}
-Rack::Handler::Mongrel.run(builder.to_app, options) do |server|
-  NewRelic::Agent.logger.info("Started Mongrel listening for '#{NewRelic::Control.instance.app_names.join(" and ")}' data at #{server.host}:#{server.port}")
-end