newrelic_rpm 3.9.6.257 → 3.9.7.266

data/test/new_relic/rack/developer_mode_test.rb

@@ -21,7 +21,7 @@ class DeveloperModeTest < Minitest::Test
   end
 
   def setup
-    @test_config = { :developer_mode => true }
+    @test_config = { :developer_mode => true, :disable_harvest_thread => true }
     NewRelic::Agent.config.add_config_for_testing(@test_config)
     run_sample_trace('/here')
     run_sample_trace('/there')

data/test/new_relic/transaction_sample_test.rb

@@ -6,9 +6,13 @@ require File.expand_path('../../test_helper.rb', __FILE__)
 
 class NewRelic::TransactionSampleTest < Minitest::Test
   include TransactionSampleTestHelper
+
   ::SQL_STATEMENT = "SELECT * from sandwiches WHERE meat='bacon'"
   ::OBFUSCATED_SQL_STATEMENT = "SELECT * from sandwiches WHERE meat=?"
 
+  FORCE_PERSIST_POSITION = 7
+  SYNTHETICS_POSITION    = 9
+
   def setup
     @test_config = { :developer_mode => true }
     NewRelic::Agent.config.add_config_for_testing(@test_config)
@@ -258,7 +262,9 @@ class NewRelic::TransactionSampleTest < Minitest::Test
                       (@t.duration * 1000).round,
                       @t.params[:path], @t.params[:uri],
                       trace_tree,
-                      @t.guid, nil, !!@t.force_persist, @t.xray_session_id]
+                      @t.guid, nil, !!@t.force_persist,
+                      @t.xray_session_id,
+                      @t.synthetics_resource_id]
 
     assert_collector_arrays_match expected_array, @t.to_collector_array(@marshaller.default_encoder)
 
@@ -271,8 +277,6 @@ class NewRelic::TransactionSampleTest < Minitest::Test
     assert_equal expected_array, actual_array
   end
 
-  FORCE_PERSIST_POSITION = 7
-
   def test_to_collector_array_forces_xrays
     @t.force_persist = false
     @t.xray_session_id = 123
@@ -280,6 +284,12 @@ class NewRelic::TransactionSampleTest < Minitest::Test
     assert_equal true, result[FORCE_PERSIST_POSITION]
   end
 
+  def test_to_collector_array_uses_synthetics_resource_id
+    @t.synthetics_resource_id = '42'
+    result = @t.to_collector_array(@marshaller.default_encoder)
+    assert_equal '42', result[SYNTHETICS_POSITION]
+  end
+
   def test_to_collector_array_with_bad_values
     transaction = NewRelic::TransactionSample.new(nil)
     transaction.root_segment.end_trace(Rational(10, 1))
@@ -290,7 +300,7 @@ class NewRelic::TransactionSampleTest < Minitest::Test
       nil, nil,
       trace_tree(transaction),
       transaction.guid,
-      nil, false, nil]
+      nil, false, nil, nil]
 
     actual = transaction.to_collector_array(@marshaller.default_encoder)
     assert_collector_arrays_match expected, actual

data/test/performance/suites/rack_middleware.rb

@@ -50,14 +50,16 @@ class RackMiddleware < Performance::TestCase
       :disable_mobile_headers => false,
       :browser_key            => 'browserKey',
       :js_agent_loader        => 'loader',
+      :encoding_key           => 'lolz',
       :application_id         => '5, 6', # collector can return app multiple ids
       :'rum.enabled'          => true,
-      :episodes_file          => 'this_is_my_file',
       :license_key            => 'a' * 40,
       :developer_mode         => false
     }
     NewRelic::Agent.config.add_config_for_testing(@config)
 
+    NewRelic::Agent.agent.events.notify(:finished_configuring)
+
     @stack = Rack::Builder.new do
       use TestMiddlewareA
       use TestMiddlewareB

data/test/test_helper.rb

@@ -22,6 +22,39 @@ unless defined?(Minitest::Test)
   Minitest::Test = MiniTest::Unit::TestCase
 end
 
