newrelic_rpm 4.7.1.340 → 4.8.0.341

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a3a168ac481a87a70d8f290883b23ab68a34350
-  data.tar.gz: cf5d8a5680a0d8303b54233c87997b64f71440bd
+  metadata.gz: b51f94bfacea16c929d073a557db1c96c171da40
+  data.tar.gz: 6b593714cfad1a3751dd07b410ba300fe46e4751
 SHA512:
-  metadata.gz: c6ef5fdc5bc818e532fc67ffb3a6ab937271f5aeb7ee98b3e52e55da5962fcfbf1fb9d5f4f585bef8592de128b2b0ea7366b3d0c3ad526687c09e136c6620d3a
-  data.tar.gz: a5d67d727409fb4879880923a26bbebdce0d77f04b7931a842fef6166fd0b0790e59b84dfc6c06e38690a4c90b73197929b728ffe9e876004834cf4c6db45974
+  metadata.gz: 88aa0416e6c2a3f8e32b6b5536e1b4f58b5b423ce06085ba583830fca6c014c04ea318bad3b48bcc17f5f93506d27f1ac7fed3ce56fb157cfd43830650c74652
+  data.tar.gz: afc0971db514b4b76e93725c6c7b299e26a281ba0a8cee2add9aba30a149f0c20a0dc74d7d08363f4977a54c5dc90f2e897edf64d2fa658cf286cc18358cc978

data/.travis.yml

@@ -10,6 +10,7 @@ sudo: required
 
 before_install:
   - gem --version
+  - gem update --system
   - ./test/script/before_install/gemstash_mirror.sh
   - bundle --version
 
@@ -33,6 +34,7 @@ notifications:
 rvm:
   # Run slowest builds first to try and optimize overall cycle time.
   - jruby-9.1.13.0
+  - 2.5.0
   - 2.4.2
   - 2.3.5
   - 2.2.8
@@ -80,6 +82,24 @@ matrix:
   fast_finish: true
   exclude:
     # Unsupported Rails/Ruby combinations
+    # 2.5
+    - rvm: 2.5.0
+      env: TYPE=UNIT ENVIRONMENT=rails21
+    - rvm: 2.5.0
+      env: TYPE=UNIT ENVIRONMENT=rails22
+    - rvm: 2.5.0
+      env: TYPE=UNIT ENVIRONMENT=rails23
+    - rvm: 2.5.0
+      env: TYPE=UNIT ENVIRONMENT=rails30
+    - rvm: 2.5.0
+      env: TYPE=UNIT ENVIRONMENT=rails31
+    - rvm: 2.5.0
+      env: TYPE=UNIT ENVIRONMENT=rails32
+    - rvm: 2.5.0
+      env: TYPE=UNIT ENVIRONMENT=rails40
+    - rvm: 2.5.0
+      env: TYPE=UNIT ENVIRONMENT=rails41
+
     # 2.4
     - rvm: 2.4.2
       env: TYPE=UNIT ENVIRONMENT=rails21
@@ -97,8 +117,6 @@ matrix:
       env: TYPE=UNIT ENVIRONMENT=rails40
     - rvm: 2.4.2
       env: TYPE=UNIT ENVIRONMENT=rails41
-    - rvm: 2.4.2
-      env: TYPE=UNIT ENVIRONMENT=rails42
 
     # 2.3
     - rvm: 2.3.5

data/CHANGELOG.md

@@ -1,5 +1,27 @@
 # New Relic Ruby Agent Release Notes #
 
