newrelic_rpm 6.7.0.359 → 6.8.0.360

data/lib/new_relic/version.rb

@@ -11,7 +11,7 @@ module NewRelic
     end
 
     MAJOR = 6
-    MINOR = 7
+    MINOR = 8
     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", "Rachel Klein", "Justin Foote" ]
+  s.authors = [ "Chris Pine", "Rachel Klein", "Justin Foote", "Michael Lang" ]
   s.date = Time.now.strftime('%Y-%m-%d')
   s.licenses    = ['New Relic']
   s.description = <<-EOS
@@ -48,12 +48,14 @@ EOS
   s.rubygems_version = Gem::VERSION
   s.summary = "New Relic Ruby Agent"
 
-  s.add_development_dependency 'rake', '10.1.0'
+  s.add_development_dependency 'rake', '12.3.3'
   s.add_development_dependency 'minitest', '~> 4.7.5'
-  s.add_development_dependency 'mocha', '~> 0.13.0'
+  s.add_development_dependency 'mocha', '~> 1.9.0'
   s.add_development_dependency 'yard'
   s.add_development_dependency 'pry-nav', '~> 0.2.4'
   s.add_development_dependency 'pry-stack_explorer', '~> 0.4.9'
+  s.add_development_dependency 'guard', '~> 2.16.0'
+  s.add_development_dependency 'guard-minitest', '~> 2.4.0'
   s.add_development_dependency 'hometown', '~> 0.2.5'
-  s.add_development_dependency 'bundler', '< 2.0'
+  s.add_development_dependency 'bundler'
 end

data/test/agent_helper.rb

@@ -212,7 +212,7 @@ end
 #
 # If you want to *allow* unexpected metrics matching certain patterns, use
 # the :ignore_filter option. This will allow you to specify a Regex that
-# whitelists broad swathes of metric territory (e.g. 'Supportability/').
+# allowlists broad swathes of metric territory (e.g. 'Supportability/').
 #
 def assert_metrics_recorded_exclusive(expected, options={})
   expected = _normalize_metric_expectations(expected)
@@ -345,6 +345,15 @@ def in_transaction(*args, &blk)
   txn
 end
 
+# Convenience wrapper to stand up a transaction and provide a segment within
+# that transaction to work with.  The same arguements as provided to in_transaction
+# may be supplied.
+def with_segment *args, &blk
+  in_transaction *args do |txn|
+    yield txn.current_segment, txn
+  end
+end
+
 def stub_transaction_guid(guid)
   NewRelic::Agent::Transaction.tl_current.instance_variable_set(:@guid, guid)
 end
@@ -612,17 +621,87 @@ ensure
   NewRelic::Agent.logger = orig_logger
 end
 
-def with_environment(env)
-  old_env = {}
-  env.each do |key, val|
-    old_env[key] = ENV[key]
-    ENV[key]     = val.to_s
+# The EnvUpdater was introduced due to random fails in JRuby environment
+# whereby attempting to set ENV[key] = some_value randomly failed.
+# It is conjectured that this is thread related, but may also be
+# a core bug in the JVM implementation of Ruby.  Root cause was not
+# discovered, but it was found that a combination of retrying and using
+# mutex lock around the update operation was the only consistently working
+# solution as the error continued to surface without the mutex and 
+# retry alone wasn't enough, either.
+#
+# JRUBY: oraclejdk8 + jruby-9.2.6.0
+#
+# NOTE: Singleton pattern to ensure one mutex lock for all threads
+class EnvUpdater
+  MAX_RETRIES = 5
+
+  def initialize
+    @mutex = Mutex.new
   end
-  begin
+
+  # Will attempt the given block up to MAX_RETRIES before 
+  # surfacing the exception down the chain.
+  def with_retry retry_limit=MAX_RETRIES
+    retries ||= 0
+    sleep(retries)
     yield
-  ensure
-    old_env.each { |key, old_val| ENV[key] = old_val }
+  rescue
+    (retries += 1) < retry_limit ? retry : raise
+  end
+
+  # Locks and updates the ENV
+  def safe_update env
+    with_retry do
+      @mutex.synchronize do
+        env.each{ |key, val| ENV[key] = val.to_s }
+      end
+    end
+  end
+
+  # Locks and restores the ENV
+  def safe_restore old_env
+    with_retry do
+      @mutex.synchronize do
+        old_env.each{ |key, val| val ? ENV[key] = val : ENV.delete(key) }
+      end
+    end
+  end
+
+  # Singleton pattern implemented via @@instance
+  def self.instance
+    @@instance ||= EnvUpdater.new
+  end
+
+  def self.safe_update env
+    instance.safe_update env
   end
