Merge pull request open-telemetry#164 from opentelemetrybot/opentelem…

…etrybot/merge-main [AutoMerge][Main] Merging staged change(s) to main
opentelemetrybot · Aug 15, 2023 · cc4ac29 · cc4ac29
2 parents 1e78ccb + 74bc904
commit cc4ac29
Show file tree

Hide file tree

Showing 411 changed files with 11,930 additions and 4,890 deletions.
diff --git a/auto-merge/contrib/.github/component_owners.yml b/auto-merge/contrib/.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:
@@ -109,7 +111,8 @@ components:
   plugins/node/opentelemetry-instrumentation-winston:
     - seemk
   plugins/web/opentelemetry-instrumentation-document-load:
-    - obecny
+    - pkanal
+    - martinkuba 
   plugins/web/opentelemetry-instrumentation-long-task:
     - mhennoch
     - t2t2

diff --git a/auto-merge/contrib/.github/workflows/peer-api.yaml b/auto-merge/contrib/.github/workflows/peer-api.yaml
@@ -15,11 +15,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Install lerna
-        run: npm install -g lerna@5.5.2
-
       - name: Install script dependencies
         run: npm install
 
       - name: Check API dependency semantics
-        run: lerna exec "node \$LERNA_ROOT_PATH/scripts/peer-api-check.js"
+        run: npx lerna exec "node \$LERNA_ROOT_PATH/scripts/peer-api-check.js"
diff --git a/auto-merge/contrib/.github/workflows/test-all-versions.yml b/auto-merge/contrib/.github/workflows/test-all-versions.yml
@@ -19,12 +19,6 @@ jobs:
       fail-fast: false
       matrix:
         node: ["14", "16", "18"]
-        include:
-          - node: "18"
-            lerna-extra-args: >-
-              --ignore @opentelemetry/instrumentation-fastify
-              --ignore @opentelemetry/instrumentation-restify
-              --ignore @opentelemetry/resource-detector-alibaba-cloud
     runs-on: ubuntu-latest
     services:
       mongo:
@@ -93,8 +87,9 @@ jobs:
       MONGODB_PORT: 27017
       MSSQL_PASSWORD: mssql_passw0rd
       MYSQL_DATABASE: otel_mysql_database
-      MYSQL_HOST: localhost
+      MYSQL_HOST: 127.0.0.1
       MYSQL_PASSWORD: secret
+      MYSQL_ROOT_PASSWORD: rootpw
       MYSQL_PORT: 3306
       MYSQL_USER: otel
       OPENTELEMETRY_REDIS_HOST: localhost
@@ -118,6 +113,8 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
+      - name: Set MySQL variables
+        run: mysql --user=root --password=${MYSQL_ROOT_PASSWORD} --host=${MYSQL_HOST} --port=${MYSQL_PORT} -e "SET GLOBAL log_output='TABLE'; SET GLOBAL general_log = 1;" mysql
       - name: Cache Dependencies
         uses: actions/cache@v3
         with:
@@ -143,6 +140,6 @@ jobs:
       - name: Install Root Dependencies
         run: npm install --ignore-scripts
       - name: Bootstrap Dependencies
-        run: lerna bootstrap --no-ci --hoist --nohoist='zone.js' --nohoist='mocha' --nohoist='ts-mocha'
+        run: npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' --nohoist='mocha' --nohoist='ts-mocha'
       - name: Run test-all-versions
-        run: lerna run test-all-versions ${{ inputs.lerna-args }} ${{ matrix.lerna-extra-args }} --stream --concurrency 1
+        run: npx lerna run test-all-versions ${{ inputs.lerna-args }} ${{ matrix.lerna-extra-args }} --stream --concurrency 1
diff --git a/auto-merge/contrib/.github/workflows/unit-test.yml b/auto-merge/contrib/.github/workflows/unit-test.yml
@@ -11,15 +11,12 @@ jobs:
       matrix:
         node: ["14", "16", "18"]
         include:
