Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-con…

…trib into chore-1473-main-codecov
open-telemetry · Jul 19, 2023 · d78dc7c · d78dc7c
2 parents b7bdf09 + 82267ab
commit d78dc7c
Show file tree

Hide file tree

Showing 78 changed files with 1,506 additions and 66 deletions.
diff --git a/.github/component_owners.yml b/.github/component_owners.yml
@@ -38,6 +38,8 @@ components:
  - blumamir
  plugins/node/instrumentation-amqplib:
  - blumamir
+ plugins/node/instrumentation-cucumber:
+ - Ugzuzg
  plugins/node/instrumentation-dataloader:
  - henrinormak
  plugins/node/instrumentation-fs:

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1 +1 @@
-{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.28.0","detectors/node/opentelemetry-resource-detector-aws":"1.3.0","detectors/node/opentelemetry-resource-detector-container":"0.3.0","detectors/node/opentelemetry-resource-detector-gcp":"0.29.0","detectors/node/opentelemetry-resource-detector-github":"0.28.0","detectors/node/opentelemetry-resource-detector-instana":"0.5.0","metapackages/auto-instrumentations-node":"0.38.0","metapackages/auto-instrumentations-web":"0.33.0","packages/opentelemetry-host-metrics":"0.33.0","packages/opentelemetry-id-generator-aws-xray":"1.2.0","packages/opentelemetry-propagation-utils":"0.30.0","packages/opentelemetry-redis-common":"0.36.0","packages/opentelemetry-sql-common":"0.40.0","packages/opentelemetry-test-utils":"0.34.0","plugins/node/instrumentation-amqplib":"0.33.0","plugins/node/instrumentation-dataloader":"0.5.0","plugins/node/instrumentation-fs":"0.8.0","plugins/node/instrumentation-lru-memoizer":"0.33.0","plugins/node/instrumentation-mongoose":"0.33.0","plugins/node/instrumentation-socket.io":"0.34.0","plugins/node/instrumentation-tedious":"0.6.0","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.36.0","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.35.0","plugins/node/opentelemetry-instrumentation-bunyan":"0.32.0","plugins/node/opentelemetry-instrumentation-cassandra":"0.33.0","plugins/node/opentelemetry-instrumentation-connect":"0.32.0","plugins/node/opentelemetry-instrumentation-dns":"0.32.0","plugins/node/opentelemetry-instrumentation-express":"0.33.0","plugins/node/opentelemetry-instrumentation-fastify":"0.32.0","plugins/node/opentelemetry-instrumentation-generic-pool":"0.32.0","plugins/node/opentelemetry-instrumentation-graphql":"0.35.0","plugins/node/opentelemetry-instrumentation-hapi":"0.32.0","plugins/node/opentelemetry-instrumentation-ioredis":"0.35.0","plugins/node/opentelemetry-instrumentation-knex":"0.32.0","plugins/node/opentelemetry-instrumentation-koa":"0.35.0","plugins/node/opentelemetry-instrumentation-memcached":"0.32.0","plugins/node/opentelemetry-instrumentation-mongodb":"0.36.0","plugins/node/opentelemetry-instrumentation-mysql":"0.34.0","plugins/node/opentelemetry-instrumentation-mysql2":"0.34.0","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.33.0","plugins/node/opentelemetry-instrumentation-net":"0.32.0","plugins/node/opentelemetry-instrumentation-pg":"0.36.0","plugins/node/opentelemetry-instrumentation-pino":"0.34.0","plugins/node/opentelemetry-instrumentation-redis":"0.35.0","plugins/node/opentelemetry-instrumentation-redis-4":"0.35.0","plugins/node/opentelemetry-instrumentation-restify":"0.33.0","plugins/node/opentelemetry-instrumentation-router":"0.33.0","plugins/node/opentelemetry-instrumentation-winston":"0.32.0","plugins/web/opentelemetry-instrumentation-document-load":"0.33.0","plugins/web/opentelemetry-instrumentation-long-task":"0.33.0","plugins/web/opentelemetry-instrumentation-user-interaction":"0.33.0","plugins/web/opentelemetry-plugin-react-load":"0.29.0","propagators/opentelemetry-propagator-aws-xray":"1.3.0","propagators/opentelemetry-propagator-grpc-census-binary":"0.27.0","propagators/opentelemetry-propagator-instana":"0.3.0","propagators/opentelemetry-propagator-ot-trace":"0.27.0"}
+{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.28.0","detectors/node/opentelemetry-resource-detector-aws":"1.3.0","detectors/node/opentelemetry-resource-detector-container":"0.3.0","detectors/node/opentelemetry-resource-detector-gcp":"0.29.0","detectors/node/opentelemetry-resource-detector-github":"0.28.0","detectors/node/opentelemetry-resource-detector-instana":"0.5.0","metapackages/auto-instrumentations-node":"0.38.0","metapackages/auto-instrumentations-web":"0.33.0","packages/opentelemetry-host-metrics":"0.33.0","packages/opentelemetry-id-generator-aws-xray":"1.2.0","packages/opentelemetry-propagation-utils":"0.30.0","packages/opentelemetry-redis-common":"0.36.0","packages/opentelemetry-sql-common":"0.40.0","packages/opentelemetry-test-utils":"0.34.0","plugins/node/instrumentation-amqplib":"0.33.0","plugins/node/instrumentation-cucumber":"0.0.1","plugins/node/instrumentation-dataloader":"0.5.0","plugins/node/instrumentation-fs":"0.8.0","plugins/node/instrumentation-lru-memoizer":"0.33.0","plugins/node/instrumentation-mongoose":"0.33.0","plugins/node/instrumentation-socket.io":"0.34.0","plugins/node/instrumentation-tedious":"0.6.0","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.36.0","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.35.0","plugins/node/opentelemetry-instrumentation-bunyan":"0.32.0","plugins/node/opentelemetry-instrumentation-cassandra":"0.33.0","plugins/node/opentelemetry-instrumentation-connect":"0.32.0","plugins/node/opentelemetry-instrumentation-dns":"0.32.0","plugins/node/opentelemetry-instrumentation-express":"0.33.0","plugins/node/opentelemetry-instrumentation-fastify":"0.32.0","plugins/node/opentelemetry-instrumentation-generic-pool":"0.32.0","plugins/node/opentelemetry-instrumentation-graphql":"0.35.0","plugins/node/opentelemetry-instrumentation-hapi":"0.32.0","plugins/node/opentelemetry-instrumentation-ioredis":"0.35.0","plugins/node/opentelemetry-instrumentation-knex":"0.32.0","plugins/node/opentelemetry-instrumentation-koa":"0.35.0","plugins/node/opentelemetry-instrumentation-memcached":"0.32.0","plugins/node/opentelemetry-instrumentation-mongodb":"0.36.0","plugins/node/opentelemetry-instrumentation-mysql":"0.34.0","plugins/node/opentelemetry-instrumentation-mysql2":"0.34.0","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.33.0","plugins/node/opentelemetry-instrumentation-net":"0.32.0","plugins/node/opentelemetry-instrumentation-pg":"0.36.0","plugins/node/opentelemetry-instrumentation-pino":"0.34.0","plugins/node/opentelemetry-instrumentation-redis":"0.35.0","plugins/node/opentelemetry-instrumentation-redis-4":"0.35.0","plugins/node/opentelemetry-instrumentation-restify":"0.33.0","plugins/node/opentelemetry-instrumentation-router":"0.33.0","plugins/node/opentelemetry-instrumentation-winston":"0.32.0","plugins/web/opentelemetry-instrumentation-document-load":"0.33.0","plugins/web/opentelemetry-instrumentation-long-task":"0.33.0","plugins/web/opentelemetry-instrumentation-user-interaction":"0.33.0","plugins/web/opentelemetry-plugin-react-load":"0.29.0","propagators/opentelemetry-propagator-aws-xray":"1.3.0","propagators/opentelemetry-propagator-grpc-census-binary":"0.27.0","propagators/opentelemetry-propagator-instana":"0.3.0","propagators/opentelemetry-propagator-ot-trace":"0.27.0"}
diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json
@@ -45,7 +45,7 @@
  "@opentelemetry/api": "^1.0.0",
  "@opentelemetry/contrib-test-utils": "^0.34.0",
  "@types/mocha": "8.2.3",
- "@types/node": "18.11.7",
+ "@types/node": "18.16.19",
  "@types/sinon": "10.0.2",
  "mocha": "7.2.0",
  "nock": "13.3.1",

diff --git a/detectors/node/opentelemetry-resource-detector-aws/package.json b/detectors/node/opentelemetry-resource-detector-aws/package.json
@@ -44,10 +44,10 @@
  "@opentelemetry/api": "^1.0.0",
  "@opentelemetry/contrib-test-utils": "^0.34.0",
  "@types/mocha": "8.2.3",
- "@types/node": "18.11.7",
+ "@types/node": "18.16.19",
  "@types/sinon": "10.0.2",
  "mocha": "7.2.0",
- "nock": "12.0.3",
+ "nock": "13.3.2",
  "nyc": "15.1.0",
  "rimraf": "5.0.0",
  "sinon": "15.0.1",

diff --git a/detectors/node/opentelemetry-resource-detector-container/package.json b/detectors/node/opentelemetry-resource-detector-container/package.json
@@ -42,7 +42,7 @@
  "@types/sinon": "10.0.2",
  "eslint-plugin-header": "^3.1.1",
  "mocha": "7.2.0",
- "nock": "12.0.3",
+ "nock": "13.3.2",
  "nyc": "15.1.0",
  "rimraf": "5.0.0",
  "sinon": "15.0.1",

diff --git a/detectors/node/opentelemetry-resource-detector-gcp/package.json b/detectors/node/opentelemetry-resource-detector-gcp/package.json
@@ -44,10 +44,10 @@
  "@opentelemetry/api": "^1.0.0",
  "@opentelemetry/contrib-test-utils": "^0.34.0",
  "@types/mocha": "8.2.3",
- "@types/node": "18.11.7",
+ "@types/node": "18.16.19",
  "@types/semver": "7.5.0",
  "mocha": "7.2.0",
- "nock": "12.0.3",
+ "nock": "13.3.2",
  "nyc": "15.1.0",
  "rimraf": "5.0.0",
  "ts-mocha": "10.0.0",

diff --git a/detectors/node/opentelemetry-resource-detector-github/package.json b/detectors/node/opentelemetry-resource-detector-github/package.json
@@ -47,7 +47,7 @@
  "devDependencies": {
  "@opentelemetry/api": "^1.0.0",
  "@types/mocha": "8.2.3",
- "@types/node": "18.11.7",
+ "@types/node": "18.16.19",
  "@types/sinon": "10.0.2",
  "mocha": "7.2.0",
  "nyc": "15.1.0",

diff --git a/detectors/node/opentelemetry-resource-detector-instana/package.json b/detectors/node/opentelemetry-resource-detector-instana/package.json
@@ -43,10 +43,10 @@
  "@opentelemetry/contrib-test-utils": "^0.34.0",
  "@opentelemetry/sdk-node": "^0.41.0",
  "@types/mocha": "8.2.3",
- "@types/node": "18.11.7",
+ "@types/node": "18.16.19",
  "@types/semver": "7.5.0",
  "mocha": "7.2.0",
- "nock": "12.0.3",
+ "nock": "13.3.2",
  "nyc": "15.1.0",
  "rimraf": "5.0.0",
  "ts-mocha": "10.0.0",

diff --git a/...rs/node/opentelemetry-resource-detector-instana/test/InstanaAgentDetectorUnitTest.test.ts b/...rs/node/opentelemetry-resource-detector-instana/test/InstanaAgentDetectorUnitTest.test.ts
@@ -65,7 +65,7 @@ describe('[UNIT] instanaAgentDetector', () => {
  });
 
  it('should return agent resource with env variables', async () => {
- process.env.INSTANA_AGENT_PORT = '88866';
+ process.env.INSTANA_AGENT_PORT = '56001';
  process.env.INSTANA_AGENT_HOST = 'instanaagent';
 
  const mockedReply = {
@@ -108,12 +108,14 @@ describe('[UNIT] instanaAgentDetector', () => {
  });
 
  it('agent timeout', async () => {
- process.env.INSTANA_AGENT_PORT = '878787';
+ process.env.INSTANA_AGENT_PORT = '56002';
  process.env.INSTANA_AGENT_HOST = 'instanaagent';
  process.env.INSTANA_AGENT_TIMEOUT_MS = '200';
  const expectedError = new Error('Instana Agent request timed out.');
 
- nock('http://instanaagent:878787')
+ nock(
+ `http://${process.env.INSTANA_AGENT_HOST}:${process.env.INSTANA_AGENT_PORT}`
+ )
  .persist()
  .put('/com.instana.plugin.nodejs.discovery')
  .delay(500)

diff --git a/metapackages/auto-instrumentations-node/README.md b/metapackages/auto-instrumentations-node/README.md
@@ -140,6 +140,7 @@ registerInstrumentations({
 - [@opentelemetry/instrumentation-bunyan](https:/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-bunyan)
 - [@opentelemetry/instrumentation-cassandra-driver](https:/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-cassandra)
 - [@opentelemetry/instrumentation-connect](https:/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-connect)
+- [@opentelemetry/instrumentation-cucumber](https:/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-cucumber)
 - [@opentelemetry/instrumentation-dataloader](https:/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-dataloader)
 - [@opentelemetry/instrumentation-dns](https:/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-dns)
 - [@opentelemetry/instrumentation-express](https:/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-express)

diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json
@@ -39,7 +39,7 @@
  "devDependencies": {
  "@opentelemetry/api": "^1.4.1",
  "@types/mocha": "7.0.2",
- "@types/node": "18.11.7",
+ "@types/node": "18.16.19",
  "@types/sinon": "10.0.2",
  "mocha": "7.2.0",
  "nyc": "15.1.0",
@@ -56,6 +56,7 @@
  "@opentelemetry/instrumentation-bunyan": "^0.32.0",
  "@opentelemetry/instrumentation-cassandra-driver": "^0.33.0",
  "@opentelemetry/instrumentation-connect": "^0.32.0",
+ "@opentelemetry/instrumentation-cucumber": "^0.0.1",
  "@opentelemetry/instrumentation-dataloader": "^0.5.0",
  "@opentelemetry/instrumentation-dns": "^0.32.0",
  "@opentelemetry/instrumentation-express": "^0.33.0",

diff --git a/metapackages/auto-instrumentations-node/src/utils.ts b/metapackages/auto-instrumentations-node/src/utils.ts
@@ -23,6 +23,7 @@ import { AwsInstrumentation } from '@opentelemetry/instrumentation-aws-sdk';
 import { BunyanInstrumentation } from '@opentelemetry/instrumentation-bunyan';
 import { CassandraDriverInstrumentation } from '@opentelemetry/instrumentation-cassandra-driver';
 import { ConnectInstrumentation } from '@opentelemetry/instrumentation-connect';
+import { CucumberInstrumentation } from '@opentelemetry/instrumentation-cucumber';
 import { DataloaderInstrumentation } from '@opentelemetry/instrumentation-dataloader';
 import { DnsInstrumentation } from '@opentelemetry/instrumentation-dns';
 import { ExpressInstrumentation } from '@opentelemetry/instrumentation-express';
@@ -90,6 +91,7 @@ const InstrumentationMap = {
  '@opentelemetry/instrumentation-cassandra-driver':
  CassandraDriverInstrumentation,
  '@opentelemetry/instrumentation-connect': ConnectInstrumentation,
+ '@opentelemetry/instrumentation-cucumber': CucumberInstrumentation,
  '@opentelemetry/instrumentation-dataloader': DataloaderInstrumentation,
  '@opentelemetry/instrumentation-dns': DnsInstrumentation,
  '@opentelemetry/instrumentation-express': ExpressInstrumentation,

diff --git a/metapackages/auto-instrumentations-web/package.json b/metapackages/auto-instrumentations-web/package.json
@@ -36,7 +36,7 @@
  "@babel/core": "7.15.0",
  "@opentelemetry/api": "^1.3.0",
  "@types/mocha": "8.2.3",
- "@types/node": "18.11.7",
+ "@types/node": "18.16.19",
  "@types/sinon": "10.0.2",
  "@types/webpack-env": "1.16.2",
  "babel-loader": "8.2.2",

diff --git a/packages/opentelemetry-host-metrics/package.json b/packages/opentelemetry-host-metrics/package.json
@@ -48,7 +48,7 @@
  "devDependencies": {
  "@opentelemetry/api": "^1.3.0",
  "@types/mocha": "8.2.3",
- "@types/node": "18.11.7",
+ "@types/node": "18.16.19",
  "@types/sinon": "10.0.2",
  "mocha": "7.2.0",
  "nyc": "15.1.0",

diff --git a/packages/opentelemetry-id-generator-aws-xray/package.json b/packages/opentelemetry-id-generator-aws-xray/package.json
@@ -56,7 +56,7 @@
  "devDependencies": {
  "@opentelemetry/api": "^1.0.0",
  "@types/mocha": "8.2.3",
- "@types/node": "18.11.7",
+ "@types/node": "18.16.19",
  "@types/sinon": "10.0.2",
  "@types/webpack-env": "1.16.2",
  "@jsdevtools/coverage-istanbul-loader": "3.0.5",

diff --git a/packages/opentelemetry-propagation-utils/package.json b/packages/opentelemetry-propagation-utils/package.json
@@ -47,7 +47,7 @@
  "@opentelemetry/api": "^1.0.0",
  "@opentelemetry/contrib-test-utils": "^0.34.0",
  "@types/mocha": "^9.1.1",
- "@types/node": "18.11.7",
+ "@types/node": "18.16.19",
  "@types/sinon": "^10.0.11",
  "expect": "29.2.0",
  "mocha": "7.2.0",

diff --git a/packages/opentelemetry-redis-common/package.json b/packages/opentelemetry-redis-common/package.json
@@ -40,7 +40,7 @@
  "homepage": "https:/open-telemetry/opentelemetry-js-contrib/tree/main/packages/redis-common#readme",
  "devDependencies": {
  "@types/mocha": "^9.1.1",
- "@types/node": "18.11.7",
+ "@types/node": "18.16.19",
  "mocha": "7.2.0",
  "nyc": "15.1.0",
  "ts-mocha": "10.0.0",

diff --git a/packages/opentelemetry-sampler-aws-xray/package.json b/packages/opentelemetry-sampler-aws-xray/package.json
@@ -54,12 +54,12 @@
  "@opentelemetry/api": "^1.3.0",
  "@opentelemetry/contrib-test-utils": "^0.34.0",
  "@types/mocha": "8.2.3",
- "@types/node": "18.11.7",
+ "@types/node": "18.16.19",
  "@types/sinon": "10.0.6",
  "eslint": "8.7.0",
  "expect": "29.2.0",
  "mocha": "7.2.0",
- "nock": "13.2.1",
+ "nock": "13.3.2",
  "sinon": "15.0.1",
  "ts-mocha": "10.0.0",
  "nyc": "15.1.0",

diff --git a/packages/opentelemetry-sql-common/package.json b/packages/opentelemetry-sql-common/package.json
@@ -48,7 +48,7 @@
  "devDependencies": {
  "@opentelemetry/api": "^1.1.0",
  "@types/mocha": "^7.0.2",
- "@types/node": "18.11.7",
+ "@types/node": "18.16.19",
  "mocha": "7.2.0",
  "nyc": "15.1.0",
  "ts-mocha": "10.0.0",

diff --git a/packages/opentelemetry-test-utils/package.json b/packages/opentelemetry-test-utils/package.json
@@ -42,7 +42,7 @@
  },
  "devDependencies": {
  "@opentelemetry/api": "^1.3.0",
- "@types/node": "18.11.7",
+ "@types/node": "18.16.19",
  "typescript": "4.4.4"
  },
  "dependencies": {

diff --git a/plugins/node/instrumentation-amqplib/package.json b/plugins/node/instrumentation-amqplib/package.json
@@ -58,7 +58,7 @@
  "@types/lodash": "4.14.178",
  "@types/mocha": "8.2.3",
  "@types/sinon": "10.0.2",
- "@types/node": "18.11.7",
+ "@types/node": "18.16.19",
  "amqplib": "0.8.0",
  "expect": "29.2.0",
  "lodash": "4.17.21",

diff --git a/plugins/node/instrumentation-cucumber/.eslintignore b/plugins/node/instrumentation-cucumber/.eslintignore
@@ -0,0 +1 @@
+build
diff --git a/plugins/node/instrumentation-cucumber/.eslintrc.js b/plugins/node/instrumentation-cucumber/.eslintrc.js
@@ -0,0 +1,7 @@
+module.exports = {
+ "env": {
+ "mocha": true,
+ "node": true
+ },
+ ...require('../../../eslint.config.js')
+}
diff --git a/plugins/node/instrumentation-cucumber/.npmignore b/plugins/node/instrumentation-cucumber/.npmignore
@@ -0,0 +1,4 @@
+/bin
+/coverage
+/doc
+/test
diff --git a/plugins/node/instrumentation-cucumber/.tav.yml b/plugins/node/instrumentation-cucumber/.tav.yml
@@ -0,0 +1,3 @@
+'@cucumber/cucumber':
+ versions: '^8.0.0 || ^9.0.0'
+ commands: npm test