newrelic_rpm 6.1.0.352 → 6.2.0.354

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73929ba01fea0db2f54b9977a41dfc7b710d51f38b9d07a8f0d96e8525a8574a
-  data.tar.gz: cb28508e22221fe2c0869a247ee9796ea9a07f595ca51679eee9fd5b75027d1a
+  metadata.gz: 61ee707dd3738565b01b05857ed9ae7de00a6ab3e9cc0522ba5d651819c24634
+  data.tar.gz: e8b630ad8f1c69a51dae797a046f90bd8d87683dcc4a2fb97f2960dcf6f90b4b
 SHA512:
-  metadata.gz: 0e8c015d61f300f5460a8c2a4e38d8baf74917529d4f17bc8218114e2a71b6b8cb9cdc520b68e301f2a6733b8026f6bf4815709374ba6c7de6fc60ec622d9775
-  data.tar.gz: d61094c98597fe88fb0d947b9ab6ea68f450e89dc592ab29116a000f06ca2acea7958a7d130619eecad1e94b908fd201e811cd6a27e5936db65876dcaaa489cf
+  metadata.gz: 9ee286b42523ceca71287a9463a6e6a66e825f27956fd460c72aacb640780a20db0e5c688951f2d0a4bb648a4d8bd5dad98220d1f5a98e9abcc51843bd71aa1e
+  data.tar.gz: 1a5070f668fd0b4f802ee71fe3909c123d0b38a53a1491ec07a496177cf9f392015c95ae62284b086a4fd27952fa0e62a7d720813de09449f5b4b8b8c4331a5e

data/.gitignore

@@ -25,4 +25,5 @@ lib/new_relic/build.rb
 .bundle
 .yardoc
 artifacts/
+test/performance/log/
 test/performance/script/log/

data/.travis.yml

@@ -10,15 +10,16 @@ sudo: required
 
 before_install:
   # RUBY-2072 Prevent Travis setup failure before our test even starts
+  - jdk_switcher use oraclejdk8
   - sudo rm -f /etc/apt/sources.list.d/travis_ci_zeromq3.list
   - gem --version
   - ./test/script/before_install/update_rubygems.sh
-  - gem uninstall bundler -a -x
+  - rvm @global do gem uninstall bundler --all --executables || true
   - gem install bundler -v=1.17.3
   - ./test/script/before_install/gemstash_mirror.sh
-  - bundle _1.17.3_ --version
+  - bundle --version
 
-install: bundle _1.17.3_ install
+install: bundle install
 
 addons:
   apt:
@@ -46,9 +47,9 @@ notifications:
 
 rvm:
   # Run slowest builds first to try and optimize overall cycle time.
-  - jruby-9.1.13.0
-  - 2.6.0
-  - 2.5.0
+  - jruby-9.2.6.0
+  - 2.6.1
+  - 2.5.3
   - 2.4.2
   - 2.3.5
   - 2.2.8
@@ -66,11 +67,6 @@ env:
     - TESTOPTS="-v"
     - VERBOSE = 1
   matrix:
-    # RUBY-1668 rails21, rails22, and rails23 are all excluded below
-    - TYPE=UNIT ENVIRONMENT=rails21
-    - TYPE=UNIT ENVIRONMENT=rails22
-    - TYPE=UNIT ENVIRONMENT=rails23
-
     - TYPE=UNIT ENVIRONMENT=rails30
     - TYPE=UNIT ENVIRONMENT=rails31
     - TYPE=UNIT ENVIRONMENT=rails32
@@ -97,48 +93,30 @@ matrix:
   exclude:
     # Unsupported Rails/Ruby combinations
     # 2.6
-    - rvm: 2.6.0
-      env: TYPE=UNIT ENVIRONMENT=rails21
-    - rvm: 2.6.0
-      env: TYPE=UNIT ENVIRONMENT=rails22
-    - rvm: 2.6.0
-      env: TYPE=UNIT ENVIRONMENT=rails23
-    - rvm: 2.6.0
+    - rvm: 2.6.1
       env: TYPE=UNIT ENVIRONMENT=rails30
