From bd908c2e56363f5198d4ba1746840b6f4dd41ee7 Mon Sep 17 00:00:00 2001 From: vmarchaud Date: Fri, 3 Jan 2020 18:05:00 +0100 Subject: [PATCH] chore: address PR comments --- .circleci/config.yml | 2 +- README.md | 2 +- packages/opentelemetry-node/src/config.ts | 2 +- .../src/version.ts | 18 ------------------ .../opentelemetry-plugin-mongodb/README.md | 2 ++ 5 files changed, 5 insertions(+), 21 deletions(-) delete mode 100644 packages/opentelemetry-plugin-mongodb-core/src/version.ts diff --git a/.circleci/config.yml b/.circleci/config.yml index 0af27cf45e8..3b044134523 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -64,7 +64,7 @@ cache_2: &cache_2 - packages/opentelemetry-plugin-grpc/node_modules - packages/opentelemetry-plugin-http/node_modules - packages/opentelemetry-plugin-http2/node_modules - - packages/opentelemetry-plugin-mongodb-core/node_modules + - packages/opentelemetry-plugin-mongodb/node_modules - packages/opentelemetry-plugin-redis/node_modules - packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/node_modules - packages/opentelemetry-plugin-document-load/node_modules diff --git a/README.md b/README.md index 3542d7bff41..9ce9ccebff5 100644 --- a/README.md +++ b/README.md @@ -120,7 +120,7 @@ OpenTelemetry can collect tracing data automatically using plugins. Vendors/User - [@opentelemetry/plugin-grpc](https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-plugin-grpc) - [@opentelemetry/plugin-http](https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-plugin-http) - [@opentelemetry/plugin-https](https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-plugin-https) -- [@opentelemetry/plugin-mongodb-core](https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-plugin-mongodb-core) +- [@opentelemetry/plugin-mongodb](https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-plugin-mongodb) - [@opentelemetry/plugin-mysql](https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-plugin-mysql) - [@opentelemetry/plugin-pg](https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg) - [@opentelemetry/plugin-pg-pool](https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool) diff --git a/packages/opentelemetry-node/src/config.ts b/packages/opentelemetry-node/src/config.ts index 5fe7f6a5679..0c52ee081d0 100644 --- a/packages/opentelemetry-node/src/config.ts +++ b/packages/opentelemetry-node/src/config.ts @@ -27,7 +27,7 @@ export interface NodeTracerConfig extends BasicTracerConfig { /** List of all default supported plugins */ export const DEFAULT_INSTRUMENTATION_PLUGINS: Plugins = { - 'mongodb-core': { enabled: true, path: '@opentelemetry/plugin-mongodb-core' }, + mongodb: { enabled: true, path: '@opentelemetry/plugin-mongodb' }, grpc: { enabled: true, path: '@opentelemetry/plugin-grpc' }, http: { enabled: true, path: '@opentelemetry/plugin-http' }, https: { enabled: true, path: '@opentelemetry/plugin-https' }, diff --git a/packages/opentelemetry-plugin-mongodb-core/src/version.ts b/packages/opentelemetry-plugin-mongodb-core/src/version.ts deleted file mode 100644 index 60ca3ab548f..00000000000 --- a/packages/opentelemetry-plugin-mongodb-core/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.3.1'; diff --git a/packages/opentelemetry-plugin-mongodb/README.md b/packages/opentelemetry-plugin-mongodb/README.md index a2a1316c49b..dd6697c39eb 100644 --- a/packages/opentelemetry-plugin-mongodb/README.md +++ b/packages/opentelemetry-plugin-mongodb/README.md @@ -14,6 +14,8 @@ For automatic instrumentation see the ```bash npm install --save @opentelemetry/plugin-mongodb ``` +### Supported Versions + - `'>=2.0.0 <4` ## Usage