fix(opentelemetry-core): traceState in sampler tests

open-telemetry · Jan 13, 2023 · c4f174b · c4f174b
1 parent 11e8265
commit c4f174b
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 7 deletions.
diff --git a/packages/opentelemetry-core/test/trace/AlwaysOffSampler.test.ts b/packages/opentelemetry-core/test/trace/AlwaysOffSampler.test.ts
@@ -25,8 +25,9 @@ describe('AlwaysOffSampler', () => {
 
   it('should return decision: api.SamplingDecision.NOT_RECORD for AlwaysOffSampler', () => {
     const sampler = new AlwaysOffSampler();
-    assert.deepStrictEqual(sampler.shouldSample(), {
+    assert.deepStrictEqual(sampler.shouldSample(api.ROOT_CONTEXT), {
       decision: api.SamplingDecision.NOT_RECORD,
+      traceState: undefined,
     });
   });
 });
diff --git a/packages/opentelemetry-core/test/trace/AlwaysOnSampler.test.ts b/packages/opentelemetry-core/test/trace/AlwaysOnSampler.test.ts
@@ -25,8 +25,9 @@ describe('AlwaysOnSampler', () => {
 
   it('should return api.SamplingDecision.RECORD_AND_SAMPLED for AlwaysOnSampler', () => {
     const sampler = new AlwaysOnSampler();
-    assert.deepStrictEqual(sampler.shouldSample(), {
+    assert.deepStrictEqual(sampler.shouldSample(api.ROOT_CONTEXT), {
       decision: api.SamplingDecision.RECORD_AND_SAMPLED,
+      traceState: undefined,
     });
   });
 });
diff --git a/packages/opentelemetry-core/test/trace/ParentBasedSampler.test.ts b/packages/opentelemetry-core/test/trace/ParentBasedSampler.test.ts
@@ -67,6 +67,7 @@ describe('ParentBasedSampler', () => {
       ),
       {
         decision: api.SamplingDecision.NOT_RECORD,
+        traceState: undefined,
       }
     );
   });
@@ -85,6 +86,7 @@ describe('ParentBasedSampler', () => {
       ),
       {
         decision: api.SamplingDecision.RECORD_AND_SAMPLED,
+        traceState: undefined,
       }
     );
   });
@@ -103,6 +105,7 @@ describe('ParentBasedSampler', () => {
       ),
       {
         decision: api.SamplingDecision.RECORD_AND_SAMPLED,
+        traceState: undefined,
       }
     );
   });
@@ -126,6 +129,7 @@ describe('ParentBasedSampler', () => {
       ),
       {
         decision: api.SamplingDecision.RECORD_AND_SAMPLED,
+        traceState: undefined,
       }
     );
   });
@@ -144,6 +148,7 @@ describe('ParentBasedSampler', () => {
       ),
       {
         decision: api.SamplingDecision.NOT_RECORD,
+        traceState: undefined,
       }
     );
   });
@@ -162,6 +167,7 @@ describe('ParentBasedSampler', () => {
       ),
       {
         decision: api.SamplingDecision.NOT_RECORD,
+        traceState: undefined,
       }
     );
   });

diff --git a/packages/opentelemetry-core/test/trace/TraceIdRatioBasedSampler.test.ts b/packages/opentelemetry-core/test/trace/TraceIdRatioBasedSampler.test.ts
@@ -18,11 +18,12 @@ import * as assert from 'assert';
 import * as api from '@opentelemetry/api';
 import { TraceIdRatioBasedSampler } from '../../src/trace/sampler/TraceIdRatioBasedSampler';
 
-const spanContext = (traceId = '1') => ({
-  traceId,
-  spanId: '1.1',
-  traceFlags: api.TraceFlags.NONE,
-});
+const spanContext = (traceId = '1') =>
+  api.trace.setSpanContext(api.ROOT_CONTEXT, {
+    traceId,
+    spanId: '1.1',
+    traceFlags: api.TraceFlags.NONE,
+  });
 
 const traceId = (part: string) => ('0'.repeat(32) + part).slice(-32);
 
@@ -59,6 +60,7 @@ describe('TraceIdRatioBasedSampler', () => {
       sampler.shouldSample(spanContext(traceId('1')), traceId('1')),
       {
         decision: api.SamplingDecision.RECORD_AND_SAMPLED,
+        traceState: undefined,
       }
     );
   });
