Merge branch 'main' into docs/readme-remove-lists

open-telemetry · Apr 18, 2022 · 0f28d5f · 0f28d5f
2 parents 97cea5c + b55b79b
commit 0f28d5f
Show file tree

Hide file tree

Showing 52 changed files with 85 additions and 66 deletions.
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Cache Dependencies
         if: ${{ steps.release.outputs.releases_created }}
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             node_modules

diff --git a/.github/workflows/test-all-versions.yml b/.github/workflows/test-all-versions.yml
@@ -134,7 +134,7 @@ jobs:
         with:
           node-version: ${{ matrix.node }}
       - name: Cache Dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             node_modules

diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -126,7 +126,7 @@ jobs:
         with:
           node-version: ${{ matrix.node }}
       - name: Cache Dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             node_modules
@@ -155,7 +155,7 @@ jobs:
         run: npm run test:ci:changed -- ${{ matrix.lerna-extra-args }}
       - name: Report Coverage
         if: matrix.node == '14'
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v3
         with:
           verbose: true
 
@@ -176,7 +176,7 @@ jobs:
         with:
           node-version: ${{ matrix.node }}
       - name: Cache Dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             node_modules
@@ -201,6 +201,6 @@ jobs:
       - name: Unit tests
         run: npm run test:browser
       - name: Report Coverage
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v3
         with:
           verbose: true
diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json
@@ -28,7 +28,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=8.5.0"
+    "node": ">=8.12.0"
   },
   "files": [
     "build/src/**/*.js",

diff --git a/detectors/node/opentelemetry-resource-detector-aws/package.json b/detectors/node/opentelemetry-resource-detector-aws/package.json
@@ -27,7 +27,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=8.5.0"
+    "node": ">=8.12.0"
   },
   "files": [
     "build/src/**/*.js",

diff --git a/detectors/node/opentelemetry-resource-detector-docker/package.json b/detectors/node/opentelemetry-resource-detector-docker/package.json
@@ -21,6 +21,9 @@
   },
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
+  "engines": {
+    "node": ">=8.12.0"
+  },
   "files": [
     "build/src/**/*.js",
     "build/src/**/*.js.map",

diff --git a/detectors/node/opentelemetry-resource-detector-github/package.json b/detectors/node/opentelemetry-resource-detector-github/package.json
@@ -28,7 +28,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=8.0.0"
+    "node": ">=8.12.0"
   },
   "files": [
     "build/src/**/*.js",

diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json
@@ -5,6 +5,9 @@
   "author": "OpenTelemetry Authors",
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme",
   "license": "Apache-2.0",
+  "engines": {
+    "node": ">=8.12.0"
+  },
   "publishConfig": {
     "access": "public"
   },

diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json
@@ -5,6 +5,9 @@
   "author": "OpenTelemetry Authors",
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme",
   "license": "Apache-2.0",
+  "engines": {
+    "node": ">=8.12.0"
+  },
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/opentelemetry-browser-extension-autoinjection/package.json b/packages/opentelemetry-browser-extension-autoinjection/package.json
@@ -22,6 +22,9 @@
   "keywords": [],
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
+  "engines": {
+    "node": ">=8.12.0"
+  },
   "peerDependencies": {
     "@opentelemetry/api": "^1.0.2"
   },

diff --git a/packages/opentelemetry-host-metrics/package.json b/packages/opentelemetry-host-metrics/package.json
@@ -29,7 +29,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=8.5.0"
+    "node": ">=8.12.0"
   },
   "files": [
     "build/src/**/*.js",

diff --git a/packages/opentelemetry-id-generator-aws-xray/package.json b/packages/opentelemetry-id-generator-aws-xray/package.json
@@ -37,7 +37,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=8.5.0"
+    "node": ">=8.12.0"
   },
   "files": [
     "build/esm/**/*.js",

diff --git a/packages/opentelemetry-propagation-utils/package.json b/packages/opentelemetry-propagation-utils/package.json
@@ -31,6 +31,9 @@
   ],
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
+  "engines": {
+    "node": ">=8.12.0"
+  },
   "bugs": {
     "url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues"
   },

diff --git a/packages/opentelemetry-test-utils/package.json b/packages/opentelemetry-test-utils/package.json
@@ -30,6 +30,9 @@
   ],
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
+  "engines": {
+    "node": ">=8.12.0"
+  },
   "bugs": {
     "url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues"
   },