+require 'hometown'
+Hometown.watch(::Thread)
+
+# Set up a watcher for leaking agent threads out of tests.  It'd be nice to
+# disable the threads everywhere, but not all tests have newrelic.yml loaded to
+# us to rely on, so instead we'll just watch for it.
+class Minitest::Test
+  def before_setup
+    @__thread_count = ruby_threads.count
+    super
+  end
+
+  def after_teardown
+    threads = ruby_threads
+    if @__thread_count != threads.count
+      backtraces = threads.map do |thread|
+        trace = Hometown.for(thread)
+        trace.backtrace.join("\n    ")
+      end.join("\n\n")
+
+      fail "Thread count changed in this test from #{@__thread_count} to #{threads.count}\n#{backtraces}"
+    end
+
+    super
+  end
+
+  # We only want to count threads that were spun up from Ruby (i.e.
+  # Thread.new) JRuby has system threads we don't care to track.
+  def ruby_threads
+    Thread.list.select { |t| Hometown.for(t) }
+  end
+end
+
 Dir.glob('test/helpers/*').each { |f| require f }
 
 Dir.glob(File.join(NEWRELIC_PLUGIN_DIR,'test/helpers/*.rb')).each do |helper|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.9.6.257
+  version: 3.9.7.266
   prerelease: 
 platform: ruby
 authors:
@@ -41,7 +41,7 @@ cert_chain:
   K0ZZTXduQWIrVm1OT2h2MVMrc0poYmpaMzBQS2d6NnZMaFQ2dW5pZUNqTGs5
   d0dHbWxTSwpZamJudkE5cXJhTExhalNqCi0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2014-10-20 00:00:00.000000000 Z
+date: 2014-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -187,6 +187,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.1
+- !ruby/object:Gem::Dependency
+  name: hometown
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -258,7 +274,6 @@ files:
 - lib/new_relic/agent/agent_logger.rb
 - lib/new_relic/agent/audit_logger.rb
 - lib/new_relic/agent/autostart.rb
-- lib/new_relic/agent/browser_token.rb
 - lib/new_relic/agent/busy_calculator.rb
 - lib/new_relic/agent/chained_call.rb
 - lib/new_relic/agent/commands/agent_command.rb
@@ -278,6 +293,7 @@ files:
 - lib/new_relic/agent/configuration/yaml_source.rb
 - lib/new_relic/agent/cross_app_monitor.rb
 - lib/new_relic/agent/cross_app_tracing.rb
+- lib/new_relic/agent/custom_event_aggregator.rb
 - lib/new_relic/agent/database.rb
 - lib/new_relic/agent/database/obfuscation_helpers.rb
 - lib/new_relic/agent/database/obfuscator.rb
@@ -288,6 +304,7 @@ files:
 - lib/new_relic/agent/datastores/mongo/obfuscator.rb
 - lib/new_relic/agent/datastores/mongo/statement_formatter.rb
 - lib/new_relic/agent/error_collector.rb
+- lib/new_relic/agent/event_buffer.rb
 - lib/new_relic/agent/event_listener.rb
 - lib/new_relic/agent/event_loop.rb
 - lib/new_relic/agent/harvester.rb
@@ -298,6 +315,7 @@ files:
 - lib/new_relic/agent/http_clients/net_http_wrappers.rb
 - lib/new_relic/agent/http_clients/typhoeus_wrappers.rb
 - lib/new_relic/agent/http_clients/uri_util.rb
+- lib/new_relic/agent/inbound_request_monitor.rb
 - lib/new_relic/agent/instrumentation.rb
 - lib/new_relic/agent/instrumentation/action_controller_subscriber.rb
 - lib/new_relic/agent/instrumentation/action_view_subscriber.rb
@@ -364,7 +382,6 @@ files:
 - lib/new_relic/agent/obfuscator.rb
 - lib/new_relic/agent/pipe_channel_manager.rb
 - lib/new_relic/agent/pipe_service.rb
-- lib/new_relic/agent/request_sampler.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
@@ -377,6 +394,7 @@ files:
 - lib/new_relic/agent/samplers/object_sampler.rb
 - lib/new_relic/agent/samplers/vm_sampler.rb
 - lib/new_relic/agent/shim_agent.rb
+- lib/new_relic/agent/sized_buffer.rb
 - lib/new_relic/agent/sql_sampler.rb
 - lib/new_relic/agent/stats.rb
 - lib/new_relic/agent/stats_engine.rb
@@ -385,6 +403,7 @@ files:
 - lib/new_relic/agent/stats_engine/samplers.rb
 - lib/new_relic/agent/stats_engine/stats_hash.rb
 - lib/new_relic/agent/supported_versions.rb