-    - rvm: 2.6.0
+    - rvm: 2.6.1
       env: TYPE=UNIT ENVIRONMENT=rails31
-    - rvm: 2.6.0
+    - rvm: 2.6.1
       env: TYPE=UNIT ENVIRONMENT=rails32
-    - rvm: 2.6.0
+    - rvm: 2.6.1
       env: TYPE=UNIT ENVIRONMENT=rails40
-    - rvm: 2.6.0
+    - rvm: 2.6.1
       env: TYPE=UNIT ENVIRONMENT=rails41
 
     # 2.5
-    - rvm: 2.5.0
-      env: TYPE=UNIT ENVIRONMENT=rails21
-    - rvm: 2.5.0
-      env: TYPE=UNIT ENVIRONMENT=rails22
-    - rvm: 2.5.0
-      env: TYPE=UNIT ENVIRONMENT=rails23
-    - rvm: 2.5.0
+    - rvm: 2.5.3
       env: TYPE=UNIT ENVIRONMENT=rails30
-    - rvm: 2.5.0
+    - rvm: 2.5.3
       env: TYPE=UNIT ENVIRONMENT=rails31
-    - rvm: 2.5.0
+    - rvm: 2.5.3
       env: TYPE=UNIT ENVIRONMENT=rails32
-    - rvm: 2.5.0
+    - rvm: 2.5.3
       env: TYPE=UNIT ENVIRONMENT=rails40
-    - rvm: 2.5.0
+    - rvm: 2.5.3
       env: TYPE=UNIT ENVIRONMENT=rails41
 
     # 2.4
-    - rvm: 2.4.2
-      env: TYPE=UNIT ENVIRONMENT=rails21
-    - rvm: 2.4.2
-      env: TYPE=UNIT ENVIRONMENT=rails22
-    - rvm: 2.4.2
-      env: TYPE=UNIT ENVIRONMENT=rails23
     - rvm: 2.4.2
       env: TYPE=UNIT ENVIRONMENT=rails30
     - rvm: 2.4.2
@@ -150,78 +128,26 @@ matrix:
     - rvm: 2.4.2
       env: TYPE=UNIT ENVIRONMENT=rails41
 
-    # 2.3
-    - rvm: 2.3.5
-      env: TYPE=UNIT ENVIRONMENT=rails21
-    - rvm: 2.3.5
-      env: TYPE=UNIT ENVIRONMENT=rails22
-    - rvm: 2.3.5
-      env: TYPE=UNIT ENVIRONMENT=rails23
-
-    # 2.2
-    - rvm: 2.2.8
-      env: TYPE=UNIT ENVIRONMENT=rails21
-    - rvm: 2.2.8
-      env: TYPE=UNIT ENVIRONMENT=rails22
-    - rvm: 2.2.8
-      env: TYPE=UNIT ENVIRONMENT=rails23
-
     # 2.1
-    - rvm: 2.1.10
-      env: TYPE=UNIT ENVIRONMENT=rails21
-    - rvm: 2.1.10
-      env: TYPE=UNIT ENVIRONMENT=rails22
-    - rvm: 2.1.10
-      env: TYPE=UNIT ENVIRONMENT=rails23
     - rvm: 2.1.10
       env: TYPE=UNIT ENVIRONMENT=rails50
     - rvm: 2.1.10
       env: TYPE=UNIT ENVIRONMENT=rails51
 
     # 2.0
-    - rvm: 2.0.0-p648
-      env: TYPE=UNIT ENVIRONMENT=rails21
-    - rvm: 2.0.0-p648
-      env: TYPE=UNIT ENVIRONMENT=rails22
-    - rvm: 2.0.0-p648
-      env: TYPE=UNIT ENVIRONMENT=rails23
     - rvm: 2.0.0-p648
       env: TYPE=UNIT ENVIRONMENT=rails50
     - rvm: 2.0.0-p648
       env: TYPE=UNIT ENVIRONMENT=rails51
 
