chore: adding redis, fixing links

open-telemetry · Mar 12, 2021 · 2856cb4 · 2856cb4
1 parent 513c362
commit 2856cb4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 17 deletions.
diff --git a/metapackages/auto-instrumentations-node/README.md b/metapackages/auto-instrumentations-node/README.md
@@ -1,5 +1,4 @@
 #OpenTelemetry Meta Packages for Node
-[![Gitter chat][gitter-image]][gitter-url]
 [![NPM Published Version][npm-img]][npm-url]
 [![dependencies][dependencies-image]][dependencies-url]
 [![devDependencies][devDependencies-image]][devDependencies-url]
@@ -47,19 +46,16 @@ registerInstrumentations({
 
 - For more information on OpenTelemetry, visit: <https://opentelemetry.io/>
 - For more about OpenTelemetry JavaScript: <https://github.com/open-telemetry/opentelemetry-js>
-- 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-contrib.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-contrib/blob/main/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-contrib.svg?path=packages%2Fopentelemetry-instrumentations-node
-[dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js-contrib?path=packages%2Fopentelemetry-instrumentations-node
-[devDependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js-contrib.svg?path=packages%2Fopentelemetry-instrumentations-node&type=dev
-[devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js-contrib?path=packages%2Fopentelemetry-instrumentations-node&type=dev
-[npm-url]: https://www.npmjs.com/package/@opentelemetry/host-metrics
-[npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fhost-metrics.svg
+[dependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js-contrib.svg?path=packages%2Fauto-instrumentations-node
+[dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js-contrib?path=packages%2Fauto-instrumentations-node
+[devDependencies-image]: https://david-dm.org/open-telemetry/opentelemetry-js-contrib.svg?path=packages%2Fauto-instrumentations-node&type=dev
+[devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js-contrib?path=packages%2Fauto-instrumentations-node&type=dev
+[npm-url]: https://www.npmjs.com/package/@opentelemetry/auto-instrumentations-node
+[npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fauto-instrumentations-node.svg
diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json
@@ -3,7 +3,7 @@
   "version": "0.14.0",
   "description": "Metapackage which bundles opentelemetry node core and contrib instrumentations",
   "author": "OpenTelemetry Authors",
-  "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
+  "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme",
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public"
@@ -53,6 +53,7 @@
     "@opentelemetry/instrumentation-koa": "^0.14.0",
     "@opentelemetry/instrumentation-ioredis": "^0.14.0",
     "@opentelemetry/instrumentation-mongodb": "^0.14.0",
-    "@opentelemetry/instrumentation-pg": "^0.14.0"
+    "@opentelemetry/instrumentation-pg": "^0.14.0",
+    "@opentelemetry/instrumentation-redis": "^0.14.0"
   }
 }
diff --git a/metapackages/auto-instrumentations-node/src/utils.ts b/metapackages/auto-instrumentations-node/src/utils.ts
@@ -26,7 +26,7 @@ import { KoaInstrumentation } from '@opentelemetry/instrumentation-koa';
 import { MongoDBInstrumentation } from '@opentelemetry/instrumentation-mongodb';
 import { PgInstrumentation } from '@opentelemetry/instrumentation-pg';
 // import { MySQLInstrumentation } from '@opentelemetry/instrumentation-mysql';
-// import { RedisInstrumentation } from '@opentelemetry/instrumentation-redis';
+import { RedisInstrumentation } from '@opentelemetry/instrumentation-redis';
 
 const InstrumentationMap = {
   '@opentelemetry/instrumentation-dns': DnsInstrumentation,
@@ -39,7 +39,7 @@ const InstrumentationMap = {
   '@opentelemetry/instrumentation-mongodb': MongoDBInstrumentation,
   '@opentelemetry/instrumentation-pg': PgInstrumentation,
   // '@opentelemetry/instrumentation-mysql': MySQLInstrumentation,
-  // '@opentelemetry/instrumentation-redis':RedisInstrumentation,
+  '@opentelemetry/instrumentation-redis': RedisInstrumentation,
 };
 
 // Config types inferred automatically from the first argument of the constructor

diff --git a/metapackages/auto-instrumentations-node/test/utils.test.ts b/metapackages/auto-instrumentations-node/test/utils.test.ts
@@ -35,9 +35,9 @@ describe('utils', () => {
         '@opentelemetry/instrumentation-mongodb',
         // '@opentelemetry/instrumentation-mysql',
         '@opentelemetry/instrumentation-pg',
-        // '@opentelemetry/instrumentation-redis',
+        '@opentelemetry/instrumentation-redis',
       ];
-      assert.strictEqual(instrumentations.length, 9);
+      assert.strictEqual(instrumentations.length, 10);
       for (let i = 0, j = instrumentations.length; i < j; i++) {
         assert.strictEqual(
           instrumentations[i].instrumentationName,
@@ -47,7 +47,7 @@ describe('utils', () => {
       }
     });
 
-    it('should merge user config with default one', () => {
+    it('should use user config', () => {
       function applyCustomAttributesOnSpan() {}
 
       const instrumentations = getNodeAutoInstrumentations({