Merge branch 'main' into upd-aws-detector

garysassano · web-flow · commit acd6b71f9b7d · 2025-01-29T22:48:27.000+01:00
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -171,7 +171,7 @@ jobs:
         run: npm run test:ci:changed
       - name: Report Coverage
         if: ${{ matrix.code-coverage && !cancelled()}}
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         with:
@@ -207,7 +207,7 @@ jobs:
       - name: Unit tests
         run: npm run test:browser
       - name: Report Coverage
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         with:
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -7,7 +7,7 @@
   "detectors/node/opentelemetry-resource-detector-github": "0.30.0",
   "detectors/node/opentelemetry-resource-detector-instana": "0.18.0",
   "metapackages/auto-configuration-propagators": "0.3.2",
-  "metapackages/auto-instrumentations-node": "0.55.3",
+  "metapackages/auto-instrumentations-node": "0.56.0",
   "metapackages/auto-instrumentations-web": "0.45.0",
   "packages/baggage-span-processor": "0.3.1",
   "packages/opentelemetry-host-metrics": "0.35.5",
@@ -18,7 +18,7 @@
   "packages/opentelemetry-test-utils": "0.45.0",
   "packages/winston-transport": "0.10.0",
   "plugins/node/instrumentation-amqplib": "0.46.0",
-  "plugins/node/instrumentation-cucumber": "0.13.0",
+  "plugins/node/instrumentation-cucumber": "0.14.0",
   "plugins/node/instrumentation-dataloader": "0.16.0",
   "plugins/node/instrumentation-fs": "0.19.0",
   "plugins/node/instrumentation-kafkajs": "0.7.0",
@@ -45,10 +45,10 @@
   "plugins/node/opentelemetry-instrumentation-memcached": "0.43.0",
   "plugins/node/opentelemetry-instrumentation-mongodb": "0.51.0",
   "plugins/node/opentelemetry-instrumentation-mysql": "0.45.0",
-  "plugins/node/opentelemetry-instrumentation-mysql2": "0.45.0",
+  "plugins/node/opentelemetry-instrumentation-mysql2": "0.45.1",
   "plugins/node/opentelemetry-instrumentation-nestjs-core": "0.44.0",
   "plugins/node/opentelemetry-instrumentation-net": "0.43.0",
-  "plugins/node/opentelemetry-instrumentation-pg": "0.50.0",
+  "plugins/node/opentelemetry-instrumentation-pg": "0.51.0",
   "plugins/node/opentelemetry-instrumentation-pino": "0.46.0",
   "plugins/node/opentelemetry-instrumentation-redis": "0.46.0",
   "plugins/node/opentelemetry-instrumentation-redis-4": "0.46.0",
diff --git a/metapackages/auto-instrumentations-node/CHANGELOG.md b/metapackages/auto-instrumentations-node/CHANGELOG.md
@@ -1,5 +1,25 @@
 # Changelog
 
