Skip to content
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

Jump to bottom

fix: ContainerId not detected post version 0.2.2 #2270

Merged
merged 7 commits into from
Jun 10, 2024
Merged

fix: ContainerId not detected post version 0.2.2 #2270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ee86abb
?? only checks for null and undefined
abhee11 Jun 9, 2024
49e6a42
Merge branch 'main' into fix/container-detector
abhee11 Jun 9, 2024
b7a6031
added unit test to cover the fix
abhee11 Jun 9, 2024
9756947
added unit test to cover the fix
abhee11 Jun 9, 2024
eba21e1
Merge branch 'fix/container-detector' of https://github.com/abhee11/o…
abhee11 Jun 9, 2024
b08a870
lint fixes
abhee11 Jun 9, 2024
e19422a
lint fixes - line too long
abhee11 Jun 9, 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
2 changes: 1 addition & 1 deletion detectors/node/opentelemetry-resource-detector-container/src/detectors/ContainerDetector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ export class ContainerDetector implements Detector {
private async _getContainerId(): Promise<string | undefined> {
try {
return (
(await this._getContainerIdV1()) ?? (await this._getContainerIdV2())
(await this._getContainerIdV1()) || (await this._getContainerIdV2())
);
} catch (e) {
if (e instanceof Error) {
Expand Down
10 changes: 10 additions & 0 deletions detectors/node/opentelemetry-resource-detector-container/test/ContainerDetector.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,16 @@ describe('ContainerDetector', () => {
assert.ok(resource);
});

it('should return a correctCgroupV2Data resource with v1Detector returns empty string ', async () => {
readStub = sinon.stub(ContainerDetector, 'readFileAsync' as any);
sinon.stub(containerDetector, '_getContainerIdV1' as any).resolves('');
sinon
.stub(containerDetector, '_getContainerIdV2' as any)
.resolves(correctCgroupV2Data);
const containerId = await containerDetector['_getContainerId']();
assert.strictEqual(containerId, correctCgroupV2Data);
});

it('should return a resource without attribute container.id when cgroup file does not contain valid Container ID', async () => {
readStub = sinon
.stub(ContainerDetector, 'readFileAsync' as any)
Expand Down