newrelic_rpm 3.9.6.257 → 3.9.7.266

data/lib/new_relic/agent/transaction_sample_builder.rb

@@ -110,7 +110,9 @@ module NewRelic
         @sample.params[:custom_params] ||= {}
         @sample.params[:custom_params].merge!(normalize_params(custom_params))
 
-        @sample.force_persist = sample.force_persist_sample?
+        # If we ever implement saving of TTs based on the record_tt flag on the
+        # calling and called applications, we should change this flag's value.
+        @sample.force_persist = false
         @sample.threshold = transaction_trace_threshold
         @sample.finished = true
         @current_segment = nil

data/lib/new_relic/agent/transaction_sampler.rb

@@ -8,6 +8,7 @@ require 'new_relic/agent/transaction_sample_builder'
 require 'new_relic/agent/transaction/developer_mode_sample_buffer'
 require 'new_relic/agent/transaction/force_persist_sample_buffer'
 require 'new_relic/agent/transaction/slowest_sample_buffer'
+require 'new_relic/agent/transaction/synthetics_sample_buffer'
 require 'new_relic/agent/transaction/xray_sample_buffer'
 
 module NewRelic
@@ -41,6 +42,7 @@ module NewRelic
         @sample_buffers << @dev_mode_sample_buffer
         @sample_buffers << @xray_sample_buffer
         @sample_buffers << NewRelic::Agent::Transaction::SlowestSampleBuffer.new
+        @sample_buffers << NewRelic::Agent::Transaction::SyntheticsSampleBuffer.new
         @sample_buffers << NewRelic::Agent::Transaction::ForcePersistSampleBuffer.new
 
         # This lock is used to synchronize access to the @last_sample
@@ -135,6 +137,14 @@ module NewRelic
           last_sample.set_custom_param(:'nr.path_hash', txn.cat_path_hash(state))
         end
 
+        if txn.is_synthetics_request?
+          last_sample.set_custom_param(:'nr.synthetics_resource_id', txn.synthetics_resource_id)
+          last_sample.set_custom_param(:'nr.synthetics_job_id', txn.synthetics_job_id)
+          last_sample.set_custom_param(:'nr.synthetics_monitor_id', txn.synthetics_monitor_id)
+
+          last_sample.synthetics_resource_id = txn.synthetics_resource_id
+        end
+
         @samples_lock.synchronize do
           @last_sample = last_sample
           store_sample(@last_sample)

data/lib/new_relic/agent/transaction_state.rb

@@ -2,7 +2,6 @@
 # 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/browser_token'
 require 'new_relic/agent/traced_method_stack'
 
 module NewRelic
@@ -40,11 +39,6 @@ module NewRelic
         @current_transaction = nil
       end
 
-      def request=(request)
-        @request = request
-        @request_token = BrowserToken.get_token(request)
-      end
-
       # This starts the timer for the transaction.
       def reset(transaction=nil)
         # We purposefully don't reset @untraced, @record_tt and @record_sql
@@ -57,7 +51,6 @@ module NewRelic
 
         @traced_method_stack.clear
 
-        @request_token = nil
         @is_cross_app_caller = false
         @client_cross_app_id = nil
         @referring_transaction_info = nil
@@ -89,8 +82,7 @@ module NewRelic
       end
 
       # Request data
-      attr_reader :request
-      attr_accessor :request_token
+      attr_accessor :request
 
       def request_guid
         return nil unless current_transaction

data/lib/new_relic/coerce.rb

@@ -56,12 +56,18 @@ module NewRelic
       end
       value.inject({}) do |memo, (key, val)|
         case val
-        when String, Float, Integer
+        when String, Integer, TrueClass, FalseClass
           memo[key.to_s] = val
+        when Float
+          if val.finite?
+            memo[key.to_s] = val
+          else
+            memo[key.to_s] = nil
+          end
         when Symbol
           memo[key.to_s] = val.to_s
         end
-      memo
+        memo
       end
     rescue => error
       log_failure(value.class, 'valid event params', context, error)

data/lib/new_relic/control.rb

@@ -3,7 +3,6 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require 'yaml'
-require 'conditional_vendored_metric_parser'
 require 'conditional_vendored_dependency_detection'
 require 'new_relic/local_environment'
 require 'new_relic/language_support'

data/lib/new_relic/local_environment.rb

@@ -146,14 +146,14 @@ module NewRelic
     end
 
     def check_for_resque
