newrelic_rpm 3.5.8.72 → 3.6.0.74.beta

data/lib/new_relic/control/instance_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.
+
 require 'new_relic/language_support'
 require 'new_relic/agent/agent_logger'
 

data/lib/new_relic/control/instrumentation.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 methods that relate to adding and executing files that

data/lib/new_relic/control/profiling.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 Profiling

data/lib/new_relic/control/server_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
 

data/lib/new_relic/control.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 'yaml'
 require 'conditional_vendored_metric_parser'
 require 'conditional_vendored_dependency_detection'

data/lib/new_relic/delayed_job_injection.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 'dependency_detection'
 # This installs some code to manually start the agent when a delayed
 # job worker starts.  It's not really instrumentation.  It's more like

data/lib/new_relic/helper.rb

@@ -1,4 +1,7 @@
-#encoding: utf-8
+# 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
   # A singleton for shared generic helper methods

data/lib/new_relic/language_support.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::LanguageSupport
   extend self
 

data/lib/new_relic/latest_changes.rb

@@ -1,4 +1,8 @@
 #!/usr/bin/ruby
+# 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 LatestChanges
@@ -21,7 +25,7 @@ EOS
           version_count += 1
         end
         break if version_count >= 2
-        changes << line.chomp
+        changes << line.sub(/^  /, "").chomp
       end
 
       changes << footer

data/lib/new_relic/local_environment.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 'set'
 require 'new_relic/version'
 
@@ -241,7 +245,7 @@ module NewRelic
     # Although you can override the dispatcher with NEWRELIC_DISPATCHER this
     # is not advisable since it implies certain api's being available.
     def discover_dispatcher
-      dispatchers = %w[passenger torquebox trinidad glassfish resque thin mongrel litespeed webrick fastcgi unicorn]
+      dispatchers = %w[passenger torquebox trinidad glassfish resque sidekiq thin mongrel litespeed webrick fastcgi rainbows unicorn]
       while dispatchers.any? && @discovered_dispatcher.nil?
         send 'check_for_'+(dispatchers.shift)
       end
@@ -315,6 +319,13 @@ module NewRelic
       end
     end
 