+- lib/new_relic/agent/synthetics_monitor.rb
 - lib/new_relic/agent/system_info.rb
 - lib/new_relic/agent/threading/agent_thread.rb
 - lib/new_relic/agent/threading/backtrace_node.rb
@@ -395,8 +414,10 @@ files:
 - lib/new_relic/agent/transaction/developer_mode_sample_buffer.rb
 - lib/new_relic/agent/transaction/force_persist_sample_buffer.rb
 - lib/new_relic/agent/transaction/slowest_sample_buffer.rb
+- lib/new_relic/agent/transaction/synthetics_sample_buffer.rb
 - lib/new_relic/agent/transaction/transaction_sample_buffer.rb
 - lib/new_relic/agent/transaction/xray_sample_buffer.rb
+- lib/new_relic/agent/transaction_event_aggregator.rb
 - lib/new_relic/agent/transaction_metrics.rb
 - lib/new_relic/agent/transaction_sample_builder.rb
 - lib/new_relic/agent/transaction_sampler.rb
@@ -564,6 +585,13 @@ files:
 - test/fixtures/cross_agent_tests/README.md
 - test/fixtures/cross_agent_tests/attribute_configuration.json
 - test/fixtures/cross_agent_tests/cat_map.json
+- test/fixtures/cross_agent_tests/docker_container_id/README.md
+- test/fixtures/cross_agent_tests/docker_container_id/cases.json
+- test/fixtures/cross_agent_tests/docker_container_id/docker-0.9.1.txt
+- test/fixtures/cross_agent_tests/docker_container_id/docker-1.0.0.txt
+- test/fixtures/cross_agent_tests/docker_container_id/docker-1.3.txt
+- test/fixtures/cross_agent_tests/docker_container_id/empty.txt
+- test/fixtures/cross_agent_tests/docker_container_id/lxc-containers-without-docker.txt
 - test/fixtures/cross_agent_tests/labels.json
 - test/fixtures/cross_agent_tests/postgres_explain_obfuscation/README.md
 - test/fixtures/cross_agent_tests/postgres_explain_obfuscation/basic_where.colon_obfuscated.txt
@@ -663,6 +691,8 @@ files:
 - test/fixtures/cross_agent_tests/proc_cpuinfo/8pack_8core_8logical.txt
 - test/fixtures/cross_agent_tests/proc_cpuinfo/README.md
 - test/fixtures/cross_agent_tests/proc_cpuinfo/Xpack_Xcore_2logical.txt
+- test/fixtures/cross_agent_tests/proc_meminfo/README.md
+- test/fixtures/cross_agent_tests/proc_meminfo/meminfo_4096MB.txt
 - test/fixtures/cross_agent_tests/rules.json
 - test/fixtures/cross_agent_tests/rum_client_config.json
 - test/fixtures/cross_agent_tests/rum_cookie.json
@@ -760,6 +790,7 @@ files:
 - test/fixtures/cross_agent_tests/sql_obfuscation/string_with_twin_single_quotes.obfuscated
 - test/fixtures/cross_agent_tests/sql_obfuscation/string_with_twin_single_quotes.sql
 - test/fixtures/cross_agent_tests/sql_parsing.json
+- test/fixtures/cross_agent_tests/synthetics/synthetics.json
 - test/fixtures/cross_agent_tests/transaction_segment_terms.json
 - test/fixtures/cross_agent_tests/url_clean.json
 - test/fixtures/cross_agent_tests/url_domain_extraction.json
@@ -785,7 +816,6 @@ files:
 - test/multiverse/suites/agent_only/Envfile
 - test/multiverse/suites/agent_only/agent_run_id_handling_test.rb
 - test/multiverse/suites/agent_only/audit_log_test.rb
-- test/multiverse/suites/agent_only/before_suite.rb
 - test/multiverse/suites/agent_only/collector_exception_handling_test.rb
 - test/multiverse/suites/agent_only/config/newrelic.yml
 - test/multiverse/suites/agent_only/cross_application_tracing_test.rb
@@ -807,6 +837,7 @@ files:
 - test/multiverse/suites/agent_only/set_transaction_name_test.rb
 - test/multiverse/suites/agent_only/ssl_test.rb
 - test/multiverse/suites/agent_only/start_up_test.rb