@@ -69,6 +71,7 @@ describe('TraceIdRatioBasedSampler', () => {
       sampler.shouldSample(spanContext(traceId('1')), traceId('1')),
       {
         decision: api.SamplingDecision.RECORD_AND_SAMPLED,
+        traceState: undefined,
       }
     );
   });
@@ -79,6 +82,7 @@ describe('TraceIdRatioBasedSampler', () => {
       sampler.shouldSample(spanContext(traceId('1')), traceId('1')),
       {
         decision: api.SamplingDecision.NOT_RECORD,
+        traceState: undefined,
       }
     );
   });
@@ -89,6 +93,7 @@ describe('TraceIdRatioBasedSampler', () => {
       sampler.shouldSample(spanContext(traceId('1')), traceId('1')),
       {
         decision: api.SamplingDecision.NOT_RECORD,
+        traceState: undefined,
       }
     );
   });
@@ -100,6 +105,7 @@ describe('TraceIdRatioBasedSampler', () => {
       sampler.shouldSample(spanContext(traceId('1')), traceId('1')),
       {
         decision: api.SamplingDecision.NOT_RECORD,
+        traceState: undefined,
       }
     );
   });
@@ -111,6 +117,7 @@ describe('TraceIdRatioBasedSampler', () => {
       sampler.shouldSample(spanContext(traceId('1')), traceId('1')),
       {
         decision: api.SamplingDecision.NOT_RECORD,
+        traceState: undefined,
       }
     );
   });
@@ -122,6 +129,7 @@ describe('TraceIdRatioBasedSampler', () => {
       sampler.shouldSample(spanContext(traceId('1')), traceId('1')),
       {
         decision: api.SamplingDecision.NOT_RECORD,
+        traceState: undefined,
       }
     );
   });
@@ -132,6 +140,7 @@ describe('TraceIdRatioBasedSampler', () => {
       sampler.shouldSample(spanContext(traceId('1')), traceId('1')),
       {
         decision: api.SamplingDecision.RECORD_AND_SAMPLED,
+        traceState: undefined,
       }
     );
 
@@ -142,6 +151,7 @@ describe('TraceIdRatioBasedSampler', () => {
       ),
       {
         decision: api.SamplingDecision.NOT_RECORD,
+        traceState: undefined,
       }
     );
   });
@@ -150,12 +160,14 @@ describe('TraceIdRatioBasedSampler', () => {
     const sampler = new TraceIdRatioBasedSampler(1);
     assert.deepStrictEqual(sampler.shouldSample(spanContext(''), ''), {
       decision: api.SamplingDecision.NOT_RECORD,
+      traceState: undefined,
     });
 
     assert.deepStrictEqual(
       sampler.shouldSample(spanContext(traceId('g')), traceId('g')),
       {
         decision: api.SamplingDecision.NOT_RECORD,
+        traceState: undefined,
       }
     );
   });
@@ -167,30 +179,36 @@ describe('TraceIdRatioBasedSampler', () => {
     const id1 = traceId((Math.floor(0xffffffff * 0.1) - 1).toString(16));
     assert.deepStrictEqual(sampler10.shouldSample(spanContext(id1), id1), {
       decision: api.SamplingDecision.RECORD_AND_SAMPLED,
+      traceState: undefined,
     });
     assert.deepStrictEqual(sampler20.shouldSample(spanContext(id1), id1), {
       decision: api.SamplingDecision.RECORD_AND_SAMPLED,
+      traceState: undefined,
     });
 
     const id2 = traceId((Math.floor(0xffffffff * 0.2) - 1).toString(16));
     assert.deepStrictEqual(sampler10.shouldSample(spanContext(id2), id2), {
       decision: api.SamplingDecision.NOT_RECORD,
+      traceState: undefined,
     });
     assert.deepStrictEqual(sampler20.shouldSample(spanContext(id2), id2), {
       decision: api.SamplingDecision.RECORD_AND_SAMPLED,
+      traceState: undefined,
     });
 
     const id2delta = traceId(Math.floor(0xffffffff * 0.2).toString(16));
     assert.deepStrictEqual(
       sampler10.shouldSample(spanContext(id2delta), id2delta),
       {
         decision: api.SamplingDecision.NOT_RECORD,
+        traceState: undefined,
       }
     );
     assert.deepStrictEqual(
       sampler20.shouldSample(spanContext(id2delta), id2delta),
       {
         decision: api.SamplingDecision.NOT_RECORD,
+        traceState: undefined,
       }
     );
   });