-    # jruby 9.0
-    - rvm: jruby-9.1.13.0
-      env: TYPE=UNIT ENVIRONMENT=rails21
-    - rvm: jruby-9.1.13.0
-      env: TYPE=UNIT ENVIRONMENT=rails22
-    - rvm: jruby-9.1.13.0
-      env: TYPE=UNIT ENVIRONMENT=rails23
-    - rvm: jruby-9.1.13.0
+    # jruby 9.2.6.0 (Compatible with MRI 2.5)
+    - rvm: jruby-9.2.6.0
       env: TYPE=UNIT ENVIRONMENT=rails30
-    - rvm: jruby-9.1.13.0
+    - rvm: jruby-9.2.6.0
       env: TYPE=UNIT ENVIRONMENT=rails31
-    - rvm: jruby-9.1.13.0
+    - rvm: jruby-9.2.6.0
       env: TYPE=UNIT ENVIRONMENT=rails32
-
-  # Travis (and only Travis) has been throwing difficult-to-reproduce
-  # errors in various JRuby tests.  These appeared after a build image
-  # update, and they seem to be unrelated to any agent code changes.
-  # So, we'll allow these specific test runs to fail while we track
-  # the issue (RUBY-1869).
-  #
-  allow_failures:
-    - rvm: jruby-9.1.13.0
+    - rvm: jruby-9.2.6.0
       env: TYPE=UNIT ENVIRONMENT=rails40
-    - rvm: jruby-9.1.13.0
+    - rvm: jruby-9.2.6.0
       env: TYPE=UNIT ENVIRONMENT=rails41
-    - rvm: jruby-9.1.13.0
-      env: TYPE=UNIT ENVIRONMENT=rails42
-    - rvm: jruby-9.1.13.0
-      env: TYPE=UNIT ENVIRONMENT=rails50
-    - rvm: jruby-9.1.13.0
-      env: TYPE=UNIT ENVIRONMENT=rails51
-    - rvm: jruby-9.1.13.0
-      env: TYPE=UNIT ENVIRONMENT=norails
-    - rvm: jruby-9.1.13.0
-      env: TYPE=FUNCTIONAL GROUP=background_2

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # New Relic Ruby Agent Release Notes #
 
+## v6.2.0
+
+  * Bugfix for superfluous `Empty JSON response` error messages
+
+    Version 6.1.0 of the agent frequently logged error messages about an empty 
+    JSON response, when no error had occurred.  These logs no longer appear. 
+
+  * Bugfix for `Unable to calculate elapsed transaction time` warning messages
+
+    Ruby Agent versions 5.4 through 6.1, when running in jruby without 
+    ObjectSpace enabled, would occasionally log a warning indicating that the 
+    agent was unable to calculate the elapsed transaction time.  When this log
+    statement appeared, the affected transactions would not be included in the 
+    data displayed on the capacity analysis page.  These transactions are now 
+    correctly recorded.
+
 ## v6.1.0
 
    * Performance monitoring on Kubernetes

data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb

@@ -31,7 +31,7 @@ module NewRelic
           # we don't expect this to be called more than once, but we're being
           # defensive.
           return if defined?(cached?)
-          if ::ActiveRecord::VERSION::STRING >= "5.1.0"
+          if defined?(::ActiveRecord) && ::ActiveRecord::VERSION::STRING >= "5.1.0"
             def cached?(payload)
               payload.fetch(:cached, false)
             end

data/lib/new_relic/agent/new_relic_service/json_marshaller.rb

@@ -39,7 +39,6 @@ module NewRelic
 
         def load(data)
           if data.nil? || data.empty?
-            ::NewRelic::Agent.logger.error "Empty JSON response from collector: '#{data.inspect}'"
             return nil
           end
 

