From 7b7ed37b2f10256de89cb3554a2c5a9a2890095d Mon Sep 17 00:00:00 2001 From: overbalance Date: Fri, 12 Sep 2025 02:04:03 -0500 Subject: [PATCH 1/2] generate esm protos --- experimental/packages/otlp-transformer/package.json | 3 ++- scripts/generate-protos.js | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/experimental/packages/otlp-transformer/package.json b/experimental/packages/otlp-transformer/package.json index 306406ec1a4..41697a3e4d8 100644 --- a/experimental/packages/otlp-transformer/package.json +++ b/experimental/packages/otlp-transformer/package.json @@ -14,7 +14,8 @@ "scripts": { "prepublishOnly": "npm run compile", "precompile": "lerna run version --scope @opentelemetry/otlp-transformer --include-dependencies", - "compile": "npm run protos && tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json", + "compile": "npm run protos && tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json && npm run copy-esm-protos-to-build", + "copy-esm-protos-to-build": "cp src/generated/root.mjs build/esm/generated/root.js && cp src/generated/root.mjs build/esnext/generated/root.js", "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json", "protos": "npm run submodule && npm run protos:generate", "protos:generate": "node ../../../scripts/generate-protos.js", diff --git a/scripts/generate-protos.js b/scripts/generate-protos.js index 21c84763e89..7e735f77e81 100644 --- a/scripts/generate-protos.js +++ b/scripts/generate-protos.js @@ -44,12 +44,12 @@ function pbts(pbjsOutFile) { return exec(path.resolve(rootBinDir, 'pbts'), [...pbtsOptions, pbjsOutFile]); } -async function pbjs(files) { - const outFile = path.join(generatedPath, 'root.js'); +async function pbjs(files, format, generatedFilename) { + const outFile = path.join(generatedPath, generatedFilename); const pbjsOptions = [ '-t', 'static-module', '-p', protosPath, - '-w', 'commonjs', + '-w', format, '--null-defaults', '-o', outFile, ]; @@ -58,6 +58,7 @@ async function pbjs(files) { } (async function main() { - const pbjsOut = await pbjs(protos); + const pbjsOut = await pbjs(protos, 'commonjs', 'root.js'); + await pbjs(protos, 'es6', 'root.mjs'); await pbts(pbjsOut); })(); From 4495b057c9967327db4720256ccff84e0120e8d3 Mon Sep 17 00:00:00 2001 From: overbalance Date: Fri, 12 Sep 2025 02:25:39 -0500 Subject: [PATCH 2/2] Update CHANGELOG.md --- experimental/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md index 1a269baa17f..16a10d4870b 100644 --- a/experimental/CHANGELOG.md +++ b/experimental/CHANGELOG.md @@ -27,6 +27,7 @@ For notes on migrating to 2.x / 0.200.x see [the upgrade guide](doc/upgrade-to-2 ### :house: Internal * refactor(otlp-exporter-base): use get*FromEnv() for otlp exporter config. [#5583](https://github.com/open-telemetry/opentelemetry-js/issues/5583) @weyert +* refactor(otlp-transformer): generate and export esm protos [#5925](https://github.com/open-telemetry/opentelemetry-js/pull/5925) @overbalance ## 0.205.0