wip: sync cross agent tests

Author: amychisholm03

test/integration/distributed-tracing/trace-context-cross-agent.test.js

@@ -268,7 +268,7 @@ async function runTestCase(testCase, parentTest) {
     testExpectedFixtureKeys(testCase, [
       'account_id',
       'expected_metrics',
-      'force_sampled_true',
+      'force_adaptive_sampled_true',
       'inbound_headers',
       'intrinsics',
       'outbound_payloads',
@@ -279,7 +279,13 @@ async function runTestCase(testCase, parentTest) {
       'trusted_account_key',
       'web_transaction',
       'comment',
-      'transaction_events_enabled'
+      'transaction_events_enabled',
+      // Sampling
+      'remote_parent_sampled',
+      'remote_parent_not_sampled',
+      'root',
+      'ratio',
+      'expected_priority_between'
     ])
 
     if (testCase.outbound_payloads) {
@@ -356,7 +362,7 @@ async function runTestCase(testCase, parentTest) {
 
       // monkey patch this transaction object
       // to force sampled to be true.
-      if (testCase.force_sampled_true) {
+      if (testCase.force_adaptive_sampled_true) {
         transaction.agent.transactionSampler.shouldSample = function stubShouldSample() {
           return true
         }

test/lib/cross_agent_tests/distributed_tracing/README.md

@@ -14,7 +14,12 @@ the agent under test. Here's what the various fields in each test case mean:
 | `account_id` | The account id the agent would receive on connect. |
 | `web_transaction` | Whether the transaction that's tested is a web transaction or not. |
 | `raises_exception` | Whether to simulate an exception happening within the transaction or not, resulting in a transaction error event. |
-| `force_sampled_true` | Whether to force a transaction to be sampled or not. |
+| `root` | The sampler to use for transactions at the root of a trace. |
+| `remote_parent_sampled` | The sampler to use for transactions with a remote parent. |
+| `remote_parent_not_sampled` | The sampler to use for transactions with a remote parent that is not sampled. |
+| `expected_priority_between` | The inclusive range of the expected priority value on the generated transaction event. |
+| `force_adaptive_sampled_true` | Whether to force a transaction to be sampled or not when the adaptive sampler is used. |
+| `ratio` | The ratio to use for all of the trace ID ratio samplers defined in the test. For testing purposes we are not defining different ratios for each trace ID ratio sampler instance. If that is necessary, we will need a different way to configure the ratios. |
 | `transport_type` | The transport type for the inbound request. |
 | `inbound_headers` | The headers you should mock coming into the agent. |
 | `outbound_payloads` | The exact/expected/unexpected values for outbound `w3c` headers. |
@@ -23,6 +28,14 @@ the agent under test. Here's what the various fields in each test case mean:
 | `span_events_enabled` | Whether span events are enabled in the agent or not. |
 | `transaction_events_enabled` | Whether transaction events are enabled in the agent or not. |
 
+The samplers that can referenced in the `root`, `remote_parent_sampled`, and `remote_parent_not_sampled` fields are:
+
+- `default`: Use the adaptive sampler.
+- `adaptive`: Use the adaptive sampler.
+- `trace_id_ratio_based`: Use the trace ID ratio sampler.
+- `always_on`: Use the always on sampler.
+- `always_off`: Use the always off sampler.
+
 The `outbound_payloads` and `intrinsics` field can have nested values, for example:
 ```javascript
 ...

test/lib/cross_agent_tests/distributed_tracing/distributed_tracing.json

@@ -796,78 +796,6 @@
             ["Supportability/DistributedTrace/CreatePayload/Success", 2]
         ]
     },
-    {
-        "test_name": "payload_from_trusted_partnership_account",
-        "trusted_account_key": "44",
-        "account_id": "11",
-        "web_transaction": true,
-        "raises_exception": false,
-        "force_sampled_true": false,
-        "span_events_enabled": true,
-        "major_version": 0,
-        "minor_version": 1,
-        "transport_type": "HTTP",
-        "inbound_payloads": [
-            {
-                "v": [0, 1],
-                "d": {
-                    "ac": "33",
-                    "ap": "2827902",
-                    "tx": "e8b91a159289ff74",
-                    "pr": 0.123456,
-                    "sa": false,
-                    "ti": 1518469636035,
-                    "tr": "d6b4ba0c3a712ca",
-                    "tk": "44",
-                    "ty": "App"
-                }
-            }
-        ],
-        "outbound_payloads": [
-            {
-                "exact": {
-                    "v": [0, 1],
-                    "d.ac": "11",
-                    "d.pr": 0.123456,
-                    "d.sa": false,
-                    "d.tr": "d6b4ba0c3a712ca",
-                    "d.tk": "44",
-                    "d.ty": "App"
-                },
-                "expected": ["d.ap", "d.tx", "d.ti"],
-                "unexpected": ["d.id"]
-            }
-        ],
-        "intrinsics": {
-            "target_events": ["Transaction"],
-            "common":{
-                "exact": {
-                    "parent.type": "App",
-                    "parent.app": "2827902",
-                    "parent.account": "33",
-                    "parent.transportType": "HTTP",
-                    "traceId": "d6b4ba0c3a712ca",
-                    "priority": 0.123456,
-                    "sampled": false
-                },
-                "expected": ["parent.transportDuration", "guid"],
-                "unexpected": ["grandparentId", "cross_process_id", "nr.tripId", "nr.pathHash", "nr.referringPathHash", "nr.guid", "nr.referringTransactionGuid", "nr.alternatePathHashes"]
-            },
-            "Transaction": {
-                "exact": {
-                    "parentId": "e8b91a159289ff74"
-                }
-            }
-        },
-        "expected_metrics": [
-            ["DurationByCaller/App/33/2827902/HTTP/all", 1],
-            ["DurationByCaller/App/33/2827902/HTTP/allWeb", 1],
-            ["TransportDuration/App/33/2827902/HTTP/all", 1],
-            ["TransportDuration/App/33/2827902/HTTP/allWeb", 1],
-            ["Supportability/DistributedTrace/AcceptPayload/Success", 1],
-            ["Supportability/DistributedTrace/CreatePayload/Success", 1]
-        ]
-    },
     {
         "test_name": "payload_has_larger_minor_version",
         "trusted_account_key": "33",