newrelic_rpm 6.12.0.367 → 7.0.0

data/lib/new_relic/version.rb

@@ -10,8 +10,8 @@ module NewRelic
       parts.compact.join('.')
     end
 
-    MAJOR = 6
-    MINOR = 12
+    MAJOR = 7
+    MINOR = 0
     TINY  = 0
 
     begin

data/lib/tasks/multiverse.rb

@@ -63,6 +63,14 @@ namespace :test do
       end
     end
 
+    def remove_generated_gemfile_lockfiles
+      file_path = File.expand_path "test/environments"
+      Dir.glob(File.join file_path, "**", "Gemfile.lock").each do |fn|
+        puts "Removing #{fn.gsub(file_path,'.../environments')}"
+        FileUtils.rm fn
+      end
+    end
+
     task :env do
       # ENV['SUITES_DIRECTORY'] = File.expand_path('../../test/multiverse/suites', __FILE__)
       require File.expand_path('../../../test/multiverse/lib/multiverse', __FILE__)
@@ -71,6 +79,7 @@ namespace :test do
     task :clobber do
       remove_local_multiverse_databases
       remove_generated_gemfiles
+      remove_generated_gemfile_lockfiles
     end
 
     desc "Clean cached gemfiles from Bundler.bundle_path"

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 = [ "Rachel Klein", "Tanna McClure", "Michael Lang" ]
+  s.authors = [ "Aaron Huntsman", "Tanna McClure", "Michael Lang" ]
   s.date = Time.now.strftime('%Y-%m-%d')
   s.licenses    = ['Apache-2.0']
   s.description = <<-EOS
@@ -28,7 +28,6 @@ EOS
     "LICENSE",
     "README.md",
     "CONTRIBUTING.md",
-    "CODE_OF_CONDUCT.md",
     "newrelic.yml"
   ]
 
@@ -40,7 +39,7 @@ EOS
     "homepage_uri"      => "https://newrelic.com/ruby",
   }
 
-  file_list = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|infinite_tracing)/(?!agent_helper.rb)}) }
+  file_list = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|infinite_tracing|\.github)/(?!agent_helper.rb)}) }
   build_file_path = 'lib/new_relic/build.rb'
   file_list << build_file_path if File.exist?(build_file_path)
   s.files = file_list

data/test/agent_helper.rb

@@ -133,6 +133,12 @@ def assert_equal_unordered left, right
   left.each { |element| assert_includes(right, element) }
 end
 
+def assert_log_contains(log, message)
+  lines = log.array
+  failure_message = "Did not find '#{message}' in log. Log contained:\n#{lines.join('')}"
+  assert (lines.any? { |line| line.match(message) }), failure_message
+end
+
 def assert_audit_log_contains audit_log_contents, needle
   # Original request bodies dumped to the log have symbol keys, but once
   # they go through a dump/load, they're strings again, so we strip
@@ -412,6 +418,7 @@ end
 # build 'em as appropriate so we can test 'em
 def build_deferred_error_attributes segment
   return unless segment.noticed_error
+  return if segment.noticed_error_attributes.frozen?
   segment.noticed_error.build_error_attributes
 end
 

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 6.12.0.367
+  version: 7.0.0
 platform: ruby
 authors:
-- Rachel Klein
+- Aaron Huntsman
 - Tanna McClure
 - Michael Lang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-14 00:00:00.000000000 Z
+date: 2021-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -199,27 +199,24 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 - CONTRIBUTING.md
-- CODE_OF_CONDUCT.md
 - newrelic.yml
 files:
 - ".gitignore"
 - ".project"
-- ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
-- CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile
 - Guardfile
 - LICENSE
 - README.md
+- ROADMAP.md
 - Rakefile
 - THIRD_PARTY_NOTICES.md
 - bin/mongrel_rpm
 - bin/newrelic
 - bin/newrelic_cmd
 - bin/nrdebug
-- cert/cacert.pem
 - config.dot
 - config/database.yml
 - init.rb
@@ -257,6 +254,7 @@ files:
 - lib/new_relic/agent/database/obfuscation_helpers.rb
 - lib/new_relic/agent/database/obfuscator.rb
 - lib/new_relic/agent/database/postgres_explain_obfuscator.rb
+- lib/new_relic/agent/database_adapter.rb
 - lib/new_relic/agent/datastores.rb
 - lib/new_relic/agent/datastores/metric_helper.rb
 - lib/new_relic/agent/datastores/mongo.rb
@@ -312,31 +310,63 @@ files:
 - lib/new_relic/agent/instrumentation/acts_as_solr.rb
 - lib/new_relic/agent/instrumentation/authlogic.rb
 - lib/new_relic/agent/instrumentation/bunny.rb
