newrelic_rpm 3.9.0.229 → 3.9.1.236

data/test/fixtures/cross_agent_tests/cat_map.json

@@ -0,0 +1,299 @@
+[
+  {
+    "name": "new_cat",
+    "appName": "testAppName",
+    "transactionName": "WebTransaction/testTxnName",
+    "transactionGuid": "9323dc260548ed0e",
+    "referringPayload": [
+      "b854df4feb2b1f06",
+      false,
+      "7e249074f277923d",
+      "5d2957be"
+    ],
+    "expectedAttributes": {
+      "nr.guid": "9323dc260548ed0e",
+      "nr.tripId": "7e249074f277923d",
+      "nr.pathHash": "169d655a",
+      "nr.referringTransactionGuid": "b854df4feb2b1f06",
+      "nr.referringPathHash": "5d2957be"
+    },
+    "nonExpectedAttributes": [
+      "nr.alternatePathHashes"
+    ]
+  },
+  {
+    "name": "new_cat_path_hash_with_leading_zero",
+    "appName": "testAppName",
+    "transactionName": "WebTransaction/txn7",
+    "transactionGuid": "9323dc260548ed0e",
+    "referringPayload": [
+      "b854df4feb2b1f06",
+      false,
+      "7e249074f277923d",
+      "5d2957be"
+    ],
+    "expectedAttributes": {
+      "nr.guid": "9323dc260548ed0e",
+      "nr.tripId": "7e249074f277923d",
+      "nr.pathHash": "04429689",
+      "nr.referringTransactionGuid": "b854df4feb2b1f06",
+      "nr.referringPathHash": "5d2957be"
+    },
+    "nonExpectedAttributes": [
+      "nr.alternatePathHashes"
+    ]
+  },
+  {
+    "name": "new_cat_no_referring_payload",
+    "appName": "testAppName",
+    "transactionName": "WebTransaction/testTxnName",
+    "transactionGuid": "9323dc260548ed0e",
+    "referringPayload": null,
+    "expectedAttributes": {},
+    "nonExpectedAttributes": [
+      "nr.guid",
+      "nr.tripId",
+      "nr.pathHash",
+      "nr.referringTransactionGuid",
+      "nr.referringPathHash",
+      "nr.alternatePathHashes"
+    ]
+  },
+  {
+    "name": "new_cat_with_call_out",
+    "appName": "testAppName",
+    "transactionName": "WebTransaction/testTxnName",
+    "transactionGuid": "9323dc260548ed0e",
+    "referringPayload": null,
+    "outgoingTxnNames": [
+      "WebTransaction/testTxnName"
+    ],
+    "expectedAttributes": {
+      "nr.guid": "9323dc260548ed0e",
+      "nr.tripId": "9323dc260548ed0e",
+      "nr.pathHash": "accfca26"
+    },
+    "nonExpectedAttributes": [
+      "nr.referringTransactionGuid",
+      "nr.referringPathHash",
+      "nr.alternatePathHashes"
+    ]
+  },
+  {
+    "name": "new_cat_with_multiple_calls_out",
+    "appName": "testAppName",
+    "transactionName": "WebTransaction/testTxnName",
+    "transactionGuid": "9323dc260548ed0e",
+    "referringPayload": null,
+    "outgoingTxnNames": [
+      "WebTransaction/otherTxnName",
+      "WebTransaction/otherTxnName",
+      "WebTransaction/moreOtherTxnName",
+      "WebTransaction/moreDifferentTxnName"
+    ],
+    "expectedAttributes": {
+      "nr.guid": "9323dc260548ed0e",
+      "nr.tripId": "9323dc260548ed0e",
+      "nr.pathHash": "accfca26",
+      "nr.alternatePathHashes": "2ab5328c,cf3bc3a8,df3fb1b5"
+    },
+    "nonExpectedAttributes": [
+      "nr.referringTransactionGuid",
+      "nr.referringPathHash"
+    ]
+  },
+  {
+    "name": "new_cat_with_many_unique_calls_out",
+    "appName": "testAppName",
+    "transactionName": "WebTransaction/testTxnName",
+    "transactionGuid": "9323dc260548ed0e",
+    "referringPayload": null,
+    "outgoingTxnNames": [
+      "WebTransaction/txn1",
+      "WebTransaction/txn2",
+      "WebTransaction/txn3",
+      "WebTransaction/txn4",
+      "WebTransaction/txn5",
+      "WebTransaction/txn6",
+      "WebTransaction/txn7",
+      "WebTransaction/txn8",
+      "WebTransaction/txn9",
+      "WebTransaction/txn10",
+      "WebTransaction/txn11"
+    ],
+    "expectedAttributes": {
+      "nr.guid": "9323dc260548ed0e",
+      "nr.tripId": "9323dc260548ed0e",
+      "nr.pathHash": "accfca26",
+      "nr.alternatePathHashes": "55f97a7f,6fc8d18f,72827114,9a3ed934,a1744603,a7d2798f,be1039f5,ccadfd2c,da7edf2e,eaca716b"
+    },
+    "nonExpectedAttributes": [
+      "nr.referringTransactionGuid",
+      "nr.referringPathHash"
+    ]
+  },
+  {
+    "name": "new_cat_with_many_calls_out",
+    "appName": "testAppName",
+    "transactionName": "WebTransaction/testTxnName",
+    "transactionGuid": "9323dc260548ed0e",
+    "referringPayload": null,
+    "outgoingTxnNames": [
+      "WebTransaction/txn1",
+      "WebTransaction/txn1",
+      "WebTransaction/txn1",
+      "WebTransaction/txn1",
+      "WebTransaction/txn1",
+      "WebTransaction/txn1",
+      "WebTransaction/txn1",
+      "WebTransaction/txn1",
+      "WebTransaction/txn1",
+      "WebTransaction/txn1",
+      "WebTransaction/txn1",
+      "WebTransaction/txn2"
+    ],
+    "expectedAttributes": {
+      "nr.guid": "9323dc260548ed0e",
+      "nr.tripId": "9323dc260548ed0e",
+      "nr.pathHash": "accfca26",
+      "nr.alternatePathHashes": "55f97a7f,a7d2798f"
+    },
+    "nonExpectedAttributes": [
+      "nr.referringTransactionGuid",
+      "nr.referringPathHash"
+    ]
+  },
+  {
+    "name": "new_cat_with_referring_info_and_call_out",
+    "appName": "testAppName",
+    "transactionName": "WebTransaction/testTxnName",
+    "transactionGuid": "9323dc260548ed0e",
+    "referringPayload": [
+      "b854df4feb2b1f06",
+      false,
+      "7e249074f277923d",
+      "5d2957be"
+    ],
+    "outgoingTxnNames": [
+      "WebTransaction/otherTxnName"
+    ],
+    "expectedAttributes": {
+      "nr.guid": "9323dc260548ed0e",
+      "nr.tripId": "7e249074f277923d",
+      "nr.pathHash": "169d655a",
+      "nr.alternatePathHashes": "656d1ec9",
+      "nr.referringTransactionGuid": "b854df4feb2b1f06",
+      "nr.referringPathHash": "5d2957be"
+    },
+    "nonExpectedAttributes": []
+  },
+  {
+    "name": "new_cat_missing_path_hash",
+    "appName": "testAppName",
+    "transactionName": "WebTransaction/testTxnName",
+    "transactionGuid": "9323dc260548ed0e",
+    "referringPayload": [
+      "b854df4feb2b1f06",
+      false,
+      "7e249074f277923d"
+    ],
+    "expectedAttributes": {
+      "nr.guid": "9323dc260548ed0e",
+      "nr.tripId": "7e249074f277923d",
+      "nr.pathHash": "accfca26",
+      "nr.referringTransactionGuid": "b854df4feb2b1f06"
+    },
+    "nonExpectedAttributes": [
+      "nr.alternatePathHashes",
+      "nr.referringPathHash"
+    ]
+  },
+  {
+    "name": "new_cat_null_path_hash",
+    "appName": "testAppName",
+    "transactionName": "WebTransaction/testTxnName",
+    "transactionGuid": "9323dc260548ed0e",
+    "referringPayload": [
+      "b854df4feb2b1f06",
+      false,
+      "7e249074f277923d",
+      null
+    ],
+    "expectedAttributes": {
+      "nr.guid": "9323dc260548ed0e",
+      "nr.tripId": "7e249074f277923d",
+      "nr.pathHash": "accfca26",
+      "nr.referringTransactionGuid": "b854df4feb2b1f06"
+    },
+    "nonExpectedAttributes": [
+      "nr.alternatePathHashes",
+      "nr.referringPathHash"
+    ]
+  },
+  {
+    "name": "new_cat_malformed_path_hash",
+    "appName": "testAppName",
+    "transactionName": "WebTransaction/testTxnName",
+    "transactionGuid": "9323dc260548ed0e",
+    "referringPayload": [
+      "b854df4feb2b1f06",
+      false,
+      "7e249074f277923d",
+      [
+        "scrambled",
+        "eggs"
+      ]
+    ],
+    "expectedAttributes": {
+      "nr.guid": "9323dc260548ed0e",
+      "nr.tripId": "7e249074f277923d",
+      "nr.pathHash": "accfca26",
+      "nr.referringTransactionGuid": "b854df4feb2b1f06"
+    },
+    "nonExpectedAttributes": [
+      "nr.alternatePathHashes",
+      "nr.referringPathHash"
+    ]
+  },
+  {
+    "name": "new_cat_missing_trip_id",
+    "appName": "testAppName",
+    "transactionName": "WebTransaction/testTxnName",
+    "transactionGuid": "9323dc260548ed0e",
+    "referringPayload": [
+      "b854df4feb2b1f06",
+      false
+    ],
+    "expectedAttributes": {
+      "nr.guid": "9323dc260548ed0e",
+      "nr.tripId": "9323dc260548ed0e",
+      "nr.pathHash": "accfca26",
+      "nr.referringTransactionGuid": "b854df4feb2b1f06"
+    },
+    "nonExpectedAttributes": [
+      "nr.referringPathHash",
+      "nr.alternatePathHashes"
+    ]
+  },
+  {
+    "name": "new_cat_null_trip_id",
+    "appName": "testAppName",
+    "transactionName": "WebTransaction/testTxnName",
+    "transactionGuid": "9323dc260548ed0e",
+    "referringPayload": [
+      "b854df4feb2b1f06",
+      false,
+      null
+    ],
+    "expectedAttributes": {
+      "nr.guid": "9323dc260548ed0e",
+      "nr.tripId": "9323dc260548ed0e",
+      "nr.pathHash": "accfca26",
+      "nr.referringTransactionGuid": "b854df4feb2b1f06"
+    },
+    "nonExpectedAttributes": [
+      "nr.alternatePathHashes",
+      "nr.referringPathHash"
+    ]
+  }
+]

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