-      using_resque = (
-        defined?(::Resque) &&
-        (ENV['QUEUE'] || ENV['QUEUES']) &&
-        (File.basename($0) == 'rake' && ARGV.include?('resque:work'))
-      ) || (
-        defined?(::Resque::Pool) &&
-        (File.basename($0) == 'resque-pool')
-      )
+      has_queue              = ENV['QUEUE'] || ENV['QUEUES']
+      resque_rake            = executable == 'rake' && ARGV.include?('resque:work')
+      resque_pool_rake       = executable == 'rake' && ARGV.include?('resque:pool')
+      resque_pool_executable = executable == 'resque-pool' && defined?(::Resque::Pool)
+
+      using_resque = defined?(::Resque) &&
+        (has_queue && resque_rake) ||
+        (resque_pool_executable || resque_pool_rake)
 
       @discovered_dispatcher = :resque if using_resque
     end
@@ -198,5 +198,9 @@ module NewRelic
       s << "]"
     end
 
+    def executable
+      File.basename($0)
+    end
+
   end
 end

data/lib/new_relic/metric_spec.rb

@@ -13,9 +13,18 @@ class NewRelic::MetricSpec
   EMPTY_SCOPE = ''.freeze
 
   def initialize(metric_name='', metric_scope=nil)
-    @name = metric_name.to_s[LENGTH_RANGE]
+    if metric_name.to_s.length > MAX_LENGTH
+      @name = metric_name.to_s[LENGTH_RANGE]
+    else
+      @name = metric_name.to_s
+    end
+
     if metric_scope
-      @scope = metric_scope.to_s[LENGTH_RANGE]
+      if metric_scope.to_s.length > MAX_LENGTH
+        @scope = metric_scope.to_s[LENGTH_RANGE]
+      else
+        @scope = metric_scope.to_s
+      end
     else
       @scope = EMPTY_SCOPE
     end

data/lib/new_relic/rack/developer_mode.rb

@@ -6,12 +6,21 @@ require 'rack'
 require 'rack/request'
 require 'rack/response'
 require 'rack/file'
+
+require 'conditional_vendored_metric_parser'
 require 'new_relic/collection_helper'
 require 'new_relic/metric_parser/metric_parser'
 require 'new_relic/rack/agent_middleware'
 require 'new_relic/agent/instrumentation/middleware_proxy'
 
+require 'new_relic/transaction_sample'
+require 'new_relic/transaction_analysis'
+
 module NewRelic
+  class TransactionSample
+    include TransactionAnalysis
+  end
+
   module Rack
     # This middleware provides the 'developer mode' feature of newrelic_rpm,
     # which allows you to see data about local web transactions in development
@@ -33,7 +42,6 @@ module NewRelic
       HELPER_PATH = File.expand_path('../../../../ui/helpers/', __FILE__)
       require File.join(HELPER_PATH, 'developer_mode_helper.rb')
 
-
       include NewRelic::DeveloperModeHelper
 
       class << self

data/lib/new_relic/transaction_sample.rb

@@ -16,14 +16,13 @@ module NewRelic
   class TransactionSample
 
     attr_accessor :params, :root_segment, :profile, :force_persist, :guid,
-                  :threshold, :finished, :xray_session_id, :start_time
+                  :threshold, :finished, :xray_session_id, :start_time,
+                  :synthetics_resource_id
     attr_reader :root_segment, :params, :sample_id
     attr_writer :prepared
 
     @@start_time = Time.now
 
-    include TransactionAnalysis
-
     def initialize(time = Time.now.to_f, sample_id = nil)
       @sample_id = sample_id || object_id
       @start_time = time
@@ -76,7 +75,8 @@ module NewRelic
         string(@guid),
         nil,
         forced?,
-        int_or_nil(xray_session_id)
+        int_or_nil(xray_session_id),
+        string(synthetics_resource_id)
       ]
     end
 
@@ -172,12 +172,6 @@ module NewRelic
       @params = params
     end
 
-    def force_persist_sample? #THREAD_LOCAL_ACCESS
-      state = NewRelic::Agent::TransactionState.tl_get
-
-      state.request_token && self.duration > state.current_transaction.apdex_t
-    end
-
   private
 
     def strip_sql!

data/lib/new_relic/version.rb

@@ -12,7 +12,7 @@ module NewRelic
 
     MAJOR = 3
     MINOR = 9
-    TINY  = 6
+    TINY  = 7
 
     begin
       require File.join(File.dirname(__FILE__), 'build')

data/newrelic_rpm.gemspec

@@ -51,6 +51,7 @@ EOS
   s.add_development_dependency 'guard', '~> 1.8.3' # Guard 2.0 is Ruby 1.9 only
   s.add_development_dependency 'guard-minitest'
   s.add_development_dependency 'rb-fsevent', '~> 0.9.1'
