newrelic_rpm 6.12.0.367 → 6.13.0

data/lib/new_relic/agent/transaction/external_request_segment.rb

@@ -28,7 +28,7 @@ module NewRelic
 
         def initialize library, uri, procedure, start_time = nil # :nodoc:
           @library = library
-          @uri = HTTPClients::URIUtil.parse_and_normalize_url(uri)
+          @uri = HTTPClients::URIUtil.obfuscated_uri(uri)
           @procedure = procedure
           @host_header = nil
           @app_data = nil
@@ -204,7 +204,7 @@ module NewRelic
         end
 
         def segment_complete
-          params[:uri] = HTTPClients::URIUtil.filter_uri(uri)
+          params[:uri] = uri.to_s
           if cross_app_request?
             params[:transaction_guid] = transaction_guid
           end

data/lib/new_relic/agent/transaction/segment.rb

@@ -13,16 +13,19 @@ module NewRelic
         # unscoped_metrics can be nil, a string, or array. we do this to save
         # object allocations. if allocations weren't important then we would
         # initialize it as an array that would be empty, have one item, or many items.
-      attr_reader :unscoped_metrics, :attributes, :custom_transaction_attributes
+        attr_reader :unscoped_metrics, :custom_transaction_attributes
 
         def initialize name=nil, unscoped_metrics=nil, start_time=nil
           @unscoped_metrics = unscoped_metrics
-          @attributes = Attributes.new(NewRelic::Agent.instance.attribute_filter)
           super name, start_time
         end
 
+        def attributes
+          @attributes ||= Attributes.new(NewRelic::Agent.instance.attribute_filter)
+        end
+
         def add_agent_attribute(key, value, default_destinations=AttributeFilter::DST_SPAN_EVENTS)
-          @attributes.add_agent_attribute(key, value, default_destinations)
+          attributes.add_agent_attribute(key, value, default_destinations)
         end
 
         def self.merge_untrusted_agent_attributes(attributes, prefix, default_destinations)
@@ -33,8 +36,9 @@ module NewRelic
           end
         end
 
-        def merge_untrusted_agent_attributes(attributes, prefix, default_destinations)
-          @attributes.merge_untrusted_agent_attributes(attributes, prefix, default_destinations)
+        def merge_untrusted_agent_attributes(agent_attributes, prefix, default_destinations)
+          return if agent_attributes.nil?
+          attributes.merge_untrusted_agent_attributes(agent_attributes, prefix, default_destinations)
         end
 
         def add_custom_attributes(p)

data/lib/new_relic/version.rb

@@ -11,7 +11,7 @@ module NewRelic
     end
 
     MAJOR = 6
-    MINOR = 12
+    MINOR = 13
     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

@@ -28,7 +28,6 @@ EOS
     "LICENSE",
     "README.md",
     "CONTRIBUTING.md",
-    "CODE_OF_CONDUCT.md",
     "newrelic.yml"
   ]
 

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 6.12.0.367
+  version: 6.13.0
 platform: ruby
 authors:
 - Rachel Klein
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-14 00:00:00.000000000 Z
+date: 2020-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -199,20 +199,43 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 - CONTRIBUTING.md
-- CODE_OF_CONDUCT.md
 - newrelic.yml
 files:
+- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/ISSUE_TEMPLATE/config.yml"
+- ".github/ISSUE_TEMPLATE/feature_request.md"
+- ".github/actions/annotate/README.md"
+- ".github/actions/annotate/action.yml"
+- ".github/actions/annotate/dist/index.js"
+- ".github/actions/annotate/index.js"
+- ".github/actions/annotate/package-lock.json"
+- ".github/actions/annotate/package.json"
+- ".github/actions/annotate/pre-commit"
+- ".github/actions/build-ruby/README.md"
+- ".github/actions/build-ruby/action.yml"
+- ".github/actions/build-ruby/dist/index.js"
+- ".github/actions/build-ruby/index.js"
+- ".github/actions/build-ruby/package-lock.json"
+- ".github/actions/build-ruby/package.json"
+- ".github/actions/build-ruby/pre-commit"
+- ".github/pull_request_template.md"
+- ".github/workflows/ci.yml"
+- ".github/workflows/pr_review_checklist.yml"
+- ".github/workflows/release.yml"
+- ".github/workflows/scripts/rubygems-authenticate.py"
+- ".github/workflows/scripts/rubygems-publish.rb"
+- ".github/workflows/snyk.yml"
+- ".github/workflows/stale.yml"
 - ".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
@@ -446,7 +469,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 +498,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 +548,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.4
 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

data/CODE_OF_CONDUCT.md

@@ -1,46 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at opensource@newrelic.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/