@@ -47,6 +47,22 @@ class CollectorExceptionHandlingTest < Minitest::Test
     assert_equal(1, $collector.calls_for('metric_data').size)
   end
 
+  def test_should_stop_reporting_after_force_disconnect_on_connect
+    $collector.reset
+
+    payload = { 'error_type' => 'NewRelic::Agent::ForceDisconnectException' }
+    $collector.stub_exception('connect', payload).once
+
+    with_config(:data_report_period => 0) do
+      worker_loop = NewRelic::Agent::WorkerLoop.new(:limit => 1)
+      NewRelic::Agent.agent.stubs(:create_worker_loop).returns(worker_loop)
+      NewRelic::Agent.agent.stubs(:sleep)
+      NewRelic::Agent.agent.deferred_work!({})
+    end
+
+    assert_equal(1, $collector.calls_for('connect').size)
+  end
+
   def test_should_reconnect_on_connect_exception
     $collector.reset
 

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

@@ -56,4 +56,34 @@ class CrossApplicationTracingTest < Minitest::Test
     get '/', {'transaction_name' => 'ignored_transaction'}, {'X-NewRelic-ID' => Base64.encode64('1#234')}
     assert_nil last_response.headers["X-NewRelic-App-Data"]
   end
+
+  load_cross_agent_test("cat_map").each do |test_case|
+    # We only can do test cases here that don't involve outgoing calls 
+    if !test_case["outgoingTxnNames"]
+      if test_case['referringPayload']
+        request_headers = {
+          'X-NewRelic-ID'          => Base64.encode64('1#234'),
+          'X-NewRelic-Transaction' => json_dump_and_encode(test_case['referringPayload'])
+        }
+      else
+        request_headers = {}
+      end
+
+      define_method("test_#{test_case['name']}") do
+        txn_category, txn_name = test_case['transactionName'].split('/')
+        request_params = {
+          'transaction_name' => txn_name,
+          'transaction_category' => txn_category,
+          'guid' => test_case['transactionGuid']
+        }
+
+        with_config('app_name' => test_case['appName']) do
+          get '/', request_params, request_headers
+        end
+
+        event = get_last_analytics_event
+        assert_event_attributes(event, test_case['name'], test_case['expectedAttributes'], test_case['nonExpectedAttributes'])
+      end
+    end
+  end
 end

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

