newrelic_rpm 4.4.0.336 → 4.5.0.337

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9d189b04c1171316153a227be91c6abad18f00a
-  data.tar.gz: 2b1c100c3778ba5fa95937d6d87bbe9949fb99a1
+  metadata.gz: 5163342ef18117639611f7ff1658dbd48aaaae2c
+  data.tar.gz: d2d78f11f66675e6887ea6a9a8ec3606d5e45704
 SHA512:
-  metadata.gz: e77e92639fc53364aaf68627c4d41f1bc9e61ad6f2ce1978732d206a3b7eaf84ee72f06a934a92087179b3c534ea4803d7da5fe6d134416bd32b14f1e7532483
-  data.tar.gz: 566143ee90b3f3c027cb4201824766986d62c66cc78f2311da53861f23dcd272deb528dabceb36efd37db5fcc8e9f8b28f45d12f3729362feea58044dbe87b76
+  metadata.gz: 3c371c48d1eaddd30865ee2d1fc1f3fef8fc55182c30d35be4d04b858d276132540f9ffb65f23ec5d231afc0be8991545032b2ef3628add899d1a3c473d7e7e6
+  data.tar.gz: 075fc7e970ac1c0d99ee4152550551cc85f3f764bfdd8ee6643f021710242ab2d47985d4c259f4adbd4544ae74826e2d900b1a9152bb882098f58d36d2e0aacb

data/.travis.yml

@@ -32,10 +32,10 @@ notifications:
 
 rvm:
   # Run slowest builds first to try and optimize overall cycle time.
-  - jruby-9.1.12.0
-  - 2.4.1
-  - 2.3.4
-  - 2.2.7
+  - jruby-9.1.13.0
+  - 2.4.2
+  - 2.3.5
+  - 2.2.8
   - 2.1.10
   - 2.0.0-p648
 
@@ -81,39 +81,39 @@ matrix:
   exclude:
     # Unsupported Rails/Ruby combinations
     # 2.4
-    - rvm: 2.4.1
+    - rvm: 2.4.2
       env: TYPE=UNIT ENVIRONMENT=rails21
-    - rvm: 2.4.1
+    - rvm: 2.4.2
       env: TYPE=UNIT ENVIRONMENT=rails22
-    - rvm: 2.4.1
+    - rvm: 2.4.2
       env: TYPE=UNIT ENVIRONMENT=rails23
-    - rvm: 2.4.1
+    - rvm: 2.4.2
       env: TYPE=UNIT ENVIRONMENT=rails30
-    - rvm: 2.4.1
+    - rvm: 2.4.2
       env: TYPE=UNIT ENVIRONMENT=rails31
-    - rvm: 2.4.1
+    - rvm: 2.4.2
       env: TYPE=UNIT ENVIRONMENT=rails32
-    - rvm: 2.4.1
+    - rvm: 2.4.2
       env: TYPE=UNIT ENVIRONMENT=rails40
-    - rvm: 2.4.1
+    - rvm: 2.4.2
       env: TYPE=UNIT ENVIRONMENT=rails41
-    - rvm: 2.4.1
+    - rvm: 2.4.2
       env: TYPE=UNIT ENVIRONMENT=rails42
 
     # 2.3
-    - rvm: 2.3.4
+    - rvm: 2.3.5
       env: TYPE=UNIT ENVIRONMENT=rails21
-    - rvm: 2.3.4
+    - rvm: 2.3.5
       env: TYPE=UNIT ENVIRONMENT=rails22
-    - rvm: 2.3.4
+    - rvm: 2.3.5
       env: TYPE=UNIT ENVIRONMENT=rails23
 
     # 2.2
-    - rvm: 2.2.7
+    - rvm: 2.2.8
       env: TYPE=UNIT ENVIRONMENT=rails21
-    - rvm: 2.2.7
+    - rvm: 2.2.8
       env: TYPE=UNIT ENVIRONMENT=rails22
-    - rvm: 2.2.7
+    - rvm: 2.2.8
       env: TYPE=UNIT ENVIRONMENT=rails23
 
     # 2.1
@@ -141,15 +141,15 @@ matrix:
       env: TYPE=UNIT ENVIRONMENT=rails51
 
     # jruby 9.0
-    - rvm: jruby-9.1.12.0
+    - rvm: jruby-9.1.13.0
       env: TYPE=UNIT ENVIRONMENT=rails21
-    - rvm: jruby-9.1.12.0
+    - rvm: jruby-9.1.13.0
       env: TYPE=UNIT ENVIRONMENT=rails22
-    - rvm: jruby-9.1.12.0
+    - rvm: jruby-9.1.13.0
       env: TYPE=UNIT ENVIRONMENT=rails23
-    - rvm: jruby-9.1.12.0
+    - rvm: jruby-9.1.13.0
       env: TYPE=UNIT ENVIRONMENT=rails30