+
+  def self.safe_restore old_env
+    instance.safe_restore old_env
+  end
+
+  # Effectively saves current ENV settings for given env's key/values,
+  # runs given block, then restores ENV to original state before returning.
+  def self.inject env, &block
+    old_env = {}
+    env.each{ |key, val| old_env[key] = ENV[key] }
+    begin
+      safe_update(env)
+      yield
+    ensure
+      safe_restore(old_env)
+    end
+  end    
+
+  # must call instance here to ensure only one @mutex for all threads.
+  instance
+end
+
+# Changes ENV settings to given and runs given block and restores ENV 
+# to original values before returning.
+def with_environment(env, &block)
+  EnvUpdater.inject(env) { yield }
 end
 
 def with_argv(argv)

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 6.7.0.359
+  version: 6.8.0.360
 platform: ruby
 authors:
-- Matthew Wear
 - Chris Pine
 - Rachel Klein
 - Justin Foote
+- Michael Lang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-25 00:00:00.000000000 Z
+date: 2019-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -47,14 +47,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 1.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -97,6 +97,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.9
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.16.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.16.0
+- !ruby/object:Gem::Dependency
+  name: guard-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: hometown
   requirement: !ruby/object:Gem::Requirement
@@ -115,16 +143,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 description: |
   New Relic is a performance management system, developed by New Relic,
   Inc (http://www.newrelic.com).  New Relic provides you with deep
@@ -172,6 +200,7 @@ files:
 - lib/new_relic/agent/agent_logger.rb
 - lib/new_relic/agent/attribute_filter.rb
 - lib/new_relic/agent/attribute_processing.rb
+- lib/new_relic/agent/attributes.rb
 - lib/new_relic/agent/audit_logger.rb
 - lib/new_relic/agent/autostart.rb
 - lib/new_relic/agent/chained_call.rb
@@ -210,8 +239,11 @@ files:
 - lib/new_relic/agent/datastores/mongo/statement_formatter.rb
 - lib/new_relic/agent/datastores/redis.rb
 - lib/new_relic/agent/deprecator.rb
+- lib/new_relic/agent/distributed_trace_intrinsics.rb
+- lib/new_relic/agent/distributed_trace_metrics.rb
 - lib/new_relic/agent/distributed_trace_monitor.rb
 - lib/new_relic/agent/distributed_trace_payload.rb
+- lib/new_relic/agent/distributed_trace_transport_type.rb
 - lib/new_relic/agent/distributed_tracing.rb
 - lib/new_relic/agent/encoding_normalizer.rb
 - lib/new_relic/agent/error_collector.rb
@@ -222,6 +254,7 @@ files:
 - lib/new_relic/agent/event_listener.rb
 - lib/new_relic/agent/event_loop.rb
 - lib/new_relic/agent/external.rb
+- lib/new_relic/agent/guid_generator.rb
 - lib/new_relic/agent/harvester.rb
 - lib/new_relic/agent/heap.rb
 - lib/new_relic/agent/hostname.rb
@@ -342,10 +375,12 @@ files:
 - lib/new_relic/agent/threading/backtrace_service.rb
 - lib/new_relic/agent/threading/thread_profile.rb
 - lib/new_relic/agent/timestamp_sampled_buffer.rb
+- lib/new_relic/agent/trace_context.rb
+- lib/new_relic/agent/trace_context_payload.rb
+- lib/new_relic/agent/trace_context_request_monitor.rb
 - lib/new_relic/agent/tracer.rb
 - lib/new_relic/agent/transaction.rb
 - lib/new_relic/agent/transaction/abstract_segment.rb
-- lib/new_relic/agent/transaction/attributes.rb
 - lib/new_relic/agent/transaction/datastore_segment.rb
 - lib/new_relic/agent/transaction/distributed_tracing.rb
 - lib/new_relic/agent/transaction/external_request_segment.rb
@@ -356,6 +391,7 @@ files:
 - lib/new_relic/agent/transaction/synthetics_sample_buffer.rb
 - lib/new_relic/agent/transaction/trace.rb
 - lib/new_relic/agent/transaction/trace_builder.rb
+- lib/new_relic/agent/transaction/trace_context.rb
 - lib/new_relic/agent/transaction/trace_node.rb
 - lib/new_relic/agent/transaction/tracing.rb
 - lib/new_relic/agent/transaction/transaction_sample_buffer.rb
@@ -430,15 +466,11 @@ files:
 - lib/tasks/multiverse.rb
 - lib/tasks/newrelic.rb
 - lib/tasks/tests.rake
-- lib/tasks/versions.html.erb
-- lib/tasks/versions.postface.html
-- lib/tasks/versions.preface.html
-- lib/tasks/versions.rake
-- lib/tasks/versions.txt.erb
 - newrelic.yml
 - newrelic_rpm.gemspec
 - recipes/newrelic.rb
 - test/agent_helper.rb
+- 'true'
 homepage: https://github.com/newrelic/rpm
 licenses:
 - New Relic
@@ -462,7 +494,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: New Relic Ruby Agent

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

@@ -1,154 +0,0 @@
-# encoding: utf-8
-# This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
-
-require 'new_relic/agent/attribute_processing'
-
-module NewRelic
-  module Agent
-    class Transaction
-      class Attributes
-        KEY_LIMIT   = 255
-        VALUE_LIMIT = 255
-        COUNT_LIMIT = 64
-
-        EMPTY_HASH = {}.freeze
-
-        def initialize(filter)
-          @filter = filter
-
-          @custom_attributes = {}
-          @agent_attributes = {}
-          @intrinsic_attributes = {}
-
-          @custom_destinations = {}
-          @agent_destinations = {}
-          @already_warned_count_limit = nil
-        end
-
-        def add_agent_attribute(key, value, default_destinations)
-          destinations = @filter.apply(key, default_destinations)
-          return if destinations == AttributeFilter::DST_NONE
-
-          @agent_destinations[key] = destinations
-          add(@agent_attributes, key, value)
-        end
-
-        def add_agent_attribute_with_key_check(key, value, default_destinations)
-          if exceeds_bytesize_limit? key, KEY_LIMIT
-            NewRelic::Agent.logger.debug("Agent attribute #{key} was dropped for exceeding key length limit #{KEY_LIMIT}")
-            return
-          end
-
-          add_agent_attribute(key, value, default_destinations)
-        end
-
-        def add_intrinsic_attribute(key, value)
-          add(@intrinsic_attributes, key, value)
-        end
-
-        def merge_untrusted_agent_attributes(attributes, prefix, default_destinations)
-          return if @filter.high_security?
-          return if !@filter.might_allow_prefix?(prefix)
-
-          AttributeProcessing.flatten_and_coerce(attributes, prefix) do |k, v|
-            add_agent_attribute_with_key_check(k, v, AttributeFilter::DST_NONE)
-          end
-        end
-
-        def merge_custom_attributes(other)
-          return unless Agent.config[:'custom_attributes.enabled']
-          return if other.empty?
-          AttributeProcessing.flatten_and_coerce(other) do |k, v|
-            add_custom_attribute(k, v)
-          end
-        end
-
-        def custom_attributes_for(destination)
-          for_destination(@custom_attributes, @custom_destinations, destination)
-        end
-
-        def agent_attributes_for(destination)
-          for_destination(@agent_attributes, @agent_destinations, destination)
-        end
-
-        def intrinsic_attributes_for(destination)
-          if destination == NewRelic::Agent::AttributeFilter::DST_TRANSACTION_TRACER ||
-             destination == NewRelic::Agent::AttributeFilter::DST_ERROR_COLLECTOR
-            @intrinsic_attributes
-          else
-            EMPTY_HASH
-          end
-        end
-
-        private
-
-        def add_custom_attribute(key, value)
-          if @custom_attributes.size >= COUNT_LIMIT
-            unless @already_warned_count_limit
-              NewRelic::Agent.logger.warn("Custom attributes count exceeded limit of #{COUNT_LIMIT}. Any additional custom attributes during this transaction will be dropped.")
-              @already_warned_count_limit = true
-            end
-            return
-          end
-
-          if @filter.high_security?
-            NewRelic::Agent.logger.debug("Unable to add custom attribute #{key} while in high security mode.")
-            return
-          end
-
-          if exceeds_bytesize_limit?(key, KEY_LIMIT)
-            NewRelic::Agent.logger.warn("Custom attribute key '#{key}' was longer than limit of #{KEY_LIMIT} bytes. This attribute will be dropped.")
-            return
-          end
-
-          destinations = @filter.apply(key, AttributeFilter::DST_ALL)
-          return if destinations == AttributeFilter::DST_NONE
-
-          @custom_destinations[key] = destinations
-          add(@custom_attributes, key, value)
-        end
-
-        def add(attributes, key, value)
-          return if value.nil?
-
-          if exceeds_bytesize_limit?(value, VALUE_LIMIT)
-            value = slice(value)
-          end
-
-          attributes[key] = value
-        end
-
-        def for_destination(attributes, calculated_destinations, destination)
-          # Avoid allocating anything if there are no attrs at all
-          return EMPTY_HASH if attributes.empty?
-
-          attributes.inject({}) do |memo, (key, value)|
-            if @filter.allows?(calculated_destinations[key], destination)
-              memo[key] = value
-            end
-            memo
-          end
-        end
-
-        def exceeds_bytesize_limit?(value, limit)
-          if value.respond_to?(:bytesize)
-            value.bytesize > limit
-          elsif value.is_a?(Symbol)
-            value.to_s.bytesize > limit
-          else
-            false
-          end
-        end
-
-        # Take one byte past our limit. Why? This lets us unconditionally chop!
-        # the end. It'll either remove the one-character-too-many we have, or
-        # peel off the partial, mangled character left by the byteslice.
-        def slice(incoming)
-          result = incoming.to_s.byteslice(0, VALUE_LIMIT + 1)
-          result.chop!
-        end
-      end
-    end
-  end
-end