newrelic_rpm 3.14.1.311 → 3.14.2.312

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 912e19ec1b6cf6be2d2350e8cb666ac20bb05eb8
-  data.tar.gz: 4e355681d0aa06679be8c4d6ff1dba58be0790c3
+  metadata.gz: d249ecd98766db01a826c39d022d93d87664cb0e
+  data.tar.gz: ede61fd51cb9dcf848302e06361f726482541da7
 SHA512:
-  metadata.gz: 790329aea53676882b79e216d726467a683ada7baad5e41a7a6e5a5dabcaba04e74007747a10f38f8be5020716708af0c7b0202c5c6cd41b4f834c269717c7ed
-  data.tar.gz: 1ce543e65d1868ce3f8f349f5d906bf37474ae4a94d3f265a324903a460af8975b11492acae472b2f7b66efe5513beb896efc74610a4525e448ce3786c4d3631
+  metadata.gz: f41a0a49218ddb2bd666b76cc7d303870ae2aaddcfb4f62ffdf126b32f577ccaa5d22e7348a216c41a2033a582ed41bab9c1a15308b40db1e119dc3abc064126
+  data.tar.gz: 41c64d4afcaedfc5d7f1d9501c1bca9522eefd1e02d27b2c94693def7876a9b616e34a5adb636330d7918cb0c6073804ab90a5fc58dea178d6ef09f3f9c9a1e6

data/.travis.yml

@@ -1,17 +1,180 @@
+services:
+  - mysql
+  - redis-server
+  - memcached
+
 language: ruby
+
+sudo: false
+
+script: ./test/script/ci.sh
+
+before_install:
+  - 'mkdir -p /home/travis/gemfiles && touch /home/travis/gemfiles/IGNORE.txt && cp -R /home/travis/gemfiles/* .'
+  - 'if [[ `ruby --version` =~ ^ruby\ 1\. ]]; then gem update --system 1.8.25; fi'
+  - gem --version
+  - gem install bundler
+  - bundle --version
+
+install: bundle install --local --path=/home/travis/bundle || bundle --path=/home/travis/bundle
+
+# Travis default Mongo is currently 2.4.14, which has some instrumentation differences with >= 2.6.
+before_script:
+  - 'if [[ $GROUP == "database" ]]; then ./test/script/install_mongodb.sh; fi'
+
+before_cache:
+  - rsync -a --prune-empty-dirs --include '*/' --include 'Gemfile.*' --exclude '*' . /home/travis/gemfiles
+
+cache:
+  directories:
+    - /home/travis/bundle
+    - /home/travis/gemfiles
+
+branches:
+  only:
+    - master
+    - dev
+    - release
+
 rvm:
-  - 1.8.7
-  - ree
-  - 1.9.2
-  - 1.9.3
-  - 2.0
-  - 2.1
-  - 2.2
-  - jruby-19mode
-  - jruby-18mode
+  # Run slowest builds first to try and optimize overall cycle time.
   - rbx-2.5.8
+  - jruby-1.7.23
+  - jruby-9.0.4.0
+  - 2.2.4
+  - 2.1.8
+  - 2.0.0-p648
+  - 1.9.3
+  - 1.9.2
+  - ree
+  - 1.8.7
+
+env:
+  global:
+    - CI_BUNDLE_PATH=/home/travis/bundle
+    - BUNDLE_PATH=/home/travis/bundle
+    - MONGODB=2.6.11
+    - JAVA_OPTS="-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
+    - JRUBY_OPTS="-Xcompile.invokedynamic=false -J-Djruby.compile.mode=OFF"
+    - RBXOPT="-Xcompiler.no_rbc -Xint"
+    - SERIALIZE=1
+    - TESTOPTS="-v"
+    - VERBOSE = 1
+  matrix:
+    - TYPE=UNIT ENVIRONMENT=rails21
+    - TYPE=UNIT ENVIRONMENT=rails22
+    - TYPE=UNIT ENVIRONMENT=rails23
+    - TYPE=UNIT ENVIRONMENT=rails30
+    - TYPE=UNIT ENVIRONMENT=rails31
+    - TYPE=UNIT ENVIRONMENT=rails32
+    - TYPE=UNIT ENVIRONMENT=rails40
+    - TYPE=UNIT ENVIRONMENT=rails41
+    - TYPE=UNIT ENVIRONMENT=rails42
+    - TYPE=UNIT ENVIRONMENT=norails
+    - TYPE=FUNCTIONAL GROUP=agent
+    - TYPE=FUNCTIONAL GROUP=api
+    - TYPE=FUNCTIONAL GROUP=background
+    - TYPE=FUNCTIONAL GROUP=database
+    - TYPE=FUNCTIONAL GROUP=httpclients
+    - TYPE=FUNCTIONAL GROUP=rails
+    - TYPE=FUNCTIONAL GROUP=serialization
+    - TYPE=FUNCTIONAL GROUP=sinatra
+    - TYPE=FUNCTIONAL GROUP=rest
+    - TYPE=NULLVERSE
 
 matrix:
   allow_failures:
-    - rvm: rbx-2
-      
+    - rvm: rbx-2.5.8
+  exclude:
+    - rvm: rbx-2.5.8 # Currently hangs
+      env: TYPE=FUNCTIONAL GROUP=agent
+
+    # Unsupported Rails/Ruby combinations
+    # 2.2
+    - rvm: 2.2.4
+      env: TYPE=UNIT ENVIRONMENT=rails21
+    - rvm: 2.2.4
+      env: TYPE=UNIT ENVIRONMENT=rails22
+    - rvm: 2.2.4
+      env: TYPE=UNIT ENVIRONMENT=rails23
+
+    # 2.1
+    - rvm: 2.1.8
+      env: TYPE=UNIT ENVIRONMENT=rails21
+    - rvm: 2.1.8
+      env: TYPE=UNIT ENVIRONMENT=rails22
+    - rvm: 2.1.8
+      env: TYPE=UNIT ENVIRONMENT=rails23
+
+    # 2.0
+    - rvm: 2.0.0-p648
+      env: TYPE=UNIT ENVIRONMENT=rails21
+    - rvm: 2.0.0-p648
+      env: TYPE=UNIT ENVIRONMENT=rails22
+    - rvm: 2.0.0-p648
+      env: TYPE=UNIT ENVIRONMENT=rails23
+
+    # 1.9.3
+    - rvm: 1.9.3
+      env: TYPE=UNIT ENVIRONMENT=rails21
+    - rvm: 1.9.3
+      env: TYPE=UNIT ENVIRONMENT=rails22
+
+    # 1.9.2
+    - rvm: 1.9.2
+      env: TYPE=UNIT ENVIRONMENT=rails21
+    - rvm: 1.9.2
+      env: TYPE=UNIT ENVIRONMENT=rails22
+
+    # REE
+    - rvm: ree
+      env: TYPE=UNIT ENVIRONMENT=rails40
+    - rvm: ree
+      env: TYPE=UNIT ENVIRONMENT=rails41
+    - rvm: ree
+      env: TYPE=UNIT ENVIRONMENT=rails42
+
+    # 1.8.7
+    - rvm: 1.8.7
+      env: TYPE=UNIT ENVIRONMENT=rails40
+    - rvm: 1.8.7
+      env: TYPE=UNIT ENVIRONMENT=rails41
+    - rvm: 1.8.7
+      env: TYPE=UNIT ENVIRONMENT=rails42
+
+    # jruby 1.7
+    - rvm: jruby-1.7.23
+      env: TYPE=UNIT ENVIRONMENT=rails21
+    - rvm: jruby-1.7.23
+      env: TYPE=UNIT ENVIRONMENT=rails22
+    - rvm: jruby-1.7.23
+      env: TYPE=UNIT ENVIRONMENT=rails23
+
+    # jruby 9.0
+    - rvm: jruby-9.0.4.0
+      env: TYPE=UNIT ENVIRONMENT=rails21
+    - rvm: jruby-9.0.4.0
+      env: TYPE=UNIT ENVIRONMENT=rails22
+    - rvm: jruby-9.0.4.0
+      env: TYPE=UNIT ENVIRONMENT=rails23
+    - rvm: jruby-9.0.4.0
+      env: TYPE=UNIT ENVIRONMENT=rails30
+    - rvm: jruby-9.0.4.0
+      env: TYPE=UNIT ENVIRONMENT=rails31
+    - rvm: jruby-9.0.4.0
+      env: TYPE=UNIT ENVIRONMENT=rails32
+
+    # rbx
+    - rvm: rbx-2.5.8
+      env: TYPE=UNIT ENVIRONMENT=rails21
+    - rvm: rbx-2.5.8
+      env: TYPE=UNIT ENVIRONMENT=rails22
+    - rvm: rbx-2.5.8
+      env: TYPE=UNIT ENVIRONMENT=rails23
+    - rvm: rbx-2.5.8
+      env: TYPE=UNIT ENVIRONMENT=rails30
+    - rvm: rbx-2.5.8
+      env: TYPE=UNIT ENVIRONMENT=rails31
+    - rvm: rbx-2.5.8
+      env: TYPE=UNIT ENVIRONMENT=rails32
+