-    - rvm: jruby-9.1.12.0
+    - rvm: jruby-9.1.13.0
       env: TYPE=UNIT ENVIRONMENT=rails31
-    - rvm: jruby-9.1.12.0
+    - rvm: jruby-9.1.13.0
       env: TYPE=UNIT ENVIRONMENT=rails32

data/CHANGELOG.md

@@ -1,5 +1,43 @@
 # New Relic Ruby Agent Release Notes #
 
+## v4.5.0 ##
+
+  * Send synthetics headers even when CAT disabled
+
+  The agent now sends synthetics headers whenever they are received from an
+  external request, even if cross-application tracing is disabled.
+
+  * Bugfix for DelayedJob Daemonization
+
+  Customers using the delayed_job script that ships with the gem may encounter
+  an IOError with a message indicating the stream was closed. This was due to
+  the agent attempting to write a byte into a Pipe that was closed during the
+  deamonization of the delayed_job script. This issue has been fixed.
+
+  * Collect supportability metrics for public API
+
+  The agent now collects Supportability/API/{method} metrics to track usage of
+  all methods in the agent's public API.
+
+  * Collect supportability metrics on `Module#prepend`
+
+  The agent now collects Supportability/PrependedModules/{Module} metrics
+  for ActiveRecord 4 and 5, ActionController 4 and 5, ActionView 4 and 5,
+  ActiveJob 5, and ActionCable 5. These help track the adoption of the
+  `Module#prepend` method so we can maintain compatibility with newer versions
+  of Ruby and Rails.
+
+  * Collect explain plans when using PostGIS ActiveRecord adapter
+
+  The agent will now collect slow SQL explain plans, if configured to, on
+  connections using the PostGIS adapter. Thanks Ari Pollak for the contribution!
+
+  * Lazily intialize New Relic Config
+
+  The agent will lazily initialize the New Relic config. This allows the agent
+  to pickup configuration from environment variables set by dotenv and similar
+  tools.
+
 ## v4.4.0 ##
 
   * Include test helper for 3rd party use

data/lib/new_relic/agent.rb

@@ -30,6 +30,7 @@ module NewRelic
     require 'new_relic/metric_spec'
     require 'new_relic/metric_data'
     require 'new_relic/noticed_error'
+    require 'new_relic/supportability_helper'
 
     require 'new_relic/agent/encoding_normalizer'
     require 'new_relic/agent/stats'
@@ -65,6 +66,8 @@ module NewRelic
     require 'thread'
     require 'resolv'
 
+    extend NewRelic::SupportabilityHelper
+
     # An exception that is thrown by the server if the agent license is invalid.
     class LicenseException < StandardError; end
 
@@ -120,17 +123,14 @@ module NewRelic
       @logger = log
     end
 
-    # This needs to come after the definition of the logger method above, since
-    # instantiating the config writes to the Logger.
-
-    @config = NewRelic::Agent::Configuration::Manager.new
-
-    attr_reader :config
+    def config
+      @config ||= Configuration::Manager.new
+    end
 
     # For testing
     # Important that we don't change the instance or we orphan callbacks
     def reset_config
-      @config.reset_to_defaults
+      config.reset_to_defaults
     end
 
     # @!group Recording custom metrics
@@ -152,6 +152,8 @@ module NewRelic
     #
     # @api public
     def record_metric(metric_name, value) #THREAD_LOCAL_ACCESS
+      record_api_supportability_metric(:record_metric)
+
       return unless agent
 
       if value.is_a?(Hash)
@@ -179,8 +181,8 @@ module NewRelic
     def increment_metric(metric_name, amount=1) #THREAD_LOCAL_ACCESS
       return unless agent
 
-      agent.stats_engine.tl_record_unscoped_metrics(metric_name) do |stats|
-        stats.increment_count(amount)
+      { 'Supportability/API/increment_metric' => 1,  metric_name => amount }.each do |metric, increment_amount|
+        agent.stats_engine.tl_record_unscoped_metrics(metric) {|stats| stats.increment_count(increment_amount) }
       end
     end
 
@@ -200,6 +202,8 @@ module NewRelic
     # @api public
     #
     def ignore_error_filter(&block)
+      record_api_supportability_metric(:ignore_error_filter)
+
       if block
         NewRelic::Agent::ErrorCollector.ignore_error_filter = block
       else
@@ -236,6 +240,7 @@ module NewRelic
     # @api public
     #
     def notice_error(exception, options={})
