newrelic_rpm 6.8.0.360 → 6.9.0.363

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

@@ -43,16 +43,13 @@ module NewRelic
           to_debug_str(0)
         end
 
-        EMPTY_HASH = {}.freeze
-        EMPTY_ARRAY = [].freeze
-
         def to_array
-          params = @params ? @params : EMPTY_HASH
+          params = @params ? @params : NewRelic::EMPTY_HASH
           [ NewRelic::Helper.time_to_millis(@entry_timestamp),
             NewRelic::Helper.time_to_millis(@exit_timestamp),
             NewRelic::Coerce.string(@metric_name),
             params ] +
-            [ (@children ? @children.map{|s| s.to_array} : EMPTY_ARRAY) ]
+            [ (@children ? @children.map{|s| s.to_array} : NewRelic::EMPTY_ARRAY) ]
         end
 
         def path_string

data/lib/new_relic/agent/transaction_error_primitive.rb

@@ -8,8 +8,8 @@
 # the transaction event aggregator and the synthetics container.
 
 require 'new_relic/agent/payload_metric_mapping'
-require 'new_relic/agent/distributed_trace_payload'
-require 'new_relic/agent/distributed_trace_intrinsics'
+require 'new_relic/agent/distributed_tracing/distributed_trace_payload'
+require 'new_relic/agent/distributed_tracing/distributed_trace_intrinsics'
 
 module NewRelic
   module Agent

data/lib/new_relic/agent/transaction_event_primitive.rb

@@ -1,6 +1,7 @@
 # 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.
+# frozen_string_literal: true
 
 # This module was introduced and largely extracted from the transaction event aggregator
 # when the synthetics container was extracted from it. Its purpose is to create the data
@@ -8,7 +9,7 @@
 # the transaction event aggregator and the synthetics container.
 
 require 'new_relic/agent/payload_metric_mapping'
-require 'new_relic/agent/distributed_trace_intrinsics'
+require 'new_relic/agent/distributed_tracing/distributed_trace_intrinsics'
 
 module NewRelic
   module Agent
@@ -16,30 +17,28 @@ module NewRelic
       include NewRelic::Coerce
       extend self
 
+      COMMA = ','
+
       # The type field of the sample
-      SAMPLE_TYPE              = 'Transaction'.freeze
+      SAMPLE_TYPE              = 'Transaction'
 
       # Strings for static keys of the sample structure
