Merge 0136425 into 126bbe7

examples/ioredis/index.js

@@ -9,11 +9,15 @@ const redis = new Redis();
 async function main() {
   try {
     await redis.set('test', 'data');
-    process.exit(0);
   } catch (error) {
     console.error(error);
-    process.exit(1);
   }
+
+  // The process must live for at least the interval past any traces that
+  // must be exported, or some risk being lost if they are recorded after the
+  // last export.
+  console.log('Sleeping 5 seconds before shutdown to ensure all records are flushed.');
+  setTimeout(() => { console.log('Completed.'); }, 5000);
 }
 
 main();

examples/ioredis/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ioredis-example",
   "private": true,
-  "version": "0.13.0",
+  "version": "0.13.1",
   "description": "Example of HTTP integration with OpenTelemetry",
   "main": "index.js",
   "scripts": {
@@ -11,7 +11,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+ssh://git@github.com/open-telemetry/opentelemetry-js.git"
+    "url": "git+ssh://git@github.com/open-telemetry/opentelemetry-js-contrib.git"
   },
   "keywords": [
     "opentelemetry",
@@ -20,20 +20,20 @@
     "tracing"
   ],
   "engines": {
-    "node": ">=8"
+    "node": ">=8.5.0"
   },
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "bugs": {
-    "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
+    "url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues"
   },
   "dependencies": {
     "@opentelemetry/api": "^0.15.0",
     "@opentelemetry/exporter-jaeger": "^0.15.0",
+    "@opentelemetry/instrumentation-ioredis": "^0.13.1",
     "@opentelemetry/node": "^0.15.0",
-    "@opentelemetry/plugin-ioredis": "^0.13.0",
     "@opentelemetry/tracing": "^0.15.0",
-    "ioredis": "^4.14.1"
+    "ioredis": "^4.22.0"
   },
-  "homepage": "https://github.com/open-telemetry/opentelemetry-js#readme"
+  "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme"
 }

examples/ioredis/tracer.js

@@ -4,6 +4,7 @@ const opentelemetry = require('@opentelemetry/api');
 const { NodeTracerProvider } = require('@opentelemetry/node');
 const { SimpleSpanProcessor } = require('@opentelemetry/tracing');
 const { JaegerExporter } = require('@opentelemetry/exporter-jaeger');
+const { IORedisInstrumentation } = require('@opentelemetry/instrumentation-ioredis');
 
 const provider = new NodeTracerProvider();
 
@@ -14,4 +15,7 @@ provider.addSpanProcessor(new SimpleSpanProcessor(exporter));
 // Initialize the OpenTelemetry APIs to use the BasicTracer bindings
 provider.register();
 
+// eslint-disable-next-line no-new
+new IORedisInstrumentation();
+
 module.exports = opentelemetry.trace.getTracer('ioredis-example');