+      record_api_supportability_metric(:notice_error)
 
       if options.has_key?(:trace_only)
         NewRelic::Agent.logger.log_once(:warn, :trace_only_deprecated,
@@ -276,9 +281,12 @@ module NewRelic
     # @api public
     #
     def record_custom_event(event_type, event_attrs)
+      record_api_supportability_metric(:record_custom_event)
+
       if agent && NewRelic::Agent.config[:'custom_insights_events.enabled']
         agent.custom_event_aggregator.record(event_type, event_attrs)
       end
+
       nil
     end
 
@@ -304,6 +312,8 @@ module NewRelic
     # @api public
     #
     def manual_start(options={})
+      record_api_supportability_metric(:manual_start)
+
       raise "Options must be a hash" unless Hash === options
       NewRelic::Control.instance.init_plugin({ :agent_enabled => true, :sync_startup => true }.merge(options))
     end
@@ -334,6 +344,7 @@ module NewRelic
     # @api public
     #
     def after_fork(options={})
+      record_api_supportability_metric(:after_fork)
       agent.after_fork(options) if agent
     end
 
@@ -345,6 +356,7 @@ module NewRelic
     # @api public
     #
     def shutdown(options={})
+      record_api_supportability_metric(:shutdown)
       agent.shutdown if agent
     end
 
@@ -354,6 +366,7 @@ module NewRelic
     # @api public
     def drop_buffered_data
       agent.drop_buffered_data if agent
+      record_api_supportability_metric(:drop_buffered_data)
     end
 
     # Add instrumentation files to the agent.  The argument should be
@@ -366,6 +379,7 @@ module NewRelic
     # @api public
     #
     def add_instrumentation(file_pattern)
+      record_api_supportability_metric(:add_instrumentation)
       NewRelic::Control.instance.add_instrumentation file_pattern
     end
 
@@ -373,6 +387,7 @@ module NewRelic
     #
     # @api public
     def require_test_helper
+      record_api_supportability_metric(:require_test_helper)
       require File.expand_path('../../../test/agent_helper', __FILE__)
     end
 
@@ -393,6 +408,7 @@ module NewRelic
     # @api public
     #
     def set_sql_obfuscator(type = :replace, &block)
+      record_api_supportability_metric(:set_sql_obfuscator)
       NewRelic::Agent::Database.set_sql_obfuscator(type, &block)
     end
 
@@ -407,6 +423,7 @@ module NewRelic
     # @api public
     #
     def ignore_transaction
+      record_api_supportability_metric(:ignore_transaction)
       txn = NewRelic::Agent::Transaction.tl_current
       txn.ignore! if txn
     end
@@ -417,6 +434,7 @@ module NewRelic
     # @api public
     #
     def ignore_apdex
+      record_api_supportability_metric(:ignore_apdex)
       txn = NewRelic::Agent::Transaction.tl_current
       txn.ignore_apdex! if txn
     end
@@ -427,6 +445,7 @@ module NewRelic
     # @api public
     #
     def ignore_enduser
+      record_api_supportability_metric(:ignore_enduser)
       txn = NewRelic::Agent::Transaction.tl_current
       txn.ignore_enduser! if txn
     end
@@ -439,6 +458,8 @@ module NewRelic
     # @api public
     #
     def disable_all_tracing
+      record_api_supportability_metric(:disable_all_tracing)
+
       return yield unless agent
 
       begin
@@ -455,6 +476,8 @@ module NewRelic
     # @api public
     #
     def disable_transaction_tracing
+      record_api_supportability_metric(:disable_transaction_tracing)
+
       return yield unless agent
 
       state = agent.set_record_tt(false)
@@ -477,6 +500,8 @@ module NewRelic
     # @api public
     #
     def disable_sql_recording
+      record_api_supportability_metric(:disable_sql_recording)
+
       return yield unless agent
 
       state = agent.set_record_sql(false)
@@ -519,6 +544,8 @@ module NewRelic
     # @api public
     #
     def add_custom_attributes(params) #THREAD_LOCAL_ACCESS
+      record_api_supportability_metric(:add_custom_attributes)
+
       if params.is_a? Hash
         txn = Transaction.tl_current
         txn.add_custom_attributes(params) if txn
@@ -555,6 +582,7 @@ module NewRelic
     # @api public
     #
     def set_transaction_name(name, options={})
+      record_api_supportability_metric(:set_transaction_name)
       Transaction.set_overriding_transaction_name(name, options[:category])
     end
 
@@ -564,6 +592,8 @@ module NewRelic
     # @api public
     #
     def get_transaction_name #THREAD_LOCAL_ACCESS
+      record_api_supportability_metric(:get_transaction_name)
+
       txn = Transaction.tl_current
       if txn
         namer = Instrumentation::ControllerInstrumentation::TransactionNamer
@@ -621,6 +651,8 @@ module NewRelic
     # @api public
     #
     def browser_timing_header
+      record_api_supportability_metric(:browser_timing_header)
+
       return "" unless agent
       agent.javascript_instrumentor.browser_timing_header
     end

data/lib/new_relic/agent/agent.rb

@@ -74,7 +74,8 @@ module NewRelic
         @waited_on_connect  = nil
         @connected_pid      = nil
 
-        @wait_on_connect_reader, @wait_on_connect_writer = IO.pipe
+        @wait_on_connect_mutex = Mutex.new
+        @wait_on_connect_condition = ConditionVariable.new
 
         setup_attribute_filter
       end
@@ -862,7 +863,9 @@ module NewRelic
           end
 
           def signal_connected
-            @wait_on_connect_writer << "."
+            @wait_on_connect_mutex.synchronize do
+              @wait_on_connect_condition.signal
+            end
           end
 
           def wait_on_connect(timeout)
@@ -870,7 +873,10 @@ module NewRelic
 
             @waited_on_connect = true
             NewRelic::Agent.logger.debug("Waiting on connect to complete.")
-            IO.select([@wait_on_connect_reader], nil, nil, timeout)
+
+            @wait_on_connect_mutex.synchronize do
+              @wait_on_connect_condition.wait(@wait_on_connect_mutex, timeout)
+            end
 
             unless connected?
               raise WaitOnConnectTimeout, "Agent was unable to connect in #{timeout} seconds."

data/lib/new_relic/agent/cross_app_tracing.rb

@@ -18,9 +18,6 @@ module NewRelic
       # The cross app transaction header for "outgoing" calls
       NR_TXN_HEADER = 'X-NewRelic-Transaction'.freeze
 
-      # The cross app synthetics header
-      NR_SYNTHETICS_HEADER = 'X-NewRelic-Synthetics'.freeze
-
       NR_MESSAGE_BROKER_ID_HEADER  = 'NewRelicID'.freeze
       NR_MESSAGE_BROKER_TXN_HEADER = 'NewRelicTransaction'.freeze
       NR_MESSAGE_BROKER_SYNTHETICS_HEADER = 'NewRelicSynthetics'.freeze
@@ -61,15 +58,12 @@ module NewRelic
         @obfuscator ||= NewRelic::Agent::Obfuscator.new(NewRelic::Agent.config[:encoding_key])
       end
 
-      def insert_request_headers(request, txn_guid, trip_id, path_hash, synthetics_header)
+      def insert_request_headers request, txn_guid, trip_id, path_hash
         cross_app_id = NewRelic::Agent.config[:cross_process_id]
         txn_data  = ::JSON.dump([txn_guid, false, trip_id, path_hash])
 
         request[NR_ID_HEADER]  = obfuscator.obfuscate(cross_app_id)
         request[NR_TXN_HEADER] = obfuscator.obfuscate(txn_data)
-        if synthetics_header
-          request[NR_SYNTHETICS_HEADER] = synthetics_header
-        end
       end
 
       def response_has_crossapp_header?(response)

data/lib/new_relic/agent/database.rb

@@ -231,13 +231,14 @@ module NewRelic
 
         private
 
+        POSTGIS_PREFIX  = 'postgis'.freeze
         POSTGRES_PREFIX = 'postgres'.freeze
         MYSQL_PREFIX    = 'mysql'.freeze
         MYSQL2_PREFIX   = 'mysql2'.freeze
         SQLITE_PREFIX   = 'sqlite'.freeze
 
         def symbolized_adapter(adapter)
-          if adapter.start_with? POSTGRES_PREFIX
+          if adapter.start_with?(POSTGRES_PREFIX) || adapter == POSTGIS_PREFIX
             :postgres
           elsif adapter == MYSQL_PREFIX
             :mysql

data/lib/new_relic/agent/datastores.rb

@@ -34,6 +34,8 @@ module NewRelic
       # @api public
       #
       def self.trace(clazz, method_name, product, operation = method_name)
+        NewRelic::Agent.record_api_supportability_metric(:trace)
+
         clazz.class_eval do
           method_name_without_newrelic = "#{method_name}_without_newrelic"
 
@@ -49,7 +51,7 @@ module NewRelic
               begin
                 send(method_name_without_newrelic, *args, &blk)
               ensure
-                segment.finish
+                segment.finish if segment
               end
             end
 
@@ -103,6 +105,8 @@ module NewRelic
       # @api public
       #
       def self.wrap(product, operation, collection = nil, callback = nil)
+        NewRelic::Agent.record_api_supportability_metric(:wrap)
+
         return yield unless operation
 
         segment = NewRelic::Agent::Transaction.start_datastore_segment(product, operation, collection)
@@ -114,7 +118,7 @@ module NewRelic
             elapsed_time = (Time.now - segment.start_time).to_f
             callback.call(result, segment.name, elapsed_time)
           end
-          segment.finish
+          segment.finish if segment
         end
       end
 
@@ -147,6 +151,8 @@ module NewRelic
       # @api public
       #
       def self.notice_sql(query, scoped_metric, elapsed)
+        NewRelic::Agent.record_api_supportability_metric(:notice_sql)
+
         state = TransactionState.tl_get
         if (txn = state.current_transaction) && (segment = txn.current_segment) && segment.respond_to?(:notice_sql)
           segment.notice_sql(query)
@@ -178,6 +184,8 @@ module NewRelic
       # @api public
       #
       def self.notice_statement(statement, elapsed)
+        NewRelic::Agent.record_api_supportability_metric(:notice_statement)
+
         # Settings may change eventually, but for now we follow the same
         # capture rules as SQL for non-SQL statements.
         state = TransactionState.tl_get

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

@@ -2,6 +2,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/prepend_supportability'
+
 DependencyDetection.defer do
   named :activejob
 
@@ -19,6 +21,8 @@ DependencyDetection.defer do
     ::ActiveJob::Base.around_perform do |job, block|
       ::NewRelic::Agent::Instrumentation::ActiveJobHelper.perform(job, block)
     end
+
+    ::NewRelic::Agent::PrependSupportability.record_metrics_for(::ActiveJob::Base)
   end
 end
 

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

@@ -66,7 +66,7 @@ module NewRelic
           begin
             log_without_newrelic_instrumentation(*args, &block)
           ensure
-            segment.finish
+            segment.finish if segment
           end
         end
       end

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

@@ -2,6 +2,7 @@
 # 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/instrumentation/active_record_subscriber'
+require 'new_relic/agent/prepend_supportability'
 
 DependencyDetection.defer do
   named :active_record_4
@@ -26,6 +27,7 @@ DependencyDetection.defer do
       NewRelic::Agent::Instrumentation::ActiveRecordSubscriber.new)
 
     ActiveSupport.on_load(:active_record) do
