Skip to content

[Unit Tests] Fix lag after Unit Tests finish, fix flakiness in Sampling test #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 8, 2024
Merged

[Unit Tests] Fix lag after Unit Tests finish, fix flakiness in Sampling test #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
feab15a
fix lag after tests finish, fix flaky Sampler unit test
jj22ee Sep 30, 2024
5d69411
Merge branch 'main' into fix-test-lag
jj22ee Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...ro-opentelemetry-node-autoinstrumentation/test/aws-batch-unsampled-span-processor.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,7 @@ describe('AwsBatchUnsampledSpanProcessor', () => {
const processor = new AwsBatchUnsampledSpanProcessor(exporter, {
maxExportBatchSize: 5,
maxQueueSize: 6,
exportTimeoutMillis: 1000,
});
const totalSpans = 50;
for (let i = 0; i < totalSpans; i++) {
Expand Down
19 changes: 11 additions & 8 deletions ...istro-opentelemetry-node-autoinstrumentation/test/sampler/aws-xray-remote-sampler.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ describe('AwsXrayRemoteSampler', () => {
).toEqual(SamplingDecision.NOT_RECORD);

setTimeout(() => {
// restore function
(_AwsXRayRemoteSampler.prototype as any).getDefaultTargetPollingInterval = tmp;

expect(
sampler.shouldSample(context.active(), '1234', 'name', SpanKind.CLIENT, { abc: '1234' }, []).decision
).toEqual(SamplingDecision.RECORD_AND_SAMPLED);
Expand All @@ -98,8 +101,6 @@ describe('AwsXrayRemoteSampler', () => {
sampler.shouldSample(context.active(), '1234', 'name', SpanKind.CLIENT, { abc: '1234' }, []).decision
).toEqual(SamplingDecision.RECORD_AND_SAMPLED);

// reset function
(_AwsXRayRemoteSampler.prototype as any).getDefaultTargetPollingInterval = tmp;
done();
}, 300);
}, 10);
Expand Down Expand Up @@ -139,10 +140,12 @@ describe('AwsXrayRemoteSampler', () => {
sampled++;
}
}

// restore function
(_AwsXRayRemoteSampler.prototype as any).getDefaultTargetPollingInterval = tmp;

expect((sampler as any)._root._root.ruleCache.ruleAppliers[0].reservoirSampler.quota).toEqual(100000);
expect(sampled).toEqual(100000);
// reset function
(_AwsXRayRemoteSampler.prototype as any).getDefaultTargetPollingInterval = tmp;
done();
}, 2000);
}, 100);
Expand Down Expand Up @@ -184,13 +187,13 @@ describe('AwsXrayRemoteSampler', () => {
sampled++;
}
}
expect(sampled).toEqual(100);
// reset function
(_AwsXRayRemoteSampler.prototype as any).getDefaultTargetPollingInterval = tmp;
clock.restore();
// restore function
(_AwsXRayRemoteSampler.prototype as any).getDefaultTargetPollingInterval = tmp;
expect(sampled).toEqual(100);
done();
}, 2000);
}, 100);
}, 300);
});

it('generates valid ClientId', () => {
Expand Down
Loading