From 4eb5fe448819b3f9fae8cc8446c29b5da99e373a Mon Sep 17 00:00:00 2001 From: Matthew Wear Date: Tue, 30 Jun 2026 15:43:09 -0700 Subject: [PATCH 1/2] fix(instrumentation,instrumentation-http): fix codecov under-reporting --- .../opentelemetry-instrumentation-http/package.json | 8 ++++---- .../packages/opentelemetry-instrumentation/package.json | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/experimental/packages/opentelemetry-instrumentation-http/package.json b/experimental/packages/opentelemetry-instrumentation-http/package.json index 1f23ad6488e..14b7b3700e1 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/package.json +++ b/experimental/packages/opentelemetry-instrumentation-http/package.json @@ -9,10 +9,10 @@ "prepublishOnly": "npm run compile", "compile": "tsc --build", "clean": "tsc --build --clean", - "test:cjs": "nyc mocha test/**/*.test.ts", - "test:esm": "nyc node --experimental-loader=@opentelemetry/instrumentation/hook.mjs ../../../node_modules/mocha/bin/mocha 'test/**/*.test.mjs'", - "test:double-instr": "nyc node --experimental-loader=@opentelemetry/instrumentation/hook.mjs ../../../node_modules/mocha/bin/mocha 'test/integrations/double-instr.test.cjs'", - "test": "npm run test:cjs && npm run test:esm && npm run test:double-instr", + "test:cjs": "nyc --silent mocha test/**/*.test.ts", + "test:esm": "nyc --silent --no-clean node --experimental-loader=@opentelemetry/instrumentation/hook.mjs ../../../node_modules/mocha/bin/mocha 'test/**/*.test.mjs'", + "test:double-instr": "nyc --silent --no-clean node --experimental-loader=@opentelemetry/instrumentation/hook.mjs ../../../node_modules/mocha/bin/mocha 'test/integrations/double-instr.test.cjs'", + "test": "npm run test:cjs && npm run test:esm && npm run test:double-instr && nyc report", "tdd": "npm run test -- --watch-extensions ts --watch", "lint": "eslint .", "lint:fix": "eslint . --fix", diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json index 29c3dc745c6..95a095d77d2 100644 --- a/experimental/packages/opentelemetry-instrumentation/package.json +++ b/experimental/packages/opentelemetry-instrumentation/package.json @@ -47,9 +47,9 @@ "tdd": "npm run tdd:node", "tdd:node": "npm run test -- --watch-extensions ts --watch", "tdd:browser": "karma start", - "test:cjs": "nyc mocha 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", - "test:esm": "nyc node --experimental-loader=./hook.mjs ../../../node_modules/mocha/bin/mocha 'test/node/*.test.mjs'", - "test": "npm run test:cjs && npm run test:esm", + "test:cjs": "nyc --silent mocha 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", + "test:esm": "nyc --silent --no-clean node --experimental-loader=./hook.mjs ../../../node_modules/mocha/bin/mocha 'test/node/*.test.mjs'", + "test": "npm run test:cjs && npm run test:esm && nyc report", "test:browser": "karma start --single-run", "version": "node ../../../scripts/version-update.js", "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json", From 67b6c2ed692de19bb2f11d2171958b5d81f56d89 Mon Sep 17 00:00:00 2001 From: Matthew Wear Date: Wed, 1 Jul 2026 11:05:03 -0700 Subject: [PATCH 2/2] chore(instrumentation,instrumentation-http): add changelog --- experimental/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md index dd83492f47c..c1c05680f58 100644 --- a/experimental/CHANGELOG.md +++ b/experimental/CHANGELOG.md @@ -45,6 +45,7 @@ For notes on migrating to 2.x / 0.200.x see [the upgrade guide](doc/upgrade-to-2 * chore(sdk-node): migrate to use the new sdk-trace package [#6828](https://github.com/open-telemetry/opentelemetry-js/pull/6828/) @trentm * The `node` re-export of `@opentelemetry/sdk-trace-node` and `tracing` re-export of `@opentelemetry/sdk-trace-base` have been deprecated. (Historically the `@opentelemetry/sdk-node` package has [re-exported from a number of core packages](https://github.com/open-telemetry/opentelemetry-js/blob/3db60e7cb46608e68258c489b2f610c1e1540248/experimental/packages/opentelemetry-sdk-node/src/index.ts#L12-L19). It is now recommended that users directly import from those other packages.) * chore(\*): migrate use of sdk-trace-base and sdk-trace-node to sdk-trace [#6851](https://github.com/open-telemetry/opentelemetry-js/pull/6851) @trentm +* fix(instrumentation,instrumentation-http): fix codecov coverage under-reporting by merging coverage across CJS/ESM test runs [#6867](https://github.com/open-telemetry/opentelemetry-js/pull/6867) @mwear ## 0.219.0