+## [0.56.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-node-v0.55.3...auto-instrumentations-node-v0.56.0) (2025-01-27)
+
+
+### ⚠ BREAKING CHANGES
+
+* **auto-instrumentations-node:** disable @opentelemetry/instrumentation-fastify by default ([#2652](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2652))
+
+### Features
+
+* **auto-instrumentations-node:** disable @opentelemetry/instrumentation-fastify by default ([#2652](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2652)) ([45c55a6](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/45c55a6de0c6c8e8c613d4115178a480fffbf491))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @opentelemetry/instrumentation-cucumber bumped from ^0.13.0 to ^0.14.0
+    * @opentelemetry/instrumentation-mysql2 bumped from ^0.45.0 to ^0.45.1
+    * @opentelemetry/instrumentation-pg bumped from ^0.50.0 to ^0.51.0
+
 ## [0.55.3](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-node-v0.55.2...auto-instrumentations-node-v0.55.3) (2025-01-20)
 
 
diff --git a/metapackages/auto-instrumentations-node/README.md b/metapackages/auto-instrumentations-node/README.md
@@ -171,7 +171,10 @@ registerInstrumentations({
 - [@opentelemetry/instrumentation-dataloader](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-dataloader)
 - [@opentelemetry/instrumentation-dns](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-dns)
 - [@opentelemetry/instrumentation-express](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-express)
-- [@opentelemetry/instrumentation-fastify](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-fastify)
+- [@opentelemetry/instrumentation-fastify](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-fastify) (deprecated, default disabled)
+  - This component is **deprecated** in favor of the official instrumentation package [`@fastify/otel`](https://www.npmjs.com/package/@fastify/otel), maintained by the Fastify authors.
+    - Please see [here](https://github.com/fastify/otel?tab=readme-ov-file#usage) for instructions on how to use `@fastify/otel`.
+  - This component will be removed on June 30, 2025
 - [@opentelemetry/instrumentation-fs](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-fs) (default disabled)
 - [@opentelemetry/instrumentation-generic-pool](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-generic-pool)
 - [@opentelemetry/instrumentation-graphql](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-graphql)
diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/auto-instrumentations-node",
-  "version": "0.55.3",
+  "version": "0.56.0",
   "description": "Metapackage which bundles opentelemetry node core and contrib instrumentations",
   "author": "OpenTelemetry Authors",
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/metapackages/auto-instrumentations-node#readme",
@@ -53,7 +53,7 @@
     "@opentelemetry/instrumentation-bunyan": "^0.45.0",
     "@opentelemetry/instrumentation-cassandra-driver": "^0.45.0",
     "@opentelemetry/instrumentation-connect": "^0.43.0",
-    "@opentelemetry/instrumentation-cucumber": "^0.13.0",
+    "@opentelemetry/instrumentation-cucumber": "^0.14.0",
     "@opentelemetry/instrumentation-dataloader": "^0.16.0",
     "@opentelemetry/instrumentation-dns": "^0.43.0",
     "@opentelemetry/instrumentation-express": "^0.47.0",
@@ -73,10 +73,10 @@
     "@opentelemetry/instrumentation-mongodb": "^0.51.0",
     "@opentelemetry/instrumentation-mongoose": "^0.46.0",
     "@opentelemetry/instrumentation-mysql": "^0.45.0",
-    "@opentelemetry/instrumentation-mysql2": "^0.45.0",
+    "@opentelemetry/instrumentation-mysql2": "^0.45.1",
     "@opentelemetry/instrumentation-nestjs-core": "^0.44.0",
     "@opentelemetry/instrumentation-net": "^0.43.0",
-    "@opentelemetry/instrumentation-pg": "^0.50.0",
+    "@opentelemetry/instrumentation-pg": "^0.51.0",
     "@opentelemetry/instrumentation-pino": "^0.46.0",
     "@opentelemetry/instrumentation-redis": "^0.46.0",
     "@opentelemetry/instrumentation-redis-4": "^0.46.0",
diff --git a/metapackages/auto-instrumentations-node/src/utils.ts b/metapackages/auto-instrumentations-node/src/utils.ts
@@ -136,7 +136,10 @@ const InstrumentationMap = {
   '@opentelemetry/instrumentation-winston': WinstonInstrumentation,
 };
 
-const defaultExcludedInstrumentations = ['@opentelemetry/instrumentation-fs'];
+const defaultExcludedInstrumentations = [
+  '@opentelemetry/instrumentation-fs',
+  '@opentelemetry/instrumentation-fastify',
+];
 
 // Config types inferred automatically from the first argument of the constructor
 type ConfigArg<T> = T extends new (...args: infer U) => unknown ? U[0] : never;
diff --git a/metapackages/auto-instrumentations-node/test/utils.test.ts b/metapackages/auto-instrumentations-node/test/utils.test.ts
@@ -30,7 +30,8 @@ describe('utils', () => {
       ).filter(depName => {
         return (
           depName.startsWith('@opentelemetry/instrumentation-') &&
-          depName !== '@opentelemetry/instrumentation-fs'
+          depName !== '@opentelemetry/instrumentation-fs' &&
+          depName !== '@opentelemetry/instrumentation-fastify'
         );
       });
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/plugins/node/instrumentation-cucumber/CHANGELOG.md b/plugins/node/instrumentation-cucumber/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.14.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-cucumber-v0.13.0...instrumentation-cucumber-v0.14.0) (2025-01-27)
+
+
+### Features
+
+* **cucumber:** support @cucumber/cucumber@11 ([#2676](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2676)) ([5c38927](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/5c38927b881a74cd94d6ee339c8a449bd2fd7dbb))
+
 ## [0.13.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-cucumber-v0.12.0...instrumentation-cucumber-v0.13.0) (2024-12-18)
 
 
diff --git a/plugins/node/instrumentation-cucumber/package.json b/plugins/node/instrumentation-cucumber/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/instrumentation-cucumber",
-  "version": "0.13.0",
+  "version": "0.14.0",
   "description": "OpenTelemetry instrumentation for `@cucumber/cucumber` automated tests runner",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
diff --git a/plugins/node/instrumentation-mongoose/package.json b/plugins/node/instrumentation-mongoose/package.json
@@ -53,7 +53,7 @@
     "@types/mocha": "8.2.3",
     "@types/node": "18.18.14",
     "expect": "29.2.0",
-    "mongoose": "6.13.5",
+    "mongoose": "6.13.6",
     "nyc": "15.1.0",
     "rimraf": "5.0.10",
     "test-all-versions": "6.1.0",
diff --git a/plugins/node/opentelemetry-instrumentation-fastify/README.md b/plugins/node/opentelemetry-instrumentation-fastify/README.md
@@ -3,9 +3,13 @@
 [![NPM Published Version][npm-img]][npm-url]
 [![Apache License][license-image]][license-image]
 
-This module provides automatic instrumentation for the [`fastify`](https://www.fastify.io/) module, which may be loaded using the [`@opentelemetry/sdk-trace-node`](https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-sdk-trace-node) package and is included in the [`@opentelemetry/auto-instrumentations-node`](https://www.npmjs.com/package/@opentelemetry/auto-instrumentations-node) bundle.
+> [!IMPORTANT]
+> This component is **deprecated** in favor of the official instrumentation package [`@fastify/otel`](https://www.npmjs.com/package/@fastify/otel), maintained by the Fastify authors.
+> Please see [here](https://github.com/fastify/otel?tab=readme-ov-file#usage) for instructions on how to use `@fastify/otel`.
+>
+> We will stop publishing new versions of `@opentelemetry/instrumentation-fastify` on June 30, 2025.
 
-If total installation size is not constrained, it is recommended to use the [`@opentelemetry/auto-instrumentations-node`](https://www.npmjs.com/package/@opentelemetry/auto-instrumentations-node) bundle with [@opentelemetry/sdk-node](`https://www.npmjs.com/package/@opentelemetry/sdk-node`) for the most seamless instrumentation experience.
+This module provides automatic instrumentation for the [`fastify`](https://www.fastify.dev/) module, which may be loaded using the [`@opentelemetry/sdk-trace-node`](https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-sdk-trace-node) package.
 
 Compatible with OpenTelemetry JS API and SDK `1.0+`.
 
diff --git a/plugins/node/opentelemetry-instrumentation-fastify/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-fastify/src/instrumentation.ts
@@ -47,7 +47,11 @@ import { PACKAGE_NAME, PACKAGE_VERSION } from './version';
 
 export const ANONYMOUS_NAME = 'anonymous';
 
-/** Fastify instrumentation for OpenTelemetry */
+/**
+ * Fastify instrumentation for OpenTelemetry
+ * @deprecated This instrumentation is deprecated in favor of the official instrumentation package `@fastify/otel`,
+ *             which is maintained by the fastify authors.
+ */
 export class FastifyInstrumentation extends InstrumentationBase<FastifyInstrumentationConfig> {
   constructor(config: FastifyInstrumentationConfig = {}) {
     super(PACKAGE_NAME, PACKAGE_VERSION, config);
diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-mysql2/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.45.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-mysql2-v0.45.0...instrumentation-mysql2-v0.45.1) (2025-01-27)
+
+
+### Bug Fixes
+
+* **instrumentation-mysql2:** missing telemetry in mysql2 when importing only promise API ([#2662](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2662)) ([c67a8c3](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/c67a8c3e096b835e3eb91cac0642bf775ffa4350))
+
 ## [0.45.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-mysql2-v0.44.0...instrumentation-mysql2-v0.45.0) (2024-12-18)
 
 
diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/package.json b/plugins/node/opentelemetry-instrumentation-mysql2/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/instrumentation-mysql2",
-  "version": "0.45.0",
+  "version": "0.45.1",
   "description": "OpenTelemetry instrumentation for `mysql2` database client for MySQL",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
diff --git a/plugins/node/opentelemetry-instrumentation-pg/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-pg/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.51.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-pg-v0.50.0...instrumentation-pg-v0.51.0) (2025-01-27)
+
+
+### Features
+
+* **pg:** Patch client inside `lib` and `lib/pg-native` ([#2563](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2563)) ([5f214eb](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/5f214eb973702a6d77d73ff28f080b4ff7752e8f))
+
 ## [0.50.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-pg-v0.49.0...instrumentation-pg-v0.50.0) (2024-12-18)
 
 
diff --git a/plugins/node/opentelemetry-instrumentation-pg/package.json b/plugins/node/opentelemetry-instrumentation-pg/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/instrumentation-pg",
-  "version": "0.50.0",
+  "version": "0.51.0",
   "description": "OpenTelemetry instrumentation for `pg` and `pg-pool` database client for PostgreSQL",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
diff --git a/scripts/lint-readme.js b/scripts/lint-readme.js
@@ -7,6 +7,9 @@ const monorepoRoot = path.resolve(__dirname, '..');
 const autoInstrumentationNodeDeps = require(`${monorepoRoot}/metapackages/auto-instrumentations-node/package.json`).dependencies;
 const autoInstrumentationWebDeps = require(`${monorepoRoot}/metapackages/auto-instrumentations-web/package.json`).dependencies;
 
+// remove exempt instrumentations
+delete autoInstrumentationNodeDeps['@opentelemetry/instrumentation-fastify'];
+
 // extract info from package.json
 const packageJsonUrl = path.resolve(`${packageRoot}/package.json`);
 const pjson = require(packageJsonUrl);
@@ -74,7 +77,7 @@ Compatible with OpenTelemetry JS API and SDK \`1.0+\`.
   const distText = `If total installation size is not constrained, it is recommended to use the [\`@opentelemetry/auto-instrumentations-web\`](https://www.npmjs.com/package/@opentelemetry/auto-instrumentations-web) bundle with [\`@opentelemetry/sdk-trace-web\`](https://www.npmjs.com/package/@opentelemetry/sdk-trace-web) for the most seamless instrumentation experience.
 
 Compatible with OpenTelemetry JS API and SDK \`1.0+\`.
-`;  
+`;
 
   if (!currentReadmeContent.includes(distText)) {
     throw new Error(

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@opentelemetry/instrumentation-cucumber",`
`3`		`- "version": "0.13.0",`
	`3`	`+ "version": "0.14.0",`
`4`	`4`	"description": "OpenTelemetry instrumentation for `@cucumber/cucumber` automated tests runner",
`5`	`5`	`"main": "build/src/index.js",`
`6`	`6`	`"types": "build/src/index.d.ts",`