newrelic_rpm 6.13.1 → 6.14.0

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

@@ -75,7 +75,7 @@ module NewRelic
           # we don't expect this to be called more than once, but we're being
           # defensive.
           return if defined?(exception_object)
-          return unless defined?(::ActiveSupport)
+          return unless defined?(::ActiveSupport::VERSION)
           if ::ActiveSupport::VERSION::STRING < "5.0.0"
             # Earlier versions of Rails did not add the exception itself to the
             # payload asssessible via :exception_object, so we create a stand-in

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

@@ -99,27 +99,17 @@ module NewRelic
             else
               run_without_newrelic(app, *args, **kwargs)
             end
-          end          
+          end
         end
 
-        if RUBY_VERSION < "2.7.0"
-          def use_with_newrelic(middleware_class, *args, &blk)
-            if ::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
-              wrapped_middleware_class = ::NewRelic::Agent::Instrumentation::MiddlewareProxy.for_class(middleware_class)
-              use_without_newrelic(wrapped_middleware_class, *args, &blk)
-            else
-              use_without_newrelic(middleware_class, *args, &blk)
-            end
+        def use_with_newrelic(middleware_class, *args, &blk)
+          return if middleware_class.nil?
+          if ::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
+            wrapped_middleware_class = ::NewRelic::Agent::Instrumentation::MiddlewareProxy.for_class(middleware_class)
+            use_without_newrelic(wrapped_middleware_class, *args, &blk)
+          else
+            use_without_newrelic(middleware_class, *args, &blk)
           end
-        else
-          def use_with_newrelic(middleware_class, *args, **kwargs, &blk)
-            if ::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
-              wrapped_middleware_class = ::NewRelic::Agent::Instrumentation::MiddlewareProxy.for_class(middleware_class)
-              use_without_newrelic(wrapped_middleware_class, *args, **kwargs, &blk)
-            else
-              use_without_newrelic(middleware_class, *args, **kwargs, &blk)
-            end
-          end  
         end
 
         # We patch this method for a reason that actually has nothing to do with

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

@@ -37,7 +37,7 @@ DependencyDetection.defer do
   named :redis_instrumentation
 
   depends_on do
-    defined? ::Redis
+    defined? ::Redis::VERSION
   end
 
   depends_on do

data/lib/new_relic/agent/method_tracer.rb

@@ -173,30 +173,20 @@ module NewRelic
           # instrumentation into effectively one method call overhead
           # when the agent is disabled
           def assemble_code_header(method_name, metric_name_code, options)
-            header = "return #{_untraced_method_name(method_name, metric_name_code)}(*args, &block) unless NewRelic::Agent.tl_is_execution_traced?\n"
+            header = "return #{_untraced_method_name(method_name, metric_name_code)}(#{ARGS_FOR_RUBY_VERSION}) unless NewRelic::Agent.tl_is_execution_traced?\n"
             header += options[:code_header].to_s
             header
           end
 
-          # Positional and Keyword arguments are separated beginning with Ruby 2.7
-          def arguments_for_ruby_version
-            if RUBY_VERSION < "2.7.0"
-              "(*args, &block)"
-            else
-              "(*args, **kwargs, &block)"
-            end
-          end
-
           # returns an eval-able string that contains the traced
           # method code used if the agent is not creating a scope for
           # use in scoped metrics.
           def method_without_push_scope(method_name, metric_name_code, options)
-            arguments = arguments_for_ruby_version
-            "def #{_traced_method_name(method_name, metric_name_code)}#{arguments}
+            "def #{_traced_method_name(method_name, metric_name_code)}(#{ARGS_FOR_RUBY_VERSION})
               #{assemble_code_header(method_name, metric_name_code, options)}
               t0 = Time.now
               begin
