Merge branch 'main' into pino-keys

.github/component_owners.yml

@@ -121,8 +121,8 @@ components:
     - t2t2
   plugins/web/opentelemetry-instrumentation-user-interaction:
     - obecny
-  plugins/web/opentelemetry-plugin-react-load: []
-    # Unmaintained?
+  plugins/web/opentelemetry-plugin-react-load:
+    - martinkuba
   propagators/opentelemetry-propagator-aws-xray:
     - carolabadeer
   propagators/opentelemetry-propagator-grpc-census-binary: []

.github/workflows/close-stale.yml

@@ -7,7 +7,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@v9
         with:
           days-before-stale: 60
           days-before-close: 14
@@ -17,5 +17,6 @@ jobs:
           close-pr-message: 'This PR was closed because it has been stale for 14 days with no activity.'
           stale-issue-label: stale
           stale-pr-label: stale
-          exempt-issue-labels: never-stale,instrumentation-request,bug
+          exempt-issue-labels: never-stale
           exempt-pr-labels: never-stale
+          any-of-labels: information-requested

.github/workflows/codeql-analysis.yml

@@ -24,12 +24,12 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: javascript
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+        uses: github/codeql-action/autobuild@v3
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3

.github/workflows/test-all-versions.pr.yml

@@ -16,22 +16,19 @@ jobs:
     env:
       PR_LABELS: ${{ toJSON(github.event.pull_request.labels.*.name) }}
     outputs:
-      args: ${{ steps.lerna-args.outputs.args }}
+      args: ${{ steps.npm-workspace-args.outputs.args }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        # Need lerna to list all packages
-      - name: Install lerna
-        run: npm install -g [email protected]
-      - name: Parse labels into lerna scope arguments
-        id: lerna-args
+      - name: Parse labels into npm workspace arguments
+        id: npm-workspace-args
         run: |
-          OUTPUT=`node scripts/parse-lerna-scopes.mjs "$PR_LABELS"`
+          OUTPUT=`node scripts/pr-labels-to-npm-workspace-args.mjs "$PR_LABELS"`
           echo "args=$OUTPUT" >> $GITHUB_OUTPUT
 
   tav:
     uses: ./.github/workflows/test-all-versions.yml
     needs: parse-labels
     with:
-      lerna-args: ${{ needs.parse-labels.outputs.args }}
+      npm-workspace-args: ${{ needs.parse-labels.outputs.args }}
     if: ${{ needs.parse-labels.outputs.args != '' }}

.github/workflows/test-all-versions.push.yml

@@ -10,4 +10,4 @@ jobs:
   tav:
     uses: ./.github/workflows/test-all-versions.yml
     with:
-      lerna-args: ""
+      npm-workspace-args: ""

.github/workflows/test-all-versions.yml

@@ -4,11 +4,11 @@ on:
     - cron: "30 4 * * *"
   workflow_dispatch:
     inputs:
-      lerna-args:
+      npm-workspace-args:
         type: string
   workflow_call:
     inputs:
-      lerna-args:
+      npm-workspace-args:
         required: true
         type: string
 
@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ["14", "16", "18"]
+        node: ["14", "16", "18.18.2"]
     runs-on: ubuntu-latest
     services:
       mongo:
@@ -115,9 +115,6 @@ jobs:
           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: Legacy Peer Dependencies for npm 7
-        if: matrix.node == '16'
-        run: npm config set legacy-peer-deps=true
       - name: Update npm to a version that supports workspaces (v7 or later)
         if: ${{ matrix.node < 16 }}
         run: npm install -g npm@9 # npm@9 supports node >=14.17.0
@@ -126,4 +123,4 @@ jobs:
       - name: Build
         run: npm run compile
       - name: Run test-all-versions
-        run: npx lerna run test-all-versions ${{ inputs.lerna-args }} ${{ matrix.lerna-extra-args }} --stream --concurrency 1
+        run: npm run --if-present --workspaces test-all-versions ${{ inputs.npm-workspace-args }}

.github/workflows/unit-test.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ["14", "16", "18"]
+        node: ["14", "16", "18.18.2"]
         include:
             - node: 14
               code-coverage: true
@@ -123,9 +123,6 @@ jobs:
           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: Legacy Peer Dependencies for npm 7
-        if: matrix.node == '16'
-        run: npm config set legacy-peer-deps=true
       - name: Update npm to a version that supports workspaces (v7 or later)
         if: ${{ matrix.node < 16 }}
         run: npm install -g npm@9 # npm@9 supports node >=14.17.0
@@ -135,10 +132,10 @@ jobs:
         run: npm run compile
       - name: Unit tests (Full)
         if: matrix.code-coverage
-        run: npm run test -- ${{ matrix.lerna-extra-args }}
+        run: npm run test
       - name: Unit tests (Delta)
         if: ${{ !matrix.code-coverage }}
-        run: npm run test:ci:changed -- ${{ matrix.lerna-extra-args }}
+        run: npm run test:ci:changed
       - name: Build examples
         run: npm run compile:examples
       - name: Report Coverage

.release-please-manifest.json

@@ -1 +1 @@
-{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.28.4","detectors/node/opentelemetry-resource-detector-aws":"1.3.4","detectors/node/opentelemetry-resource-detector-azure":"0.2.1","detectors/node/opentelemetry-resource-detector-container":"0.3.4","detectors/node/opentelemetry-resource-detector-gcp":"0.29.4","detectors/node/opentelemetry-resource-detector-github":"0.28.1","detectors/node/opentelemetry-resource-detector-instana":"0.5.4","metapackages/auto-instrumentations-node":"0.40.1","metapackages/auto-instrumentations-web":"0.34.0","packages/opentelemetry-host-metrics":"0.33.2","packages/opentelemetry-id-generator-aws-xray":"1.2.1","packages/opentelemetry-propagation-utils":"0.30.4","packages/opentelemetry-redis-common":"0.36.1","packages/opentelemetry-sql-common":"0.40.0","packages/opentelemetry-test-utils":"0.35.0","plugins/node/instrumentation-amqplib":"0.33.4","plugins/node/instrumentation-cucumber":"0.1.2","plugins/node/instrumentation-dataloader":"0.5.3","plugins/node/instrumentation-fs":"0.8.3","plugins/node/instrumentation-lru-memoizer":"0.33.4","plugins/node/instrumentation-mongoose":"0.33.4","plugins/node/instrumentation-socket.io":"0.34.4","plugins/node/instrumentation-tedious":"0.6.4","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.37.2","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.37.0","plugins/node/opentelemetry-instrumentation-bunyan":"0.33.0","plugins/node/opentelemetry-instrumentation-cassandra":"0.34.1","plugins/node/opentelemetry-instrumentation-connect":"0.32.3","plugins/node/opentelemetry-instrumentation-dns":"0.32.4","plugins/node/opentelemetry-instrumentation-express":"0.33.3","plugins/node/opentelemetry-instrumentation-fastify":"0.32.4","plugins/node/opentelemetry-instrumentation-generic-pool":"0.32.4","plugins/node/opentelemetry-instrumentation-graphql":"0.36.0","plugins/node/opentelemetry-instrumentation-hapi":"0.33.2","plugins/node/opentelemetry-instrumentation-ioredis":"0.36.0","plugins/node/opentelemetry-instrumentation-knex":"0.32.3","plugins/node/opentelemetry-instrumentation-koa":"0.36.2","plugins/node/opentelemetry-instrumentation-memcached":"0.32.4","plugins/node/opentelemetry-instrumentation-mongodb":"0.37.3","plugins/node/opentelemetry-instrumentation-mysql":"0.34.4","plugins/node/opentelemetry-instrumentation-mysql2":"0.34.4","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.33.3","plugins/node/opentelemetry-instrumentation-net":"0.32.3","plugins/node/opentelemetry-instrumentation-pg":"0.37.1","plugins/node/opentelemetry-instrumentation-pino":"0.34.3","plugins/node/opentelemetry-instrumentation-redis":"0.35.4","plugins/node/opentelemetry-instrumentation-redis-4":"0.35.5","plugins/node/opentelemetry-instrumentation-restify":"0.34.2","plugins/node/opentelemetry-instrumentation-router":"0.33.3","plugins/node/opentelemetry-instrumentation-winston":"0.33.0","plugins/web/opentelemetry-instrumentation-document-load":"0.34.0","plugins/web/opentelemetry-instrumentation-long-task":"0.34.0","plugins/web/opentelemetry-instrumentation-user-interaction":"0.34.0","plugins/web/opentelemetry-plugin-react-load":"0.30.0","propagators/opentelemetry-propagator-aws-xray":"1.3.1","propagators/opentelemetry-propagator-grpc-census-binary":"0.27.1","propagators/opentelemetry-propagator-instana":"0.3.1","propagators/opentelemetry-propagator-ot-trace":"0.27.1"}
+{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.28.4","detectors/node/opentelemetry-resource-detector-aws":"1.3.4","detectors/node/opentelemetry-resource-detector-azure":"0.2.2","detectors/node/opentelemetry-resource-detector-container":"0.3.4","detectors/node/opentelemetry-resource-detector-gcp":"0.29.4","detectors/node/opentelemetry-resource-detector-github":"0.28.1","detectors/node/opentelemetry-resource-detector-instana":"0.5.4","metapackages/auto-instrumentations-node":"0.40.2","metapackages/auto-instrumentations-web":"0.34.0","packages/opentelemetry-host-metrics":"0.34.0","packages/opentelemetry-id-generator-aws-xray":"1.2.1","packages/opentelemetry-propagation-utils":"0.30.4","packages/opentelemetry-redis-common":"0.36.1","packages/opentelemetry-sql-common":"0.40.0","packages/opentelemetry-test-utils":"0.35.0","plugins/node/instrumentation-amqplib":"0.33.4","plugins/node/instrumentation-cucumber":"0.2.0","plugins/node/instrumentation-dataloader":"0.5.3","plugins/node/instrumentation-fs":"0.8.3","plugins/node/instrumentation-lru-memoizer":"0.33.4","plugins/node/instrumentation-mongoose":"0.33.4","plugins/node/instrumentation-socket.io":"0.34.4","plugins/node/instrumentation-tedious":"0.6.4","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.37.3","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.37.1","plugins/node/opentelemetry-instrumentation-bunyan":"0.34.0","plugins/node/opentelemetry-instrumentation-cassandra":"0.34.1","plugins/node/opentelemetry-instrumentation-connect":"0.32.3","plugins/node/opentelemetry-instrumentation-dns":"0.32.4","plugins/node/opentelemetry-instrumentation-express":"0.34.0","plugins/node/opentelemetry-instrumentation-fastify":"0.32.5","plugins/node/opentelemetry-instrumentation-generic-pool":"0.32.4","plugins/node/opentelemetry-instrumentation-graphql":"0.36.0","plugins/node/opentelemetry-instrumentation-hapi":"0.33.2","plugins/node/opentelemetry-instrumentation-ioredis":"0.36.0","plugins/node/opentelemetry-instrumentation-knex":"0.32.3","plugins/node/opentelemetry-instrumentation-koa":"0.36.3","plugins/node/opentelemetry-instrumentation-memcached":"0.32.4","plugins/node/opentelemetry-instrumentation-mongodb":"0.38.0","plugins/node/opentelemetry-instrumentation-mysql":"0.34.4","plugins/node/opentelemetry-instrumentation-mysql2":"0.34.4","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.33.3","plugins/node/opentelemetry-instrumentation-net":"0.32.4","plugins/node/opentelemetry-instrumentation-pg":"0.37.1","plugins/node/opentelemetry-instrumentation-pino":"0.34.4","plugins/node/opentelemetry-instrumentation-redis":"0.35.4","plugins/node/opentelemetry-instrumentation-redis-4":"0.35.5","plugins/node/opentelemetry-instrumentation-restify":"0.34.2","plugins/node/opentelemetry-instrumentation-router":"0.33.3","plugins/node/opentelemetry-instrumentation-winston":"0.33.0","plugins/web/opentelemetry-instrumentation-document-load":"0.34.0","plugins/web/opentelemetry-instrumentation-long-task":"0.34.0","plugins/web/opentelemetry-instrumentation-user-interaction":"0.34.0","plugins/web/opentelemetry-plugin-react-load":"0.30.0","propagators/opentelemetry-propagator-aws-xray":"1.3.1","propagators/opentelemetry-propagator-grpc-census-binary":"0.27.1","propagators/opentelemetry-propagator-instana":"0.3.1","propagators/opentelemetry-propagator-ot-trace":"0.27.1"}

CHANGELOG.md

@@ -1,6 +1,6 @@
 # CHANGELOG
 
-All notable changes to this project will be documented in this file. Do not remove the "Unreleased" header; it is used in the automated release workflow.
+As of v0.25.1 (2022-01-24) changelog content has moved to separate CHANGELOG.md files for each package. Use [this search for a list of all CHANGELOG.md files in this repo](https://github.com/search?q=repo%3Aopen-telemetry%2Fopentelemetry-js-contrib+path%3A**%2FCHANGELOG.md&type=code).
 
 ## Unreleased
 

CONTRIBUTING.md

@@ -42,16 +42,9 @@ for general practices for OpenTelemetry project.
 
 #### Conventional commit
 
-The Conventional Commits specification is a lightweight convention on top of commit messages. It provides an easy set of rules for creating an explicit commit history; which makes it easier to write automated tools on top of. This convention dovetails with SemVer, by describing the features, fixes, and breaking changes made in commit messages. You can see examples [here](https://www.conventionalcommits.org/en/v1.0.0-beta.4/#examples).
-We use [commitlint](https://github.com/conventional-changelog/commitlint) and [husky](https://github.com/typicode/husky) to prevent bad commit message.
-For example, you want to submit the following commit message `git commit -s -am "my bad commit"`.
-You will receive the following error :
+The Conventional Commits specification is a lightweight convention on top of commit messages. It provides an easy set of rules for creating an explicit commit history; which makes it easier to write automated tools on top of. This convention dovetails with SemVer, by describing the features, fixes, and breaking changes made in commit messages. You can see examples [here](https://www.conventionalcommits.org/en/v1.0.0/#examples).
 
-```text
-✖   type must be one of [ci, feat, fix, docs, style, refactor, perf, test, revert, chore] [type-enum]
-```
-
-Here an example that will pass the verification: `git commit -s -am "chore(opentelemetry-core): update deps"`
+We use [the "pr-title" CI workflow](./.github/workflows/pr-title.yml) to ensure PR titles, and hence the commit message from those PRs, follow the Conventional Commits spec.
 
 ### Fork
 

detectors/node/opentelemetry-resource-detector-azure/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.2.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-azure-v0.2.1...resource-detector-azure-v0.2.2) (2023-12-07)
+
+
+### Bug Fixes
+
+* **resource-detector-azure:** only detect Azure Functions when FUNCTIONS_EXTENSION_VERSION is defined ([#1846](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1846)) ([8f2a195](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/8f2a195d405c173ed7b817db63a1735af424a3e8))
+
 ## [0.2.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-azure-v0.2.0...resource-detector-azure-v0.2.1) (2023-11-22)
 
 

detectors/node/opentelemetry-resource-detector-azure/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-azure",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "OpenTelemetry SDK resource detector for Azure",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",

detectors/node/opentelemetry-resource-detector-azure/src/detectors/AzureFunctionsDetector.ts

@@ -44,8 +44,8 @@ class AzureFunctionsDetector implements DetectorSync {
   detect(): IResource {
     let attributes = {};
     const functionName = process.env[WEBSITE_SITE_NAME];
-    if (functionName) {
-      const functionVersion = process.env[FUNCTIONS_VERSION];
+    const functionVersion = process.env[FUNCTIONS_VERSION];
+    if (functionName && functionVersion) {
       const functionInstance = process.env[WEBSITE_INSTANCE_ID];
       const functionMemLimit = process.env[FUNCTIONS_MEM_LIMIT];
 

detectors/node/opentelemetry-resource-detector-instana/package.json

@@ -39,7 +39,7 @@
   "devDependencies": {
     "@opentelemetry/api": "^1.3.0",
     "@opentelemetry/contrib-test-utils": "^0.35.0",
-    "@opentelemetry/sdk-node": "^0.45.1",
+    "@opentelemetry/sdk-node": "^0.46.0",
     "@types/mocha": "8.2.3",
     "@types/node": "18.6.5",
     "@types/semver": "7.5.3",