+- lib/new_relic/agent/instrumentation/bunny/chain.rb
+- lib/new_relic/agent/instrumentation/bunny/instrumentation.rb
+- lib/new_relic/agent/instrumentation/bunny/prepend.rb
 - lib/new_relic/agent/instrumentation/controller_instrumentation.rb
 - lib/new_relic/agent/instrumentation/curb.rb
+- lib/new_relic/agent/instrumentation/curb/chain.rb
+- lib/new_relic/agent/instrumentation/curb/instrumentation.rb
+- lib/new_relic/agent/instrumentation/curb/prepend.rb
 - lib/new_relic/agent/instrumentation/data_mapper.rb
+- lib/new_relic/agent/instrumentation/delayed_job/chain.rb
+- lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb
+- lib/new_relic/agent/instrumentation/delayed_job/prepend.rb
 - lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb
 - lib/new_relic/agent/instrumentation/excon.rb
 - lib/new_relic/agent/instrumentation/excon/connection.rb
 - lib/new_relic/agent/instrumentation/excon/middleware.rb
 - lib/new_relic/agent/instrumentation/grape.rb
-- lib/new_relic/agent/instrumentation/http.rb
+- lib/new_relic/agent/instrumentation/grape/chain.rb
+- lib/new_relic/agent/instrumentation/grape/instrumentation.rb
+- lib/new_relic/agent/instrumentation/grape/prepend.rb
 - lib/new_relic/agent/instrumentation/httpclient.rb
+- lib/new_relic/agent/instrumentation/httpclient/chain.rb
+- lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb
+- lib/new_relic/agent/instrumentation/httpclient/prepend.rb
+- lib/new_relic/agent/instrumentation/httprb.rb
+- lib/new_relic/agent/instrumentation/httprb/chain.rb
+- lib/new_relic/agent/instrumentation/httprb/instrumentation.rb
+- lib/new_relic/agent/instrumentation/httprb/prepend.rb
 - lib/new_relic/agent/instrumentation/ignore_actions.rb
 - lib/new_relic/agent/instrumentation/memcache.rb
+- lib/new_relic/agent/instrumentation/memcache/chain.rb
 - lib/new_relic/agent/instrumentation/memcache/dalli.rb
+- lib/new_relic/agent/instrumentation/memcache/helper.rb
+- lib/new_relic/agent/instrumentation/memcache/instrumentation.rb
+- lib/new_relic/agent/instrumentation/memcache/prepend.rb
 - lib/new_relic/agent/instrumentation/merb/controller.rb
 - lib/new_relic/agent/instrumentation/merb/errors.rb
 - lib/new_relic/agent/instrumentation/middleware_proxy.rb
 - lib/new_relic/agent/instrumentation/middleware_tracing.rb
 - lib/new_relic/agent/instrumentation/mongo.rb
 - lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb
-- lib/new_relic/agent/instrumentation/net.rb
+- lib/new_relic/agent/instrumentation/net_http.rb
+- lib/new_relic/agent/instrumentation/net_http/chain.rb
+- lib/new_relic/agent/instrumentation/net_http/instrumentation.rb
+- lib/new_relic/agent/instrumentation/net_http/prepend.rb
 - lib/new_relic/agent/instrumentation/notifications_subscriber.rb
 - lib/new_relic/agent/instrumentation/padrino.rb
+- lib/new_relic/agent/instrumentation/padrino/chain.rb
+- lib/new_relic/agent/instrumentation/padrino/instrumentation.rb
+- lib/new_relic/agent/instrumentation/padrino/prepend.rb
 - lib/new_relic/agent/instrumentation/passenger_instrumentation.rb
 - lib/new_relic/agent/instrumentation/queue_time.rb
 - lib/new_relic/agent/instrumentation/rack.rb
+- lib/new_relic/agent/instrumentation/rack/chain.rb
+- lib/new_relic/agent/instrumentation/rack/helpers.rb
+- lib/new_relic/agent/instrumentation/rack/instrumentation.rb
+- lib/new_relic/agent/instrumentation/rack/prepend.rb
 - lib/new_relic/agent/instrumentation/rails/action_controller.rb
 - lib/new_relic/agent/instrumentation/rails/action_web_service.rb
 - lib/new_relic/agent/instrumentation/rails3/action_controller.rb
@@ -346,16 +376,31 @@ files:
 - lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb
 - lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb
 - lib/new_relic/agent/instrumentation/rake.rb