data/CHANGELOG

@@ -1,5 +1,27 @@
 # New Relic Ruby Agent Release Notes #
 
+## v3.14.2 ##
+
+  * Improved transaction names for Sinatra
+
+  The agent will now use sinatra.route for transaction names on Sinatra 1.4.3+,
+  which sets it in the request environment. This gives names that closer resemble the
+  routes defined in the Sinatra DSL.  Thanks to Brian Phillips for the suggestion!
+
+  * Bugfix for error flag on transaction events
+
+  There was an issue causing the error flag to always be set to false for Insights
+  transaction events that has been fixed.
+
+  * Official support for Sidekiq 4
+
+  The Ruby agent now officially supports Sidekiq 4.
+
+  * Additional attributes collected
+
+  The agent now collects the following information in web transactions:
+  Content-Length HTTP response and Content-Type HTTP request headers.
+
 ## v3.14.1 ##
 
   * Add support for setting a display name on hosts

data/Rakefile

@@ -65,6 +65,11 @@ namespace :test do
     t.verbose = true
   end
 
+  Rake::TestTask.new(:nullverse) do |t|
+    t.pattern = "#{agent_home}/test/nullverse/*_test.rb"
+    t.verbose = true
+  end
+
   # Note unit testing task is defined in lib/tasks/tests.rake to facilitate
   # running them in a rails application environment.
 

data/lib/new_relic/agent/agent.rb

@@ -21,7 +21,7 @@ require 'new_relic/agent/event_listener'
 require 'new_relic/agent/cross_app_monitor'
 require 'new_relic/agent/synthetics_monitor'
 require 'new_relic/agent/synthetics_event_buffer'
-require 'new_relic/agent/transaction_event_aggregator'
+require 'new_relic/agent/transaction_event_recorder'
 require 'new_relic/agent/custom_event_aggregator'
 require 'new_relic/agent/sampler_collection'
 require 'new_relic/agent/javascript_instrumentor'
@@ -64,7 +64,8 @@ module NewRelic
         @harvester       = NewRelic::Agent::Harvester.new(@events)
         @after_fork_lock = Mutex.new
 
-        @transaction_event_aggregator = NewRelic::Agent::TransactionEventAggregator.new(@events)
+        @transaction_event_recorder = NewRelic::Agent::TransactionEventRecorder.new
+
         @custom_event_aggregator      = NewRelic::Agent::CustomEventAggregator.new
 
         @connect_state      = :pending
@@ -138,9 +139,17 @@ module NewRelic
         # GC::Profiler.total_time is not monotonic so we wrap it.
         attr_reader :monotonic_gc_profiler
         attr_reader :custom_event_aggregator
-
+        attr_reader :transaction_event_recorder
         attr_reader :attribute_filter
 
+        def transaction_event_aggregator
+          @transaction_event_recorder.transaction_event_aggregator
+        end
+
+        def synthetics_event_aggregator
+          @transaction_event_recorder.synthetics_event_aggregator
+        end
+
         # This method should be called in a forked process after a fork.
         # It assumes the parent process initialized the agent, but does
         # not assume the agent started.
@@ -557,7 +566,7 @@ module NewRelic
           @stats_engine.reset!
           @error_collector.drop_buffered_data
           @transaction_sampler.reset!
-          @transaction_event_aggregator.reset!
+          @transaction_event_recorder.drop_buffered_data
           @custom_event_aggregator.reset!
           @sql_sampler.reset!
         end
@@ -926,7 +935,7 @@ module NewRelic
           when :transaction_sample_data then @transaction_sampler
           when :error_data              then @error_collector.error_trace_aggregator
           when :error_event_data        then @error_collector.error_event_aggregator
-          when :analytic_event_data     then @transaction_event_aggregator
+          when :analytic_event_data     then transaction_event_aggregator
           when :custom_event_data       then @custom_event_aggregator
           when :sql_trace_data          then @sql_sampler
           end
@@ -934,7 +943,12 @@ module NewRelic
 
         def merge_data_for_endpoint(endpoint, data)
           if data && !data.empty?
-            container_for_endpoint(endpoint).merge!(data)
+            container = container_for_endpoint endpoint
+            if container.respond_to?(:has_metadata?) && container.has_metadata?
+              container_for_endpoint(endpoint).merge!(data, false)
+            else
+              container_for_endpoint(endpoint).merge!(data)
+            end
           end
         rescue => e
           NewRelic::Agent.logger.error("Error while merging #{endpoint} data from child: ", e)
@@ -1100,7 +1114,8 @@ module NewRelic
         end
 
         def harvest_and_send_analytic_event_data