diff --git a/plugins/node/instrumentation-amqplib/package.json b/plugins/node/instrumentation-amqplib/package.json
@@ -72,4 +72,4 @@
   "engines": {
     "node": ">=10.0.0"
   }
-}
+}
diff --git a/plugins/node/instrumentation-fs/package.json b/plugins/node/instrumentation-fs/package.json
@@ -28,7 +28,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=8.0.0"
+    "node": ">=8.12.0"
   },
   "files": [
     "build/src/**/*.js",

diff --git a/plugins/node/instrumentation-tedious/package.json b/plugins/node/instrumentation-tedious/package.json
@@ -33,7 +33,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=8.5.0"
+    "node": ">=10.0.0"
   },
   "files": [
     "build/src/**/*.js",

diff --git a/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json b/plugins/node/opentelemetry-instrumentation-aws-lambda/package.json
@@ -28,7 +28,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=8.5.0"
+    "node": ">=8.12.0"
   },
   "files": [
     "build/src/**/*.js",

diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json
@@ -77,6 +77,6 @@
     "typescript": "4.3.4"
   },
   "engines": {
-    "node": ">=12"
+    "node": ">=12.0.0"
   }
 }
diff --git a/plugins/node/opentelemetry-instrumentation-bunyan/package.json b/plugins/node/opentelemetry-instrumentation-bunyan/package.json
@@ -30,7 +30,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=8.5.0"
+    "node": ">=8.12.0"
   },
   "files": [
     "build/src/**/*.js",

diff --git a/plugins/node/opentelemetry-instrumentation-cassandra/package.json b/plugins/node/opentelemetry-instrumentation-cassandra/package.json
@@ -29,7 +29,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=8.5.0"
+    "node": ">=8.12.0"
   },
   "files": [
     "build/src/**/*.js",

diff --git a/plugins/node/opentelemetry-instrumentation-connect/package.json b/plugins/node/opentelemetry-instrumentation-connect/package.json
@@ -28,7 +28,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=8.5.0"
+    "node": ">=8.12.0"
   },
   "files": [
     "build/src/**/*.js",

diff --git a/plugins/node/opentelemetry-instrumentation-dns/package.json b/plugins/node/opentelemetry-instrumentation-dns/package.json
@@ -28,7 +28,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=8.0.0"
+    "node": ">=8.12.0"
   },
   "files": [
     "build/src/**/*.js",

diff --git a/plugins/node/opentelemetry-instrumentation-express/package.json b/plugins/node/opentelemetry-instrumentation-express/package.json
@@ -30,7 +30,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=8.5.0"
+    "node": ">=8.12.0"
   },
   "files": [
     "build/src/**/*.js",

diff --git a/plugins/node/opentelemetry-instrumentation-express/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-express/src/instrumentation.ts
@@ -101,9 +101,10 @@ export class ExpressInstrumentation extends InstrumentationBase<
         (moduleExports, moduleVersion) => {
           if (moduleExports === undefined) return;
           diag.debug(`Removing patch for express@${moduleVersion}`);
-          this._unwrap(moduleExports.Router.prototype, 'route');
-          this._unwrap(moduleExports.Router.prototype, 'use');
-          this._unwrap(moduleExports.application.prototype, 'use');
+          const routerProto = moduleExports.Router as unknown as express.Router;
+          this._unwrap(routerProto, 'route');
+          this._unwrap(routerProto, 'use');
+          this._unwrap(moduleExports.application, 'use');
         }
       ),
     ];