-          - node: "18"
-            lerna-extra-args: >-
-              --ignore @opentelemetry/resource-detector-alibaba-cloud
-              --ignore @opentelemetry/instrumentation-fastify
-              --ignore @opentelemetry/instrumentation-restify
+            - node: 14
+              code-coverage: true
     runs-on: ubuntu-latest
     services:
       memcached:
-        image: memcached:1.6.9-alpine
+        image: memcached:1.6.21-alpine
         ports:
         - 11211:11211
       mongo:
@@ -101,8 +98,9 @@ jobs:
       MONGODB_PORT: 27017
       MSSQL_PASSWORD: mssql_passw0rd
       MYSQL_DATABASE: otel_mysql_database
-      MYSQL_HOST: localhost
+      MYSQL_HOST: 127.0.0.1
       MYSQL_PASSWORD: secret
+      MYSQL_ROOT_PASSWORD: rootpw
       MYSQL_PORT: 3306
       MYSQL_USER: otel
       OPENTELEMETRY_MEMCACHED_HOST: localhost
@@ -123,6 +121,8 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
+      - name: Set MySQL variables
+        run: mysql --user=root --password=${MYSQL_ROOT_PASSWORD} --host=${MYSQL_HOST} --port=${MYSQL_PORT} -e "SET GLOBAL log_output='TABLE'; SET GLOBAL general_log = 1;" mysql
       - name: Cache Dependencies
         uses: actions/cache@v3
         with:
@@ -149,12 +149,16 @@ jobs:
         run: npm install --ignore-scripts
       - name: Bootstrap Dependencies
         run: npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' --nohoist='mocha' --nohoist='ts-mocha'
-      - name: Unit tests
+      - name: Unit tests (Full)
+        if: matrix.code-coverage
+        run: npm run test -- ${{ matrix.lerna-extra-args }}
+      - name: Unit tests (Delta)
+        if: ${{ !matrix.code-coverage }}
         run: npm run test:ci:changed -- ${{ matrix.lerna-extra-args }}
       - name: Build examples
         run: npm run compile:examples
       - name: Report Coverage
-        if: matrix.node == '14'
+        if: ${{ matrix.code-coverage && !cancelled()}}
         uses: codecov/codecov-action@v3
         with:
           verbose: true