+- test/multiverse/suites/agent_only/synthetics_test.rb
 - test/multiverse/suites/agent_only/testing_app.rb
 - test/multiverse/suites/agent_only/thread_profiling_test.rb
 - test/multiverse/suites/agent_only/transaction_ignoring_test.rb
@@ -835,6 +866,11 @@ files:
 - test/multiverse/suites/deferred_instrumentation/Envfile
 - test/multiverse/suites/deferred_instrumentation/config/newrelic.yml
 - test/multiverse/suites/deferred_instrumentation/sinatra_test.rb
+- test/multiverse/suites/delayed_job/Envfile
+- test/multiverse/suites/delayed_job/before_suite.rb
+- test/multiverse/suites/delayed_job/config/newrelic.yml
+- test/multiverse/suites/delayed_job/delayed_job_sampler_test.rb
+- test/multiverse/suites/delayed_job/unsupported_backend_test.rb
 - test/multiverse/suites/excon/Envfile
 - test/multiverse/suites/excon/config/newrelic.yml
 - test/multiverse/suites/excon/excon_test.rb
@@ -962,7 +998,6 @@ files:
 - test/new_relic/agent/apdex_from_server_test.rb
 - test/new_relic/agent/audit_logger_test.rb
 - test/new_relic/agent/autostart_test.rb
-- test/new_relic/agent/browser_token_test.rb
 - test/new_relic/agent/busy_calculator_test.rb
 - test/new_relic/agent/commands/agent_command_router_test.rb
 - test/new_relic/agent/commands/agent_command_test.rb
@@ -980,6 +1015,7 @@ files:
 - test/new_relic/agent/configuration/yaml_source_test.rb
 - test/new_relic/agent/cross_app_monitor_test.rb
 - test/new_relic/agent/cross_app_tracing_test.rb
+- test/new_relic/agent/custom_event_aggregator_test.rb
 - test/new_relic/agent/database/postgres_explain_obfuscator_test.rb
 - test/new_relic/agent/database/sql_obfuscation_test.rb
 - test/new_relic/agent/database_test.rb
@@ -989,11 +1025,13 @@ files:
 - test/new_relic/agent/datastores/mongo/statement_formatter_test.rb
 - test/new_relic/agent/error_collector/notice_error_test.rb
 - test/new_relic/agent/error_collector_test.rb
+- test/new_relic/agent/event_buffer_test_cases.rb
 - test/new_relic/agent/event_listener_test.rb
 - test/new_relic/agent/event_loop_test.rb
 - test/new_relic/agent/harvester_test.rb
 - test/new_relic/agent/hostname_test.rb
 - test/new_relic/agent/http_clients/uri_util_test.rb
+- test/new_relic/agent/inbound_request_monitor_test.rb
 - test/new_relic/agent/instrumentation/action_controller_subscriber_test.rb
 - test/new_relic/agent/instrumentation/action_view_subscriber_test.rb
 - test/new_relic/agent/instrumentation/active_job_test.rb
@@ -1024,7 +1062,6 @@ files:
 - test/new_relic/agent/obfuscator_test.rb
 - test/new_relic/agent/pipe_channel_manager_test.rb
 - test/new_relic/agent/pipe_service_test.rb
-- test/new_relic/agent/request_sampler_test.rb
 - test/new_relic/agent/rpm_agent_test.rb
 - test/new_relic/agent/rules_engine_test.rb
 - test/new_relic/agent/sampled_buffer_test.rb
@@ -1033,6 +1070,7 @@ files:
 - test/new_relic/agent/samplers/cpu_sampler_test.rb
 - test/new_relic/agent/samplers/vm_sampler_test.rb
 - test/new_relic/agent/shim_agent_test.rb
+- test/new_relic/agent/sized_buffer_test.rb
 - test/new_relic/agent/sql_sampler_test.rb
 - test/new_relic/agent/stats_engine/gc_profiler_test.rb
 - test/new_relic/agent/stats_engine/metric_stats_test.rb
@@ -1040,6 +1078,7 @@ files:
 - test/new_relic/agent/stats_engine/stats_hash_test.rb
 - test/new_relic/agent/stats_engine_test.rb
 - test/new_relic/agent/stats_test.rb
