Merge branch 'master' into metrics_rca_runtime

Author: obecny

plugins/node/opentelemetry-koa-instrumentation/src/koa.ts

@@ -129,9 +129,12 @@ export class KoaInstrumentation extends BasePlugin<typeof koa> {
       const span = this._tracer.startSpan(metadata.name, {
         attributes: metadata.attributes,
       });
-      const result = await middlewareLayer(context, next);
-      span.end();
-      return result;
+
+      return this._tracer.withSpan(span, async () => {
+        const result = await middlewareLayer(context, next);
+        span.end();
+        return result;
+      });
     };
   }
 }

plugins/node/opentelemetry-koa-instrumentation/test/koa.test.ts

@@ -93,6 +93,12 @@ describe('Koa Instrumentation - Core Tests', () => {
     await next();
   };
 
+  const spanCreateMiddleware: koa.Middleware = async (ctx, next) => {
+    const span = tracer.startSpan('foo');
+    span.end();
+    await next();
+  };
+
   const asyncMiddleware: koa.Middleware = async (ctx, next) => {
     const start = Date.now();
     await next();
@@ -106,11 +112,12 @@ describe('Koa Instrumentation - Core Tests', () => {
       app.use((ctx, next) => tracer.withSpan(rootSpan, next));
       app.use(customMiddleware);
       app.use(simpleResponse);
+      app.use(spanCreateMiddleware);
 
       await tracer.withSpan(rootSpan, async () => {
         await httpRequest.get(`http://localhost:${port}`);
         rootSpan.end();
-        assert.deepStrictEqual(memoryExporter.getFinishedSpans().length, 5);
+        assert.deepStrictEqual(memoryExporter.getFinishedSpans().length, 8);
 
         assert.notStrictEqual(
           memoryExporter
@@ -119,6 +126,18 @@ describe('Koa Instrumentation - Core Tests', () => {
           undefined
         );
 
+        const fooParentSpan = memoryExporter
+          .getFinishedSpans()
+          .find(span => span.name.includes('spanCreateMiddleware'));
+        assert.notStrictEqual(fooParentSpan, undefined);
+
+        const fooSpan = memoryExporter.getFinishedSpans().find(span => 'foo');
+        assert.notStrictEqual(fooSpan, undefined);
+        assert.strictEqual(
+          fooSpan!.parentSpanId,
+          fooParentSpan!.spanContext.spanId
+        );
+
         const simpleResponseSpan = memoryExporter
           .getFinishedSpans()
           .find(span => span.name.includes('simpleResponse'));

plugins/web/opentelemetry-plugin-react-load/package.json

@@ -63,8 +63,8 @@
     "karma-webpack": "4.0.2",
     "mocha": "7.2.0",
     "nyc": "15.1.0",
-    "react": "16.13.1",
-    "react-dom": "16.13.1",
+    "react": "17.0.1",
+    "react-dom": "17.0.1",
     "rimraf": "3.0.2",
     "sinon": "9.0.2",
     "ts-loader": "8.0.4",
@@ -78,7 +78,7 @@
     "webpack-merge": "5.2.0"
   },
   "peerDependencies": {
-    "react": "^16.13.1"
+    "react": "^16.13.1 || ^17.0.0"
   },
   "dependencies": {
     "@opentelemetry/api": "^0.11.0",