-      TYPE_KEY                       = 'type'.freeze
-      TIMESTAMP_KEY                  = 'timestamp'.freeze
-      NAME_KEY                       = 'name'.freeze
-      DURATION_KEY                   = 'duration'.freeze
-      ERROR_KEY                      = 'error'.freeze
-      SAMPLED_KEY                    = 'sampled'.freeze
-      PRIORITY_KEY                   = 'priority'.freeze
-      GUID_KEY                       = 'nr.guid'.freeze
-      REFERRING_TRANSACTION_GUID_KEY = 'nr.referringTransactionGuid'.freeze
-      CAT_PATH_HASH_KEY              = 'nr.pathHash'.freeze
-      CAT_REFERRING_PATH_HASH_KEY    = 'nr.referringPathHash'.freeze
-      CAT_ALTERNATE_PATH_HASHES_KEY  = 'nr.alternatePathHashes'.freeze
-      APDEX_PERF_ZONE_KEY            = 'nr.apdexPerfZone'.freeze
-      SYNTHETICS_RESOURCE_ID_KEY     = "nr.syntheticsResourceId".freeze
-      SYNTHETICS_JOB_ID_KEY          = "nr.syntheticsJobId".freeze
-      SYNTHETICS_MONITOR_ID_KEY      = "nr.syntheticsMonitorId".freeze
-
-
-      # To avoid allocations when we have empty custom or agent attributes
-      EMPTY_HASH = {}.freeze
+      TYPE_KEY                       = 'type'
+      TIMESTAMP_KEY                  = 'timestamp'
+      NAME_KEY                       = 'name'
+      DURATION_KEY                   = 'duration'
+      ERROR_KEY                      = 'error'
+      SAMPLED_KEY                    = 'sampled'
+      PRIORITY_KEY                   = 'priority'
+      GUID_KEY                       = 'nr.guid'
+      REFERRING_TRANSACTION_GUID_KEY = 'nr.referringTransactionGuid'
+      CAT_PATH_HASH_KEY              = 'nr.pathHash'
+      CAT_REFERRING_PATH_HASH_KEY    = 'nr.referringPathHash'
+      CAT_ALTERNATE_PATH_HASHES_KEY  = 'nr.alternatePathHashes'
+      APDEX_PERF_ZONE_KEY            = 'nr.apdexPerfZone'
+      SYNTHETICS_RESOURCE_ID_KEY     = "nr.syntheticsResourceId"
+      SYNTHETICS_JOB_ID_KEY          = "nr.syntheticsJobId"
+      SYNTHETICS_MONITOR_ID_KEY      = "nr.syntheticsMonitorId"
 
       def create(payload)
         intrinsics = {
@@ -53,7 +52,7 @@ module NewRelic
 
         intrinsics[SAMPLED_KEY] = payload[:sampled] if payload.key?(:sampled)
 
-        NewRelic::Agent::PayloadMetricMapping.append_mapped_metrics(payload[:metrics], intrinsics)
+        PayloadMetricMapping.append_mapped_metrics(payload[:metrics], intrinsics)
         append_optional_attributes(intrinsics, payload)
         DistributedTraceIntrinsics.copy_to_hash payload, intrinsics
 
@@ -76,8 +75,6 @@ module NewRelic
         append_cat_alternate_path_hashes(sample, payload)
       end
 
-      COMMA = ','.freeze
-
       def append_cat_alternate_path_hashes(sample, payload)
         if payload.include?(:cat_alternate_path_hashes)
           sample[CAT_ALTERNATE_PATH_HASHES_KEY] = payload[:cat_alternate_path_hashes].sort.join(COMMA)
@@ -92,19 +89,19 @@ module NewRelic
 
       def custom_attributes attributes
         if attributes
-          result = attributes.custom_attributes_for(NewRelic::Agent::AttributeFilter::DST_TRANSACTION_EVENTS)
+          result = attributes.custom_attributes_for(AttributeFilter::DST_TRANSACTION_EVENTS)
           result.freeze
         else
-          EMPTY_HASH
+          NewRelic::EMPTY_HASH
         end
       end
 
       def agent_attributes attributes
         if attributes
-          result = attributes.agent_attributes_for(NewRelic::Agent::AttributeFilter::DST_TRANSACTION_EVENTS)
+          result = attributes.agent_attributes_for(AttributeFilter::DST_TRANSACTION_EVENTS)
           result.freeze
         else
-          EMPTY_HASH
+          NewRelic::EMPTY_HASH
         end
       end
     end

data/lib/new_relic/coerce.rb

@@ -1,9 +1,11 @@
 # 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.
+# frozen_string_literal: true
 
 module NewRelic
   module Coerce
+
     module_function
 
     # We really don't want to send bad values to the collector, and it doesn't
@@ -74,13 +76,13 @@ module NewRelic
       value.to_i
     end
 
-    def float! value
+    def float! value, precision=NewRelic::PRIORITY_PRECISION
       return nil unless value_or_nil(value)
-      value.to_f
+      value.to_f.round(precision)
     end
 
     def value_or_nil value
-      return nil if value.nil? || value.empty?
+      return nil if value.nil? || (value.respond_to?(:empty?) && value.empty?)
       value
     end
 

data/lib/new_relic/constants.rb

@@ -0,0 +1,34 @@
+# 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.
+# frozen_string_literal: true
+
+module NewRelic
+  PRIORITY_PRECISION = 6
+
+  EMPTY_ARRAY = [].freeze
+  EMPTY_HASH = {}.freeze
+  EMPTY_STR = ""
+
+  HTTP = "HTTP"
+  HTTPS = "HTTPS"
+  UNKNOWN = "Unknown"
+
+  FORMAT_NON_RACK = 0
+  FORMAT_RACK = 1
+
+  NEWRELIC_KEY = "newrelic"
+  CANDIDATE_NEWRELIC_KEYS = [
+    NEWRELIC_KEY,
+    'NEWRELIC',
+    'NewRelic',
+    'Newrelic'
+  ].freeze
+
+  TRACEPARENT_KEY = "traceparent"
+  TRACESTATE_KEY = "tracestate"
+
+  HTTP_TRACEPARENT_KEY = "HTTP_#{TRACEPARENT_KEY.upcase}"
+  HTTP_TRACESTATE_KEY = "HTTP_#{TRACESTATE_KEY.upcase}"
+  HTTP_NEWRELIC_KEY = "HTTP_#{NEWRELIC_KEY.upcase}"
+end

data/lib/new_relic/noticed_error.rb

@@ -81,8 +81,6 @@ class NewRelic::NoticedError
   AGENT_ATTRIBUTES = "agentAttributes".freeze
   INTRINSIC_ATTRIBUTES = "intrinsics".freeze
 
-  EMPTY_HASH = {}.freeze
-
   DESTINATION = NewRelic::Agent::AttributeFilter::DST_ERROR_COLLECTOR
 
   # Note that we process attributes lazily and store the result. This is because
@@ -137,7 +135,7 @@ class NewRelic::NoticedError
     agent_attributes = if @attributes
       @attributes.agent_attributes_for(DESTINATION)
     else
-      EMPTY_HASH
+      NewRelic::EMPTY_HASH
     end
 
     # It's possible to override the request_uri from the transaction attributes
@@ -155,7 +153,7 @@ class NewRelic::NoticedError
     if @attributes
       @attributes.intrinsic_attributes_for(DESTINATION)
     else
-      EMPTY_HASH
+      NewRelic::EMPTY_HASH
     end
   end
 

data/lib/new_relic/rack/browser_monitoring.rb

@@ -21,6 +21,7 @@ module NewRelic::Rack
 
     CONTENT_TYPE        = 'Content-Type'.freeze
     CONTENT_DISPOSITION = 'Content-Disposition'.freeze
+    CONTENT_LENGTH      = 'Content-Length'.freeze
     ATTACHMENT          = 'attachment'.freeze
     TEXT_HTML           = 'text/html'.freeze
 
@@ -35,6 +36,9 @@ module NewRelic::Rack
       js_to_inject = NewRelic::Agent.browser_timing_header
       if (js_to_inject != "") && should_instrument?(env, status, headers)
         response_string = autoinstrument_source(response, headers, js_to_inject)
+        if headers.key?(CONTENT_LENGTH)
+          headers[CONTENT_LENGTH] = response_string.size.to_s
+        end
 
         env[ALREADY_INSTRUMENTED_KEY] = true
         if response_string

data/lib/new_relic/supportability_helper.rb

@@ -11,6 +11,8 @@ module NewRelic
     # transaction, just to eke out a bit less performance hit
     #
     API_SUPPORTABILITY_METRICS = [
+      :accept_distributed_trace_headers,
+      :create_distributed_trace_headers,
       :add_custom_attributes,
       :add_instrumentation,
       :add_method_tracer,
@@ -64,5 +66,17 @@ module NewRelic
         NewRelic::Agent.logger.debug "API supportability metric not found for :#{method_name}"
       end
     end
+
+    def valid_api_argument_class? arg, name, klass
+      return true if arg.is_a?(klass)
+
+      caller_location = caller_locations.first.label
+
+      message = "Bad argument passed to ##{caller_location}. " \
+        "Expected #{klass} for `#{name}` but got #{headers.class}"
+
+      NewRelic::Agent.logger.warn message
+      nil
+    end
   end
 end

data/lib/new_relic/version.rb

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

data/lib/tasks/tests.rake

@@ -26,9 +26,14 @@ if defined? Rake::TestTask
     agent_home = File.expand_path(File.join(File.dirname(__FILE__),'..','..'))
 
     Rake::TestTask.new(:newrelic) do |t|
+      
+      file_pattern = ENV["file"]
+      file_pattern = file_pattern.split(",").map{|f| "#{agent_home}/#{f}".gsub("//", "/")} if file_pattern
+      file_pattern ||= "#{agent_home}/test/new_relic/**/*_test.rb"
+
       t.libs << "#{agent_home}/test"
       t.libs << "#{agent_home}/lib"
-      t.pattern = "#{agent_home}/test/new_relic/**/*_test.rb"
+      t.pattern = file_pattern
       t.verbose = true
     end
 

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 = [ "Chris Pine", "Rachel Klein", "Justin Foote", "Michael Lang" ]
+  s.authors = [ "Chris Pine", "Rachel Klein", "Tanna McClure", "Michael Lang" ]
   s.date = Time.now.strftime('%Y-%m-%d')
   s.licenses    = ['New Relic']
   s.description = <<-EOS
@@ -49,10 +49,12 @@ EOS
   s.summary = "New Relic Ruby Agent"
 
   s.add_development_dependency 'rake', '12.3.3'
+  s.add_development_dependency 'rb-inotify', '0.9.10'   # locked to support < Ruby 2.3 (and listen 3.0.8)
+  s.add_development_dependency 'listen', '3.0.8'        # locked to support < Ruby 2.3
   s.add_development_dependency 'minitest', '~> 4.7.5'
   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-nav', '~> 0.3.0'
   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'

data/test/agent_helper.rb

@@ -345,11 +345,22 @@ def in_transaction(*args, &blk)
   txn
 end
 
+# Temporarily disables default transformer so tests with invalid inputs can be tried
+def with_disabled_defaults_transformer key
+  begin
+    transformer = NewRelic::Agent::Configuration::DEFAULTS[key][:transform]
+    NewRelic::Agent::Configuration::DEFAULTS[key][:transform] = nil
+    yield
+  ensure
+    NewRelic::Agent::Configuration::DEFAULTS[key][:transform] = transformer
+  end
+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|
+  in_transaction(*args) do |txn|
     yield txn.current_segment, txn
   end
 end
@@ -795,3 +806,12 @@ end
 def attributes_for(sample, type)
   sample.attributes.instance_variable_get("@#{type}_attributes")
 end
+
+def uncache_trusted_account_key
+   NewRelic::Agent::Transaction::TraceContext::AccountHelpers.instance_variable_set :@trace_state_entry_key, nil
+end
+
+def reset_buffers_and_caches
+  NewRelic::Agent.drop_buffered_data
+  uncache_trusted_account_key
+end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 6.8.0.360
+  version: 6.9.0.363
 platform: ruby
 authors:
 - Chris Pine
 - Rachel Klein
-- Justin Foote
+- Tanna McClure
 - Michael Lang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-19 00:00:00.000000000 Z
+date: 2020-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -27,6 +27,34 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 12.3.3
+- !ruby/object:Gem::Dependency
+  name: rb-inotify
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.10
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.10
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.8
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.8
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -75,14 +103,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: pry-stack_explorer
   requirement: !ruby/object:Gem::Requirement
@@ -221,9 +249,6 @@ files:
 - lib/new_relic/agent/configuration/yaml_source.rb
 - lib/new_relic/agent/connect/request_builder.rb
 - lib/new_relic/agent/connect/response_handler.rb
-- lib/new_relic/agent/cross_app_monitor.rb
-- lib/new_relic/agent/cross_app_payload.rb
-- lib/new_relic/agent/cross_app_tracing.rb
 - lib/new_relic/agent/custom_event_aggregator.rb
 - lib/new_relic/agent/database.rb
 - lib/new_relic/agent/database/explain_plan_helpers.rb
@@ -239,12 +264,15 @@ 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/distributed_tracing/cross_app_payload.rb
+- lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb
+- lib/new_relic/agent/distributed_tracing/distributed_trace_intrinsics.rb
+- lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb
+- lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb
+- lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb
+- lib/new_relic/agent/distributed_tracing/trace_context.rb
+- lib/new_relic/agent/distributed_tracing/trace_context_payload.rb
 - lib/new_relic/agent/encoding_normalizer.rb
 - lib/new_relic/agent/error_collector.rb
 - lib/new_relic/agent/error_event_aggregator.rb
@@ -266,7 +294,6 @@ files:
 - lib/new_relic/agent/http_clients/net_http_wrappers.rb
 - lib/new_relic/agent/http_clients/typhoeus_wrappers.rb
 - lib/new_relic/agent/http_clients/uri_util.rb
-- lib/new_relic/agent/inbound_request_monitor.rb
 - lib/new_relic/agent/instrumentation.rb
 - lib/new_relic/agent/instrumentation/action_cable_subscriber.rb
 - lib/new_relic/agent/instrumentation/action_controller_subscriber.rb
@@ -335,6 +362,11 @@ files:
 - lib/new_relic/agent/messaging.rb
 - lib/new_relic/agent/method_tracer.rb
 - lib/new_relic/agent/method_tracer_helpers.rb
+- lib/new_relic/agent/monitors.rb
+- lib/new_relic/agent/monitors/cross_app_monitor.rb
+- lib/new_relic/agent/monitors/distributed_tracing_monitor.rb
+- lib/new_relic/agent/monitors/inbound_request_monitor.rb
+- lib/new_relic/agent/monitors/synthetics_monitor.rb
 - lib/new_relic/agent/new_relic_service.rb
 - lib/new_relic/agent/new_relic_service/encoders.rb
 - lib/new_relic/agent/new_relic_service/json_marshaller.rb
@@ -368,20 +400,17 @@ files:
 - lib/new_relic/agent/stats_engine/stats_hash.rb
 - lib/new_relic/agent/supported_versions.rb
 - lib/new_relic/agent/synthetics_event_aggregator.rb
-- lib/new_relic/agent/synthetics_monitor.rb
 - lib/new_relic/agent/system_info.rb
 - lib/new_relic/agent/threading/agent_thread.rb
 - lib/new_relic/agent/threading/backtrace_node.rb
 - 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/datastore_segment.rb
+- lib/new_relic/agent/transaction/distributed_tracer.rb
 - lib/new_relic/agent/transaction/distributed_tracing.rb
 - lib/new_relic/agent/transaction/external_request_segment.rb
 - lib/new_relic/agent/transaction/message_broker_segment.rb
@@ -420,6 +449,7 @@ files:
 - lib/new_relic/cli/commands/install.rb
 - lib/new_relic/coerce.rb
 - lib/new_relic/collection_helper.rb
+- lib/new_relic/constants.rb
 - lib/new_relic/control.rb
 - lib/new_relic/control/class_methods.rb
 - lib/new_relic/control/frameworks.rb
@@ -494,7 +524,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: New Relic Ruby Agent