diff --git a/plugins/node/opentelemetry-instrumentation-express/test/express.test.ts b/plugins/node/opentelemetry-instrumentation-express/test/express.test.ts
@@ -56,20 +56,12 @@ describe('ExpressInstrumentation', () => {
   describe('Instrumenting normal get operations', () => {
     it('should create a child span for middlewares', async () => {
       const rootSpan = tracer.startSpan('rootSpan');
-      const app = express();
-      app.use((req, res, next) =>
-        context.with(trace.setSpan(context.active(), rootSpan), next)
-      );
-      app.use(express.json());
       const customMiddleware: express.RequestHandler = (req, res, next) => {
         for (let i = 0; i < 1000000; i++) {
           continue;
         }
         return next();
       };
-      app.use(customMiddleware);
-      const router = express.Router();
-      app.use('/toto', router);
       let finishListenerCount: number | undefined;
       const { server, port } = await serverWithMiddleware(
         tracer,
@@ -289,22 +281,30 @@ describe('ExpressInstrumentation', () => {
 
   describe('Disabling plugin', () => {
     it('should not create new spans', async () => {
+      instrumentation.disable();
       const rootSpan = tracer.startSpan('rootSpan');
-      const app = express();
-      app.use(express.json());
-      app.use((req, res, next) => {
-        for (let i = 0; i < 1000; i++) {
-          continue;
+      const { server, port } = await serverWithMiddleware(
+        tracer,
+        rootSpan,
+        app => {
+          app.use(express.json());
+          const customMiddleware: express.RequestHandler = (req, res, next) => {
+            for (let i = 0; i < 1000; i++) {
+              continue;
+            }
+            return next();
+          };
+          app.use(customMiddleware);
         }
-        return next();
-      });
-      const { server, port } = await createServer(app);
+      );
       assert.strictEqual(memoryExporter.getFinishedSpans().length, 0);
       await context.with(
         trace.setSpan(context.active(), rootSpan),
         async () => {
           await httpRequest.get(`http://localhost:${port}/toto/tata`);
           rootSpan.end();
+          // There should be exactly one span, and it should be the root span.
+          // There should not be any spans from the Express instrumentation.
           assert.deepEqual(memoryExporter.getFinishedSpans().length, 1);
           assert.notStrictEqual(
             memoryExporter.getFinishedSpans()[0],

diff --git a/plugins/node/opentelemetry-instrumentation-fastify/package.json b/plugins/node/opentelemetry-instrumentation-fastify/package.json
@@ -28,7 +28,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=8.5.0"
+    "node": ">=8.12.0"
   },
   "files": [
     "build/src/**/*.js",

diff --git a/plugins/node/opentelemetry-instrumentation-generic-pool/package.json b/plugins/node/opentelemetry-instrumentation-generic-pool/package.json
@@ -28,7 +28,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=8.5.0"
+    "node": ">=8.12.0"
   },
   "files": [
     "build/src/**/*.js",

diff --git a/plugins/node/opentelemetry-instrumentation-graphql/package.json b/plugins/node/opentelemetry-instrumentation-graphql/package.json
@@ -30,7 +30,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=8.5.0"
+    "node": ">=8.12.0"
   },
   "files": [
     "build/src/**/*.js",

diff --git a/plugins/node/opentelemetry-instrumentation-hapi/package.json b/plugins/node/opentelemetry-instrumentation-hapi/package.json
@@ -28,7 +28,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=8.0.0"
+    "node": ">=8.12.0"
   },
   "files": [
     "build/src/**/*.js",

diff --git a/plugins/node/opentelemetry-instrumentation-ioredis/package.json b/plugins/node/opentelemetry-instrumentation-ioredis/package.json
@@ -33,7 +33,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=8.0.0"
+    "node": ">=8.12.0"
   },
   "files": [
     "build/src/**/*.js",

diff --git a/plugins/node/opentelemetry-instrumentation-knex/package.json b/plugins/node/opentelemetry-instrumentation-knex/package.json
@@ -28,7 +28,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=8.5.0"
+    "node": ">=8.12.0"
   },
   "files": [
     "build/src/**/*.js",

diff --git a/plugins/node/opentelemetry-instrumentation-koa/package.json b/plugins/node/opentelemetry-instrumentation-koa/package.json
@@ -31,7 +31,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=8.0.0"
+    "node": ">=8.12.0"
   },
   "files": [
     "build/src/**/*.js",

diff --git a/plugins/node/opentelemetry-instrumentation-memcached/package.json b/plugins/node/opentelemetry-instrumentation-memcached/package.json
@@ -30,7 +30,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=8.0.0"
+    "node": ">=8.12.0"
   },
   "files": [
     "build/src/**/*.js",

diff --git a/plugins/node/opentelemetry-instrumentation-mongodb/package.json b/plugins/node/opentelemetry-instrumentation-mongodb/package.json
@@ -32,7 +32,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=12"
+    "node": ">=12.0.0"
   },
   "files": [
     "build/src/**/*.js",