+      ::NewRelic::Agent::PrependSupportability.record_metrics_for(::ActiveRecord::Base, ::ActiveRecord::Relation)
       ::NewRelic::Agent::Instrumentation::ActiveRecordHelper.instrument_additional_methods
     end
   end

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

@@ -2,6 +2,7 @@
 # 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/instrumentation/active_record_subscriber'
+require 'new_relic/agent/prepend_supportability'
 
 module NewRelic
   module Agent
@@ -78,6 +79,8 @@ DependencyDetection.defer do
   end
 
   executes do
+    ::NewRelic::Agent::PrependSupportability.record_metrics_for(::ActiveRecord::Base, ::ActiveRecord::Relation)
+
     ActiveSupport::Notifications.subscribe('sql.active_record',
       NewRelic::Agent::Instrumentation::ActiveRecordSubscriber.new)
 

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

@@ -134,7 +134,7 @@ module NewRelic
             if txn = state.current_transaction
               txn.add_segment @segment
             end
-            @segment.finish
+            @segment.finish if @segment
           end
 
           def state

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

@@ -55,6 +55,7 @@ module NewRelic
           # @api public
           #
           def newrelic_ignore(specifiers={})
+            NewRelic::Agent.record_api_supportability_metric(:newrelic_ignore)
             newrelic_ignore_aspect(NR_DO_NOT_TRACE_KEY, specifiers)
           end
           # Have NewRelic omit apdex measurements on the given actions.  Typically used for