-          harvest_and_send_from_container(@transaction_event_aggregator, :analytic_event_data)
+          harvest_and_send_from_container(transaction_event_aggregator, :analytic_event_data)
+          harvest_and_send_from_container(synthetics_event_aggregator, :analytic_event_data)
           harvest_and_send_from_container(@custom_event_aggregator,      :custom_event_data)
         end
 

data/lib/new_relic/agent/aws_info.rb

@@ -62,7 +62,7 @@ module NewRelic
         rescue Timeout::Error
           handle_error "UtilizationData timed out fetching remote keys."
         rescue StandardError => e
-          handle_error "UtilizationData encountered error fetching remote keys", e
+          handle_error "UtilizationData encountered error fetching remote keys: #{e.message}"
         end
       end
 

data/lib/new_relic/agent/custom_event_aggregator.rb

@@ -2,35 +2,21 @@
 # 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/sized_buffer'
+require 'new_relic/agent/event_aggregator'
 require 'new_relic/agent/attribute_processing'
 
 module NewRelic
   module Agent
-    class CustomEventAggregator
+    class CustomEventAggregator < EventAggregator
       include NewRelic::Coerce
 
       TYPE             = 'type'.freeze
       TIMESTAMP        = 'timestamp'.freeze
       EVENT_TYPE_REGEX = /^[a-zA-Z0-9:_ ]+$/.freeze
 
-      DEFAULT_CAPACITY_KEY = :'custom_insights_events.max_samples_stored'
-
-      def initialize
-        @lock         = Mutex.new
-        @buffer       = SampledBuffer.new(NewRelic::Agent.config[DEFAULT_CAPACITY_KEY])
-        @type_strings = Hash.new { |hash, key| hash[key] = key.to_s.freeze }
-        register_config_callbacks
-      end
-
-      def register_config_callbacks
-        NewRelic::Agent.config.register_callback(DEFAULT_CAPACITY_KEY) do |max_samples|
-          NewRelic::Agent.logger.debug "CustomEventAggregator max_samples set to #{max_samples}"
-          @lock.synchronize do
-            @buffer.capacity = max_samples
-          end
-        end
-      end
+      named :CustomEventAggregator
+      capacity_key :'custom_insights_events.max_samples_stored'
+      enabled_key :'custom_insights_events.enabled'
 
       def record(type, attributes)
         unless attributes.is_a? Hash
@@ -54,47 +40,36 @@ module NewRelic
         stored
       end
 
-      def harvest!
-        results = []
-        drop_count = 0
-        @lock.synchronize do
-          results.concat(@buffer.to_a)
-          drop_count += @buffer.num_dropped
-          @buffer.reset!
-        end
-        note_dropped_events(results.size, drop_count)
-        results
+      private
+
+      def after_initialize
+        @type_strings = Hash.new { |hash, key| hash[key] = key.to_s.freeze }
       end
 
-      def note_dropped_events(captured_count, dropped_count)
-        total_count = captured_count + dropped_count
+      def after_harvest metadata
+        dropped_count = metadata[:seen] - metadata[:captured]
+        note_dropped_events(metadata[:seen], dropped_count)
+        record_supportability_metrics(metadata[:seen], metadata[:captured], dropped_count)
+      end
+
+      def note_dropped_events total_count, dropped_count
         if dropped_count > 0
           NewRelic::Agent.logger.warn("Dropped #{dropped_count} custom events out of #{total_count}.")
         end
+      end
+
+      def record_supportability_metrics total_count, captured_count, dropped_count
         engine = NewRelic::Agent.instance.stats_engine
         engine.tl_record_supportability_metric_count("Events/Customer/Seen"   ,    total_count)
         engine.tl_record_supportability_metric_count("Events/Customer/Sent"   , captured_count)
         engine.tl_record_supportability_metric_count("Events/Customer/Dropped",  dropped_count)
       end
 
-      def merge!(events)
-        @lock.synchronize do
-          events.each do |event|
-            @buffer.append(event)
-          end
-        end
-      end
-
-      def reset!
-        @lock.synchronize { @buffer.reset! }
-      end
-
       def note_dropped_event(type)
         ::NewRelic::Agent.logger.log_once(:warn, "dropping_event_of_type:#{type}",
           "Invalid event type name '#{type}', not recording.")
         @buffer.note_dropped
       end
-
     end
   end
 end

data/lib/new_relic/agent/error_event_aggregator.rb

@@ -3,124 +3,32 @@
 # 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/sampled_buffer'
-require 'new_relic/agent/payload_metric_mapping'
+require 'new_relic/agent/event_aggregator'
+require 'new_relic/agent/transaction_error_primitive'
 
 module NewRelic
   module Agent
