From f9b16ee2019770ad21c53473808c49143d4bc3a1 Mon Sep 17 00:00:00 2001 From: xiao-lix Date: Thu, 31 Oct 2019 12:10:31 -0700 Subject: [PATCH 1/4] feat(plugin): postgres-pool plugin skeleton --- .../.npmignore | 0 .../LICENSE | 0 .../opentelemetry-plugin-pg-pool/README.md | 46 ++++ .../opentelemetry-plugin-pg-pool/package.json | 74 +++++++ .../src/pg-pool.ts | 15 ++ .../test/pg-pool.test.ts | 15 ++ .../tsconfig.json | 2 +- .../opentelemetry-plugin-pg-pool/tslint.json | 4 + .../opentelemetry-plugin-pg/.npmignore | 4 + .../opentelemetry-plugin-pg/LICENSE | 201 ++++++++++++++++++ .../{ => opentelemetry-plugin-pg}/README.md | 12 +- .../package.json | 2 +- .../src/enums.ts | 0 .../src/index.ts | 0 .../{ => opentelemetry-plugin-pg}/src/pg.ts | 0 .../src/types.ts | 0 .../src/utils.ts | 0 .../test/assertionUtils.ts | 0 .../test/pg.test.ts | 0 .../test/testUtils.ts | 0 .../opentelemetry-plugin-pg/tsconfig.json | 11 + .../opentelemetry-plugin-pg/tslint.json | 4 + .../opentelemetry-plugin-postgres/tslint.json | 4 - 23 files changed, 382 insertions(+), 12 deletions(-) rename packages/opentelemetry-plugin-postgres/{ => opentelemetry-plugin-pg-pool}/.npmignore (100%) rename packages/opentelemetry-plugin-postgres/{ => opentelemetry-plugin-pg-pool}/LICENSE (100%) create mode 100644 packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/README.md create mode 100644 packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/package.json create mode 100644 packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/src/pg-pool.ts create mode 100644 packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/test/pg-pool.test.ts rename packages/opentelemetry-plugin-postgres/{ => opentelemetry-plugin-pg-pool}/tsconfig.json (78%) create mode 100644 packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/tslint.json create mode 100644 packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/.npmignore create mode 100644 packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/LICENSE rename packages/opentelemetry-plugin-postgres/{ => opentelemetry-plugin-pg}/README.md (84%) rename packages/opentelemetry-plugin-postgres/{ => opentelemetry-plugin-pg}/package.json (97%) rename packages/opentelemetry-plugin-postgres/{ => opentelemetry-plugin-pg}/src/enums.ts (100%) rename packages/opentelemetry-plugin-postgres/{ => opentelemetry-plugin-pg}/src/index.ts (100%) rename packages/opentelemetry-plugin-postgres/{ => opentelemetry-plugin-pg}/src/pg.ts (100%) rename packages/opentelemetry-plugin-postgres/{ => opentelemetry-plugin-pg}/src/types.ts (100%) rename packages/opentelemetry-plugin-postgres/{ => opentelemetry-plugin-pg}/src/utils.ts (100%) rename packages/opentelemetry-plugin-postgres/{ => opentelemetry-plugin-pg}/test/assertionUtils.ts (100%) rename packages/opentelemetry-plugin-postgres/{ => opentelemetry-plugin-pg}/test/pg.test.ts (100%) rename packages/opentelemetry-plugin-postgres/{ => opentelemetry-plugin-pg}/test/testUtils.ts (100%) create mode 100644 packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/tsconfig.json create mode 100644 packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/tslint.json delete mode 100644 packages/opentelemetry-plugin-postgres/tslint.json diff --git a/packages/opentelemetry-plugin-postgres/.npmignore b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/.npmignore similarity index 100% rename from packages/opentelemetry-plugin-postgres/.npmignore rename to packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/.npmignore diff --git a/packages/opentelemetry-plugin-postgres/LICENSE b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/LICENSE similarity index 100% rename from packages/opentelemetry-plugin-postgres/LICENSE rename to packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/LICENSE diff --git a/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/README.md b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/README.md new file mode 100644 index 0000000000..498830104c --- /dev/null +++ b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/README.md @@ -0,0 +1,46 @@ +# OpenTelemetry Postgres Instrumentation for Node.js +[![Gitter chat][gitter-image]][gitter-url] +[![dependencies][dependencies-image]][dependencies-url] +[![devDependencies][devDependencies-image]][devDependencies-url] +[![Apache License][license-image]][license-image] + +This module provides automatic instrumentation for [`pg`](https://github.com/brianc/node-postgres). + +For automatic instrumentation see the +[@opentelemetry/node](https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-node) package. + +## Installation + +```bash +npm install --save @opentelemetry/plugin-pg-pool +``` + +## Usage + +```js +const opentelemetry = require('@opentelemetry/plugin-pg-pool'); + +// TODO: DEMONSTRATE API +``` + +## Supported Versions + +- [pg](https://npmjs.com/package/pg-pool): `2.x` + +## Useful links +- For more information on OpenTelemetry, visit: +- For more about OpenTelemetry JavaScript: +- For help or feedback on this project, join us on [gitter][gitter-url] + +## License + +Apache 2.0 - See [LICENSE][license-url] for more information. + +[gitter-image]: https://badges.gitter.im/open-telemetry/opentelemetry-js.svg +[gitter-url]: https://gitter.im/open-telemetry/opentelemetry-node?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge +[license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/master/LICENSE +[license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat +[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=packages/opentelemetry-plugin-pg-pool +[dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-plugin-pg-pool +[devDependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/dev-status.svg?path=packages/opentelemetry-plugin-pg-pool +[devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-plugin-pg-pool&type=dev diff --git a/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/package.json b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/package.json new file mode 100644 index 0000000000..f42d8f6646 --- /dev/null +++ b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/package.json @@ -0,0 +1,74 @@ +{ + "name": "@opentelemetry/plugin-pg-pool", + "version": "0.1.1", + "description": "OpenTelemetry postgres pool automatic instrumentation package.", + "private": true, + "main": "build/src/index.js", + "types": "build/src/index.d.ts", + "repository": "open-telemetry/opentelemetry-js", + "scripts": { + "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", + "test:debug": "ts-mocha --inspect-brk --no-timeouts -p tsconfig.json 'test/**/*.test.ts'", + "test:local": "cross-env RUN_POSTGRES_TESTS_LOCAL=true yarn test", + "tdd": "yarn test -- --watch-extensions ts --watch", + "clean": "rimraf build/*", + "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", + "check": "gts check", + "compile": "tsc -p .", + "fix": "gts fix", + "prepare": "npm run compile" + }, + "keywords": [ + "opentelemetry", + "postgres", + "pg", + "pg-pool", + "postgresql", + "nodejs", + "tracing", + "profiling", + "plugin" + ], + "author": "OpenTelemetry Authors", + "license": "Apache-2.0", + "engines": { + "node": ">=8.0.0" + }, + "files": [ + "build/src/**/*.js", + "build/src/**/*.d.ts", + "doc", + "LICENSE", + "README.md" + ], + "publishConfig": { + "access": "public" + }, + "devDependencies": { + "@opentelemetry/plugin-pg": "^0.1.1", + "@types/mocha": "^5.2.7", + "@types/node": "^12.6.9", + "@types/pg": "^7.11.2", + "@types/shimmer": "^1.0.1", + "codecov": "^3.5.0", + "gts": "^1.0.0", + "mocha": "^6.2.0", + "nyc": "^14.1.1", + "rimraf": "^3.0.0", + "pg": "^7.12.1", + "pg-pool": "^2.0.7", + "tslint-microsoft-contrib": "^6.2.0", + "tslint-consistent-codestyle": "^1.15.1", + "ts-mocha": "^6.0.0", + "ts-node": "^8.3.0", + "typescript": "^3.6.3" + }, + "dependencies": { + "@opentelemetry/core": "^0.1.1", + "@opentelemetry/node": "^0.1.1", + "@opentelemetry/tracing": "^0.1.1", + "@opentelemetry/types": "^0.1.1", + "@types/pg-pool": "^2.0.1", + "shimmer": "^1.2.1" + } +} diff --git a/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/src/pg-pool.ts b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/src/pg-pool.ts new file mode 100644 index 0000000000..14db3c23ac --- /dev/null +++ b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/src/pg-pool.ts @@ -0,0 +1,15 @@ +/*! + * Copyright 2019, 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. + */ \ No newline at end of file diff --git a/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/test/pg-pool.test.ts b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/test/pg-pool.test.ts new file mode 100644 index 0000000000..14db3c23ac --- /dev/null +++ b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/test/pg-pool.test.ts @@ -0,0 +1,15 @@ +/*! + * Copyright 2019, 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. + */ \ No newline at end of file diff --git a/packages/opentelemetry-plugin-postgres/tsconfig.json b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/tsconfig.json similarity index 78% rename from packages/opentelemetry-plugin-postgres/tsconfig.json rename to packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/tsconfig.json index a2042cd68b..4078877ce6 100644 --- a/packages/opentelemetry-plugin-postgres/tsconfig.json +++ b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../tsconfig.base", + "extends": "../../tsconfig.base", "compilerOptions": { "rootDir": ".", "outDir": "build" diff --git a/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/tslint.json b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/tslint.json new file mode 100644 index 0000000000..b4d08744db --- /dev/null +++ b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/tslint.json @@ -0,0 +1,4 @@ +{ + "rulesDirectory": ["node_modules/tslint-microsoft-contrib"], + "extends": ["../../../tslint.base.js", "./node_modules/tslint-consistent-codestyle"] +} diff --git a/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/.npmignore b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/.npmignore new file mode 100644 index 0000000000..9505ba9450 --- /dev/null +++ b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/.npmignore @@ -0,0 +1,4 @@ +/bin +/coverage +/doc +/test diff --git a/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/LICENSE b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/LICENSE new file mode 100644 index 0000000000..261eeb9e9f --- /dev/null +++ b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/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 [yyyy] [name of copyright owner] + + 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/packages/opentelemetry-plugin-postgres/README.md b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/README.md similarity index 84% rename from packages/opentelemetry-plugin-postgres/README.md rename to packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/README.md index f18233a45e..985e82bc5f 100644 --- a/packages/opentelemetry-plugin-postgres/README.md +++ b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/README.md @@ -12,13 +12,13 @@ For automatic instrumentation see the ## Installation ```bash -npm install --save @opentelemetry/plugin-postgres +npm install --save @opentelemetry/plugin-pg ``` ## Usage ```js -const opentelemetry = require('@opentelemetry/plugin-postgres'); +const opentelemetry = require('@opentelemetry/plugin-pg'); // TODO: DEMONSTRATE API ``` @@ -40,7 +40,7 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [gitter-url]: https://gitter.im/open-telemetry/opentelemetry-node?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge [license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/master/LICENSE [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=packages/opentelemetry-plugin-postgres -[dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-plugin-postgres -[devDependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/dev-status.svg?path=packages/opentelemetry-plugin-postgres -[devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-plugin-postgres&type=dev +[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/status.svg?path=packages/opentelemetry-plugin-pg +[dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-plugin-pg +[devDependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/dev-status.svg?path=packages/opentelemetry-plugin-pg +[devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-plugin-pg&type=dev diff --git a/packages/opentelemetry-plugin-postgres/package.json b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/package.json similarity index 97% rename from packages/opentelemetry-plugin-postgres/package.json rename to packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/package.json index 1a785a4f7f..1e6b1fea6d 100644 --- a/packages/opentelemetry-plugin-postgres/package.json +++ b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/package.json @@ -1,5 +1,5 @@ { - "name": "@opentelemetry/plugin-postgres", + "name": "@opentelemetry/plugin-pg", "version": "0.1.1", "description": "OpenTelemetry postgres automatic instrumentation package.", "private": true, diff --git a/packages/opentelemetry-plugin-postgres/src/enums.ts b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/src/enums.ts similarity index 100% rename from packages/opentelemetry-plugin-postgres/src/enums.ts rename to packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/src/enums.ts diff --git a/packages/opentelemetry-plugin-postgres/src/index.ts b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/src/index.ts similarity index 100% rename from packages/opentelemetry-plugin-postgres/src/index.ts rename to packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/src/index.ts diff --git a/packages/opentelemetry-plugin-postgres/src/pg.ts b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/src/pg.ts similarity index 100% rename from packages/opentelemetry-plugin-postgres/src/pg.ts rename to packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/src/pg.ts diff --git a/packages/opentelemetry-plugin-postgres/src/types.ts b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/src/types.ts similarity index 100% rename from packages/opentelemetry-plugin-postgres/src/types.ts rename to packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/src/types.ts diff --git a/packages/opentelemetry-plugin-postgres/src/utils.ts b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/src/utils.ts similarity index 100% rename from packages/opentelemetry-plugin-postgres/src/utils.ts rename to packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/src/utils.ts diff --git a/packages/opentelemetry-plugin-postgres/test/assertionUtils.ts b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/test/assertionUtils.ts similarity index 100% rename from packages/opentelemetry-plugin-postgres/test/assertionUtils.ts rename to packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/test/assertionUtils.ts diff --git a/packages/opentelemetry-plugin-postgres/test/pg.test.ts b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/test/pg.test.ts similarity index 100% rename from packages/opentelemetry-plugin-postgres/test/pg.test.ts rename to packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/test/pg.test.ts diff --git a/packages/opentelemetry-plugin-postgres/test/testUtils.ts b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/test/testUtils.ts similarity index 100% rename from packages/opentelemetry-plugin-postgres/test/testUtils.ts rename to packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/test/testUtils.ts diff --git a/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/tsconfig.json b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/tsconfig.json new file mode 100644 index 0000000000..4078877ce6 --- /dev/null +++ b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/tslint.json b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/tslint.json new file mode 100644 index 0000000000..b4d08744db --- /dev/null +++ b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/tslint.json @@ -0,0 +1,4 @@ +{ + "rulesDirectory": ["node_modules/tslint-microsoft-contrib"], + "extends": ["../../../tslint.base.js", "./node_modules/tslint-consistent-codestyle"] +} diff --git a/packages/opentelemetry-plugin-postgres/tslint.json b/packages/opentelemetry-plugin-postgres/tslint.json deleted file mode 100644 index 0710b135d0..0000000000 --- a/packages/opentelemetry-plugin-postgres/tslint.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "rulesDirectory": ["node_modules/tslint-microsoft-contrib"], - "extends": ["../../tslint.base.js", "./node_modules/tslint-consistent-codestyle"] -} From 5dba420ea57787ef6a12f6f10f8d9393797b612f Mon Sep 17 00:00:00 2001 From: xiao-lix Date: Mon, 4 Nov 2019 11:16:46 -0800 Subject: [PATCH 2/4] fix: add packages in lerna.json --- lerna.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 6c0c6b703d..0a1cc8cda8 100644 --- a/lerna.json +++ b/lerna.json @@ -4,7 +4,8 @@ "packages": [ "packages/*", "examples/*", - "benchmark/*" + "benchmark/*", + "packages/opentelemetry-plugin-postgres/*" ], "version": "0.1.1", "changelog": { From 9607ce25a4f2fc39787742261f8eba8058765b8d Mon Sep 17 00:00:00 2001 From: xiao-lix Date: Mon, 4 Nov 2019 11:44:29 -0800 Subject: [PATCH 3/4] fix: linting --- .../opentelemetry-plugin-pg-pool/src/pg-pool.ts | 2 +- .../opentelemetry-plugin-pg-pool/test/pg-pool.test.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/src/pg-pool.ts b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/src/pg-pool.ts index 14db3c23ac..ae225f6b52 100644 --- a/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/src/pg-pool.ts +++ b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/src/pg-pool.ts @@ -12,4 +12,4 @@ * 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. - */ \ No newline at end of file + */ diff --git a/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/test/pg-pool.test.ts b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/test/pg-pool.test.ts index 14db3c23ac..ae225f6b52 100644 --- a/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/test/pg-pool.test.ts +++ b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/test/pg-pool.test.ts @@ -12,4 +12,4 @@ * 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. - */ \ No newline at end of file + */ From 76eec6af93ac152a84201a14fadec96f860e279d Mon Sep 17 00:00:00 2001 From: xiao-lix Date: Mon, 4 Nov 2019 15:44:31 -0800 Subject: [PATCH 4/4] chore: upgrade versions --- .../opentelemetry-plugin-pg-pool/package.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/package.json b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/package.json index 0a02c6ce72..7b8db3b182 100644 --- a/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/package.json +++ b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/package.json @@ -45,11 +45,12 @@ "access": "public" }, "devDependencies": { - "@opentelemetry/plugin-pg": "^0.1.1", + "@opentelemetry/plugin-pg": "^0.2.0", "@types/mocha": "^5.2.7", "@types/node": "^12.6.9", "@types/pg": "^7.11.2", "@types/shimmer": "^1.0.1", + "@types/pg-pool": "^2.0.1", "codecov": "^3.5.0", "gts": "^1.0.0", "mocha": "^6.2.0", @@ -64,11 +65,10 @@ "typescript": "^3.6.3" }, "dependencies": { - "@opentelemetry/core": "^0.1.1", - "@opentelemetry/node": "^0.1.1", - "@opentelemetry/tracing": "^0.1.1", - "@opentelemetry/types": "^0.1.1", - "@types/pg-pool": "^2.0.1", + "@opentelemetry/core": "^0.2.0", + "@opentelemetry/node": "^0.2.0", + "@opentelemetry/tracing": "^0.2.0", + "@opentelemetry/types": "^0.2.0", "shimmer": "^1.2.1" } }