@@ -64,11 +65,13 @@ module NewRelic
           # @api public
           #
           def newrelic_ignore_apdex(specifiers={})
+            NewRelic::Agent.record_api_supportability_metric(:newrelic_ignore_apdex)
             newrelic_ignore_aspect(NR_IGNORE_APDEX_KEY, specifiers)
           end
 
           # @api public
           def newrelic_ignore_enduser(specifiers={})
+            NewRelic::Agent.record_api_supportability_metric(:newrelic_ignore_enduser)
             newrelic_ignore_aspect(NR_IGNORE_ENDUSER_KEY, specifiers)
           end
 
@@ -156,6 +159,8 @@ module NewRelic
           # @api public
           #
           def add_transaction_tracer(method, options={})
+            NewRelic::Agent.record_api_supportability_metric(:add_transaction_tracer)
+
             # The metric path:
             options[:name] ||= method.to_s
 
@@ -337,6 +342,7 @@ module NewRelic
         # @api public
         #
         def perform_action_with_newrelic_trace(*args, &block) #THREAD_LOCAL_ACCESS
+          NewRelic::Agent.record_api_supportability_metric(:perform_action_with_newrelic_trace)
           state = NewRelic::Agent::TransactionState.tl_get
           state.request = newrelic_request(args)
 

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

@@ -172,7 +172,7 @@ DependencyDetection.defer do
           begin
             segment.read_response_headers wrapped_response
           ensure
-            segment.finish
+            segment.finish if segment
             # Make sure the existing completion callback is run, and restore the
             # on_complete callback to how it was before.
             original_callback.call(finished_request) if original_callback

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

@@ -164,7 +164,7 @@ module NewRelic
 
               raise
             ensure
-              segment.finish
+              segment.finish if segment
             end
           end
         end

data/lib/new_relic/agent/instrumentation/excon/connection.rb

