test fixes

Author: amychisholm03

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

@@ -504,7 +504,11 @@ function forceAdaptiveSamplers(agent, forceAdaptiveSampled) {
   if (forceAdaptiveSampled === undefined || forceAdaptiveSampled === null) return
   // "Whether to force a transaction to be sampled or not when the adaptive sampler is used"
   // implies this affects all samplers that are adaptive samplers
-  const samplers = [agent.transactionSampler, agent.remoteParentSampledSampler, agent.remoteParentNotSampledSampler]
+  const samplers = [
+    agent.sampler.root,
+    agent.sampler.remoteParentSampled,
+    agent.sampler.remoteParentNotSampled
+  ]
   for (const sampler of samplers) {
     if (sampler?.toString() === 'AdaptiveSampler') {
       // monkey patch this transaction object

test/unit/samplers/adaptive-sampler.test.js

@@ -149,5 +149,3 @@ test('in standard mode', async (t) => {
     })
   })
 })
-
-// TODO: applySamplingDecision

test/unit/samplers/determine-sampler.test.js

@@ -191,7 +191,7 @@ test('if trace_id_ratio_based is defined but ratio is not, use adaptive sampler'
     }
   })
   t.nr.agent = helper.loadMockedAgent(config)
-  const sampler = t.nr.agent.transactionSampler
+  const sampler = t.nr.agent.sampler.root
   assert.ok(sampler instanceof AdaptiveSampler)
 })
 
@@ -208,6 +208,6 @@ test('should use traceidratiobasedsampler if trace_id_ratio_based and ratio is d
     }
   })
   t.nr.agent = helper.loadMockedAgent(config)
-  const sampler = t.nr.agent.transactionSampler
+  const sampler = t.nr.agent.sampler.root
   assert.ok(sampler instanceof TraceIdRatioBasedSampler)
 })

test/unit/samplers/ratio-based-sampler.test.js

@@ -7,7 +7,7 @@
 
 const test = require('node:test')
 const assert = require('node:assert')
-const helper = require('../../lib/agent_helper')
+const helper = require('#testlib/agent_helper.js')
 const hashes = require('#agentlib/util/hashes.js')
 const TraceIdRatioBasedSampler = require('#agentlib/samplers/ratio-based-sampler.js')
 
@@ -83,7 +83,25 @@ test('should sample approximately correct percentage of traces', (t) => {
   assert.ok(actualRatio > ratio - 0.01 && actualRatio < ratio + 0.01)
 })
 
-// TODO: applySamplingDecision
+test('should set `sampled` and `priority` correctly on sampled transaction', (t, end) => {
+  t.nr.agent.sampler.root = new TraceIdRatioBasedSampler({ agent: t.nr.agent, ratio: 1 })
+  helper.runInTransaction(t.nr.agent, (txn) => {
+    txn.end()
+    assert.strictEqual(txn.sampled, true)
+    assert.ok(txn.priority > 1)
+    end()
+  })
+})
+
+test('should set `sampled` and `priority` correctly on not sampled transaction', (t, end) => {
+  t.nr.agent.sampler.root = new TraceIdRatioBasedSampler({ agent: t.nr.agent, ratio: 0 })
+  helper.runInTransaction(t.nr.agent, (txn) => {
+    txn.end()
+    assert.strictEqual(txn.sampled, false)
+    assert.ok(txn.priority < 1)
+    end()
+  })
+})
 
 function generateRandomTraceId() {
   return hashes.makeId(32)