From a12b3063506d0ad93705f2aeda92b91f60805b73 Mon Sep 17 00:00:00 2001 From: Mark Wolff Date: Thu, 23 Jul 2020 10:15:26 -0400 Subject: [PATCH 1/2] feat(grpc-js): enable autoinstrumentation by default --- packages/opentelemetry-node/README.md | 2 +- packages/opentelemetry-node/src/config.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/opentelemetry-node/README.md b/packages/opentelemetry-node/README.md index 258e95ff80b..93f600d9665 100644 --- a/packages/opentelemetry-node/README.md +++ b/packages/opentelemetry-node/README.md @@ -112,7 +112,7 @@ For example, `OTEL_NO_PATCH_MODULES=pg,https` will disable the postgres plugin a ## Examples -See how to automatically instrument [http](https://github.com/open-telemetry/opentelemetry-js/tree/master/examples/http) and [gRPC](https://github.com/open-telemetry/opentelemetry-js/tree/master/examples/grpc) using node-sdk. +See how to automatically instrument [http](https://github.com/open-telemetry/opentelemetry-js/tree/master/examples/http) and [gRPC](https://github.com/open-telemetry/opentelemetry-js/tree/master/examples/grpc) / [grpc-js](https://github.com/open-telemetry/opentelemetry-js/tree/master/examples/grpc-js) using node-sdk. ## Useful links diff --git a/packages/opentelemetry-node/src/config.ts b/packages/opentelemetry-node/src/config.ts index 65b76307612..1d04cd868ef 100644 --- a/packages/opentelemetry-node/src/config.ts +++ b/packages/opentelemetry-node/src/config.ts @@ -29,6 +29,7 @@ export interface NodeTracerConfig extends TracerConfig { export const DEFAULT_INSTRUMENTATION_PLUGINS: Plugins = { mongodb: { enabled: true, path: '@opentelemetry/plugin-mongodb' }, grpc: { enabled: true, path: '@opentelemetry/plugin-grpc' }, + '@grpc/grpc-js': { enabled: true, path: '@opentelemetry/plugin-grpc-js' }, http: { enabled: true, path: '@opentelemetry/plugin-http' }, https: { enabled: true, path: '@opentelemetry/plugin-https' }, mysql: { enabled: true, path: '@opentelemetry/plugin-mysql' }, From 53fd15d3933fc2ea120b25df55aa934beb816dc3 Mon Sep 17 00:00:00 2001 From: Mark Wolff Date: Thu, 23 Jul 2020 10:49:31 -0400 Subject: [PATCH 2/2] fix: add grpc-js to metapackages --- metapackages/plugins-node-core/README.md | 2 ++ metapackages/plugins-node-core/package.json | 1 + 2 files changed, 3 insertions(+) diff --git a/metapackages/plugins-node-core/README.md b/metapackages/plugins-node-core/README.md index 768aeb52102..a831a7f60da 100644 --- a/metapackages/plugins-node-core/README.md +++ b/metapackages/plugins-node-core/README.md @@ -10,6 +10,7 @@ This package depends on all core node plugins maintained by OpenTelemetry author ## Plugins - [@opentelemetry/plugin-grpc][otel-plugin-grpc] +- [@opentelemetry/plugin-grpc-js][otel-plugin-grpc-js] - [@opentelemetry/plugin-http][otel-plugin-http] - [@opentelemetry/plugin-https][otel-plugin-https] @@ -33,5 +34,6 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fplugins-node-core.svg [otel-plugin-grpc]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-plugin-grpc +[otel-plugin-grpc-js]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-plugin-grpc-js [otel-plugin-http]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-plugin-http [otel-plugin-https]: https://github.com/open-telemetry/opentelemetry-js/tree/master/packages/opentelemetry-plugin-https diff --git a/metapackages/plugins-node-core/package.json b/metapackages/plugins-node-core/package.json index 2eb161393f0..e4ea03b0df9 100644 --- a/metapackages/plugins-node-core/package.json +++ b/metapackages/plugins-node-core/package.json @@ -17,6 +17,7 @@ }, "dependencies": { "@opentelemetry/plugin-grpc": "^0.9.0", + "@opentelemetry/plugin-grpc-js": "^0.9.0", "@opentelemetry/plugin-http": "^0.9.0", "@opentelemetry/plugin-https": "^0.9.0" }