@@ -9,37 +9,37 @@ require 'multiverse_helpers'
 
 class MarshalingTest < Minitest::Test
   include MultiverseHelpers
+  include NewRelic::Agent::MethodTracer
 
   setup_and_teardown_agent(:'transaction_tracer.transaction_threshold' => 0.0) do |collector|
     collector.stub('connect', { 'agent_run_id' => 666 })
   end
 
   def test_transaction_trace_marshaling
-    # create fake transaction trace
     time = freeze_time
-    state = NewRelic::Agent::TransactionState.tl_get
-    sampler = agent.transaction_sampler
-    sampler.on_start_transaction(state, time, nil)
-    sampler.notice_push_frame(state, "a")
-    sampler.notice_push_frame(state, "ab")
-    advance_time 1
-    sampler.notice_pop_frame(state, "ab")
-    sampler.notice_pop_frame(state, "a")
-    sampler.on_finishing_transaction(state, OpenStruct.new(:name => 'path',
-                                               :custom_parameters => {}))
-
-    expected_sample = sampler.last_sample
+
+    in_transaction do
+      trace_execution_scoped('a') do
+        trace_execution_scoped('ab') do
+          advance_time 1
+        end
+      end
+    end
+
+    expected_sample = NewRelic::Agent.instance.transaction_sampler.last_sample
 
     agent.service.connect
     agent.send(:harvest_and_send_transaction_traces)
 
     marshaller = agent.service.marshaller
 