diff --git a/auto-merge/contrib/.release-please-manifest.json b/auto-merge/contrib/.release-please-manifest.json
@@ -1 +1 @@
-{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.27.7","detectors/node/opentelemetry-resource-detector-aws":"1.2.5","detectors/node/opentelemetry-resource-detector-container":"0.2.5","detectors/node/opentelemetry-resource-detector-gcp":"0.28.3","detectors/node/opentelemetry-resource-detector-github":"0.27.1","detectors/node/opentelemetry-resource-detector-instana":"0.4.4","metapackages/auto-instrumentations-node":"0.37.1","metapackages/auto-instrumentations-web":"0.32.3","packages/opentelemetry-host-metrics":"0.32.2","packages/opentelemetry-id-generator-aws-xray":"1.1.2","packages/opentelemetry-propagation-utils":"0.29.5","packages/opentelemetry-redis-common":"0.35.1","packages/opentelemetry-test-utils":"0.33.4","plugins/node/instrumentation-amqplib":"0.32.5","plugins/node/instrumentation-dataloader":"0.4.3","plugins/node/instrumentation-fs":"0.7.4","plugins/node/instrumentation-lru-memoizer":"0.32.4","plugins/node/instrumentation-mongoose":"0.32.4","plugins/node/instrumentation-socket.io":"0.33.4","plugins/node/instrumentation-tedious":"0.5.4","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.35.3","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.34.3","plugins/node/opentelemetry-instrumentation-bunyan":"0.31.4","plugins/node/opentelemetry-instrumentation-cassandra":"0.32.4","plugins/node/opentelemetry-instrumentation-connect":"0.31.4","plugins/node/opentelemetry-instrumentation-dns":"0.31.5","plugins/node/opentelemetry-instrumentation-express":"0.32.4","plugins/node/opentelemetry-instrumentation-fastify":"0.31.4","plugins/node/opentelemetry-instrumentation-generic-pool":"0.31.4","plugins/node/opentelemetry-instrumentation-graphql":"0.34.3","plugins/node/opentelemetry-instrumentation-hapi":"0.31.4","plugins/node/opentelemetry-instrumentation-ioredis":"0.34.3","plugins/node/opentelemetry-instrumentation-knex":"0.31.4","plugins/node/opentelemetry-instrumentation-koa":"0.34.6","plugins/node/opentelemetry-instrumentation-memcached":"0.31.4","plugins/node/opentelemetry-instrumentation-mongodb":"0.35.0","plugins/node/opentelemetry-instrumentation-mysql":"0.33.3","plugins/node/opentelemetry-instrumentation-mysql2":"0.33.4","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.32.5","plugins/node/opentelemetry-instrumentation-net":"0.31.4","plugins/node/opentelemetry-instrumentation-pg":"0.35.3","plugins/node/opentelemetry-instrumentation-pino":"0.33.4","plugins/node/opentelemetry-instrumentation-redis":"0.34.7","plugins/node/opentelemetry-instrumentation-redis-4":"0.34.6","plugins/node/opentelemetry-instrumentation-restify":"0.32.4","plugins/node/opentelemetry-instrumentation-router":"0.32.4","plugins/node/opentelemetry-instrumentation-winston":"0.31.4","plugins/web/opentelemetry-instrumentation-document-load":"0.32.3","plugins/web/opentelemetry-instrumentation-long-task":"0.32.5","plugins/web/opentelemetry-instrumentation-user-interaction":"0.32.4","plugins/web/opentelemetry-plugin-react-load":"0.28.2","propagators/opentelemetry-propagator-aws-xray":"1.2.1","propagators/opentelemetry-propagator-grpc-census-binary":"0.26.1","propagators/opentelemetry-propagator-instana":"0.2.2","propagators/opentelemetry-propagator-ot-trace":"0.26.3"}
+{"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/auto-merge/contrib/CONTRIBUTING.md b/auto-merge/contrib/CONTRIBUTING.md
@@ -87,10 +87,6 @@ The `opentelemetry-js-contrib` project is written in TypeScript.
 - `npm test` tests code the same way that our CI will test it.
 - `npm run lint:fix` lint (and maybe fix) any changes.
 
-### Generating API documentation
-
-- `npm run docs` to generate API documentation. Generates the documentation in `packages/opentelemetry-api/docs/out`
-
 ### Generating CHANGELOG documentation
 
 - `npm run changelog` to generate CHANGELOG documentation in your terminal (see [RELEASING.md](RELEASING.md) for more details).
@@ -117,6 +113,9 @@ A component may be **unreleased**, **experimental**, **beta**, **stable**, **unm
 With the exception of the stable status, it is up to each individual [component owner](#component-ownership) to determine the status of a component.
 A component may only be marked stable with the approval of a member of @open-telemetry/javascript-maintainers; see the definition of stable below for more details.
 
+A Pull Request modifying components in any stage of the lifecycle is subject to the
+[Pull Request Merge Requirements](#pull-request-merge-requirements).
+
 ### Unreleased
 
 Unreleased components are in active development and have not yet been released to NPM.
@@ -162,6 +161,33 @@ They may not work and there are no guarantees for fixes or new features.
 Their source files may be deleted from the repository.
 Any packages released from their source will be marked as deprecated in NPM.
 
+## Pull Request Merge Requirements
+
+Pull requests MAY be merged by an approver OR a maintainer provided they meet all the following requirements:
+
+- Approved by
+  - at least one component owner if one is defined in [.github/component_owners.yml](.github/component_owners.yml)
+  - OR one maintainer
+  - OR at least one approver who is not the approver merging the pull request
+    - A pull request for small (simple typo, URL, update docs, or grammatical fix) changes may be approved and merged by the same approver
+- No “changes requested” reviews or unresolved conversations by
+  - approvers
+  - maintainers
+  - technical committee members
+  - component owners
+  - subject-matter experts
+- New or changed functionality is tested by unit tests
+- New or changed functionality is documented if appropriate
+- Substantial changes should not be merged within 24 hours of opening in order to allow reviewers from all time zones to have a chance to review
+
+All requirements are at the discretion of the maintainers.
+Maintainers MAY merge pull requests which have not strictly met these requirements.
+Maintainers MAY close, block, or put on hold pull requests even if they have strictly met these requirements.
+
+If a PR has not been interacted with by a reviewer within one week, please ping the component
+owners as listed in [.github/component_owners.yml](.github/component_owners.yml), if component owners are unresponsive
+please ping ([@open-telemetry/javascript-approvers](https://github.com/orgs/open-telemetry/teams/javascript-approvers)).
+
 ## Contributing Vendor Components
 
 This repo is generally meant for hosting components that work with popular open-source frameworks and tools. However, it is also possible to contribute components specific to a 3rd party vendor in this repo.

diff --git a/...ntrib/detectors/node/opentelemetry-resource-detector-alibaba-cloud/CHANGELOG.md b/...ntrib/detectors/node/opentelemetry-resource-detector-alibaba-cloud/CHANGELOG.md
@@ -36,6 +36,20 @@
   * devDependencies
     * @opentelemetry/contrib-test-utils bumped from ^0.33.3 to ^0.33.4
 
+## [0.28.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.27.7...resource-detector-alibaba-cloud-v0.28.0) (2023-07-12)
+
+
+### Features
+
+* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * devDependencies
+    * @opentelemetry/contrib-test-utils bumped from ^0.33.4 to ^0.34.0
+
 ## [0.27.6](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.27.5...resource-detector-alibaba-cloud-v0.27.6) (2023-05-16)
 
 

diff --git a/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json b/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-alibaba-cloud",
-  "version": "0.27.7",
+  "version": "0.28.0",
   "description": "OpenTelemetry resource detector for Alibaba Cloud",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -43,14 +43,14 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/contrib-test-utils": "^0.33.4",
+    "@opentelemetry/contrib-test-utils": "^0.34.0",
     "@types/mocha": "8.2.3",
-    "@types/node": "18.11.7",
-    "@types/sinon": "10.0.2",
+    "@types/node": "18.16.19",
+    "@types/sinon": "10.0.16",
     "mocha": "7.2.0",
-    "nock": "12.0.3",
+    "nock": "13.3.2",
     "nyc": "15.1.0",
-    "rimraf": "5.0.0",
+    "rimraf": "5.0.1",
     "sinon": "15.0.1",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4"

diff --git a/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-aws/CHANGELOG.md b/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-aws/CHANGELOG.md
@@ -36,6 +36,21 @@
   * devDependencies
     * @opentelemetry/contrib-test-utils bumped from ^0.33.3 to ^0.33.4
 
+## [1.3.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.2.5...resource-detector-aws-v1.3.0) (2023-07-12)
+
+
+### Features
+
+* **aws-ecs:** add cloud resource attributes for fargate ([#1543](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1543)) ([de17f77](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/de17f77bd7f75fc2fc8a92d35dfcfbf749b50f71))
+* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * devDependencies
+    * @opentelemetry/contrib-test-utils bumped from ^0.33.4 to ^0.34.0
+
 ## [1.2.4](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.2.3...resource-detector-aws-v1.2.4) (2023-05-16)
 
 

diff --git a/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-aws/package.json b/auto-merge/contrib/detectors/node/opentelemetry-resource-detector-aws/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-aws",
-  "version": "1.2.5",
+  "version": "1.3.0",
   "description": "OpenTelemetry SDK resource detector for AWS",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -42,14 +42,14 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/contrib-test-utils": "^0.33.4",
+    "@opentelemetry/contrib-test-utils": "^0.34.0",
     "@types/mocha": "8.2.3",
-    "@types/node": "18.11.7",
-    "@types/sinon": "10.0.2",
+    "@types/node": "18.16.19",
+    "@types/sinon": "10.0.16",
     "mocha": "7.2.0",
-    "nock": "12.0.3",
+    "nock": "13.3.2",
     "nyc": "15.1.0",
-    "rimraf": "5.0.0",
+    "rimraf": "5.0.1",
     "sinon": "15.0.1",
     "ts-mocha": "10.0.0",
     "typescript": "4.4.4"