data/lib/new_relic/agent/transaction_time_aggregator.rb

@@ -2,8 +2,6 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
-require 'objspace'
-
 # This module powers the Busy calculation for the Capacity report in
 # APM (https://rpm.newrelic.com/accounts/.../applications/.../optimize/capacity_analysis).
 #
@@ -102,12 +100,27 @@ module NewRelic
         end
 
         def thread_is_alive?(thread_id)
-          thread = ObjectSpace._id2ref(thread_id)
+          thread = thread_by_id thread_id
           thread && thread.alive?
         rescue StandardError
           false
         end
 
+        # ObjectSpace is faster on MRI, but disabled by default on JRuby for
+        # perfomance reasons. We have two implmentations of `thread_by_id`
+        # based on ruby implementation.
+        if RUBY_ENGINE == 'jruby'
+          def thread_by_id thread_id
+            Thread.list.detect { |t| t.object_id == thread_id }
+          end
+        else
+          require 'objspace'
+
+          def thread_by_id thread_id
+            ObjectSpace._id2ref(thread_id)
+          end
+        end
+
         def set_transaction_start_time(timestamp, thread_id = current_thread)
           @stats[thread_id].transaction_started_at = timestamp
         end
@@ -131,7 +144,9 @@ module NewRelic
         end
 
         def log_missing_elapsed_transaction_time
-          transaction_name = Tracer.current_transaction.best_name
+          transaction_name = Tracer.current_transaction &&
+            Tracer.current_transaction.best_name ||
+              "unknown"
           NewRelic::Agent.logger.warn("Unable to calculate elapsed transaction time for #{transaction_name}")
         end
       end

data/lib/new_relic/version.rb

@@ -11,7 +11,7 @@ module NewRelic
     end
 
     MAJOR = 6
-    MINOR = 1
+    MINOR = 2
     TINY  = 0
 
     begin

data/newrelic_rpm.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.version = NewRelic::VERSION::STRING
   s.required_ruby_version = '>= 2.0.0'
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = [ "Matthew Wear", "Chris Pine", "Erin Dees", "Rachel Klein" ]
+  s.authors = [ "Matthew Wear", "Chris Pine", "Rachel Klein", "Justin Foote" ]
   s.date = Time.now.strftime('%Y-%m-%d')
   s.licenses    = ['New Relic']
   s.description = <<-EOS
@@ -45,15 +45,8 @@ EOS
   s.add_development_dependency 'minitest', '~> 4.7.5'
   s.add_development_dependency 'mocha', '~> 0.13.0'
   s.add_development_dependency 'yard'
-  s.add_development_dependency 'rails', '~> 3.2.13'
-  s.add_development_dependency 'json', '>= 2.0.2' if RUBY_VERSION >= '2.4.0' # possible bundler issue?
   s.add_development_dependency 'pry-nav', '~> 0.2.4'
   s.add_development_dependency 'pry-stack_explorer', '~> 0.4.9'
   s.add_development_dependency 'hometown', '~> 0.2.5'
-
-  if RUBY_PLATFORM == 'java'
-    s.add_development_dependency 'activerecord-jdbcsqlite3-adapter'
-  else
-    s.add_development_dependency 'sqlite3', '~> 1.3.13'
-  end
+  s.add_development_dependency 'bundler', '< 2.0'
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 6.1.0.352
+  version: 6.2.0.354
 platform: ruby
 authors:
 - Matthew Wear
 - Chris Pine
-- Erin Dees
 - Rachel Klein
+- Justin Foote
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-21 00:00:00.000000000 Z
+date: 2019-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -69,34 +69,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.2.13
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.2.13
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
@@ -140,19 +112,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.5
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.3.13
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.3.13
+        version: '2.0'
 description: |
   New Relic is a performance management system, developed by New Relic,
   Inc (http://www.newrelic.com).  New Relic provides you with deep
@@ -489,8 +461,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: New Relic Ruby Agent