From 23677a16f60f6dea89f449607b5549f711d6ff99 Mon Sep 17 00:00:00 2001 From: legendecas Date: Thu, 30 Apr 2020 01:37:29 +0800 Subject: [PATCH] refactor: merge opentelemetry-base to opentelemetry-core (#991) They act a very similar role in the SDK. Co-authored-by: Daniel Dyla --- .circleci/config.yml | 1 - README.md | 2 - packages/opentelemetry-base/LICENSE | 201 ------------------ packages/opentelemetry-base/README.md | 28 --- packages/opentelemetry-base/package.json | 62 ------ packages/opentelemetry-base/src/index.ts | 18 -- .../src/platform/browser/index.ts | 17 -- .../opentelemetry-base/src/platform/index.ts | 20 -- .../src/platform/node/index.ts | 17 -- packages/opentelemetry-base/src/version.ts | 18 -- packages/opentelemetry-base/tsconfig.json | 11 - packages/opentelemetry-base/tslint.json | 4 - .../src/ExportResult.ts | 2 +- packages/opentelemetry-core/src/index.ts | 1 + .../src/platform/browser/index.ts | 3 +- .../src/platform/browser/sdk-info.ts} | 0 .../src/platform/node/index.ts | 1 + .../src/platform/node/sdk-info.ts} | 0 .../package.json | 1 - .../src/CollectorExporter.ts | 3 +- .../src/transform.ts | 5 +- .../test/common/CollectorExporter.test.ts | 3 +- .../package.json | 1 - .../src/jaeger.ts | 3 +- .../test/jaeger.test.ts | 3 +- .../package.json | 1 - .../src/prometheus.ts | 7 +- .../package.json | 1 - .../src/zipkin.ts | 3 +- .../test/zipkin.test.ts | 7 +- packages/opentelemetry-metrics/package.json | 1 - .../src/export/ConsoleMetricExporter.ts | 2 +- .../src/export/Controller.ts | 3 +- .../src/export/NoopExporter.ts | 2 +- .../opentelemetry-metrics/src/export/types.ts | 2 +- .../package.json | 1 - packages/opentelemetry-resources/package.json | 2 +- .../opentelemetry-resources/src/Resource.ts | 2 +- .../test/Resource.test.ts | 2 +- .../test/resource-assertions.test.ts | 2 +- .../test/util/resource-assertions.ts | 2 +- packages/opentelemetry-tracing/package.json | 1 - .../src/export/ConsoleSpanExporter.ts | 3 +- .../src/export/InMemorySpanExporter.ts | 2 +- .../src/export/SpanExporter.ts | 2 +- .../test/export/InMemorySpanExporter.test.ts | 3 +- 46 files changed, 35 insertions(+), 441 deletions(-) delete mode 100644 packages/opentelemetry-base/LICENSE delete mode 100644 packages/opentelemetry-base/README.md delete mode 100644 packages/opentelemetry-base/package.json delete mode 100644 packages/opentelemetry-base/src/index.ts delete mode 100644 packages/opentelemetry-base/src/platform/browser/index.ts delete mode 100644 packages/opentelemetry-base/src/platform/index.ts delete mode 100644 packages/opentelemetry-base/src/platform/node/index.ts delete mode 100644 packages/opentelemetry-base/src/version.ts delete mode 100644 packages/opentelemetry-base/tsconfig.json delete mode 100644 packages/opentelemetry-base/tslint.json rename packages/{opentelemetry-base => opentelemetry-core}/src/ExportResult.ts (94%) rename packages/{opentelemetry-base/src/platform/browser/constants.ts => opentelemetry-core/src/platform/browser/sdk-info.ts} (100%) rename packages/{opentelemetry-base/src/platform/node/constants.ts => opentelemetry-core/src/platform/node/sdk-info.ts} (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index 177e915a7f..3764a844a5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,6 @@ cache_1: &cache_1 - ./node_modules - ./package-lock.json - packages/opentelemetry-api/node_modules - - packages/opentelemetry-base/node_modules - packages/opentelemetry-context-async-hooks/node_modules - packages/opentelemetry-context-base/node_modules - packages/opentelemetry-context-zone/node_modules diff --git a/README.md b/README.md index 84a4fab324..d330f48244 100644 --- a/README.md +++ b/README.md @@ -142,7 +142,6 @@ Maintainers ([@open-telemetry/js-maintainers](https://github.com/orgs/open-telem | [@opentelemetry/metrics][otel-metrics] | This module provides instruments and meters for reporting of time series data. | | [@opentelemetry/node][otel-node] | This module provides automatic tracing for Node.js applications. It is intended for use on the server only. | | [@opentelemetry/web][otel-web] | This module provides automated instrumentation and tracing for Web applications. It is intended for use in the browser only. | -| [@opentelemetry/base][otel-base] | This package provides base code for the SDK packages (tracing and metrics). | ### Compatible Exporters @@ -202,7 +201,6 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [docs]: https://open-telemetry.github.io/opentelemetry-js -[otel-base]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-base [otel-metrics]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-metrics [otel-node]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-node diff --git a/packages/opentelemetry-base/LICENSE b/packages/opentelemetry-base/LICENSE deleted file mode 100644 index 261eeb9e9f..0000000000 --- a/packages/opentelemetry-base/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - 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-base/README.md b/packages/opentelemetry-base/README.md deleted file mode 100644 index 9cf3819ca4..0000000000 --- a/packages/opentelemetry-base/README.md +++ /dev/null @@ -1,28 +0,0 @@ -# OpenTelemetry Base -[![Gitter chat][gitter-image]][gitter-url] -[![NPM Published Version][npm-img]][npm-url] -[![dependencies][dependencies-image]][dependencies-url] -[![devDependencies][devDependencies-image]][devDependencies-url] -[![Apache License][license-image]][license-image] - -This package provides base code for the SDK packages. - -## 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-base -[dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-base -[devDependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js/dev-status.svg?path=packages/opentelemetry-base -[devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-base&type=dev -[npm-url]: https://www.npmjs.com/package/@opentelemetry/base -[npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fbase.svg diff --git a/packages/opentelemetry-base/package.json b/packages/opentelemetry-base/package.json deleted file mode 100644 index 2ea9741afc..0000000000 --- a/packages/opentelemetry-base/package.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "name": "@opentelemetry/base", - "version": "0.7.0", - "description": "OpenTelemetry base provides base code for the SDK packages", - "main": "build/src/index.js", - "browser": { - "./src/platform/index.ts": "./src/platform/browser/index.ts", - "./build/src/platform/index.js": "./build/src/platform/browser/index.js" - }, - "types": "build/src/index.d.ts", - "repository": "open-telemetry/opentelemetry-js", - "scripts": { - "test": "nyc ts-mocha -p tsconfig.json test/**/*.test.ts", - "tdd": "npm run tdd:node", - "tdd:node": "npm run test -- --watch-extensions ts --watch", - "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", - "clean": "rimraf build/*", - "lint": "gts check", - "lint:fix": "gts fix", - "precompile": "tsc --version", - "version:update": "node ../../scripts/version-update.js", - "compile": "npm run version:update && tsc -p .", - "prepare": "npm run compile" - }, - "keywords": [ - "opentelemetry", - "nodejs", - "tracing", - "profiling", - "metrics", - "stats" - ], - "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": { - "@types/mocha": "^7.0.0", - "@types/node": "^12.6.8", - "codecov": "^3.6.1", - "gts": "^1.1.0", - "mocha": "^6.1.0", - "nyc": "^15.0.0", - "rimraf": "^3.0.0", - "ts-mocha": "^6.0.0", - "ts-node": "^8.6.2", - "tslint-consistent-codestyle": "^1.16.0", - "tslint-microsoft-contrib": "^6.2.0", - "typescript": "3.7.2" - } -} diff --git a/packages/opentelemetry-base/src/index.ts b/packages/opentelemetry-base/src/index.ts deleted file mode 100644 index 1c2e67e6b7..0000000000 --- a/packages/opentelemetry-base/src/index.ts +++ /dev/null @@ -1,18 +0,0 @@ -/*! - * 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. - */ - -export * from './ExportResult'; -export * from './platform'; diff --git a/packages/opentelemetry-base/src/platform/browser/index.ts b/packages/opentelemetry-base/src/platform/browser/index.ts deleted file mode 100644 index 953b08f4da..0000000000 --- a/packages/opentelemetry-base/src/platform/browser/index.ts +++ /dev/null @@ -1,17 +0,0 @@ -/*! - * Copyright 2020, 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 './constants'; diff --git a/packages/opentelemetry-base/src/platform/index.ts b/packages/opentelemetry-base/src/platform/index.ts deleted file mode 100644 index 6c6d039c91..0000000000 --- a/packages/opentelemetry-base/src/platform/index.ts +++ /dev/null @@ -1,20 +0,0 @@ -/*! - * Copyright 2020, 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. - */ - -// Use the node platform by default. The "browser" field of package.json is used -// to override this file to use `./browser/index.ts` when packaged with -// webpack, Rollup, etc. -export * from './node'; diff --git a/packages/opentelemetry-base/src/platform/node/index.ts b/packages/opentelemetry-base/src/platform/node/index.ts deleted file mode 100644 index 953b08f4da..0000000000 --- a/packages/opentelemetry-base/src/platform/node/index.ts +++ /dev/null @@ -1,17 +0,0 @@ -/*! - * Copyright 2020, 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 './constants'; diff --git a/packages/opentelemetry-base/src/version.ts b/packages/opentelemetry-base/src/version.ts deleted file mode 100644 index 103553581c..0000000000 --- a/packages/opentelemetry-base/src/version.ts +++ /dev/null @@ -1,18 +0,0 @@ -/*! - * 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. - */ - -// this is autogenerated file, see scripts/version-update.js -export const VERSION = '0.7.0'; diff --git a/packages/opentelemetry-base/tsconfig.json b/packages/opentelemetry-base/tsconfig.json deleted file mode 100644 index a2042cd68b..0000000000 --- a/packages/opentelemetry-base/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../tsconfig.base", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ] -} diff --git a/packages/opentelemetry-base/tslint.json b/packages/opentelemetry-base/tslint.json deleted file mode 100644 index 0710b135d0..0000000000 --- a/packages/opentelemetry-base/tslint.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "rulesDirectory": ["node_modules/tslint-microsoft-contrib"], - "extends": ["../../tslint.base.js", "./node_modules/tslint-consistent-codestyle"] -} diff --git a/packages/opentelemetry-base/src/ExportResult.ts b/packages/opentelemetry-core/src/ExportResult.ts similarity index 94% rename from packages/opentelemetry-base/src/ExportResult.ts rename to packages/opentelemetry-core/src/ExportResult.ts index 3f94eddd57..1306c98b04 100644 --- a/packages/opentelemetry-base/src/ExportResult.ts +++ b/packages/opentelemetry-core/src/ExportResult.ts @@ -1,5 +1,5 @@ /*! - * Copyright 2019, OpenTelemetry Authors + * Copyright 2020, OpenTelemetry Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/packages/opentelemetry-core/src/index.ts b/packages/opentelemetry-core/src/index.ts index 60b8b04f92..46f1baf8be 100644 --- a/packages/opentelemetry-core/src/index.ts +++ b/packages/opentelemetry-core/src/index.ts @@ -18,6 +18,7 @@ export * from './common/ConsoleLogger'; export * from './common/NoopLogger'; export * from './common/time'; export * from './common/types'; +export * from './ExportResult'; export * from './version'; export * from './context/context'; export * from './context/propagation/B3Propagator'; diff --git a/packages/opentelemetry-core/src/platform/browser/index.ts b/packages/opentelemetry-core/src/platform/browser/index.ts index 4668bb35aa..36164efce5 100644 --- a/packages/opentelemetry-core/src/platform/browser/index.ts +++ b/packages/opentelemetry-core/src/platform/browser/index.ts @@ -14,7 +14,8 @@ * limitations under the License. */ +export * from './hex-to-base64'; export * from './id'; export * from './performance'; +export * from './sdk-info'; export * from './timer-util'; -export * from './hex-to-base64'; diff --git a/packages/opentelemetry-base/src/platform/browser/constants.ts b/packages/opentelemetry-core/src/platform/browser/sdk-info.ts similarity index 100% rename from packages/opentelemetry-base/src/platform/browser/constants.ts rename to packages/opentelemetry-core/src/platform/browser/sdk-info.ts diff --git a/packages/opentelemetry-core/src/platform/node/index.ts b/packages/opentelemetry-core/src/platform/node/index.ts index 4668bb35aa..47a879b04d 100644 --- a/packages/opentelemetry-core/src/platform/node/index.ts +++ b/packages/opentelemetry-core/src/platform/node/index.ts @@ -14,6 +14,7 @@ * limitations under the License. */ +export * from './sdk-info'; export * from './id'; export * from './performance'; export * from './timer-util'; diff --git a/packages/opentelemetry-base/src/platform/node/constants.ts b/packages/opentelemetry-core/src/platform/node/sdk-info.ts similarity index 100% rename from packages/opentelemetry-base/src/platform/node/constants.ts rename to packages/opentelemetry-core/src/platform/node/sdk-info.ts diff --git a/packages/opentelemetry-exporter-collector/package.json b/packages/opentelemetry-exporter-collector/package.json index ca89b50383..27a209fa1a 100644 --- a/packages/opentelemetry-exporter-collector/package.json +++ b/packages/opentelemetry-exporter-collector/package.json @@ -85,7 +85,6 @@ "dependencies": { "@grpc/proto-loader": "^0.5.3", "@opentelemetry/api": "^0.7.0", - "@opentelemetry/base": "^0.7.0", "@opentelemetry/core": "^0.7.0", "@opentelemetry/resources": "^0.7.0", "@opentelemetry/tracing": "^0.7.0", diff --git a/packages/opentelemetry-exporter-collector/src/CollectorExporter.ts b/packages/opentelemetry-exporter-collector/src/CollectorExporter.ts index 7199848da8..070042b121 100644 --- a/packages/opentelemetry-exporter-collector/src/CollectorExporter.ts +++ b/packages/opentelemetry-exporter-collector/src/CollectorExporter.ts @@ -14,8 +14,7 @@ * limitations under the License. */ -import { ExportResult } from '@opentelemetry/base'; -import { NoopLogger } from '@opentelemetry/core'; +import { ExportResult, NoopLogger } from '@opentelemetry/core'; import { ReadableSpan, SpanExporter } from '@opentelemetry/tracing'; import { Attributes, Logger } from '@opentelemetry/api'; import { onInit, onShutdown, sendSpans } from './platform/index'; diff --git a/packages/opentelemetry-exporter-collector/src/transform.ts b/packages/opentelemetry-exporter-collector/src/transform.ts index 580434c990..3f67635ce6 100644 --- a/packages/opentelemetry-exporter-collector/src/transform.ts +++ b/packages/opentelemetry-exporter-collector/src/transform.ts @@ -21,7 +21,6 @@ import { TimedEvent, TraceState, } from '@opentelemetry/api'; -import { SDK_INFO } from '@opentelemetry/base'; import * as core from '@opentelemetry/core'; import { Resource } from '@opentelemetry/resources'; import { ReadableSpan } from '@opentelemetry/tracing'; @@ -218,8 +217,8 @@ export function toCollectorExportTraceServiceRequest( const instrumentationLibrarySpans: opentelemetryProto.trace.v1.InstrumentationLibrarySpans = { spans: spansToBeSent, instrumentationLibrary: { - name: name || `${SDK_INFO.NAME} - ${SDK_INFO.LANGUAGE}`, - version: SDK_INFO.VERSION, + name: name || `${core.SDK_INFO.NAME} - ${core.SDK_INFO.LANGUAGE}`, + version: core.SDK_INFO.VERSION, }, }; const resourceSpan: opentelemetryProto.trace.v1.ResourceSpans = { diff --git a/packages/opentelemetry-exporter-collector/test/common/CollectorExporter.test.ts b/packages/opentelemetry-exporter-collector/test/common/CollectorExporter.test.ts index 175222f0e4..749de6b217 100644 --- a/packages/opentelemetry-exporter-collector/test/common/CollectorExporter.test.ts +++ b/packages/opentelemetry-exporter-collector/test/common/CollectorExporter.test.ts @@ -14,8 +14,7 @@ * limitations under the License. */ -import { ExportResult } from '@opentelemetry/base'; -import { NoopLogger } from '@opentelemetry/core'; +import { ExportResult, NoopLogger } from '@opentelemetry/core'; import { ReadableSpan } from '@opentelemetry/tracing'; import * as assert from 'assert'; import * as sinon from 'sinon'; diff --git a/packages/opentelemetry-exporter-jaeger/package.json b/packages/opentelemetry-exporter-jaeger/package.json index 7cee3b85e0..99ccd8073d 100644 --- a/packages/opentelemetry-exporter-jaeger/package.json +++ b/packages/opentelemetry-exporter-jaeger/package.json @@ -57,7 +57,6 @@ }, "dependencies": { "@opentelemetry/api": "^0.7.0", - "@opentelemetry/base": "^0.7.0", "@opentelemetry/core": "^0.7.0", "@opentelemetry/tracing": "^0.7.0", "jaeger-client": "^3.15.0" diff --git a/packages/opentelemetry-exporter-jaeger/src/jaeger.ts b/packages/opentelemetry-exporter-jaeger/src/jaeger.ts index 83f6658492..62d1320b4e 100644 --- a/packages/opentelemetry-exporter-jaeger/src/jaeger.ts +++ b/packages/opentelemetry-exporter-jaeger/src/jaeger.ts @@ -15,8 +15,7 @@ */ import * as api from '@opentelemetry/api'; -import { ExportResult } from '@opentelemetry/base'; -import { NoopLogger } from '@opentelemetry/core'; +import { ExportResult, NoopLogger } from '@opentelemetry/core'; import { ReadableSpan, SpanExporter } from '@opentelemetry/tracing'; import { Socket } from 'dgram'; import { spanToThrift } from './transform'; diff --git a/packages/opentelemetry-exporter-jaeger/test/jaeger.test.ts b/packages/opentelemetry-exporter-jaeger/test/jaeger.test.ts index 53105fd3ce..1ff6808a13 100644 --- a/packages/opentelemetry-exporter-jaeger/test/jaeger.test.ts +++ b/packages/opentelemetry-exporter-jaeger/test/jaeger.test.ts @@ -16,11 +16,10 @@ import * as assert from 'assert'; import { JaegerExporter } from '../src'; -import { NoopLogger } from '@opentelemetry/core'; +import { ExportResult, NoopLogger } from '@opentelemetry/core'; import * as types from '@opentelemetry/api'; import { ThriftProcess } from '../src/types'; import { ReadableSpan } from '@opentelemetry/tracing'; -import { ExportResult } from '@opentelemetry/base'; import { TraceFlags } from '@opentelemetry/api'; import { Resource } from '@opentelemetry/resources'; diff --git a/packages/opentelemetry-exporter-prometheus/package.json b/packages/opentelemetry-exporter-prometheus/package.json index d8985c4da7..d8c759f1be 100644 --- a/packages/opentelemetry-exporter-prometheus/package.json +++ b/packages/opentelemetry-exporter-prometheus/package.json @@ -55,7 +55,6 @@ }, "dependencies": { "@opentelemetry/api": "^0.7.0", - "@opentelemetry/base": "^0.7.0", "@opentelemetry/core": "^0.7.0", "@opentelemetry/metrics": "^0.7.0", "prom-client": "^11.5.3" diff --git a/packages/opentelemetry-exporter-prometheus/src/prometheus.ts b/packages/opentelemetry-exporter-prometheus/src/prometheus.ts index 9d266ecdc1..a9a5b2588d 100644 --- a/packages/opentelemetry-exporter-prometheus/src/prometheus.ts +++ b/packages/opentelemetry-exporter-prometheus/src/prometheus.ts @@ -14,8 +14,11 @@ * limitations under the License. */ -import { ExportResult } from '@opentelemetry/base'; -import { NoopLogger, hrTimeToMilliseconds } from '@opentelemetry/core'; +import { + ExportResult, + NoopLogger, + hrTimeToMilliseconds, +} from '@opentelemetry/core'; import { CounterSumAggregator, LastValue, diff --git a/packages/opentelemetry-exporter-zipkin/package.json b/packages/opentelemetry-exporter-zipkin/package.json index 394981afa3..5dea64a4fb 100644 --- a/packages/opentelemetry-exporter-zipkin/package.json +++ b/packages/opentelemetry-exporter-zipkin/package.json @@ -55,7 +55,6 @@ }, "dependencies": { "@opentelemetry/api": "^0.7.0", - "@opentelemetry/base": "^0.7.0", "@opentelemetry/core": "^0.7.0", "@opentelemetry/resources": "^0.7.0", "@opentelemetry/tracing": "^0.7.0" diff --git a/packages/opentelemetry-exporter-zipkin/src/zipkin.ts b/packages/opentelemetry-exporter-zipkin/src/zipkin.ts index 56a06469f2..ca57625fdd 100644 --- a/packages/opentelemetry-exporter-zipkin/src/zipkin.ts +++ b/packages/opentelemetry-exporter-zipkin/src/zipkin.ts @@ -18,9 +18,8 @@ import * as types from '@opentelemetry/api'; import * as http from 'http'; import * as https from 'https'; import * as url from 'url'; -import { NoopLogger } from '@opentelemetry/core'; +import { ExportResult, NoopLogger } from '@opentelemetry/core'; import { SpanExporter, ReadableSpan } from '@opentelemetry/tracing'; -import { ExportResult } from '@opentelemetry/base'; import * as zipkinTypes from './types'; import { toZipkinSpan, diff --git a/packages/opentelemetry-exporter-zipkin/test/zipkin.test.ts b/packages/opentelemetry-exporter-zipkin/test/zipkin.test.ts index bd0105e553..6f0c06087a 100644 --- a/packages/opentelemetry-exporter-zipkin/test/zipkin.test.ts +++ b/packages/opentelemetry-exporter-zipkin/test/zipkin.test.ts @@ -17,8 +17,11 @@ import * as assert from 'assert'; import * as nock from 'nock'; import { ReadableSpan } from '@opentelemetry/tracing'; -import { ExportResult } from '@opentelemetry/base'; -import { NoopLogger, hrTimeToMicroseconds } from '@opentelemetry/core'; +import { + ExportResult, + NoopLogger, + hrTimeToMicroseconds, +} from '@opentelemetry/core'; import * as types from '@opentelemetry/api'; import { Resource } from '@opentelemetry/resources'; import { ZipkinExporter } from '../src'; diff --git a/packages/opentelemetry-metrics/package.json b/packages/opentelemetry-metrics/package.json index 1e7a12497c..9ea621828e 100644 --- a/packages/opentelemetry-metrics/package.json +++ b/packages/opentelemetry-metrics/package.json @@ -58,7 +58,6 @@ }, "dependencies": { "@opentelemetry/api": "^0.7.0", - "@opentelemetry/base": "^0.7.0", "@opentelemetry/core": "^0.7.0", "@opentelemetry/resources": "^0.7.0" } diff --git a/packages/opentelemetry-metrics/src/export/ConsoleMetricExporter.ts b/packages/opentelemetry-metrics/src/export/ConsoleMetricExporter.ts index 0440f89581..90f2f6be5d 100644 --- a/packages/opentelemetry-metrics/src/export/ConsoleMetricExporter.ts +++ b/packages/opentelemetry-metrics/src/export/ConsoleMetricExporter.ts @@ -15,7 +15,7 @@ */ import { MetricExporter, MetricRecord, Distribution, Histogram } from './types'; -import { ExportResult } from '@opentelemetry/base'; +import { ExportResult } from '@opentelemetry/core'; /** * This is implementation of {@link MetricExporter} that prints metrics data to diff --git a/packages/opentelemetry-metrics/src/export/Controller.ts b/packages/opentelemetry-metrics/src/export/Controller.ts index ccef3213eb..5ce3d0ee68 100644 --- a/packages/opentelemetry-metrics/src/export/Controller.ts +++ b/packages/opentelemetry-metrics/src/export/Controller.ts @@ -14,10 +14,9 @@ * limitations under the License. */ -import { unrefTimer } from '@opentelemetry/core'; +import { ExportResult, unrefTimer } from '@opentelemetry/core'; import { Meter } from '../Meter'; import { MetricExporter } from './types'; -import { ExportResult } from '@opentelemetry/base'; const DEFAULT_EXPORT_INTERVAL = 60_000; diff --git a/packages/opentelemetry-metrics/src/export/NoopExporter.ts b/packages/opentelemetry-metrics/src/export/NoopExporter.ts index 84eab150b8..05b3694939 100644 --- a/packages/opentelemetry-metrics/src/export/NoopExporter.ts +++ b/packages/opentelemetry-metrics/src/export/NoopExporter.ts @@ -15,7 +15,7 @@ */ import { MetricExporter, MetricRecord } from './types'; -import { ExportResult } from '@opentelemetry/base'; +import { ExportResult } from '@opentelemetry/core'; export class NoopExporter implements MetricExporter { // By default does nothing diff --git a/packages/opentelemetry-metrics/src/export/types.ts b/packages/opentelemetry-metrics/src/export/types.ts index 40b631e026..cffe91bc47 100644 --- a/packages/opentelemetry-metrics/src/export/types.ts +++ b/packages/opentelemetry-metrics/src/export/types.ts @@ -15,7 +15,7 @@ */ import { ValueType, HrTime, Labels } from '@opentelemetry/api'; -import { ExportResult } from '@opentelemetry/base'; +import { ExportResult } from '@opentelemetry/core'; /** The kind of metric. */ export enum MetricKind { diff --git a/packages/opentelemetry-plugin-xml-http-request/package.json b/packages/opentelemetry-plugin-xml-http-request/package.json index fa1a100e07..b12a130ed7 100644 --- a/packages/opentelemetry-plugin-xml-http-request/package.json +++ b/packages/opentelemetry-plugin-xml-http-request/package.json @@ -77,7 +77,6 @@ }, "dependencies": { "@opentelemetry/api": "^0.7.0", - "@opentelemetry/base": "^0.7.0", "@opentelemetry/core": "^0.7.0", "@opentelemetry/web": "^0.7.0", "shimmer": "^1.2.1" diff --git a/packages/opentelemetry-resources/package.json b/packages/opentelemetry-resources/package.json index 51925febfb..21b3d4cfed 100644 --- a/packages/opentelemetry-resources/package.json +++ b/packages/opentelemetry-resources/package.json @@ -62,7 +62,7 @@ }, "dependencies": { "@opentelemetry/api": "^0.7.0", - "@opentelemetry/base": "^0.7.0", + "@opentelemetry/core": "^0.7.0", "gcp-metadata": "^3.5.0" } } diff --git a/packages/opentelemetry-resources/src/Resource.ts b/packages/opentelemetry-resources/src/Resource.ts index 0a76dad968..bed19ee739 100644 --- a/packages/opentelemetry-resources/src/Resource.ts +++ b/packages/opentelemetry-resources/src/Resource.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { SDK_INFO } from '@opentelemetry/base'; +import { SDK_INFO } from '@opentelemetry/core'; import { TELEMETRY_SDK_RESOURCE } from './constants'; import { ResourceLabels } from './types'; diff --git a/packages/opentelemetry-resources/test/Resource.test.ts b/packages/opentelemetry-resources/test/Resource.test.ts index 2623094817..4061932532 100644 --- a/packages/opentelemetry-resources/test/Resource.test.ts +++ b/packages/opentelemetry-resources/test/Resource.test.ts @@ -15,7 +15,7 @@ */ import * as assert from 'assert'; -import { SDK_INFO } from '@opentelemetry/base'; +import { SDK_INFO } from '@opentelemetry/core'; import { Resource } from '../src'; import { assertTelemetrySDKResource } from './util/resource-assertions'; diff --git a/packages/opentelemetry-resources/test/resource-assertions.test.ts b/packages/opentelemetry-resources/test/resource-assertions.test.ts index d3b0e17957..2ccff2e1b4 100644 --- a/packages/opentelemetry-resources/test/resource-assertions.test.ts +++ b/packages/opentelemetry-resources/test/resource-assertions.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { SDK_INFO } from '@opentelemetry/base'; +import { SDK_INFO } from '@opentelemetry/core'; import { Resource } from '../src/Resource'; import { CLOUD_RESOURCE, diff --git a/packages/opentelemetry-resources/test/util/resource-assertions.ts b/packages/opentelemetry-resources/test/util/resource-assertions.ts index 02332191a1..db33bd7632 100644 --- a/packages/opentelemetry-resources/test/util/resource-assertions.ts +++ b/packages/opentelemetry-resources/test/util/resource-assertions.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { SDK_INFO } from '@opentelemetry/base'; +import { SDK_INFO } from '@opentelemetry/core'; import * as assert from 'assert'; import { Resource } from '../../src/Resource'; import { diff --git a/packages/opentelemetry-tracing/package.json b/packages/opentelemetry-tracing/package.json index 13c0d9e29a..967241ecb8 100644 --- a/packages/opentelemetry-tracing/package.json +++ b/packages/opentelemetry-tracing/package.json @@ -74,7 +74,6 @@ }, "dependencies": { "@opentelemetry/api": "^0.7.0", - "@opentelemetry/base": "^0.7.0", "@opentelemetry/context-base": "^0.7.0", "@opentelemetry/core": "^0.7.0", "@opentelemetry/resources": "^0.7.0" diff --git a/packages/opentelemetry-tracing/src/export/ConsoleSpanExporter.ts b/packages/opentelemetry-tracing/src/export/ConsoleSpanExporter.ts index 7f5fc96804..42c5875bd6 100644 --- a/packages/opentelemetry-tracing/src/export/ConsoleSpanExporter.ts +++ b/packages/opentelemetry-tracing/src/export/ConsoleSpanExporter.ts @@ -16,8 +16,7 @@ import { SpanExporter } from './SpanExporter'; import { ReadableSpan } from './ReadableSpan'; -import { ExportResult } from '@opentelemetry/base'; -import { hrTimeToMicroseconds } from '@opentelemetry/core'; +import { ExportResult, hrTimeToMicroseconds } from '@opentelemetry/core'; /** * This is implementation of {@link SpanExporter} that prints spans to the diff --git a/packages/opentelemetry-tracing/src/export/InMemorySpanExporter.ts b/packages/opentelemetry-tracing/src/export/InMemorySpanExporter.ts index 5415075ddb..b3de120411 100644 --- a/packages/opentelemetry-tracing/src/export/InMemorySpanExporter.ts +++ b/packages/opentelemetry-tracing/src/export/InMemorySpanExporter.ts @@ -16,7 +16,7 @@ import { SpanExporter } from './SpanExporter'; import { ReadableSpan } from './ReadableSpan'; -import { ExportResult } from '@opentelemetry/base'; +import { ExportResult } from '@opentelemetry/core'; /** * This class can be used for testing purposes. It stores the exported spans diff --git a/packages/opentelemetry-tracing/src/export/SpanExporter.ts b/packages/opentelemetry-tracing/src/export/SpanExporter.ts index 88e191c1ff..72f7ff2572 100644 --- a/packages/opentelemetry-tracing/src/export/SpanExporter.ts +++ b/packages/opentelemetry-tracing/src/export/SpanExporter.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { ExportResult } from '@opentelemetry/base'; +import { ExportResult } from '@opentelemetry/core'; import { ReadableSpan } from './ReadableSpan'; /** diff --git a/packages/opentelemetry-tracing/test/export/InMemorySpanExporter.test.ts b/packages/opentelemetry-tracing/test/export/InMemorySpanExporter.test.ts index cfd215ff88..f83f96ce02 100644 --- a/packages/opentelemetry-tracing/test/export/InMemorySpanExporter.test.ts +++ b/packages/opentelemetry-tracing/test/export/InMemorySpanExporter.test.ts @@ -20,9 +20,8 @@ import { SimpleSpanProcessor, BasicTracerProvider, } from '../../src'; -import { ExportResult } from '@opentelemetry/base'; import { context } from '@opentelemetry/api'; -import { setActiveSpan } from '@opentelemetry/core'; +import { ExportResult, setActiveSpan } from '@opentelemetry/core'; describe('InMemorySpanExporter', () => { const memoryExporter = new InMemorySpanExporter();