-    transaction_sample_data_post = $collector.calls_for('transaction_sample_data')[0]
-    assert_equal('666', transaction_sample_data_post.run_id)
+    actual = $collector.calls_for('transaction_sample_data')[0][1][0]
     encoder = NewRelic::Agent::NewRelicService::Encoders::Identity
-    assert_equal(expected_sample.to_collector_array(encoder),
-                 transaction_sample_data_post[1][0])
+
+    expected = expected_sample.to_collector_array(encoder)
+    expected = NewRelic::JSONWrapper.normalize(expected)
+
+    assert_equal(expected, actual)
   end
 
   def test_metric_data_marshalling

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

@@ -20,8 +20,17 @@ class TestingApp
     request = Rack::Request.new(env)
     params = request.params
     if params['transaction_name']
-      NewRelic::Agent.set_transaction_name(params['transaction_name'])
+      opts = {}
+      if params['transaction_category']
+        opts[:category] = params['transaction_category']
+        NewRelic::Agent::Transaction.stubs(:transaction_category_is_web?).returns(true)
+      end
+      NewRelic::Agent.set_transaction_name(params['transaction_name'], opts)
     end
+    if params['cross_app_caller']
+      NewRelic::Agent::TransactionState.tl_get.is_cross_app_caller = true
+    end
+    stub_transaction_guid(params['guid']) if params['guid']
     sleep(params['sleep'].to_f) if params['sleep']
     [200, headers, [response]]
   end

data/test/multiverse/suites/deferred_instrumentation/config/newrelic.yml

@@ -9,7 +9,6 @@ development:
   license_key: bootstrap_newrelic_admin_license_key_000
   developer_mode: false
   app_name: test
-  sync_startup: true
   host: 127.0.0.1
   api_host: 127.0.0.1
   transaction_tracer:

data/test/multiverse/suites/high_security/Envfile

@@ -0,0 +1,3 @@
+gemfile <<-RB
+  gem 'rack'
+RB

data/test/multiverse/suites/high_security/config/newrelic.yml

@@ -0,0 +1,27 @@
+---
+development:
+  high_security: true
+
+  # Settings known to be overridden by high security, purposefully set wrong
+  # in local configuration for testing purposes!
+  ssl: false
+  transaction_tracer:
+    record_sql: raw
+    enabled: true
+    stack_trace_threshold: 0.5
+  slow_sql:
+    record_sql: obfuscated
+  capture_params: true
+
+  error_collector:
+    enabled: true
+  apdex_t: 0.24
+  monitor_mode: true
+  license_key: bootstrap_newrelic_admin_license_key_000
+  developer_mode: false
+  app_name: test
+  host: 127.0.0.1
+  api_host: 127.0.0.1
+  port: <%= $collector && $collector.port %>
+  browser_monitoring:
+    auto_instrument: true