From a27dbacb7c280ceea7995a9bb2734a9f70c1dcce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Th=C3=A9riault?= Date: Thu, 2 Feb 2023 11:49:31 -0800 Subject: [PATCH] Revert "fix(opentelemetry-core): traceState in sampler tests" This reverts commit c4f174b2f8af2da9c881a2eb157a762662c00b1e. --- .../test/trace/AlwaysOffSampler.test.ts | 3 +- .../test/trace/AlwaysOnSampler.test.ts | 3 +- .../test/trace/ParentBasedSampler.test.ts | 6 ---- .../trace/TraceIdRatioBasedSampler.test.ts | 28 ++++--------------- 4 files changed, 7 insertions(+), 33 deletions(-) diff --git a/packages/opentelemetry-core/test/trace/AlwaysOffSampler.test.ts b/packages/opentelemetry-core/test/trace/AlwaysOffSampler.test.ts index 2dc9e5a8fc..bda93eddd3 100644 --- a/packages/opentelemetry-core/test/trace/AlwaysOffSampler.test.ts +++ b/packages/opentelemetry-core/test/trace/AlwaysOffSampler.test.ts @@ -25,9 +25,8 @@ describe('AlwaysOffSampler', () => { it('should return decision: api.SamplingDecision.NOT_RECORD for AlwaysOffSampler', () => { const sampler = new AlwaysOffSampler(); - assert.deepStrictEqual(sampler.shouldSample(api.ROOT_CONTEXT), { + assert.deepStrictEqual(sampler.shouldSample(), { 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 index 95169aec0a..fce88b19bb 100644 --- a/packages/opentelemetry-core/test/trace/AlwaysOnSampler.test.ts +++ b/packages/opentelemetry-core/test/trace/AlwaysOnSampler.test.ts @@ -25,9 +25,8 @@ describe('AlwaysOnSampler', () => { it('should return api.SamplingDecision.RECORD_AND_SAMPLED for AlwaysOnSampler', () => { const sampler = new AlwaysOnSampler(); - assert.deepStrictEqual(sampler.shouldSample(api.ROOT_CONTEXT), { + assert.deepStrictEqual(sampler.shouldSample(), { 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 index 6b998e169d..828a32fa3e 100644 --- a/packages/opentelemetry-core/test/trace/ParentBasedSampler.test.ts +++ b/packages/opentelemetry-core/test/trace/ParentBasedSampler.test.ts @@ -67,7 +67,6 @@ describe('ParentBasedSampler', () => { ), { decision: api.SamplingDecision.NOT_RECORD, - traceState: undefined, } ); }); @@ -86,7 +85,6 @@ describe('ParentBasedSampler', () => { ), { decision: api.SamplingDecision.RECORD_AND_SAMPLED, - traceState: undefined, } ); }); @@ -105,7 +103,6 @@ describe('ParentBasedSampler', () => { ), { decision: api.SamplingDecision.RECORD_AND_SAMPLED, - traceState: undefined, } ); }); @@ -129,7 +126,6 @@ describe('ParentBasedSampler', () => { ), { decision: api.SamplingDecision.RECORD_AND_SAMPLED, - traceState: undefined, } ); }); @@ -148,7 +144,6 @@ describe('ParentBasedSampler', () => { ), { decision: api.SamplingDecision.NOT_RECORD, - traceState: undefined, } ); }); @@ -167,7 +162,6 @@ 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 index d8586606c4..c94534c776 100644 --- a/packages/opentelemetry-core/test/trace/TraceIdRatioBasedSampler.test.ts +++ b/packages/opentelemetry-core/test/trace/TraceIdRatioBasedSampler.test.ts @@ -18,12 +18,11 @@ import * as assert from 'assert'; import * as api from '@opentelemetry/api'; import { TraceIdRatioBasedSampler } from '../../src/trace/sampler/TraceIdRatioBasedSampler'; -const spanContext = (traceId = '1') => - api.trace.setSpanContext(api.ROOT_CONTEXT, { - traceId, - spanId: '1.1', - traceFlags: api.TraceFlags.NONE, - }); +const spanContext = (traceId = '1') => ({ + traceId, + spanId: '1.1', + traceFlags: api.TraceFlags.NONE, +}); const traceId = (part: string) => ('0'.repeat(32) + part).slice(-32); @@ -60,7 +59,6 @@ describe('TraceIdRatioBasedSampler', () => { sampler.shouldSample(spanContext(traceId('1')), traceId('1')), { decision: api.SamplingDecision.RECORD_AND_SAMPLED, - traceState: undefined, } ); }); @@ -71,7 +69,6 @@ describe('TraceIdRatioBasedSampler', () => { sampler.shouldSample(spanContext(traceId('1')), traceId('1')), { decision: api.SamplingDecision.RECORD_AND_SAMPLED, - traceState: undefined, } ); }); @@ -82,7 +79,6 @@ describe('TraceIdRatioBasedSampler', () => { sampler.shouldSample(spanContext(traceId('1')), traceId('1')), { decision: api.SamplingDecision.NOT_RECORD, - traceState: undefined, } ); }); @@ -93,7 +89,6 @@ describe('TraceIdRatioBasedSampler', () => { sampler.shouldSample(spanContext(traceId('1')), traceId('1')), { decision: api.SamplingDecision.NOT_RECORD, - traceState: undefined, } ); }); @@ -105,7 +100,6 @@ describe('TraceIdRatioBasedSampler', () => { sampler.shouldSample(spanContext(traceId('1')), traceId('1')), { decision: api.SamplingDecision.NOT_RECORD, - traceState: undefined, } ); }); @@ -117,7 +111,6 @@ describe('TraceIdRatioBasedSampler', () => { sampler.shouldSample(spanContext(traceId('1')), traceId('1')), { decision: api.SamplingDecision.NOT_RECORD, - traceState: undefined, } ); }); @@ -129,7 +122,6 @@ describe('TraceIdRatioBasedSampler', () => { sampler.shouldSample(spanContext(traceId('1')), traceId('1')), { decision: api.SamplingDecision.NOT_RECORD, - traceState: undefined, } ); }); @@ -140,7 +132,6 @@ describe('TraceIdRatioBasedSampler', () => { sampler.shouldSample(spanContext(traceId('1')), traceId('1')), { decision: api.SamplingDecision.RECORD_AND_SAMPLED, - traceState: undefined, } ); @@ -151,7 +142,6 @@ describe('TraceIdRatioBasedSampler', () => { ), { decision: api.SamplingDecision.NOT_RECORD, - traceState: undefined, } ); }); @@ -160,14 +150,12 @@ 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, } ); }); @@ -179,21 +167,17 @@ 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)); @@ -201,14 +185,12 @@ describe('TraceIdRatioBasedSampler', () => { 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, } ); });