+    def check_for_rainbows
+      if (defined?(::Rainbows) && defined?(::Rainbows::HttpServer)) && working_jruby?
+        v = find_class_in_object_space(::Rainbows::HttpServer)
+        @discovered_dispatcher = :rainbows if v
+      end
+    end
+
     def check_for_resque
       using_resque = (
         defined?(::Resque) &&
@@ -324,6 +335,12 @@ module NewRelic
       @discovered_dispatcher = :resque if using_resque
     end
 
+    def check_for_sidekiq
+      if defined?(::Sidekiq) && File.basename($0) == 'sidekiq'
+        @discovered_dispatcher = :sidekiq
+      end
+    end
+
     def check_for_thin
       if defined?(::Thin) && defined?(::Thin::Server)
         # This case covers the thin web dispatcher

data/lib/new_relic/merbtasks.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.
+
 namespace :newrelic do
   desc "Install the developer mode newrelic.yml file"
   task :default do

data/lib/new_relic/metric_data.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/coerce'
 
 module NewRelic

data/lib/new_relic/metric_spec.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 struct uniquely defines a metric, optionally inside
 # the call scope of another metric
 class NewRelic::MetricSpec

data/lib/new_relic/metrics.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 Metrics
     CONTROLLER = "Controller"

data/lib/new_relic/noticed_error.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/helper'
 
 # This class encapsulates an error that was noticed by New Relic in a managed app.

data/lib/new_relic/okjson.rb

@@ -1,4 +1,7 @@
-# encoding: UTF-8
+# encoding: utf-8
+# This file is distributed under okjson's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 #
 # Copyright 2011, 2012 Keith Rarick
 #

data/lib/new_relic/rack/agent_hooks.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/event_listener'
 
 module NewRelic::Rack

data/lib/new_relic/rack/browser_monitoring.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 'rack'
 
 module NewRelic::Rack

data/lib/new_relic/rack/developer_mode.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 'rack'
 require 'rack/request'
 require 'rack/response'

data/lib/new_relic/rack/error_collector.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::Rack
   class ErrorCollector
     def initialize(app, options={})

data/lib/new_relic/rack.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 Rack
   end

data/lib/new_relic/recipes.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.
+
 # When installed as a plugin this is loaded automatically.
 #
 # When installed as a gem, you need to add

data/lib/new_relic/timer_lib.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under Ruby's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 # Copyright:  (C) 2008 David Vollbracht & Philippe Hanrigou
 
 # This code was borrowed from the system_timer gem under the terms

data/lib/new_relic/transaction_analysis/segment_summary.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 TransactionAnalysis
     # summarizes performance data for all calls to segments

data/lib/new_relic/transaction_analysis.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/transaction_analysis/segment_summary'
 # Add these methods to TransactionSample that enable performance analysis in the user interface.
 module NewRelic

data/lib/new_relic/transaction_sample/composite_segment.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/transaction_sample'
 require 'new_relic/transaction_sample/segment'
 require 'new_relic/transaction_sample/summary_segment'

data/lib/new_relic/transaction_sample/fake_segment.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/transaction_sample'
 require 'new_relic/transaction_sample/segment'
 module NewRelic

data/lib/new_relic/transaction_sample/segment.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/transaction_sample'
 
 module NewRelic

data/lib/new_relic/transaction_sample/summary_segment.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/transaction_sample'
 require 'new_relic/transaction_sample/segment'
 module NewRelic

data/lib/new_relic/transaction_sample.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 'base64'
 
 require 'new_relic/transaction_sample/segment'

data/lib/new_relic/url_rule.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.
+
 # Represents url mapping rules stored on the server.  These rules should be applied
 # to URLs which are not normalized into controller class/action by Rails routes.
 # Insantiated strictly by Marshal.

data/lib/new_relic/version.rb

@@ -1,4 +1,8 @@
 #!/usr/bin/ruby
+# 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 VERSION #:nodoc:
@@ -7,8 +11,8 @@ module NewRelic
     end
 
     MAJOR = 3
-    MINOR = 5
-    TINY  = 8
+    MINOR = 6
+    TINY  = 0
 
     begin
       require File.join(File.dirname(__FILE__), 'build')

data/lib/newrelic_rpm.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.
+
 # == New Relic Initialization
 #
 # When installed as a gem, you can activate the New Relic agent one of the following ways:

data/lib/tasks/all.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 required to load in task definitions from merb
 Dir.glob(File.join(File.dirname(__FILE__),'*.rake')) do |file|
   load file

data/recipes/newrelic.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.
+
 # The capistrano recipes in plugins are automatically
 # loaded from here.  From gems, they are available from
 # the lib directory.  We have to make them available from

data/test/active_record_fixtures.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.
+
 # Some test models
 # These will get created and dropped during the active record tests
 # Be sure and call setup and teardown

data/test/config/test_control.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/control/frameworks/rails3'
 require 'new_relic/control/frameworks/rails4'

data/test/intentional_fail.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 'test/unit'
 class IntentionalFail < Test::Unit::TestCase
 

data/test/multiverse/lib/multiverse/color.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 Multiverse
   module Color
     def red(string)

data/test/multiverse/lib/multiverse/envfile.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 Multiverse
   # Reads an envfile.rb and converts it into gemfiles that can be used by
   # bundler

data/test/multiverse/lib/multiverse/environment.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 'test/unit'
 module Multiverse

data/test/multiverse/lib/multiverse/output_collector.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 module is responsible for intercepting output made through various stdlib
 # calls (i.e. puts, print, etc.) and printing summary information (e.g. a list
 # of failing tests) at the end of the process.