diff --git a/.github/component_owners.yml b/.github/component_owners.yml index 45e8f16da3f..84524973621 100644 --- a/.github/component_owners.yml +++ b/.github/component_owners.yml @@ -5,6 +5,8 @@ components: detectors/node/opentelemetry-resource-detector-aws: - NathanielRN - willarmiros + detectors/node/opentelemetry-resource-detector-docker: + - abhee11 metapackages/auto-instrumentations-node: - obecny metapackages/auto-instrumentations-web: diff --git a/detectors/node/opentelemetry-resource-detector-docker/.eslintignore b/detectors/node/opentelemetry-resource-detector-docker/.eslintignore new file mode 100644 index 00000000000..378eac25d31 --- /dev/null +++ b/detectors/node/opentelemetry-resource-detector-docker/.eslintignore @@ -0,0 +1 @@ +build diff --git a/detectors/node/opentelemetry-resource-detector-docker/.eslintrc.js b/detectors/node/opentelemetry-resource-detector-docker/.eslintrc.js new file mode 100644 index 00000000000..029ade46349 --- /dev/null +++ b/detectors/node/opentelemetry-resource-detector-docker/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + env: { + mocha: true, + node: true, + }, + ...require("../../../eslint.config.js"), +}; diff --git a/detectors/node/opentelemetry-resource-detector-docker/.npmignore b/detectors/node/opentelemetry-resource-detector-docker/.npmignore new file mode 100644 index 00000000000..9505ba9450f --- /dev/null +++ b/detectors/node/opentelemetry-resource-detector-docker/.npmignore @@ -0,0 +1,4 @@ +/bin +/coverage +/doc +/test diff --git a/detectors/node/opentelemetry-resource-detector-docker/LICENSE b/detectors/node/opentelemetry-resource-detector-docker/LICENSE new file mode 100644 index 00000000000..a42588e10f1 --- /dev/null +++ b/detectors/node/opentelemetry-resource-detector-docker/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [2021] OpenTelemetry Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/detectors/node/opentelemetry-resource-detector-docker/README.md b/detectors/node/opentelemetry-resource-detector-docker/README.md new file mode 100644 index 00000000000..56a884cff2d --- /dev/null +++ b/detectors/node/opentelemetry-resource-detector-docker/README.md @@ -0,0 +1,48 @@ +# OpenTelemetry Resource Detector for Docker + +[![NPM Published Version][npm-img]][npm-url] +[![dependencies][dependencies-image]][dependencies-url] +[![devDependencies][devDependencies-image]][devDependencies-url] +[![Apache License][license-image]][license-image] + +[component owners](https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/.github/component_owners.yml): @abhee11 + +Resource detector for docker. + +Compatible with OpenTelemetry JS API and SDK `1.0+`. + +## Installation + +```bash +npm install --save @opentelemetry/resource-detector-docker +``` + +## Usage + +```typescript +import { detectResources } from '@opentelemetry/resources'; +import { dockerCGroupV1Detector } from '@opentelemetry/resource-detector-docker' +const resource = await detectResources({ + detectors: [dockerCGroupV1Detector], +}) + +const tracerProvider = new NodeTracerProvider({ resource }); +``` + +## Available detectors + +- `dockerCGroupV1Detector`: Populates `container.id` for processes running on docker cgroup v1 + +## Useful links + +- For more information on OpenTelemetry, visit: +- For more about OpenTelemetry JavaScript: +- For help or feedback on this project, join us in [GitHub Discussions][discussions-url] + +## License + +Apache 2.0 - See [LICENSE][license-url] for more information. + +[discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions +[license-url]: https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/LICENSE +[license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat diff --git a/detectors/node/opentelemetry-resource-detector-docker/package.json b/detectors/node/opentelemetry-resource-detector-docker/package.json new file mode 100644 index 00000000000..ba23367df68 --- /dev/null +++ b/detectors/node/opentelemetry-resource-detector-docker/package.json @@ -0,0 +1,57 @@ +{ + "name": "@opentelemetry/resource-detector-docker", + "version": "0.1.0", + "description": "Opentelemetry resource detector to get docker resource attributes", + "main": "build/src/index.js", + "types": "build/src/index.d.ts", + "repository": "open-telemetry/opentelemetry-js-contrib", + "scripts": { + "clean": "rimraf build/*", + "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", + "compile": "npm run version:update && tsc -p .", + "lint": "eslint . --ext .ts", + "lint:fix": "eslint . --ext .ts --fix", + "precompile": "tsc --version && lerna run version --scope @opentelemetry/resource-detector-docker --include-dependencies", + "prewatch": "npm run precompile", + "prepare": "npm run compile", + "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", + "tdd": "npm run test -- --watch-extensions ts --watch", + "version:update": "node ../../../scripts/version-update.js", + "watch": "tsc -w" + }, + "author": "OpenTelemetry Authors", + "license": "Apache-2.0", + "files": [ + "build/src/**/*.js", + "build/src/**/*.js.map", + "build/src/**/*.d.ts", + "LICENSE", + "README.md" + ], + "publishConfig": { + "access": "public" + }, + "devDependencies": { + "@opentelemetry/api": "1.0.4", + "@opentelemetry/contrib-test-utils": "^0.29.0", + "@types/mocha": "8.2.3", + "@types/node": "^17.0.14", + "@types/sinon": "10.0.2", + "eslint-plugin-header": "^3.1.1", + "gts": "^3.1.0", + "mocha": "7.2.0", + "nock": "12.0.3", + "nyc": "15.1.0", + "rimraf": "3.0.2", + "sinon": "^12.0.1", + "ts-mocha": "8.0.0", + "typescript": "^4.5.5" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.0.4" + }, + "dependencies": { + "@opentelemetry/resources": "^1.0.1", + "@opentelemetry/semantic-conventions": "^1.0.1" + } +} diff --git a/detectors/node/opentelemetry-resource-detector-docker/src/detectors/DockerCGroupV1Detector.ts b/detectors/node/opentelemetry-resource-detector-docker/src/detectors/DockerCGroupV1Detector.ts new file mode 100644 index 00000000000..8b2ee77fa24 --- /dev/null +++ b/detectors/node/opentelemetry-resource-detector-docker/src/detectors/DockerCGroupV1Detector.ts @@ -0,0 +1,77 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import { + Detector, + Resource, + ResourceDetectionConfig, +} from '@opentelemetry/resources'; + +import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions'; + +import * as fs from 'fs'; +import * as util from 'util'; +import { diag } from '@opentelemetry/api'; + +export class DockerCGroupV1Detector implements Detector { + readonly CONTAINER_ID_LENGTH = 64; + readonly DEFAULT_CGROUP_PATH = '/proc/self/cgroup'; + readonly UTF8_UNICODE = 'utf8'; + + private static readFileAsync = util.promisify(fs.readFile); + + async detect(_config?: ResourceDetectionConfig): Promise { + try { + const containerId = await this._getContainerId(); + return !containerId + ? Resource.empty() + : new Resource({ + [SemanticResourceAttributes.CONTAINER_ID]: containerId, + }); + } catch (e) { + diag.info( + 'Docker CGROUP V1 Detector did not identify running inside a supported docker container, no docker attributes will be added to resource: ', + e + ); + return Resource.empty(); + } + } + + private async _getContainerId(): Promise { + try { + const rawData = await DockerCGroupV1Detector.readFileAsync( + this.DEFAULT_CGROUP_PATH, + this.UTF8_UNICODE + ); + const splitData = rawData.trim().split('\n'); + for (const str of splitData) { + if (str.length >= this.CONTAINER_ID_LENGTH) { + return str.substring(str.length - this.CONTAINER_ID_LENGTH); + } + } + } catch (e) { + if (e instanceof Error) { + const errorMessage = e.message; + diag.info( + 'Docker CGROUP V1 Detector failed to read the Container ID: ', + errorMessage + ); + } + } + return undefined; + } +} + +export const dockerCGroupV1Detector = new DockerCGroupV1Detector(); diff --git a/detectors/node/opentelemetry-resource-detector-docker/src/detectors/index.ts b/detectors/node/opentelemetry-resource-detector-docker/src/detectors/index.ts new file mode 100644 index 00000000000..25aa53ab9a8 --- /dev/null +++ b/detectors/node/opentelemetry-resource-detector-docker/src/detectors/index.ts @@ -0,0 +1,16 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +export * from './DockerCGroupV1Detector'; diff --git a/detectors/node/opentelemetry-resource-detector-docker/src/index.ts b/detectors/node/opentelemetry-resource-detector-docker/src/index.ts new file mode 100644 index 00000000000..9bfde8defd2 --- /dev/null +++ b/detectors/node/opentelemetry-resource-detector-docker/src/index.ts @@ -0,0 +1,16 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +export * from './detectors'; diff --git a/detectors/node/opentelemetry-resource-detector-docker/test/DockerCGroupv1Detector.test.ts b/detectors/node/opentelemetry-resource-detector-docker/test/DockerCGroupv1Detector.test.ts new file mode 100644 index 00000000000..79115454273 --- /dev/null +++ b/detectors/node/opentelemetry-resource-detector-docker/test/DockerCGroupv1Detector.test.ts @@ -0,0 +1,91 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import * as sinon from 'sinon'; +import * as assert from 'assert'; +import { Resource } from '@opentelemetry/resources'; +import { dockerCGroupV1Detector } from '../src'; +import { + assertContainerResource, + assertEmptyResource, +} from '@opentelemetry/contrib-test-utils'; + +import { DockerCGroupV1Detector } from '../src'; + +describe('dockerCGroupV1Detector', () => { + let readStub; + const correctCgroupData = + 'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklm'; + + afterEach(() => { + sinon.restore(); + }); + + describe('Supported docker - Container ID ', () => { + it('should return a resource attributes without container id - docker cgroup v1 detector', async () => { + readStub = sinon + .stub(DockerCGroupV1Detector, 'readFileAsync' as any) + .resolves(undefined); + + const resource: Resource = await dockerCGroupV1Detector.detect(); + + assert.deepStrictEqual(resource.attributes, {}); + assert.ok(resource); + }); + + it('should return a resource with container ID with a valid container ID present', async () => { + readStub = sinon + .stub(DockerCGroupV1Detector, 'readFileAsync' as any) + .resolves(correctCgroupData); + + const resource: Resource = await dockerCGroupV1Detector.detect(); + + sinon.assert.calledOnce(readStub); + + assert.ok(resource); + assertContainerResource(resource, { + id: 'bcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklm', + }); + }); + + it('should return a resource without attribute container.id when cgroup file does not contain valid Container ID', async () => { + readStub = sinon + .stub(DockerCGroupV1Detector, 'readFileAsync' as any) + .resolves(''); + + const resource: Resource = await dockerCGroupV1Detector.detect(); + assert.deepStrictEqual(resource.attributes, {}); + + sinon.assert.calledOnce(readStub); + assert.ok(resource); + }); + + it('should return an empty resource when containerId is not valid', async () => { + const errorMsg = { + fileNotFoundError: new Error('cannot find file in path'), + }; + + readStub = sinon + .stub(DockerCGroupV1Detector, 'readFileAsync' as any) + .rejects(errorMsg.fileNotFoundError); + + const resource: Resource = await dockerCGroupV1Detector.detect(); + + sinon.assert.calledOnce(readStub); + assertEmptyResource(resource); + }); + }); +}); diff --git a/detectors/node/opentelemetry-resource-detector-docker/tsconfig.json b/detectors/node/opentelemetry-resource-detector-docker/tsconfig.json new file mode 100644 index 00000000000..505b67a248f --- /dev/null +++ b/detectors/node/opentelemetry-resource-detector-docker/tsconfig.json @@ -0,0 +1,12 @@ +{ + "extends": "../../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] + } + \ No newline at end of file diff --git a/release-please-config.json b/release-please-config.json index 46f9c4a9713..4f5898a388e 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -9,6 +9,7 @@ "detectors/node/opentelemetry-resource-detector-aws": {}, "detectors/node/opentelemetry-resource-detector-gcp": {}, "detectors/node/opentelemetry-resource-detector-github": {}, + "detectors/node/opentelemetry-resource-detector-docker": {}, "metapackages/auto-instrumentations-node": {}, "metapackages/auto-instrumentations-web": {}, "packages/opentelemetry-browser-extension-autoinjection": {},