-                #{_untraced_method_name(method_name, metric_name_code)}#{arguments}\n
+                #{_untraced_method_name(method_name, metric_name_code)}(#{ARGS_FOR_RUBY_VERSION})\n
               ensure
                 duration = (Time.now - t0).to_f
                 NewRelic::Agent.record_metric(\"#{metric_name_code}\", duration)
@@ -208,12 +198,11 @@ module NewRelic
           # returns an eval-able string that contains the tracing code
           # for a fully traced metric including scoping
           def method_with_push_scope(method_name, metric_name_code, options)
-            arguments = arguments_for_ruby_version
-            "def #{_traced_method_name(method_name, metric_name_code)}#{arguments}
+            "def #{_traced_method_name(method_name, metric_name_code)}(#{ARGS_FOR_RUBY_VERSION})
               #{options[:code_header]}
               result = ::NewRelic::Agent::MethodTracerHelpers.trace_execution_scoped(\"#{metric_name_code}\",
                         :metric => #{options[:metric]}) do
-                #{_untraced_method_name(method_name, metric_name_code)}#{arguments}
+                #{_untraced_method_name(method_name, metric_name_code)}(#{ARGS_FOR_RUBY_VERSION})
               end
               #{options[:code_footer]}
               result
@@ -337,6 +326,7 @@ module NewRelic
           class_eval traced_method, __FILE__, __LINE__
           alias_method _untraced_method_name(method_name, metric_name_code), method_name
           alias_method method_name, _traced_method_name(method_name, metric_name_code)
+          ruby2_keywords(_traced_method_name(method_name, metric_name_code)) if respond_to?(:ruby2_keywords, true)
           send visibility, method_name
           send visibility, _traced_method_name(method_name, metric_name_code)
           ::NewRelic::Agent.logger.debug("Traced method: class = #{derived_class_name},"+

data/lib/new_relic/agent/new_relic_service.rb

@@ -526,6 +526,7 @@ module NewRelic
         else
           request = Net::HTTP::Post.new(opts[:uri], headers)
         end
+        @audit_logger.log_request_headers(opts[:uri], headers)
         request['user-agent'] = user_agent
         request.content_type = "application/octet-stream"
         request.body = opts[:data]

data/lib/new_relic/agent/samplers/memory_sampler.rb

@@ -29,7 +29,7 @@ module NewRelic
             end
           elsif platform =~ /darwin9/ # 10.5
             @sampler = ShellPS.new("ps -o rsz")
-          elsif platform =~ /darwin1\d+/ # >= 10.6
+          elsif platform =~ /darwin(1|2)\d+/ # >= 10.6
             @sampler = ShellPS.new("ps -o rss")
           elsif platform =~ /freebsd/
             @sampler = ShellPS.new("ps -o rss")

data/lib/new_relic/agent/stats_engine/gc_profiler.rb

@@ -99,7 +99,7 @@ module NewRelic
 
           # When using GC::Profiler, it's important to periodically call
           # GC::Profiler.clear in order to avoid unbounded growth in the number
-          # of GC recordds that are stored. However, we actually do this
+          # of GC records that are stored. However, we actually do this
           # internally within MonotonicGCProfiler on calls to #total_time_s,
           # so the reset here is a no-op.
           def reset; end

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

@@ -68,13 +68,19 @@ module NewRelic
             payload
         end
 
-        def insert_headers request
-          insert_trace_context_header request
-          insert_distributed_trace_header request
-          insert_cross_app_header request
+        def log_request_headers headers, direction = "OUTGOING"
+          NewRelic::Agent.logger.debug "#{direction} REQUEST HEADERS: #{headers}"
+        end
+
+        def insert_headers headers
+          insert_trace_context_header headers
+          insert_distributed_trace_header headers
+          insert_cross_app_header headers
+          log_request_headers headers
         end
 
         def consume_message_headers headers, tracer_state, transport_type
+          log_request_headers headers, "INCOMING"
           consume_message_distributed_tracing_headers headers, transport_type
           consume_message_cross_app_tracing_headers headers, tracer_state
           consume_message_synthetics_headers headers
@@ -90,11 +96,11 @@ module NewRelic
           end
         end
 
-        def insert_distributed_trace_header request
+        def insert_distributed_trace_header headers
           return unless Agent.config[:'distributed_tracing.enabled']
           return if Agent.config[:'exclude_newrelic_header']
           payload = create_distributed_trace_payload
-          request[NewRelic::NEWRELIC_KEY] = payload.http_safe if payload
+          headers[NewRelic::NEWRELIC_KEY] = payload.http_safe if payload
         end
 
         def insert_cat_headers headers

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

@@ -93,6 +93,7 @@ module NewRelic
           if headers && transaction && action == :produce && record_metrics?
             transaction.distributed_tracer.insert_distributed_trace_header headers
             transaction.distributed_tracer.insert_cat_headers headers
+            transaction.distributed_tracer.log_request_headers headers
           end
         rescue => e
           NewRelic::Agent.logger.error "Error during message header processing", e

data/lib/new_relic/constants.rb

@@ -28,6 +28,10 @@ module NewRelic
   TRACEPARENT_KEY = "traceparent"
   TRACESTATE_KEY = "tracestate"
 
+  # Right now, old and new Rubies are the same.  Intention is to use "(...)" for
+  # Ruby 2.7+ for argument delegation, but doing so is a breaking API change.
+  ARGS_FOR_RUBY_VERSION = RUBY_VERSION < "2.7.0" ? "*args, &block" : "*args, &block"
+
   HTTP_TRACEPARENT_KEY = "HTTP_#{TRACEPARENT_KEY.upcase}"
   HTTP_TRACESTATE_KEY = "HTTP_#{TRACESTATE_KEY.upcase}"
   HTTP_NEWRELIC_KEY = "HTTP_#{NEWRELIC_KEY.upcase}"

data/lib/new_relic/environment_report.rb

@@ -71,7 +71,13 @@ module NewRelic
     report_on('OS'                ) { ::NewRelic::Agent::SystemInfo.ruby_os_identifier     }
     report_on('Database adapter'  ) do
       begin
-        ActiveRecord::Base.configurations.configs_for(env_name: NewRelic::Control.instance.env, spec_name: "primary").config['adapter']
+        if ::ActiveRecord::Base.respond_to?(:connection_db_config)
+          ActiveRecord::Base.configurations.configs_for(env_name: NewRelic::Control.instance.env, name: "primary")
+            .connection_db_config.configuration_hash['adapter']
+        else
+          ActiveRecord::Base.configurations.configs_for(env_name: NewRelic::Control.instance.env, spec_name: "primary").config['adapter']
+        end
+
       rescue NoMethodError
         ActiveRecord::Base.configurations[NewRelic::Control.instance.env]['adapter']
       end

data/lib/new_relic/supportability_helper.rb

@@ -14,6 +14,7 @@ module NewRelic
       :accept_distributed_trace_headers,
       :create_distributed_trace_headers,
       :add_custom_attributes,
+      :add_custom_span_attributes,
       :add_instrumentation,
       :add_method_tracer,
       :add_transaction_tracer,

data/lib/new_relic/version.rb

@@ -11,8 +11,8 @@ module NewRelic
     end
 
     MAJOR = 6
-    MINOR = 13
-    TINY  = 1
+    MINOR = 14
+    TINY  = 0
 
     begin
       require File.join(File.dirname(__FILE__), 'build')

data/newrelic_rpm.gemspec

@@ -39,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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 6.13.1
+  version: 6.14.0
 platform: ruby
 authors:
 - Rachel Klein
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-25 00:00:00.000000000 Z
+date: 2020-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -201,31 +201,6 @@ extra_rdoc_files:
 - CONTRIBUTING.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"
 - ".yardopts"
@@ -355,6 +330,7 @@ files:
 - 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_prepend.rb
 - lib/new_relic/agent/instrumentation/notifications_subscriber.rb
 - lib/new_relic/agent/instrumentation/padrino.rb
 - lib/new_relic/agent/instrumentation/passenger_instrumentation.rb

data/.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,31 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-^^ Provide a general summary of the issue in the title above. ^^ 
-
-## Description
-Describe the problem you're encountering.
-TIP: Do NOT share sensitive information, whether personal, proprietary, or otherwise! 
-
-## Expected Behavior
-Tell us what you expected to happen.
-
-## [Troubleshooting](https://discuss.newrelic.com/t/troubleshooting-frameworks/108787) or [NR Diag](https://docs.newrelic.com/docs/using-new-relic/cross-product-functions/troubleshooting/new-relic-diagnostics) results
-Provide any other relevant log data.
-TIP:  Scrub logs and diagnostic information for sensitive information 
-
-## Steps to Reproduce
-Please be as specific as possible.
-TIP:  Link a sample application that demonstrates the issue. 
-
-## Your Environment
-Include as many relevant details about your environment as possible including the running version of the Ruby agent, the Ruby version being used and any other relevant environment information
-
-## Additional context
-Add any other context about the problem here. For example, relevant community posts or support tickets.

data/.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Troubleshooting
-    url:  https://github.com/newrelic/newrelic-ruby-agent#support
-    about: checkout the README for troubleshooting directions

data/.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,24 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
----
-
-### Is your feature request related to a problem? Please describe.
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-### Feature Description
-A clear and concise description of the feature you want or need.
-
-### Describe Alternatives
-A clear and concise description of any alternative solutions or features you've considered. Are there examples you could link us to?
-
-### Additional context
-Add any other context here.
-
-### Priority
-Please help us better understand this feature request by choosing a priority from the following options: 
-[Nice to Have, Really Want, Must Have, Blocker]

data/.github/actions/annotate/README.md

@@ -1,79 +0,0 @@
-
-# Install Node
-
-Using Homebrew, install Node (npm will be installed with Node):
-
-```
-brew install node
-```
-
-# Install Yarn
-
-Yarn provides dependency management, so install it:
-
-```
-brew install yarn
-```
-
-# Install NCC
-
-NCC is used to compile the *.js into a dist/index.js
-
-```
-npm i -g @zeit/ncc
-```
-
-# Build the dist/index.js
-
-```
-yarn run package
-```
-
-# Installing new javascript packages
-
-Adding new javascript packages is fairly straightforward.  If you're adding a github @actions/xxx package,
-simply refer to it by its short-hand name:
-
-```
-npm install @actions/core
-```
-
-# Optional pre-commit hook
-
-A pre-commit hook is provided that can help keep dist/index.js in tune with local changes
-
-
-# Using Node as a REPL
-
-If you're developing or working on the index.js script, it can be handy to try out stuff 
-locally.  To do that, use Node to start up a REPL shell by running it from the action's folder:
-
-```
-cd .github/workflow/actions/annotate
-node
-```
-
-Example session:
-
-```javascript
-Welcome to Node.js v14.3.0.
-Type ".help" for more information.
-> const os = require('os')
-undefined
-> const fs = require('fs')
-undefined
-> const path = require('path')
-undefined
->
-> const core = require('@actions/core')
-undefined
-> core.startGroup("hello")
-::group::hello
-undefined
-> console.debug("hello")
-hello
-undefined
-> core.endGroup()
-::endgroup::
-undefined
-```