@@ -31,7 +31,7 @@ module ::Excon
 
         response
       ensure
-        segment.finish
+        segment.finish if segment
       end
     end
 

data/lib/new_relic/agent/instrumentation/excon/middleware.rb

@@ -53,7 +53,7 @@ module ::Excon
               segment.read_response_headers wrapped_response
             end
           ensure
-            segment.finish
+            segment.finish if segment
           end
         end
       end

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

@@ -44,7 +44,7 @@ DependencyDetection.defer do
 
           response
         ensure
-          segment.finish
+          segment.finish if segment
         end
       end
 

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

@@ -48,7 +48,7 @@ module NewRelic
                   if NewRelic::Agent.config[:capture_memcache_keys]
                     segment.notice_nosql_statement "#{method_name} #{args.first.inspect}"
                   end
-                  segment.finish
+                  segment.finish if segment
                 end
               end
 

data/lib/new_relic/agent/instrumentation/memcache/dalli.rb

@@ -68,7 +68,7 @@ module NewRelic
                   if ::NewRelic::Agent.config[:capture_memcache_keys]
                     segment.notice_nosql_statement "#{SEND_MULTIGET_METRIC_NAME} #{keys.inspect}"
                   end
-                  segment.finish
+                  segment.finish if segment
                 end
               end
             end
@@ -86,7 +86,7 @@ module NewRelic
                 begin
                   __send__ method_name_without, *args, &block
                 ensure
-                  segment.finish
+                  segment.finish if segment
                 end
               end
 

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

@@ -24,7 +24,7 @@ module NewRelic
             state = NewRelic::Agent::TransactionState.tl_get
             return unless state.is_execution_traced?
             segment = segments.delete(event.operation_id)
-            segment.finish
+            segment.finish if segment
           rescue Exception => e
             log_notification_error('completed', e)
           end

data/lib/new_relic/agent/instrumentation/rails4/action_controller.rb

@@ -2,6 +2,7 @@
 # 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/instrumentation/action_controller_subscriber'
+require 'new_relic/agent/prepend_supportability'
 
 
 DependencyDetection.defer do
@@ -25,5 +26,7 @@ DependencyDetection.defer do
     end
     NewRelic::Agent::Instrumentation::ActionControllerSubscriber \
       .subscribe(/^process_action.action_controller$/)
+
+    ::NewRelic::Agent::PrependSupportability.record_metrics_for(::ActionController::Base)
   end
 end

data/lib/new_relic/agent/instrumentation/rails4/action_view.rb

@@ -2,6 +2,7 @@
 # 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/instrumentation/action_view_subscriber'
+require 'new_relic/agent/prepend_supportability'
 
 DependencyDetection.defer do
   @name = :rails4_view
@@ -21,5 +22,6 @@ DependencyDetection.defer do
 
   executes do
     NewRelic::Agent::Instrumentation::ActionViewSubscriber.subscribe(/render_.+\.action_view$/)
+    NewRelic::Agent::PrependSupportability.record_metrics_for(::ActionView::Base, ::ActionView::Template, ::ActionView::Renderer)
   end
 end

data/lib/new_relic/agent/instrumentation/rails5/action_cable.rb

@@ -2,6 +2,7 @@
 # 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/instrumentation/action_cable_subscriber'
+require 'new_relic/agent/prepend_supportability'
 
 DependencyDetection.defer do
   @name = :rails5_action_cable
@@ -25,5 +26,7 @@ DependencyDetection.defer do
     # enumerate the specific events we want so that we do not get unexpected additions in the future
     ActiveSupport::Notifications.subscribe(/(perform_action|transmit)\.action_cable/,
       NewRelic::Agent::Instrumentation::ActionCableSubscriber.new)
+
+    ::NewRelic::Agent::PrependSupportability.record_metrics_for(::ActionCable::Engine, ::ActionCable::RemoteConnections)
   end
 end

data/lib/new_relic/agent/instrumentation/rails5/action_controller.rb

@@ -2,6 +2,7 @@
 # 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/instrumentation/action_controller_subscriber'
+require 'new_relic/agent/prepend_supportability'
 
 
 DependencyDetection.defer do
@@ -26,5 +27,7 @@ DependencyDetection.defer do
 
     NewRelic::Agent::Instrumentation::ActionControllerSubscriber \
       .subscribe(/^process_action.action_controller$/)
+
+    NewRelic::Agent::PrependSupportability.record_metrics_for(::ActionController::Base, ::ActionController::API)
   end
 end

data/lib/new_relic/agent/instrumentation/rails5/action_view.rb

@@ -2,6 +2,7 @@
 # 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/instrumentation/action_view_subscriber'
+require 'new_relic/agent/prepend_supportability'
 
 DependencyDetection.defer do
   @name = :rails5_view
@@ -16,10 +17,11 @@ DependencyDetection.defer do
   end
 
   executes do
-    ::NewRelic::Agent.logger.info 'Installing Rails 5 view instrumentation'
+    NewRelic::Agent.logger.info 'Installing Rails 5 view instrumentation'
   end
 
   executes do
     NewRelic::Agent::Instrumentation::ActionViewSubscriber.subscribe(/render_.+\.action_view$/)
+    NewRelic::Agent::PrependSupportability.record_metrics_for(::ActionView::Base, ::ActionView::Template, ::ActionView::Renderer)
   end
 end

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

@@ -68,7 +68,7 @@ DependencyDetection.defer do
           segment.notice_nosql_statement(statement) if statement
           call_without_new_relic(*args, &block)
         ensure
-          segment.finish
+          segment.finish if segment
         end
       end
 
@@ -88,7 +88,7 @@ DependencyDetection.defer do
           segment.notice_nosql_statement(statement)
           call_pipeline_without_new_relic(*args, &block)
         ensure
-          segment.finish
+          segment.finish if segment
         end
       end
 
@@ -104,7 +104,7 @@ DependencyDetection.defer do
         begin
           connect_without_new_relic(*args, &block)
         ensure
-          segment.finish
+          segment.finish if segment
         end
       end
     end

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

@@ -73,7 +73,7 @@ module NewRelic::Agent::Instrumentation::TyphoeusTracing
       callback = Proc.new do
         wrapped_response = ::NewRelic::Agent::HTTPClients::TyphoeusHTTPResponse.new(request.response)
         segment.read_response_headers wrapped_response
-        segment.finish
+        segment.finish if segment
       end
       request.on_complete.unshift(callback)
     end

data/lib/new_relic/agent/method_tracer.rb

@@ -68,6 +68,7 @@ module NewRelic
       # @api public
       #
       def trace_execution_scoped(metric_names, options={}) #THREAD_LOCAL_ACCESS
+        NewRelic::Agent.record_api_supportability_metric :trace_execution_scoped
         NewRelic::Agent::MethodTracerHelpers.trace_execution_scoped(metric_names, options) do
           # Using an implicit block avoids object allocation for a &block param
           yield
@@ -83,6 +84,7 @@ module NewRelic
       # @api public
       #
       def trace_execution_unscoped(metric_names, options={}) #THREAD_LOCAL_ACCESS
+        NewRelic::Agent.record_api_supportability_metric :trace_execution_unscoped
         return yield unless NewRelic::Agent.tl_is_execution_traced?
         t0 = Time.now
         begin
@@ -290,6 +292,8 @@ module NewRelic
         # @api public
         #
         def add_method_tracer(method_name, metric_name_code=nil, options = {})
+          NewRelic::Agent.record_api_supportability_metric(:add_method_tracer)
+
           return unless newrelic_method_exists?(method_name)
           metric_name_code ||= default_metric_name_code(method_name)
           return if traced_method_exists?(method_name, metric_name_code)

data/lib/new_relic/agent/method_tracer_helpers.rb

@@ -25,7 +25,7 @@ module NewRelic
         begin
           yield
         ensure
-          segment.finish
+          segment.finish if segment
         end
       end
     end

data/lib/new_relic/agent/prepend_supportability.rb

@@ -0,0 +1,16 @@
+# 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.
+
+module NewRelic
+  module Agent
+    module PrependSupportability
+      def self.record_metrics_for *classes
+        classes.each do |klass|
+          count = klass.send(:ancestors).index(klass)
+          ::NewRelic::Agent.record_metric("Supportability/PrependedModules/#{klass}", count) if count > 0
+        end
+      end
+    end
+  end
+end

data/lib/new_relic/agent/transaction.rb

@@ -194,6 +194,8 @@ module NewRelic
       # @api public
       #
       def self.recording_web_transaction? #THREAD_LOCAL_ACCESS
+        NewRelic::Agent.record_api_supportability_metric(:recording_web_transaction?)
+
         txn = tl_current
         txn && txn.recording_web_transaction?
       end

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

@@ -11,6 +11,8 @@ module NewRelic
       class ExternalRequestSegment < Segment
         attr_reader :library, :uri, :procedure
 
+        NR_SYNTHETICS_HEADER = 'X-NewRelic-Synthetics'.freeze
+
         def initialize library, uri, procedure
           @library = library
           @uri = HTTPClients::URIUtil.parse_and_normalize_url(uri)
@@ -33,19 +35,22 @@ module NewRelic
         # header is used it will update the segment name to reflect the host header.
         def add_request_headers request
           process_host_header request
+
+          synthetics_header = transaction && transaction.raw_synthetics_header
+          insert_synthetics_header request, synthetics_header if synthetics_header
+
           return unless record_metrics? && CrossAppTracing.cross_app_enabled?
 
           transaction_state.is_cross_app_caller = true
           txn_guid = transaction_state.request_guid
           trip_id   = transaction && transaction.cat_trip_id(transaction_state)
           path_hash = transaction && transaction.cat_path_hash(transaction_state)