+  s.add_development_dependency 'hometown', '~> 0.2.5'
   s.add_development_dependency 'jruby-openssl' if RUBY_PLATFORM == 'java'
 
   if RUBY_PLATFORM == 'java'

data/test/agent_helper.rb

@@ -414,7 +414,7 @@ def advance_time(seconds)
   freeze_time(Time.now + seconds)
 end
 
-def with_constant_defined(constant_symbol, implementation)
+def with_constant_defined(constant_symbol, implementation=Module.new)
   const_path = constant_path(constant_symbol.to_s)
 
   if const_path
@@ -520,6 +520,19 @@ def with_environment(env)
   end
 end
 
+def with_argv(argv)
+  old_argv = ARGV.dup
+  ARGV.clear
+  ARGV.concat(argv)
+
+  begin
+    yield
+  ensure
+    ARGV.clear
+    ARGV.concat(old_argv)
+  end
+end
+
 def with_ignore_error_filter(filter, &blk)
   original_filter = NewRelic::Agent.ignore_error_filter
   NewRelic::Agent.ignore_error_filter(&filter)
@@ -534,7 +547,7 @@ def json_dump_and_encode(object)
 end
 
 def get_last_analytics_event
-  NewRelic::Agent.agent.instance_variable_get(:@request_sampler).samples.last
+  NewRelic::Agent.agent.instance_variable_get(:@transaction_event_aggregator).samples.last
 end
 
 def swap_instance_method(target, method_name, new_method_implementation, &blk)

data/test/environments/norails/Gemfile

@@ -18,3 +18,4 @@ end
 gem "newrelic_rpm", :path => "../../.."
 
 gem 'pry', '~> 0.9.12'
+gem 'hometown', '~> 0.2.5'

data/test/environments/rails21/Gemfile

@@ -22,3 +22,4 @@ else
 end
 
 gem 'pry', '~> 0.9.12'
+gem 'hometown', '~> 0.2.5'

data/test/environments/rails22/Gemfile

@@ -22,3 +22,4 @@ else
 end
 
 gem 'pry', '~> 0.9.12'
+gem 'hometown', '~> 0.2.5'

data/test/environments/rails23/Gemfile

@@ -21,3 +21,4 @@ else
 end
 
 gem 'pry', '~> 0.9.12'
+gem 'hometown', '~> 0.2.5'

data/test/environments/rails30/Gemfile

@@ -20,3 +20,4 @@ else
 end
 
 gem 'pry', '~> 0.9.12'
+gem 'hometown', '~> 0.2.5'

data/test/environments/rails31/Gemfile

@@ -20,3 +20,4 @@ else
 end
 
 gem 'pry', '~> 0.9.12'
+gem 'hometown', '~> 0.2.5'

data/test/environments/rails32/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~>3.2.15'
+gem 'rails', '~>3.2.20'
 
 gem 'rake', '~>10.1.1'
 gem 'minitest', '~>4.7.5'
@@ -22,3 +22,4 @@ platforms :ruby, :rbx do
 end
 
 gem 'pry', '~> 0.9.12'
+gem 'hometown', '~> 0.2.5'

data/test/environments/rails40/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'rake'
 
-gem 'rails', '~>4.0.10'
+gem 'rails', '~>4.0.11'
 
 # Do not automatically require minitest, since this will break with rbx-2.2.5.
 # rbx-2.2.5 helpfully bundles minitest-5.3.0.
@@ -40,3 +40,4 @@ end
 gem "newrelic_rpm", :path => "../../.."
 
 gem 'pry', '~> 0.9.12'
+gem 'hometown', '~> 0.2.5'

data/test/environments/rails41/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'rake'
 
-gem 'rails', '~>4.1.6'
+gem 'rails', '~>4.1.7'
 
 gem 'minitest', '5.2.3'
 gem 'mocha', :require => false
@@ -30,4 +30,6 @@ platforms :rbx do
 end
 
 gem "newrelic_rpm", :path => "../../.."
+
 gem 'pry', '~> 0.9.12'
+gem 'hometown', '~> 0.2.5'

data/test/environments/rails42/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'rake'
 
-gem 'rails', '~>4.2.0.beta2'
+gem 'rails', '~>4.2.0.beta4'
 
 gem 'minitest', '5.2.3'
 gem 'mocha', :require => false
@@ -30,4 +30,6 @@ platforms :rbx do
 end
 
 gem "newrelic_rpm", :path => "../../.."
+
 gem 'pry', '~> 0.9.12'
+gem 'hometown', '~> 0.2.5'

data/test/fixtures/cross_agent_tests/README.md

