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

feat(opentelemetry-resources): add runtime version information #2727

Merged
merged 18 commits into from
Mar 4, 2022
Merged

feat(opentelemetry-resources): add runtime version information #2727

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
7ce4389
feat(opentelemetry-resources): add runtime version information
cuichenli Jan 21, 2022
7bd392f
test(opentelemetry-resources): update unit test
cuichenli Jan 21, 2022
8607046
feat(opentelemetry-resources): hardcode the runtime name and description
cuichenli Jan 24, 2022
1827b95
feat(opentelemetry-resources): add browser detector
cuichenli Jan 24, 2022
304edad
fix: strange import and export
cuichenli Jan 25, 2022
abcf4a0
fix: improve type
cuichenli Jan 25, 2022
ee76a6c
fix: improve runtime description
cuichenli Jan 25, 2022
d25b453
test: fix unit test
cuichenli Jan 26, 2022
3d36a7c
test: improve stub
cuichenli Jan 26, 2022
caea930
docs: remove unnecessary inline docs
cuichenli Jan 26, 2022
b8e73c6
fix: hack the type error
cuichenli Jan 26, 2022
d78d714
Merge branch 'main' of github.com:cuichenli/opentelemetry-js into add…
cuichenli Jan 26, 2022
478cab0
Merge branch 'main' of github.com:cuichenli/opentelemetry-js into add…
cuichenli Mar 2, 2022
1f1ca09
chore: move BrowserDetector to detectors directory
cuichenli Mar 3, 2022
c749614
chore: move detectResources back to different platform
cuichenli Mar 3, 2022
508fce0
Merge branch 'main' into add-runtime-version
cuichenli Mar 3, 2022
abb3d3a
test: use describeNode and describeBrowser accordingly
cuichenli Mar 4, 2022
09236f6
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js int…
cuichenli Mar 4, 2022
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
6 changes: 5 additions & 1 deletion packages/opentelemetry-resources/src/platform/node/detectors/ProcessDetector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ class ProcessDetector implements Detector {
[SemanticResourceAttributes.PROCESS_COMMAND]: process.argv[1] || '',
[SemanticResourceAttributes.PROCESS_COMMAND_LINE]:
process.argv.join(' ') || '',
[SemanticResourceAttributes.PROCESS_RUNTIME_VERSION]: process.versions.node,
[SemanticResourceAttributes.PROCESS_RUNTIME_NAME]: 'nodejs',
vmarchaud marked this conversation as resolved.
Show resolved Hide resolved
[SemanticResourceAttributes.PROCESS_RUNTIME_DESCRIPTION]: 'NodeJS',
cuichenli marked this conversation as resolved.
Show resolved Hide resolved
};
return this._getResourceAttributes(processResource, config);
}
Expand All @@ -51,7 +54,8 @@ class ProcessDetector implements Detector {
processResource[SemanticResourceAttributes.PROCESS_EXECUTABLE_PATH] ===
'' ||
processResource[SemanticResourceAttributes.PROCESS_COMMAND] === '' ||
processResource[SemanticResourceAttributes.PROCESS_COMMAND_LINE] === ''
processResource[SemanticResourceAttributes.PROCESS_COMMAND_LINE] === '' ||
processResource[SemanticResourceAttributes.PROCESS_RUNTIME_VERSION] === ''
) {
diag.debug(
'ProcessDetector failed: Unable to find required process resources. '
Expand Down
6 changes: 6 additions & 0 deletions packages/opentelemetry-resources/test/detectors/ProcessDetector.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,19 @@ describe('processDetector()', () => {
sinon
.stub(process, 'argv')
.value(['/tmp/node', '/home/ot/test.js', 'arg1', 'arg2']);
sinon
.stub(process, 'versions')
.value({'node': '1.4.1'});

const resource: Resource = await processDetector.detect();
assertProcessResource(resource, {
pid: 1234,
name: 'otProcess',
command: '/home/ot/test.js',
commandLine: '/tmp/node /home/ot/test.js arg1 arg2',
version: '1.4.1',
runtimeDescription: 'NodeJS',
runtimeName: 'nodejs',
});
});
it('should return empty resources if title, command and commondLine is missing', async () => {
Expand Down
21 changes: 21 additions & 0 deletions packages/opentelemetry-resources/test/util/resource-assertions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,9 @@ export const assertProcessResource = (
name?: string;
command?: string;
commandLine?: string;
version?: string;
runtimeName?: string;
runtimeDescription?: string;
}
) => {
assert.strictEqual(
Expand All @@ -294,6 +297,24 @@ export const assertProcessResource = (
validations.commandLine
);
}
if (validations.version) {
assert.strictEqual(
resource.attributes[SemanticResourceAttributes.PROCESS_RUNTIME_VERSION],
validations.version
);
}
if (validations.runtimeName) {
assert.strictEqual(
resource.attributes[SemanticResourceAttributes.PROCESS_RUNTIME_NAME],
validations.runtimeName
);
}
if (validations.runtimeDescription) {
assert.strictEqual(
resource.attributes[SemanticResourceAttributes.PROCESS_RUNTIME_DESCRIPTION],
validations.runtimeDescription
);
}
};

/**
Expand Down