+- lib/new_relic/agent/instrumentation/rake/chain.rb
+- lib/new_relic/agent/instrumentation/rake/instrumentation.rb
+- lib/new_relic/agent/instrumentation/rake/prepend.rb
 - lib/new_relic/agent/instrumentation/redis.rb
+- lib/new_relic/agent/instrumentation/redis/chain.rb
+- lib/new_relic/agent/instrumentation/redis/instrumentation.rb
+- lib/new_relic/agent/instrumentation/redis/prepend.rb
 - lib/new_relic/agent/instrumentation/resque.rb
+- lib/new_relic/agent/instrumentation/resque/chain.rb
+- lib/new_relic/agent/instrumentation/resque/instrumentation.rb
+- lib/new_relic/agent/instrumentation/resque/prepend.rb
 - lib/new_relic/agent/instrumentation/sequel.rb
 - lib/new_relic/agent/instrumentation/sequel_helper.rb
 - lib/new_relic/agent/instrumentation/sidekiq.rb
 - lib/new_relic/agent/instrumentation/sinatra.rb
+- lib/new_relic/agent/instrumentation/sinatra/chain.rb
 - lib/new_relic/agent/instrumentation/sinatra/ignorer.rb
+- lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb
+- lib/new_relic/agent/instrumentation/sinatra/prepend.rb
 - lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb
 - lib/new_relic/agent/instrumentation/sunspot.rb
 - lib/new_relic/agent/instrumentation/typhoeus.rb
+- lib/new_relic/agent/instrumentation/typhoeus/chain.rb
+- lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb
+- lib/new_relic/agent/instrumentation/typhoeus/prepend.rb
 - lib/new_relic/agent/internal_agent_error.rb
 - lib/new_relic/agent/javascript_instrumentor.rb
 - lib/new_relic/agent/log_once.rb
@@ -446,7 +491,6 @@ files:
 - lib/new_relic/agent/vm/mri_vm.rb
 - lib/new_relic/agent/vm/snapshot.rb
 - lib/new_relic/agent/worker_loop.rb
-- lib/new_relic/build.rb
 - lib/new_relic/cli/command.rb
 - lib/new_relic/cli/commands/deployments.rb
 - lib/new_relic/cli/commands/install.rb
@@ -476,7 +520,6 @@ files:
 - lib/new_relic/local_environment.rb
 - lib/new_relic/metric_data.rb
 - 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/agent_hooks.rb
@@ -527,7 +570,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: New Relic Ruby Agent

data/.travis.yml

