Merge pull request #1491 from ruby-agent/dev

3.18.0 RC 1

.travis.yml

@@ -10,8 +10,8 @@ sudo: required
 before_install:
   - ./test/script/before_install/revert_rubygems.sh
   - gem --version
-  - ./test/script/before_install/jruby_bundler.sh
   - ./test/script/before_install/gemstash_mirror.sh
+  - ./test/script/before_install/update_bundler.sh
   - bundle --version
 
 install: bundle install
@@ -33,9 +33,10 @@ notifications:
 
 rvm:
   # Run slowest builds first to try and optimize overall cycle time.
-  - jruby-1.7.23 # NOTE: see test/script/before_install/jruby_bundler.sh
+  - jruby-1.7.23
   - jruby-9.1.2.0
-  - 2.3.2
+  - 2.4.0
+  - 2.3.3
   - 2.2.6
   - 2.1.10
   - 2.0.0-p648
@@ -76,32 +77,53 @@ env:
     - TYPE=FUNCTIONAL GROUP=serialization
     - TYPE=FUNCTIONAL GROUP=sinatra
     - TYPE=FUNCTIONAL GROUP=rest
-    - TYPE=FUNCTIONAL GROUP=rake
+    - TYPE=FUNCTIONAL GROUP=background_2
     - TYPE=NULLVERSE
 
 matrix:
   allow_failures:
     - rvm: rbx-2.5.8
+    - rvm: ree
   fast_finish: true
   exclude:
     - rvm: rbx-2.5.8 # Currently hangs
       env: TYPE=FUNCTIONAL GROUP=agent
 
     # Unsupported Rails/Ruby combinations
+    # 2.4
+    - rvm: 2.4.0
+      env: TYPE=UNIT ENVIRONMENT=rails21
+    - rvm: 2.4.0
+      env: TYPE=UNIT ENVIRONMENT=rails22
+    - rvm: 2.4.0
+      env: TYPE=UNIT ENVIRONMENT=rails23
+    - rvm: 2.4.0
+      env: TYPE=UNIT ENVIRONMENT=rails30
+    - rvm: 2.4.0
+      env: TYPE=UNIT ENVIRONMENT=rails31
+    - rvm: 2.4.0
+      env: TYPE=UNIT ENVIRONMENT=rails32
+    - rvm: 2.4.0
+      env: TYPE=UNIT ENVIRONMENT=rails40
+    - rvm: 2.4.0
+      env: TYPE=UNIT ENVIRONMENT=rails41
+    - rvm: 2.4.0
+      env: TYPE=UNIT ENVIRONMENT=rails42
+
     # 2.3
-    - rvm: 2.3.1
+    - rvm: 2.3.3
       env: TYPE=UNIT ENVIRONMENT=rails21
-    - rvm: 2.3.1
+    - rvm: 2.3.3
       env: TYPE=UNIT ENVIRONMENT=rails22
-    - rvm: 2.3.1
+    - rvm: 2.3.3
       env: TYPE=UNIT ENVIRONMENT=rails23
 
     # 2.2
-    - rvm: 2.2.5
+    - rvm: 2.2.6
       env: TYPE=UNIT ENVIRONMENT=rails21
-    - rvm: 2.2.5
+    - rvm: 2.2.6
       env: TYPE=UNIT ENVIRONMENT=rails22
-    - rvm: 2.2.5
+    - rvm: 2.2.6
       env: TYPE=UNIT ENVIRONMENT=rails23
 
     # 2.1

CHANGELOG.md

@@ -1,10 +1,50 @@
 # New Relic Ruby Agent Release Notes #
 
-  ## v3.17.2
+## v3.18.0 ##
 
-  * Compatibility with Ruby 2.4.0-preview3
+  * Ruby 2.4.0 support
 
-  The Ruby agent has been updated to work on Ruby 2.4.0-preview3.
+  The agent is now tested against the official release of ruby 2.4.0,
+  excluding incompatible packages.
+
+  * Agent-based metrics will not be recorded outside of active transactions
+
+  The agent has historically recorded metrics outside of a transaction. In
+  practice, this usually occurs in applications that run background job
+  processors. The agent would record metrics for queries the
+  background job processor is making between transactions. This can lead
+  to display issues on the background overview page and the presence of
+  metrics generated by the background job processor can mask the application
+  generated metrics on the database page. The agent will no longer generate
+  metrics outside of a transaction. Custom metrics recorded using
+  `NewRelic::Agent.record_metric` will continue to be recorded regardless
+  of whether there is an active transaction.
+
+  * Include ControllerInstrumentation module with ActiveSupport.on_load
+
+  The agent will now use the `on_load :action_controller` hook to include
+  the ControllerInstrumentation module in to both the `Base` and `API`
+  classes of ActionController for Rails 5. This ensures that the proper
+  load order is retained, minimizing side-effects of having the agent in
+  an application.
+
+  * Ensure values for revisions on Capistrano deploy notices
+
+  Previously, running the task to look up the changelog could
+  generate an error, if there weren't previous and current revisions
+  defined. This has now been fixed. Thanks Winfield Peterson for the
+  contribution!
+
+  * External Segment Rewrites
+
+  The agent has made internal changes to how it represents segments for
+  external web requests.
+
+## v3.17.2 ##
+
+  * compatibility with ruby 2.4.0-preview3
+
+  the ruby agent has been updated to work on ruby 2.4.0-preview3.
 
   * Early Access Sinatra 2.0 instrumentation
 

Rakefile

@@ -22,27 +22,6 @@ namespace :test do
 
   agent_home = File.expand_path(File.dirname(__FILE__))
 
-  # Agent-specific setup to enforce getting our proper suites directory
-  task :multiverse_setup do
-    ENV["SUITES_DIRECTORY"] = File.expand_path(File.join(File.dirname(__FILE__), 'test', 'multiverse', 'suites'))
-  end
-
-  task :multiverse => :multiverse_setup
-
-  desc "Test the multiverse testing framework by executing tests in test/multiverse/test. Get meta with it."
-  task 'multiverse:self', [:suite, :mode] => [] do |t, args|
-    args.with_defaults(:suite => "", :mode => "")
-    puts ("Testing the multiverse testing framework...")
-    test_files = FileList['test/multiverse/test/*_test.rb']
-    ruby test_files.join(" ")
-  end
-
-  task 'multiverse:prime', [:suite] => [] do |t, args|
-    require File.expand_path(File.join(File.dirname(__FILE__), 'test', 'multiverse', 'lib', 'multiverse', 'environment'))
-    opts = Multiverse::Runner.parse_args(args)
-    Multiverse::Runner.prime(args.suite, opts)
-  end
-
   desc "Run agent performance tests"
   task :performance, [:suite, :name] => [] do |t, args|
     require File.expand_path(File.join(File.dirname(__FILE__), 'test', 'performance', 'lib', 'performance'))