+- test/new_relic/agent/synthetics_monitor_test.rb
 - test/new_relic/agent/system_info_test.rb
 - test/new_relic/agent/threading/agent_thread_test.rb
 - test/new_relic/agent/threading/backtrace_node_test.rb
@@ -1051,7 +1090,9 @@ files:
 - test/new_relic/agent/transaction/developer_mode_sample_buffer_test.rb
 - test/new_relic/agent/transaction/force_persist_sample_buffer_test.rb
 - test/new_relic/agent/transaction/slowest_sample_buffer_test.rb
+- test/new_relic/agent/transaction/synthetics_sample_buffer_test.rb
 - test/new_relic/agent/transaction/xray_sample_buffer_test.rb
+- test/new_relic/agent/transaction_event_aggregator_test.rb
 - test/new_relic/agent/transaction_interrobang_test.rb
 - test/new_relic/agent/transaction_metrics_test.rb
 - test/new_relic/agent/transaction_sample_builder_test.rb

data/lib/new_relic/agent/browser_token.rb

@@ -1,41 +0,0 @@
-# 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.
-
-require 'erb'
-
-module NewRelic
-  module Agent
-    module BrowserToken
-
-      def self.get_token(request)
-        return nil unless request
-
-        agent_flag = request.cookies['NRAGENT']
-        if agent_flag and agent_flag.instance_of? String
-          s = agent_flag.split("=")
-          if s.length == 2
-            if s[0] == "tk" && s[1]
-              sanitized = sanitize_token(s[1])
-              return nil unless sanitized
-              ERB::Util.h(sanitized)
-            end
-          end
-        else
-          nil
-        end
-      end
-
-      # Remove any non-alphanumeric characters from the token to avoid XSS attacks.
-      def self.sanitize_token(token)
-        if token.match(/[^a-zA-Z0-9]/)
-          ::NewRelic::Agent.logger.log_once(:warn, :invalid_browser_token,
-                                           "Invalid characters found in browser token.")
-          nil
-        else
-          token
-        end
-      end
-    end
-  end
-end

data/test/multiverse/suites/agent_only/before_suite.rb

@@ -1,7 +0,0 @@
-# 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.
-
-require 'multiverse_helpers'
-
-MultiverseHelpers.setup_collector

data/test/new_relic/agent/browser_token_test.rb

@@ -1,56 +0,0 @@
-# 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.
-
-require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
-require 'new_relic/agent/browser_token'
-
-module NewRelic::Agent
-  class BrowserTokenTest < Minitest::Test
-    def assert_token(expected, cookies)
-      request = stub(:cookies => cookies)
-      assert_equal(expected, BrowserToken.get_token(request))
-    end
-
-    def test_get_token_safe_token_returned_untouched
-      assert_token("12345678", 'NRAGENT' => 'tk=12345678')
-    end
-
-    def test_get_token_with_embedded_tags_sanitized
-      assert_token(nil, 'NRAGENT' => 'tk=1234<tag>evil</tag>5678')
-    end
-
-    def test_get_token_with_embedded_utf8_js_sanitized
-      assert_token(nil, 'NRAGENT' => "tk=1234&#34&#93&#41&#595678")
-    end
-
-    def test_get_token_with_embedded_utf7_js_sanitized
-      assert_token(nil, 'NRAGENT' => 'tk=+ADw-SCRIPT+AD4-alert(1)+ADw-/SCRIPT+AD4-')
-    end
-
-    def test_get_token_replaces_double_quoted_token_with_empty_string
-      assert_token(nil, 'NRAGENT' => 'tk="""deadbeef"""')
-    end
-
-    def test_get_token_replaces_single_quoted_token_with_empty_string
-      assert_token(nil, 'NRAGENT' => "tk='''deadbeef'''")
-    end
-
-    def test_get_token_replaces_token_started_with_multiple_Lt_with_empty_string
-      assert_token(nil, 'NRAGENT' => 'tk=<<<deadbeef')
-    end
-
-    def test_get_token_replaces_token_started_with_multiple_gt_with_empty_string
-      assert_token(nil, 'NRAGENT' => 'tk=>>>deadbeef')
-    end
-
-    def test_get_token_bare_value_replaced_with_nil
-      assert_token(nil, 'NRAGENT' => 0xdeadbeef)
-    end
-
-    def test_get_token_nil_token_returns_nil_token
-      assert_token(nil, 'NRAGENT' => nil)
-    end
-
-  end
-end