-    class ErrorEventAggregator
-      EVENT_TYPE = "TransactionError".freeze
+    class ErrorEventAggregator < EventAggregator
 
-      def initialize
-        @lock = Mutex.new
-        @error_event_buffer = SampledBuffer.new Agent.config[:'error_collector.max_event_samples_stored']
-        register_config_callbacks
-      end
-
-      def enabled?
-        Agent.config[:'error_collector.capture_events']
-      end
+      named :ErrorEventAggregator
+      capacity_key :'error_collector.max_event_samples_stored'
+      enabled_key :'error_collector.capture_events'
 
       def append_event noticed_error, transaction_payload = nil
         return unless enabled?
 
         @lock.synchronize do
-          @error_event_buffer.append do
-            event_for_collector(noticed_error, transaction_payload)
+          @buffer.append do
+            create_event(noticed_error, transaction_payload)
           end
+          notify_if_full
         end
       end
 
-      def harvest!
-        @lock.synchronize do
-          samples = @error_event_buffer.to_a
-          # Eventually the logic for adding reservoir data will move to the sampled buffer
-          # so it can be shared with the other event aggregators. We'll first get it working
-          # here and then promote the functionality later.
-          stats = reservoir_stats
-          @error_event_buffer.reset!
-          [stats, samples]
-        end
-      end
-
-      def reset!
-        @lock.synchronize do
-          @error_event_buffer.reset!
-        end
-      end
-
-      # samples will have already been transformed into
-      # collector primitives by event_for_collector
-      def merge! payload
-        @lock.synchronize do
-          _, samples = payload
-          @error_event_buffer.decrement_lifetime_counts_by samples.count
-          samples.each { |s| @error_event_buffer.append s }
-        end
-      end
-
-      def has_metadata?
-        true
-      end
-
       private
 
-      def reservoir_stats
-        {
-          :reservoir_size => Agent.config[:'error_collector.max_event_samples_stored'],
-          :events_seen => @error_event_buffer.num_seen
-        }
-      end
-
-      def register_config_callbacks
-        NewRelic::Agent.config.register_callback(:'error_collector.max_event_samples_stored') do |max_samples|
-          NewRelic::Agent.logger.debug "ErrorEventAggregator max_samples set to #{max_samples}"
-          @lock.synchronize { @error_event_buffer.capacity = max_samples }
-        end
-
-        NewRelic::Agent.config.register_callback(:'error_collector.capture_events') do |enabled|
-          ::NewRelic::Agent.logger.debug "Error events will #{enabled ? '' : 'not '}be sent to the New Relic service."
-        end
-      end
-
-      def event_for_collector noticed_error, transaction_payload
-        [
-          intrinsic_attributes_for(noticed_error, transaction_payload),
-          noticed_error.custom_attributes,
-          noticed_error.agent_attributes
-        ]
-      end
-
-      def intrinsic_attributes_for noticed_error, transaction_payload
-        attrs = {
-          :type => EVENT_TYPE,
-          :'error.class' => noticed_error.exception_class_name,
-          :'error.message' => noticed_error.message,
-          :timestamp => noticed_error.timestamp.to_f
-        }
-
-        attrs[:port] = noticed_error.request_port if noticed_error.request_port
-
-        if transaction_payload
-          attrs[:transactionName] = transaction_payload[:name]
-          attrs[:duration] = transaction_payload[:duration]
-          append_synthetics transaction_payload, attrs
-          append_cat transaction_payload, attrs
-          PayloadMetricMapping.append_mapped_metrics transaction_payload[:metrics], attrs
-        end
-
-        attrs
-      end
-
-      def append_synthetics transaction_payload, sample
-        sample[:'nr.syntheticsResourceId'] = transaction_payload[:synthetics_resource_id] if transaction_payload[:synthetics_resource_id]
-        sample[:'nr.syntheticsJobId'] = transaction_payload[:synthetics_job_id] if transaction_payload[:synthetics_job_id]
-        sample[:'nr.syntheticsMonitorId'] = transaction_payload[:synthetics_monitor_id] if transaction_payload[:synthetics_monitor_id]
-      end
-
-      def append_cat transaction_payload, sample
-        sample[:'nr.transactionGuid'] = transaction_payload[:guid] if transaction_payload[:guid]
-        sample[:'nr.referringTransactionGuid'] = transaction_payload[:referring_transaction_guid] if transaction_payload[:referring_transaction_guid]
+      def create_event noticed_error, transaction_payload
+        TransactionErrorPrimitive.create noticed_error, transaction_payload
       end
     end
   end