+  ## v4.8.0 ##
+
+  * Initialize New Relic Agent before config initializers
+
+  When running in a Rails environment, the agent registers an initializer that
+  starts the agent. This initializer is now defined to run before config/initializers.
+  Previously, the ordering was not specified for the initializer. This change
+  guarantees the agent will started by the time your initializers run, so you can
+  safely reference the Agent in your custom initializers. Thanks to Tony Ta for
+  the contribution.
+
+  * Ruby 2.5 Support
+
+  The Ruby Agent has been verified to run under Ruby 2.5.
+
+  * `request.uri` Collected as an Agent Attribute
+
+  Users can now control the collection of `request.uri` on errors and transaction
+  traces. Previously it was always collected without the ability to turn it off.
+  It is now an agent attribute that can be controlled via the attributes config.
+  For more information on agent attributes [see here](https://docs.newrelic.com/docs/agents/manage-apm-agents/agent-data/agent-attributes).
+
   ## 4.7.1 ##
 
   * Bugfix for Manual Browser Instrumentation
@@ -7,7 +29,8 @@
   There was a previous bug that required setting both `rum.enabled: false` and
   `browser.auto_instrument: false` to completely disable browser monitoring. An
   attempt to fix this in 4.7.0 resulted in breaking manual browser
-  instrumentation. Those changes have been reverted.
+  instrumentation. Those changes have been reverted. We will revisit this issue
+  in an upcoming release.
 
   ## v4.7.0 ##
 

data/lib/new_relic/agent/attribute_filter.rb

@@ -100,8 +100,6 @@ module NewRelic
         build_rule(config[:'transaction_events.attributes.include'], DST_TRANSACTION_EVENTS, true)
         build_rule(config[:'error_collector.attributes.include'],    DST_ERROR_COLLECTOR,    true)
         build_rule(config[:'browser_monitoring.attributes.include'], DST_BROWSER_MONITORING, true)
-        # This agent attribute has unexpected behaviors and we need to ensure it only goes where directed in configuration
-        build_rule(['request_uri'], DST_TRANSACTION_TRACER | DST_ERROR_COLLECTOR, false)
 
         @rules.sort!
 

data/lib/new_relic/agent/configuration/yaml_source.rb

@@ -9,11 +9,19 @@ module NewRelic
     module Configuration
       class YamlSource < DottedHash
         attr_accessor :file_path, :failures
+        attr_reader :generated_for_user, :license_key
 
         def initialize(path, env)
           config    = {}
           @failures = []
 
+          # These are needed in process_erb for populating the newrelic.yml via
+          # erb binding, necessary when using the default newrelic.yml file. They
+          # are defined as ivars instead of local variables to prevent
+          # `assigned but unused variable` warnings when running with -W
+          @generated_for_user = ''
+          @license_key = ''
+
           begin
             @file_path = validate_config_file_path(path)
             return unless @file_path
@@ -81,20 +89,10 @@ module NewRelic
             # ERB template commented at the YML level is fine. Leave the line,
             # though, so ERB line numbers remain correct.
             file.gsub!(/^\s*#.*$/, '#')
-
-            # Next two are for populating the newrelic.yml via erb binding, necessary
-            # when using the default newrelic.yml file
-            generated_for_user = ''
-            license_key = ''
-
             ERB.new(file).result(binding)
           rescue ScriptError, StandardError => e
             log_failure("Failed ERB processing configuration file. This is typically caused by a Ruby error in <% %> templating blocks in your newrelic.yml file.", e)
             nil
-          ensure
-            # Avoid warnings by using these again
-            generated_for_user = nil
-            license_key = nil
           end
         end
 

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

@@ -12,8 +12,6 @@ module NewRelic
                     :host, :port, :user_agent, :request_method
 
         HTTP_ACCEPT_HEADER_KEY = "HTTP_ACCEPT".freeze
-        REQUEST_URI_KEY = "request_uri".freeze
-        WILDCARD = "*".freeze
 
         def initialize request
           @request_path = path_from_request request
@@ -36,12 +34,11 @@ module NewRelic
             txn.add_agent_attribute :'request.headers.referer', referer, AttributeFilter::DST_ERROR_COLLECTOR
           end
 
-          # This is temporary and aims to avoid collecting this attribute on transaction and error traces, 
-          # which already directly have a path value that the RPM UI depends on. We will either only
-          # collect request_uri as an agent attribute, in conjunction with UI work, or we will stop collecting
-          # this as an agent attribute (RUBY-1573)
-          if request_path && configured_to_collect?
-            txn.add_agent_attribute :request_uri, request_path, AttributeFilter::DST_TRANSACTION_EVENTS
+          if request_path
+            txn.add_agent_attribute :'request.uri',
+                                    request_path,
+                                    AttributeFilter::DST_TRANSACTION_TRACER |
+                                    AttributeFilter::DST_ERROR_COLLECTOR
           end
 
           if accept
@@ -119,11 +116,6 @@ module NewRelic
             env[key]
           end
         end
-
-        def configured_to_collect?
-          txn_event_attributes = NewRelic::Agent.config[:'transaction_events.attributes.include']
-          txn_event_attributes.any?{|attribute| attribute == REQUEST_URI_KEY || attribute == WILDCARD}
-        end
       end
     end
   end

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

@@ -11,9 +11,8 @@ module NewRelic
         class FinishedTraceError < StandardError; end
 
         attr_reader :start_time, :root_node
-        attr_accessor :transaction_name, :uri, :guid, :xray_session_id,
-                      :attributes, :node_count, :finished, :threshold,
-                      :profile
+        attr_accessor :transaction_name, :guid, :xray_session_id, :attributes,
+                      :node_count, :finished, :threshold, :profile
 
         ROOT = "ROOT".freeze
 
@@ -118,35 +117,44 @@ module NewRelic
           @root_node.each_node_with_nest_tracking(&block)
         end
 
-        EMPTY_HASH = {}.freeze
+        AGENT_ATTRIBUTES_KEY     = 'agentAttributes'.freeze
+        USER_ATTRIBUTES_KEY      = 'userAttributes'.freeze
+        INTRINSIC_ATTRIBUTES_KEY = 'intrinsics'.freeze
 
-        def trace_tree
+        def attributes_for_tracer_destination
           destination = NewRelic::Agent::AttributeFilter::DST_TRANSACTION_TRACER
 
           agent_attributes     = self.attributes.agent_attributes_for(destination)
           custom_attributes    = self.attributes.custom_attributes_for(destination)
           intrinsic_attributes = self.attributes.intrinsic_attributes_for(destination)
 
+          {
+            AGENT_ATTRIBUTES_KEY     => agent_attributes,
+            USER_ATTRIBUTES_KEY      => custom_attributes,
+            INTRINSIC_ATTRIBUTES_KEY => intrinsic_attributes
+          }
+        end
+
+        EMPTY_HASH = {}.freeze
+
+        def trace_tree attributes_hash
           [
             NewRelic::Coerce.float(self.start_time),
             EMPTY_HASH,
             EMPTY_HASH,
             self.root_node.to_array,
-            {
-              'agentAttributes' => agent_attributes,
-              'userAttributes'  => custom_attributes,
-              'intrinsics'      => intrinsic_attributes
-            }
+            attributes_hash
           ]
         end
 
         def to_collector_array(encoder)
+          attributes_hash = attributes_for_tracer_destination
           [
             NewRelic::Helper.time_to_millis(self.start_time),
             NewRelic::Helper.time_to_millis(self.root_node.duration),
             NewRelic::Coerce.string(self.transaction_name),
-            NewRelic::Coerce.string(self.uri),
-            encoder.encode(trace_tree),
+            NewRelic::Coerce.string(attributes_hash[AGENT_ATTRIBUTES_KEY][:'request.uri']),
+            encoder.encode(trace_tree(attributes_hash)),
             NewRelic::Coerce.string(self.guid),
             nil,
             forced?,

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

@@ -45,7 +45,6 @@ module NewRelic
 
         def copy_attributes transaction, trace
           trace.transaction_name = transaction.best_name
-          trace.uri = transaction.request_path
           trace.guid = transaction.guid
           trace.attributes = transaction.attributes
           trace.threshold = transaction.threshold

data/lib/new_relic/noticed_error.rb

@@ -87,8 +87,9 @@ class NewRelic::NoticedError
   def processed_attributes
     @processed_attributes ||= begin
       attributes = base_parameters
-      append_attributes(attributes, USER_ATTRIBUTES, merged_custom_attributes)
-      append_attributes(attributes, AGENT_ATTRIBUTES, build_agent_attributes)
+      merged_attributes = NewRelic::Agent::Transaction::Attributes.new(NewRelic::Agent.instance.attribute_filter)
+      append_attributes(attributes, USER_ATTRIBUTES, merged_custom_attributes(merged_attributes))
+      append_attributes(attributes, AGENT_ATTRIBUTES, build_agent_attributes(merged_attributes))
       append_attributes(attributes, INTRINSIC_ATTRIBUTES, build_intrinsic_attributes)
       attributes
     end
@@ -96,7 +97,6 @@ class NewRelic::NoticedError
 
   def base_parameters
     params = {}
-    params[:request_uri]      = request_uri if request_uri
     params[:file_name]        = file_name   if file_name
     params[:line_number]      = line_number if line_number
     params[:stack_trace]      = stack_trace if stack_trace
@@ -108,9 +108,7 @@ class NewRelic::NoticedError
   # hold in @attributes, or passed options to notice_error which show up in
   # @attributes_from_notice_error. Both need filtering, so merge them together
   # in our Attributes class for consistent handling
-  def merged_custom_attributes
-    merged_attributes = NewRelic::Agent::Transaction::Attributes.new(NewRelic::Agent.instance.attribute_filter)
-
+  def merged_custom_attributes(merged_attributes)
     merge_custom_attributes_from_transaction(merged_attributes)
     merge_custom_attributes_from_notice_error(merged_attributes)
 
@@ -131,12 +129,22 @@ class NewRelic::NoticedError
     end
   end
 
-  def build_agent_attributes
-    if @attributes
+  def build_agent_attributes(merged_attributes)
+    agent_attributes = if @attributes
       @attributes.agent_attributes_for(DESTINATION)
     else
       EMPTY_HASH
     end
+
+    # It's possible to override the request_uri from the transaction attributes
+    # with a uri passed to notice_error. Add it to merged_attributes filter and
+    # merge with the transaction attributes, possibly overriding the request_uri
+    if request_uri
+      merged_attributes.add_agent_attribute(:'request.uri', request_uri, DESTINATION)
+      agent_attributes.merge(merged_attributes.agent_attributes_for(DESTINATION))
+    end
+
+    agent_attributes
   end
 
   def build_intrinsic_attributes

data/lib/new_relic/version.rb

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

data/lib/newrelic_rpm.rb

@@ -37,7 +37,7 @@ elsif defined?(Rails::VERSION)
     module NewRelic
       class Railtie < Rails::Railtie
 
-        initializer "newrelic_rpm.start_plugin" do |app|
+        initializer "newrelic_rpm.start_plugin", before: :load_config_initializers do |app|
           NewRelic::Control.instance.init_plugin(:config => app.config)
         end
       end

data/test/agent_helper.rb

@@ -484,16 +484,16 @@ unless Time.respond_to?(:__original_now)
   end
 end
 
-def freeze_time(now=Time.now)
+def nr_freeze_time(now=Time.now)
   Time.__frozen_now = now
 end
 
-def unfreeze_time
+def nr_unfreeze_time
   Time.__frozen_now = nil
 end
 
 def advance_time(seconds)
-  freeze_time(Time.now + seconds)
+  Time.__frozen_now = Time.now + seconds
 end
 
 def with_constant_defined(constant_symbol, implementation=Module.new)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 4.7.1.340
+  version: 4.8.0.341
 platform: ruby
 authors:
 - Matthew Wear
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-21 00:00:00.000000000 Z
+date: 2018-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake