lib/new_relic/agent/agent.rb in newrelic_rpm-3.9.5.251 vs lib/new_relic/agent/agent.rb in newrelic_rpm-3.9.6.257

@@ -296,10 +296,18 @@
 
           def log_app_name
             ::NewRelic::Agent.logger.info "Application: #{Agent.config.app_names.join(", ")}"
           end
 
+          def log_ignore_url_regexes
+            regexes = NewRelic::Agent.config[:'rules.ignore_url_regexes']
+
+            unless regexes.empty?
+              ::NewRelic::Agent.logger.info "Ignoring URLs that match the following regexes: #{regexes.map(&:inspect).join(", ")}."
+            end
+          end
+
           # Logs the configured application names
           def app_name_configured?
             names = Agent.config.app_names
             return names.respond_to?(:any?) && names.any?
           end
@@ -493,10 +501,14 @@
           return unless agent_should_start?
 
           log_startup
           check_config_and_start_agent
           log_version_and_pid
+
+          events.subscribe(:finished_configuring) do
+            log_ignore_url_regexes
+          end
         end
 
         # Clear out the metric data, errors, and transaction traces, etc.
         def drop_buffered_data
           @stats_engine.reset!
@@ -568,15 +580,15 @@
           def create_and_run_event_loop
             @event_loop = create_event_loop
             @event_loop.on(:report_data) do
               transmit_data
             end
-            @event_loop.on(:report_transaction_event_data) do
-              transmit_transaction_event_data
+            @event_loop.on(:report_event_data) do
+              transmit_event_data
             end
             @event_loop.fire_every(Agent.config[:data_report_period],       :report_data)
-            @event_loop.fire_every(report_period_for(:analytic_event_data), :report_transaction_event_data)
+            @event_loop.fire_every(report_period_for(:analytic_event_data), :report_event_data)
             @event_loop.run
           end
 
           # Handles the case where the server tells us to restart -
           # this clears the data, clears connection attempts, and
@@ -1017,11 +1029,11 @@
           harvest_lock.synchronize do
             transmit_data_already_locked
           end
         end
 
-        def transmit_transaction_event_data
+        def transmit_event_data
           now = Time.now
           ::NewRelic::Agent.logger.debug "Sending analytics data to New Relic Service"
 
           harvest_lock.synchronize do
             @service.session do # use http keep-alive
@@ -1069,10 +1081,10 @@
             begin
               @service.request_timeout = 10
 
               @events.notify(:before_shutdown)
               transmit_data
-              transmit_transaction_event_data
+              transmit_event_data
 
               if @connected_pid == $$ && !@service.kind_of?(NewRelic::Agent::NewRelicService)
                 ::NewRelic::Agent.logger.debug "Sending New Relic service agent run shutdown message"
                 @service.shutdown(Time.now.to_f)
               else