@@ -13,7 +13,6 @@ Please be careful when adding new tests from real world failures.
 | [rum_footer_insertion_location](rum_footer_insertion_location) | Describe where the RUM footer (aka "client config") should be inserted.  These tests do not apply to agents which insert the footer directly after the loader. |
 | [rules.json](rules.json) | Describe how url/metric/txn-name rules should be applied. |
 | [rum_client_config.json](rum_client_config.json) | These tests dictate the format and contents of the browser monitoring client configuration.  For more information see: [SPEC](https://newrelic.atlassian.net/wiki/display/eng/JavaScript+Agent+Auto-Instrumentation) |
-| [rum_cookie.json](rum_cookie.json)      | These tests indicate the format requirements of a valid RUM cookie. |
 | [sql_parsing.json](sql_parsing.json) | These tests show how an SQL string should be parsed for the operation and table name. |
 | [url_clean.json](url_clean.json) | These tests show how URLs should be cleaned before putting them into a trace segment's parameter hash (under the key 'uri'). |
 | [url_domain_extraction.json](url_domain_extraction.json) | These tests show how the domain of a URL should be extracted (for the purpose of creating external metrics). |
@@ -21,8 +20,11 @@ Please be careful when adding new tests from real world failures.
 | [sql_obfuscation](sql_obfuscation) | Describe how agents should obfuscate SQL queries before transmission to the collector. |
 | [attribute_configuration](attribute_configuration.json) | These tests show how agents should respond to the various attribute configuration settings.  For more information see: [Attributes SPEC](https://newrelic.atlassian.net/wiki/display/eng/Agent+Attributes) |
 | [cat_map](cat_map.json) | These tests cover the new Dirac attributes that are added for the CAT Map project. See the [CAT Map Spec](https://newrelic.jiveon.com/docs/DOC-1798) and the section below for details.|
-| [labels](labels.json) | These tests cover the Labels for Language Agents project. See the [Labels for Language Agents Spec](https://newrelic.atlassian.net/wiki/display/eng/Labels+for+Language+Agents+-+draft+spec) for details.|
+| [labels](labels.json) | These tests cover the Labels for Language Agents project. See the [Labels for Language Agents Spec](https://newrelic.atlassian.net/wiki/display/eng/Labels+for+Language+Agents) for details.|
 | [proc_cpuinfo](proc_cpuinfo) | These test correct processing of `/proc/cpuinfo` output on Linux hosts. |
+| [proc_meminfo](proc_meminfo) | These test correct processing of `/proc/meminfo` output on Linux hosts. |
+| [transaction_segment_terms.json](transaction_segment_terms.json) | These tests cover agent implementations of the `transaction_segment_terms` transaction renaming rules introduced in collector protocol 14. See [the spec](https://newrelic.atlassian.net/wiki/display/eng/Language+agent+transaction+segment+terms+rules) for details. |
+| [docker_container_id](docker_container_id) | These tests cover parsing of Docker container IDs from `/proc` on Linux hosts. |
 
 ### CAT Map test details
 
@@ -30,6 +32,8 @@ The CAT map test cases in `cat_map.json` are meant to be used to verify the
 attributes that agents collect and attach to analytics transaction events for
 the CAT map project.
 
+**NOTE** currently `nr.apdexPerfZone` is not covered by these tests, make sure you test for this yourself until it is added to these tests.
+
 Each test case should correspond to a simulated transaction in the agent under
 test. Here's what the various fields in each test case mean:
 

data/test/fixtures/cross_agent_tests/docker_container_id/README.md

@@ -0,0 +1,6 @@
+These tests cover parsing of Docker container IDs on Linux hosts out of 
+`/proc/self/cgroup` (or `/proc/<pid>/cgroup` more generally).
+
+The `cases.json` file lists each filename in this directory containing 
+example `/proc/self/cgroup` content, and the expected Docker container ID that
+should be parsed from that file.

data/test/fixtures/cross_agent_tests/docker_container_id/cases.json

@@ -0,0 +1,22 @@
+[
+  {
+    "filename": "docker-0.9.1.txt",
+    "dockerContainerId": "f37a7e4d17017e7bf774656b19ca4360c6cdc4951c86700a464101d0d9ce97ee"
+  },
+  {
+    "filename": "docker-1.0.0.txt",
+    "dockerContainerId": "3ccfa00432798ff38f85839de1e396f771b4acbe9f4ddea0a761c39b9790a782"
+  },
+  {
+    "filename": "docker-1.3.txt",
+    "dockerContainerId": "47cbd16b77c50cbf71401c069cd2189f0e659af17d5a2daca3bddf59d8a870b2"
+  },
+  {
+    "filename": "lxc-containers-without-docker.txt",
+    "dockerContainerId": null
+  },
+  {
+    "filename": "empty.txt",
+    "dockerContainerId": null
+  }
+]