ghazel-newrelic_rpm 3.4.0.2 → 3.5.4

data/vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/servlet_init.rb

@@ -0,0 +1,7 @@
+require 'new_relic/metric_parser/java'
+class NewRelic::MetricParser::ServletInit < NewRelic::MetricParser::Java
+
+  def call_rate_suffix
+    'cpm'
+  end
+end

metadata

@@ -4,59 +4,22 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 3
+  - 5
   - 4
-  - 0
-  - 2
-  version: 3.4.0.2
+  version: 3.5.4
 platform: ruby
 authors: 
-- Bill Kayser
+- Jason Clark
+- Sam Goldstein
 - Jon Guymon
-- Justin George
-- Darin Swanson
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-06-25 00:00:00 -07:00
+date: 2012-12-06 00:00:00 -08:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mocha
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: shoulda
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id003
+dependencies: []
+
 description: |
   New Relic is a performance management system, developed by New Relic,
   Inc (http://www.newrelic.com).  New Relic provides you with deep
@@ -68,25 +31,36 @@ description: |
 email: support@newrelic.com
 executables: 
 - mongrel_rpm
-- newrelic
 - newrelic_cmd
+- newrelic
 extensions: []
 
 extra_rdoc_files: 
 - CHANGELOG
 - LICENSE
-- README.rdoc
+- README.md
+- GUIDELINES_FOR_CONTRIBUTING.md
 - newrelic.yml
 files: 
+- .gitignore
+- .project
+- .travis.yml
 - CHANGELOG
+- GUIDELINES_FOR_CONTRIBUTING.md
+- Gemfile
+- InstallationNotes.md
 - LICENSE
-- README.rdoc
+- README.md
+- Rakefile
 - bin/mongrel_rpm
 - bin/newrelic
 - bin/newrelic_cmd
 - cert/cacert.pem
 - cert/oldsite.pem
 - cert/site.pem
+- config.dot
+- config/database.yml
+- init.rb
 - install.rb
 - lib/conditional_vendored_dependency_detection.rb
 - lib/conditional_vendored_metric_parser.rb
@@ -96,6 +70,12 @@ files:
 - lib/new_relic/agent/browser_monitoring.rb
 - lib/new_relic/agent/busy_calculator.rb
 - lib/new_relic/agent/chained_call.rb
+- lib/new_relic/agent/configuration.rb
+- lib/new_relic/agent/configuration/defaults.rb
+- lib/new_relic/agent/configuration/environment_source.rb
+- lib/new_relic/agent/configuration/manager.rb
+- lib/new_relic/agent/configuration/server_source.rb
+- lib/new_relic/agent/configuration/yaml_source.rb
 - lib/new_relic/agent/database.rb
 - lib/new_relic/agent/error_collector.rb
 - lib/new_relic/agent/instrumentation.rb
@@ -120,11 +100,11 @@ files:
 - lib/new_relic/agent/instrumentation/rails/errors.rb
 - lib/new_relic/agent/instrumentation/rails3/action_controller.rb
 - lib/new_relic/agent/instrumentation/rails3/errors.rb
+- lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb
 - lib/new_relic/agent/instrumentation/resque.rb
 - lib/new_relic/agent/instrumentation/sinatra.rb
 - lib/new_relic/agent/instrumentation/sunspot.rb
 - lib/new_relic/agent/instrumentation/unicorn_instrumentation.rb
-- lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb
 - lib/new_relic/agent/method_tracer.rb
 - lib/new_relic/agent/new_relic_service.rb
 - lib/new_relic/agent/pipe_channel_manager.rb
@@ -141,6 +121,8 @@ files:
 - lib/new_relic/agent/stats_engine/metric_stats.rb
 - lib/new_relic/agent/stats_engine/samplers.rb
 - lib/new_relic/agent/stats_engine/transactions.rb
+- lib/new_relic/agent/thread.rb
+- lib/new_relic/agent/thread_profiler.rb
 - lib/new_relic/agent/transaction_info.rb
 - lib/new_relic/agent/transaction_sample_builder.rb
 - lib/new_relic/agent/transaction_sampler.rb
@@ -151,7 +133,6 @@ files:
 - lib/new_relic/commands/install.rb
 - lib/new_relic/control.rb
 - lib/new_relic/control/class_methods.rb
-- lib/new_relic/control/configuration.rb
 - lib/new_relic/control/frameworks.rb
 - lib/new_relic/control/frameworks/external.rb
 - lib/new_relic/control/frameworks/merb.rb
@@ -173,8 +154,10 @@ files:
 - lib/new_relic/metric_spec.rb
 - lib/new_relic/metrics.rb
 - lib/new_relic/noticed_error.rb
+- lib/new_relic/rack.rb
 - lib/new_relic/rack/browser_monitoring.rb
 - lib/new_relic/rack/developer_mode.rb
+- lib/new_relic/rack/error_collector.rb
 - lib/new_relic/recipes.rb
 - lib/new_relic/stats.rb
 - lib/new_relic/timer_lib.rb
@@ -192,12 +175,93 @@ files:
 - lib/tasks/install.rake
 - lib/tasks/tests.rake
 - newrelic.yml
-- newrelic_rpm.gemspec
+- newrelic_rpm.gemspec.erb
 - recipes/newrelic.rb
 - test/active_record_fixtures.rb
 - test/config/newrelic.yml
 - test/config/test_control.rb
 - test/fixtures/proc_cpuinfo.txt
+- test/intentional_fail.rb
+- test/multiverse/.gitignore
+- test/multiverse/README.md
+- test/multiverse/Rakefile
+- test/multiverse/lib/multiverse/color.rb
+- test/multiverse/lib/multiverse/envfile.rb
+- test/multiverse/lib/multiverse/environment.rb
+- test/multiverse/lib/multiverse/output_collector.rb
+- test/multiverse/lib/multiverse/runner.rb
+- test/multiverse/lib/multiverse/suite.rb
+- test/multiverse/script/run_one
+- test/multiverse/script/runner
+- test/multiverse/suites/active_record/Envfile
+- test/multiverse/suites/active_record/ar_method_aliasing.rb
+- test/multiverse/suites/active_record/config/newrelic.yml
+- test/multiverse/suites/active_record/encoding_test.rb
+- test/multiverse/suites/agent_only/Envfile
+- test/multiverse/suites/agent_only/config/newrelic.yml
+- test/multiverse/suites/agent_only/http_response_code_test.rb
+- test/multiverse/suites/agent_only/marshaling_test.rb
+- test/multiverse/suites/agent_only/method_visibility_test.rb
+- test/multiverse/suites/agent_only/pipe_manager_test.rb
+- test/multiverse/suites/agent_only/service_timeout_test.rb
+- test/multiverse/suites/agent_only/test_trace_method_with_punctuation.rb
+- test/multiverse/suites/agent_only/test_trace_transaction_with_punctuation.rb
+- test/multiverse/suites/agent_only/thread_profiling_test.rb
+- test/multiverse/suites/datamapper/Envfile
+- test/multiverse/suites/datamapper/config/newrelic.yml
+- test/multiverse/suites/datamapper/encoding_test.rb
+- test/multiverse/suites/monitor_mode_false/Envfile
+- test/multiverse/suites/monitor_mode_false/config/newrelic.yml
+- test/multiverse/suites/monitor_mode_false/no_dns_resolv.rb
+- test/multiverse/suites/no_load/Envfile
+- test/multiverse/suites/no_load/config/newrelic.yml
+- test/multiverse/suites/no_load/start_up_test.rb
+- test/multiverse/suites/rails_3_error_tracing/Envfile
+- test/multiverse/suites/rails_3_error_tracing/config/newrelic.yml
+- test/multiverse/suites/rails_3_error_tracing/error_tracing_test.rb
+- test/multiverse/suites/rails_3_gc/Envfile
+- test/multiverse/suites/rails_3_gc/config/newrelic.yml
+- test/multiverse/suites/rails_3_gc/instrumentation_test.rb
+- test/multiverse/suites/rails_3_queue_time/Envfile
+- test/multiverse/suites/rails_3_queue_time/config/newrelic.yml
+- test/multiverse/suites/rails_3_queue_time/queue_time_test.rb
+- test/multiverse/suites/rails_3_views/.gitignore
+- test/multiverse/suites/rails_3_views/Envfile
+- test/multiverse/suites/rails_3_views/app/views/foos/_foo.html.haml
+- test/multiverse/suites/rails_3_views/app/views/test/_a_partial.html.erb
+- test/multiverse/suites/rails_3_views/app/views/test/_mid_partial.html.erb
+- test/multiverse/suites/rails_3_views/app/views/test/_top_partial.html.erb
+- test/multiverse/suites/rails_3_views/app/views/test/deep_partial.html.erb
+- test/multiverse/suites/rails_3_views/app/views/test/haml_view.html.haml
+- test/multiverse/suites/rails_3_views/app/views/test/index.html.erb
+- test/multiverse/suites/rails_3_views/config/newrelic.yml
+- test/multiverse/suites/rails_3_views/view_instrumentation_test.rb
+- test/multiverse/suites/resque/Envfile
+- test/multiverse/suites/resque/config/newrelic.yml
+- test/multiverse/suites/resque/dump.rdb
+- test/multiverse/suites/resque/instrumentation_test.rb
+- test/multiverse/suites/rum_auto_instrumentation/Envfile
+- test/multiverse/suites/rum_auto_instrumentation/config/newrelic.yml
+- test/multiverse/suites/rum_auto_instrumentation/problem_response.html
+- test/multiverse/suites/rum_auto_instrumentation/responses/worst_case_small.html
+- test/multiverse/suites/rum_auto_instrumentation/sanity_test.rb
+- test/multiverse/suites/sinatra/Envfile
+- test/multiverse/suites/sinatra/config/newrelic.yml
+- test/multiverse/suites/sinatra/sinatra_metric_explosion_test.rb
+- test/multiverse/suites/sinatra/sinatra_routes_test.rb
+- test/multiverse/test/multiverse_test.rb
+- test/multiverse/test/suite_examples/one/a/Envfile
+- test/multiverse/test/suite_examples/one/a/a_test.rb
+- test/multiverse/test/suite_examples/one/a/config/newrelic.yml
+- test/multiverse/test/suite_examples/one/b/Envfile
+- test/multiverse/test/suite_examples/one/b/b_test.rb
+- test/multiverse/test/suite_examples/one/b/config/newrelic.yml
+- test/multiverse/test/suite_examples/three/a/Envfile
+- test/multiverse/test/suite_examples/three/a/fail_test.rb
+- test/multiverse/test/suite_examples/three/b/Envfile
+- test/multiverse/test/suite_examples/three/b/win_test.rb
+- test/multiverse/test/suite_examples/two/a/Envfile
+- test/multiverse/test/suite_examples/two/a/fail_test.rb
 - test/new_relic/agent/agent/connect_test.rb
 - test/new_relic/agent/agent/start_test.rb
 - test/new_relic/agent/agent/start_worker_thread_test.rb
@@ -208,6 +272,10 @@ files:
 - test/new_relic/agent/beacon_configuration_test.rb
 - test/new_relic/agent/browser_monitoring_test.rb
 - test/new_relic/agent/busy_calculator_test.rb
+- test/new_relic/agent/configuration/environment_source_test.rb
+- test/new_relic/agent/configuration/manager_test.rb
+- test/new_relic/agent/configuration/server_source_test.rb
+- test/new_relic/agent/configuration/yaml_source_test.rb
 - test/new_relic/agent/database_test.rb
 - test/new_relic/agent/error_collector/notice_error_test.rb
 - test/new_relic/agent/error_collector_test.rb
@@ -236,6 +304,9 @@ files:
 - test/new_relic/agent/stats_engine/metric_stats_test.rb
 - test/new_relic/agent/stats_engine/samplers_test.rb
 - test/new_relic/agent/stats_engine_test.rb
+- test/new_relic/agent/thread_profiler_test.rb
+- test/new_relic/agent/thread_test.rb
+- test/new_relic/agent/threaded_test.rb
 - test/new_relic/agent/transaction_info_test.rb
 - test/new_relic/agent/transaction_sample_builder_test.rb
 - test/new_relic/agent/transaction_sampler_test.rb
@@ -244,20 +315,23 @@ files:
 - test/new_relic/collection_helper_test.rb
 - test/new_relic/command/deployments_test.rb
 - test/new_relic/control/class_methods_test.rb
-- test/new_relic/control/configuration_test.rb
+- test/new_relic/control/frameworks/rails_test.rb
 - test/new_relic/control/logging_methods_test.rb
 - test/new_relic/control_test.rb
 - test/new_relic/delayed_job_injection_test.rb
 - test/new_relic/fake_collector.rb
 - test/new_relic/fake_service.rb
+- test/new_relic/load_test.rb
 - test/new_relic/local_environment_test.rb
 - test/new_relic/metric_data_test.rb
 - test/new_relic/metric_parser/metric_parser_test.rb
 - test/new_relic/metric_spec_test.rb
+- test/new_relic/noticed_error_test.rb
 - test/new_relic/rack/all_test.rb
 - test/new_relic/rack/browser_monitoring_test.rb
 - test/new_relic/rack/developer_mode_helper_test.rb
 - test/new_relic/rack/developer_mode_test.rb
+- test/new_relic/rack/error_collector_test.rb
 - test/new_relic/stats_test.rb
 - test/new_relic/transaction_analysis/segment_summary_test.rb
 - test/new_relic/transaction_analysis_test.rb
@@ -309,6 +383,7 @@ files:
 - vendor/gems/dependency_detection-0.0.1.build/LICENSE
 - vendor/gems/dependency_detection-0.0.1.build/lib/dependency_detection.rb
 - vendor/gems/dependency_detection-0.0.1.build/lib/dependency_detection/version.rb
+- vendor/gems/metric_parser-0.1.0.pre1/.specification
 - vendor/gems/metric_parser-0.1.0.pre1/lib/metric_parser.rb
 - vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser.rb
 - vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/action_mailer.rb
@@ -340,6 +415,7 @@ files:
 - vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/servlet.rb
 - vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/servlet_context_listener.rb
 - vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/servlet_filter.rb
+- vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/servlet_init.rb
 - vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/solr.rb
 - vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/solr_request_handler.rb
 - vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/spring.rb
@@ -352,12 +428,12 @@ files:
 - vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/web_frontend.rb
 - vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/web_service.rb
 - vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/web_transaction.rb
+- newrelic_rpm.gemspec
 has_rdoc: true
 homepage: http://www.github.com/newrelic/rpm
 licenses: []
 
-post_install_message: |
-  
+post_install_message: |+
   PLEASE NOTE:
   
   Developer Mode is now a Rack middleware.
@@ -368,18 +444,16 @@ post_install_message: |
   in a non-Rails application, just add NewRelic::Rack::DeveloperMode to
   your middleware stack.
   
-  If you are using JRuby, we recommend using at least version 1.4 or 
+  If you are using JRuby, we recommend using at least version 1.4 or
   later because of issues with the implementation of the timeout library.
   
   Refer to the README.md file for more information.
   
   Please see http://github.com/newrelic/rpm/blob/master/CHANGELOG
   for a complete description of the features and enhancements available
-  in version 3.4 of the Ruby Agent.
-    
-
+  in this version of the Ruby Agent.
+  
 rdoc_options: 
-- --charset=UTF-8
 - --line-numbers
 - --inline-source
 - --title

data/lib/new_relic/control/configuration.rb

@@ -1,206 +0,0 @@
-module NewRelic
-  class Control
-    # used to contain methods to look up settings from the
-    # configuration located in newrelic.yml
-    module Configuration
-      def settings
-        unless @settings
-          @settings = (@yaml && merge_defaults(@yaml[env])) || {}
-          # At the time we bind the settings, we also need to run this little piece
-          # of magic which allows someone to augment the id with the app name, necessary
-          if self['multi_homed'] && app_names.size > 0
-            if @local_env.dispatcher_instance_id
-              @local_env.dispatcher_instance_id << ":#{app_names.first}"
-            else
-              @local_env.dispatcher_instance_id = app_names.first
-            end
-          end
-
-        end
-        @settings
-      end
-
-      def merge_defaults(settings_hash)
-        s = {
-          'host' => 'collector.newrelic.com',
-          'ssl' => false,
-          'log_level' => 'info',
-          'apdex_t' => 0.5
-        }
-        s.merge! settings_hash if settings_hash
-        # monitor_daemons replaced with agent_enabled
-        s['agent_enabled'] = s.delete('monitor_daemons') if s['agent_enabled'].nil? && s.include?('monitor_daemons')
-        s
-      end
-
-      # Merge the given options into the config options.
-      # They might be a nested hash
-      def merge_options(options, hash=self)
-        options.each do |key, val|
-          case
-          when key == :config then next
-          when val.is_a?(Hash)
-            merge_options(val, hash[key.to_s] ||= {})
-          when val.nil?
-            hash.delete(key.to_s)
-          else
-            hash[key.to_s] = val
-          end
-        end
-      end
-
-      def merge_server_side_config(data)
-        remove_server_controlled_configs
-        config = Hash.new
-        data.each_pair do |key, value|
-          if key.include?('.')
-            key = key.split('.')
-            config[key.first] ||= Hash.new
-            config[key.first][key[1]] = value
-          else
-            config[key] = value
-          end
-        end
-        merge_options(config)
-      end
-
-      def remove_server_controlled_configs
-        settings.delete('transaction_tracer')
-        settings.delete('slow_sql')
-        settings.delete('error_collector')
-        settings.delete('capture_params')
-      end
-
-      def [](key)
-        fetch(key)
-      end
-
-      def []=(key, value)
-        settings[key] = value
-      end
-
-      def fetch(key, default=nil)
-        settings.fetch(key, default)
-      end
-
-      def apdex_t
-        # Always initialized with a default
-        @apdex_t_float ||= fetch('apdex_t').to_f
-      end
-
-      def license_key
-        env_setting = ENV['NEW_RELIC_LICENSE_KEY'] || ENV['NEWRELIC_LICENSE_KEY']
-        fetch('license_key', env_setting)
-      end
-      
-      def capture_params
-        fetch('capture_params')
-      end
-      
-      # True if we are sending data to the server, monitoring production
-      def monitor_mode?
-        fetch('monitor_mode', fetch('enabled'))
-      end
-
-      # True if we are capturing data and displaying in /newrelic
-      def developer_mode?
-        fetch('developer_mode', fetch('developer'))
-      end
-      
-      # whether we should install the
-      # NewRelic::Rack::BrowserMonitoring middleware automatically on
-      # Rails applications
-      def browser_monitoring_auto_instrument?
-        fetch('browser_monitoring', {}).fetch('auto_instrument', true)
-      end
-
-      def multi_threaded?
-        fetch('multi_threaded')
-      end
-
-      def disable_serialization?
-        fetch('disable_serialization', true)
-      end
-      def disable_serialization=(b)
-        self['disable_serialization'] = b
-      end
-      
-      # True if we should view files in textmate
-      def use_textmate?
-        fetch('textmate')
-      end
-      
-      # defaults to 2MiB
-      def post_size_limit
-        fetch('post_size_limit', 2 * 1024 * 1024)
-      end
-
-      # Configuration option of the same name to indicate that we should connect
-      # to New Relic synchronously on startup.  This means when the agent is loaded it
-      # won't return without trying to set up the server connection at least once
-      # which can make startup take longer.  Defaults to false.
-      def sync_startup
-        fetch('sync_startup', false)
-      end
-
-      # Configuration option of the same name to indicate that we should flush
-      # data to the server on exiting.  Defaults to true.
-      def send_data_on_exit
-        fetch('send_data_on_exit', true)
-      end
-
-      def dispatcher_instance_id
-        self['dispatcher_instance_id'] || @local_env.dispatcher_instance_id
-      end
-
-      def dispatcher
-        (self['dispatcher'] && self['dispatcher'].to_sym) || @local_env.dispatcher
-      end
-      def app_names
-        case self['app_name']
-        when Array then self['app_name']
-        when String then self['app_name'].split(';')
-        else [ env ]
-        end
-      end
-      def validate_seed
-        self['validate_seed'] || ENV['NR_VALIDATE_SEED']
-      end
-      def validate_token
-        self['validate_token'] || ENV['NR_VALIDATE_TOKEN']
-      end
-      
-      def use_ssl?
-        @use_ssl = fetch('ssl', false) unless @use_ssl
-        @use_ssl
-      end
-      
-      def log_file_path
-        fetch('log_file_path', 'log/')
-      end
-      
-      # only verify certificates if you're very sure you want this
-      # level of security, it includes possibly app-crashing dns
-      # lookups every connection to the server
-      def verify_certificate?
-        unless @verify_certificate
-          unless use_ssl?
-            @verify_certificate = false
-          else
-            @verify_certificate = fetch('verify_certificate', false)
-          end
-        end
-        @verify_certificate
-      end
-
-      def disable_backtrace_cleanup?
-        fetch('disable_backtrace_cleanup')
-      end
-
-      def has_slow_sql_config?
-        self['slow_sql'] && self['slow_sql'].has_key?('enabled')
-      end
-    end
-    include Configuration
-  end
-end