-          synthetics_header = transaction && transaction.raw_synthetics_header
 
-          CrossAppTracing.insert_request_headers request, txn_guid, trip_id, path_hash, synthetics_header
+          CrossAppTracing.insert_request_headers request, txn_guid, trip_id, path_hash
         rescue => e
           NewRelic::Agent.logger.error "Error in add_request_headers", e
         end
-
+        
         def read_response_headers response
           return unless record_metrics? && CrossAppTracing.cross_app_enabled?
           return unless CrossAppTracing.response_has_crossapp_header?(response)
@@ -82,6 +87,10 @@ module NewRelic
 
         private
 
+        def insert_synthetics_header request, header
+          request[NR_SYNTHETICS_HEADER] = header
+        end
+
         def segment_complete
           params[:uri] = HTTPClients::URIUtil.filter_uri(uri)
           if cross_app_request?

data/lib/new_relic/supportability_helper.rb

@@ -0,0 +1,63 @@
+# 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.
+
+module NewRelic
+  module SupportabilityHelper
+
+    API_SUPPORTABILITY_PREFIX = 'Supportability/API/'.freeze
+
+    # pre-instantiate these strings as they may be used multiple times per
+    # transaction, just to eke out a bit less performance hit
+    #
+    API_SUPPORTABILITY_METRICS = [
+      :add_custom_attributes,
+      :add_instrumentation,
+      :add_method_tracer,
+      :add_transaction_tracer,
+      :after_fork,
+      :browser_timing_header,
+      :disable_all_tracing,
+      :disable_sql_recording,
+      :disable_transaction_tracing,
+      :drop_buffered_data,
+      :get_transaction_name,
+      :ignore_apdex,
+      :ignore_enduser,
+      :ignore_error_filter,
+      :ignore_transaction,
+      :increment_metric,
+      :manual_start,
+      :newrelic_ignore,
+      :newrelic_ignore_apdex,
+      :newrelic_ignore_enduser,
+      :notice_error,
+      :notice_sql,
+      :notice_statement,
+      :perform_action_with_newrelic_trace,
+      :record_custom_event,
+      :record_metric,
+      :recording_web_transaction?,
+      :require_test_helper,
+      :set_sql_obfuscator,
+      :set_transaction_name,
+      :shutdown,
+      :trace,
+      :trace_execution_scoped,
+      :trace_execution_unscoped,
+      :wrap
+    ].reduce({}) do |h,o|
+      h[o] = API_SUPPORTABILITY_PREFIX + o.to_s
+      h
+    end
+
+    def record_api_supportability_metric(method_name)
+      agent = NewRelic::Agent.agent or return
+      if metric = API_SUPPORTABILITY_METRICS[method_name]
+        agent.stats_engine.tl_record_unscoped_metrics metric, &:increment_count
+      else
+        NewRelic::Agent.logger.debug "API supportability metric not found for :#{method_name}"
+      end
+    end
+  end
+end

data/lib/new_relic/version.rb

@@ -11,7 +11,7 @@ module NewRelic
     end
 
     MAJOR = 4
-    MINOR = 4
+    MINOR = 5
     TINY  = 0
 
     begin

data/lib/sequel/extensions/newrelic_instrumentation.rb

@@ -53,7 +53,7 @@ module Sequel
         super(*args, &blk)
       ensure
         notice_sql(sql)
-        segment.finish
+        segment.finish if segment
       end
     end
 

data/lib/sequel/plugins/newrelic_instrumentation.rb

@@ -28,7 +28,7 @@ module Sequel
             begin
               NewRelic::Agent.disable_all_tracing { super(*args, &block) }
             ensure
-              segment.finish
+              segment.finish if segment
             end
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 4.4.0.336
+  version: 4.5.0.337
 platform: ruby
 authors:
 - Matthew Wear
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-14 00:00:00.000000000 Z
+date: 2017-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -302,6 +302,7 @@ files:
 - lib/new_relic/agent/payload_metric_mapping.rb
 - lib/new_relic/agent/pipe_channel_manager.rb
 - lib/new_relic/agent/pipe_service.rb
+- lib/new_relic/agent/prepend_supportability.rb
 - lib/new_relic/agent/rules_engine.rb
 - lib/new_relic/agent/rules_engine/replacement_rule.rb
 - lib/new_relic/agent/rules_engine/segment_terms_rule.rb
@@ -402,6 +403,7 @@ files:
 - lib/new_relic/recipes.rb
 - lib/new_relic/recipes/capistrano3.rb
 - lib/new_relic/recipes/capistrano_legacy.rb
+- lib/new_relic/supportability_helper.rb
 - lib/new_relic/version.rb
 - lib/newrelic_rpm.rb
 - lib/sequel/extensions/newrelic_instrumentation.rb