@@ -1,240 +0,0 @@
-services:
-  - mysql
-  - redis-server
-  - memcached
-  - rabbitmq
-
-notifications:
-  slack:
-    secure: Ziq6vzXmc1S+SZnJF7DyjprRgzZKvVK5TXtnNJAoH4EFchziCqko+75hMxDZ/6Y2kShcijgbzZSkIIVSiuYyx0Jgxdsmwed7yrs91uv2WsUw2/l+taOTBIAMa/m9PZppsRqmkywxWeeTPL6cf65Vg3PYRuqzj83nczUFJo4UNrA=
-
-language: ruby
-
-dist: precise
-sudo: required
-jdk:
-  - oraclejdk8
-
-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
-  - "echo 'gem: --no-rdoc --no-ri --no-document' > ~/.gemrc"
-  - ./test/script/before_install/conditionally_upgrade_rubygems.sh
-  - ./test/script/before_install/gemstash_mirror.sh
-  - "echo GEMSTASH_MIRROR: $GEMSTASH_MIRROR"
-  - bundle --version
-
-install: bundle install --jobs 4
-
-addons:
-  apt:
-    update: true
-    packages:
-      - libgmp3-dev
-      - openssl
-      - libssl-dev
-      - build-essential
-      - haveged
-
-before_script: ./test/script/before_script/install_mongodb.sh
-
-script: ./test/script/ci.sh
-
-branches:
-  only:
-    - main
-    - dev
-    - release
-
-rvm:
-  # Run slowest builds first to try and optimize overall cycle time.
-  - jruby-9.2.6.0
-  - 2.7.0
-  - 2.6.1
-  - 2.5.3
-  - 2.4.2
-  - 2.3.5
-  - 2.2.8
-  - 2.1.10
-  - 2.0.0-p648
-
-jdk:
-  - oraclejdk8
-
-env:
-  global:
-    - BUNDLE_PATH=/home/travis/bundle
-    - MONGODB=2.6.11
-    - JAVA_OPTS="-XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Xmx1024m -XX:CICompilerCount=1 -Xshare:auto"
-    - JRUBY_OPTS="-Xcompile.invokedynamic=false -J-Djruby.compile.mode=OFF"
-    - RBXOPT="-Xcompiler.no_rbc -Xint"
-    - SERIALIZE=1
-    - TESTOPTS="-v"
-    - VERBOSE = 1
-  matrix:
-    - TYPE=UNIT ENVIRONMENT=rails30
-    - TYPE=UNIT ENVIRONMENT=rails31
-    - TYPE=UNIT ENVIRONMENT=rails32
-    - TYPE=UNIT ENVIRONMENT=rails40
-    - TYPE=UNIT ENVIRONMENT=rails41
-    - TYPE=UNIT ENVIRONMENT=rails42
-    - TYPE=UNIT ENVIRONMENT=rails50
-    - TYPE=UNIT ENVIRONMENT=rails51
-    - TYPE=UNIT ENVIRONMENT=rails52
-    - TYPE=UNIT ENVIRONMENT=rails60
-    - TYPE=UNIT ENVIRONMENT=norails
-    - TYPE=FUNCTIONAL GROUP=agent
-    - TYPE=FUNCTIONAL GROUP=api
-    - TYPE=FUNCTIONAL GROUP=background
-    - TYPE=FUNCTIONAL GROUP=database
-    - TYPE=FUNCTIONAL GROUP=httpclients
-    - TYPE=FUNCTIONAL GROUP=rails
-    - TYPE=FUNCTIONAL GROUP=serialization
-    - TYPE=FUNCTIONAL GROUP=sinatra
-    - TYPE=FUNCTIONAL GROUP=rest
-    - TYPE=FUNCTIONAL GROUP=background_2
-    - TYPE=FUNCTIONAL GROUP=infinite_tracing
-    - TYPE=NULLVERSE
-
-matrix:
-  allow_failures:
-    - rvm: jruby-9.2.6.0
-      env: TYPE=FUNCTIONAL GROUP=agent
-  fast_finish: true
-  exclude:
-    # Unsupported Rails/Ruby combinations
-    # 2.7
-    - rvm: 2.7.0
-      env: TYPE=UNIT ENVIRONMENT=rails30
-    - rvm: 2.7.0
-      env: TYPE=UNIT ENVIRONMENT=rails31
-    - rvm: 2.7.0
-      env: TYPE=UNIT ENVIRONMENT=rails32
-    - rvm: 2.7.0
-      env: TYPE=UNIT ENVIRONMENT=rails40
-    - rvm: 2.7.0
-      env: TYPE=UNIT ENVIRONMENT=rails41
-
-    - rvm: 2.7.0
-      env: TYPE=UNIT ENVIRONMENT=rails42  # rails (= 4.2.11) depends on bundler (< 2.0, >= 1.3.0)
-    - rvm: 2.7.0
-      env: TYPE=UNIT ENVIRONMENT=rails50  # rails (= 5.0.0) depends on bundler (< 2.0, >= 1.3.0)
-    - rvm: 2.7.0
-      env: TYPE=UNIT ENVIRONMENT=rails51  # rails (= 5.1.0) depends on bundler (< 2.0, >= 1.3.0)
-    - rvm: 2.7.0
-      env: TYPE=UNIT ENVIRONMENT=rails52  # rails (= 5.2.0) depends on bundler (< 2.0, >= 1.3.0)
-    - rvm: 2.7.0
-      env: TYPE=FUNCTIONAL GROUP=api      # blocked: https://github.com/solnic/coercible/issues/27
-    - rvm: 2.7.0
-      env: TYPE=FUNCTIONAL GROUP=sinatra  # padrino (~> 0.14.0) depends on bundler (~> 1.0)
-
-    - rvm: 2.7.0
-      env: TYPE=UNIT ENVIRONMENT=rails42  # rails (= 4.2.11) depends on bundler (< 2.0, >= 1.3.0)
-    - rvm: 2.7.0
-      env: TYPE=UNIT ENVIRONMENT=rails50  # rails (= 5.0.0) depends on bundler (< 2.0, >= 1.3.0)
-    - rvm: 2.7.0
-      env: TYPE=UNIT ENVIRONMENT=rails51  # rails (= 5.1.0) depends on bundler (< 2.0, >= 1.3.0)
-    - rvm: 2.7.0
-      env: TYPE=UNIT ENVIRONMENT=rails52  # rails (= 5.2.0) depends on bundler (< 2.0, >= 1.3.0)
-    - rvm: 2.7.0
-      env: TYPE=FUNCTIONAL GROUP=api      # blocked: https://github.com/solnic/coercible/issues/27
-    - rvm: 2.7.0
-      env: TYPE=FUNCTIONAL GROUP=sinatra  # padrino (~> 0.14.0) depends on bundler (~> 1.0)
-
-    # 2.6
-    - rvm: 2.6.1
-      env: TYPE=UNIT ENVIRONMENT=rails30
-    - rvm: 2.6.1
-      env: TYPE=UNIT ENVIRONMENT=rails31
-    - rvm: 2.6.1
-      env: TYPE=UNIT ENVIRONMENT=rails32
-    - rvm: 2.6.1
-      env: TYPE=UNIT ENVIRONMENT=rails40
-    - rvm: 2.6.1
-      env: TYPE=UNIT ENVIRONMENT=rails41
-
-    # 2.5
-    - rvm: 2.5.3
-      env: TYPE=UNIT ENVIRONMENT=rails30
-    - rvm: 2.5.3
-      env: TYPE=UNIT ENVIRONMENT=rails31
-    - rvm: 2.5.3
-      env: TYPE=UNIT ENVIRONMENT=rails32
-    - rvm: 2.5.3
-      env: TYPE=UNIT ENVIRONMENT=rails40
-    - rvm: 2.5.3
-      env: TYPE=UNIT ENVIRONMENT=rails41
-
-    # 2.4
-    - rvm: 2.4.2
-      env: TYPE=UNIT ENVIRONMENT=rails30
-    - rvm: 2.4.2
-      env: TYPE=UNIT ENVIRONMENT=rails31
-    - rvm: 2.4.2
-      env: TYPE=UNIT ENVIRONMENT=rails32
-    - rvm: 2.4.2
-      env: TYPE=UNIT ENVIRONMENT=rails40
-    - rvm: 2.4.2
-      env: TYPE=UNIT ENVIRONMENT=rails41
-    - rvm: 2.4.2
-      env: TYPE=UNIT ENVIRONMENT=rails60
-
-    # 2.3
-    - rvm: 2.3.5
-      env: TYPE=UNIT ENVIRONMENT=rails60
-
-    # 2.2
-    - rvm: 2.2.8
-      env: TYPE=UNIT ENVIRONMENT=rails60
-
-    # 2.1
-    - rvm: 2.1.10
-      env: TYPE=UNIT ENVIRONMENT=rails50
-    - rvm: 2.1.10
-      env: TYPE=UNIT ENVIRONMENT=rails51
-    - rvm: 2.1.10
-      env: TYPE=UNIT ENVIRONMENT=rails52
-    - rvm: 2.1.10
-      env: TYPE=UNIT ENVIRONMENT=rails60
-
-    # 2.0
-    - rvm: 2.0.0-p648
-      env: TYPE=UNIT ENVIRONMENT=rails50
-    - rvm: 2.0.0-p648
-      env: TYPE=UNIT ENVIRONMENT=rails51
-    - rvm: 2.0.0-p648
-      env: TYPE=UNIT ENVIRONMENT=rails52
-    - rvm: 2.0.0-p648
-      env: TYPE=UNIT ENVIRONMENT=rails60
-
-    # jruby 9.2.6.0 (Compatible with MRI 2.5)
-    - rvm: jruby-9.2.6.0
-      env: TYPE=UNIT ENVIRONMENT=rails30
-    - rvm: jruby-9.2.6.0
-      env: TYPE=UNIT ENVIRONMENT=rails31
-    - rvm: jruby-9.2.6.0
-      env: TYPE=UNIT ENVIRONMENT=rails32
-    - rvm: jruby-9.2.6.0
-      env: TYPE=UNIT ENVIRONMENT=rails40
-    - rvm: jruby-9.2.6.0
-      env: TYPE=UNIT ENVIRONMENT=rails41
-    - rvm: jruby-9.2.6.0
-      env: TYPE=UNIT ENVIRONMENT=rails60
-    - rvm: jruby-9.2.6.0
-      env: TYPE=UNIT ENVIRONMENT=rails52
-
-    # Excluding unsupported Rubies for grpc
-    - rvm: 2.0.0-p648
-      env: TYPE=FUNCTIONAL GROUP=infinite_tracing
-    - rvm: 2.1.10
-      env: TYPE=FUNCTIONAL GROUP=infinite_tracing
-    - rvm: 2.2.8
-      env: TYPE=FUNCTIONAL GROUP=infinite_tracing
-    - rvm: 2.3.5
-      env: TYPE=FUNCTIONAL GROUP=infinite_tracing
-    - rvm: 2.4.2
-      env: TYPE=FUNCTIONAL GROUP=infinite_tracing
-    - rvm: jruby-9.2.6.0
-      env: TYPE=FUNCTIONAL GROUP=infinite_tracing