Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(otlp-exporter-base): use dynamic import instead of require in esm/esnext build #5220

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
3 changes: 3 additions & 0 deletions experimental/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ All notable changes to experimental packages in this project will be documented

### :bug: (Bug Fix)

* fix(otlp-exporter-base): use dynamic imports over require for lazy-loading http transport utils [#5220](https://github.com/open-telemetry/opentelemetry-js/pull/5220) @pichlermarc
* enables bundling of Node.js HTTP exporters with rollup
* Limitation: if a single-file bundle is built the dynamically loaded file needs to be inlined via rollup's `inlineDynamicImports: true` setting. However, doing so may lead to `@opentelemetry/instrumentation-http` not generating telemetry.
* fix(instrumentation-grpc): monitor error events with events.errorMonitor [#5369](https://github.com/open-telemetry/opentelemetry-js/pull/5369) @cjihrig
* fix(exporter-metrics-otlp-http): browser OTLPMetricExporter was not passing config to OTLPMetricExporterBase super class [#5331](https://github.com/open-telemetry/opentelemetry-js/pull/5331) @trentm
* fix(instrumentation-fetch, instrumentation-xhr): Ignore network events with zero-timings [#5332](https://github.com/open-telemetry/opentelemetry-js/pull/5332) @chancancode
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
constructor(private _parameters: HttpRequestParameters) {}

async send(data: Uint8Array, timeoutMillis: number): Promise<ExportResponse> {
const { agent, send } = this._loadUtils();
const { agent, send } = await this._loadUtils();

return new Promise<ExportResponse>(resolve => {
send(
Expand All @@ -56,16 +56,18 @@
// intentionally left empty, nothing to do.
}

private _loadUtils(): Utils {
private async _loadUtils(): Utils {
let utils = this._utils;

if (utils === null) {
const { sendWithHttp, createHttpAgent } =
// Lazy require to ensure that http/https is not required before instrumentations can wrap it.
const {

Check failure on line 65 in experimental/packages/otlp-exporter-base/src/transport/http-exporter-transport.ts

View workflow job for this annotation

GitHub Actions / browser-tests

Expression expected.

Check failure on line 65 in experimental/packages/otlp-exporter-base/src/transport/http-exporter-transport.ts

View workflow job for this annotation

GitHub Actions / browser-tests

Expression expected.

Check failure on line 65 in experimental/packages/otlp-exporter-base/src/transport/http-exporter-transport.ts

View workflow job for this annotation

GitHub Actions / browser-tests

Expression expected.

Check failure on line 65 in experimental/packages/otlp-exporter-base/src/transport/http-exporter-transport.ts

View workflow job for this annotation

GitHub Actions / node-tests (18.19.0)

Expression expected.

Check failure on line 65 in experimental/packages/otlp-exporter-base/src/transport/http-exporter-transport.ts

View workflow job for this annotation

GitHub Actions / node-tests (18.19.0)

Expression expected.

Check failure on line 65 in experimental/packages/otlp-exporter-base/src/transport/http-exporter-transport.ts

View workflow job for this annotation

GitHub Actions / node-tests (18.19.0)

Expression expected.

Check failure on line 65 in experimental/packages/otlp-exporter-base/src/transport/http-exporter-transport.ts

View workflow job for this annotation

GitHub Actions / node-tests (18)

Expression expected.

Check failure on line 65 in experimental/packages/otlp-exporter-base/src/transport/http-exporter-transport.ts

View workflow job for this annotation

GitHub Actions / node-tests (18)

Expression expected.

Check failure on line 65 in experimental/packages/otlp-exporter-base/src/transport/http-exporter-transport.ts

View workflow job for this annotation

GitHub Actions / node-tests (18)

Expression expected.

Check failure on line 65 in experimental/packages/otlp-exporter-base/src/transport/http-exporter-transport.ts

View workflow job for this annotation

GitHub Actions / node-tests (20.6.0)

Expression expected.

Check failure on line 65 in experimental/packages/otlp-exporter-base/src/transport/http-exporter-transport.ts

View workflow job for this annotation

GitHub Actions / node-tests (20.6.0)

Expression expected.

Check failure on line 65 in experimental/packages/otlp-exporter-base/src/transport/http-exporter-transport.ts

View workflow job for this annotation

GitHub Actions / node-tests (20.6.0)

Expression expected.

Check failure on line 65 in experimental/packages/otlp-exporter-base/src/transport/http-exporter-transport.ts

View workflow job for this annotation

GitHub Actions / node-tests (20)

Expression expected.

Check failure on line 65 in experimental/packages/otlp-exporter-base/src/transport/http-exporter-transport.ts

View workflow job for this annotation

GitHub Actions / node-tests (20)

Expression expected.

Check failure on line 65 in experimental/packages/otlp-exporter-base/src/transport/http-exporter-transport.ts

View workflow job for this annotation

GitHub Actions / node-tests (20)

Expression expected.

Check failure on line 65 in experimental/packages/otlp-exporter-base/src/transport/http-exporter-transport.ts

View workflow job for this annotation

GitHub Actions / node-tests (22)

Expression expected.

Check failure on line 65 in experimental/packages/otlp-exporter-base/src/transport/http-exporter-transport.ts

View workflow job for this annotation

GitHub Actions / node-tests (22)

Expression expected.

Check failure on line 65 in experimental/packages/otlp-exporter-base/src/transport/http-exporter-transport.ts

View workflow job for this annotation

GitHub Actions / node-tests (22)

Expression expected.

Check failure on line 65 in experimental/packages/otlp-exporter-base/src/transport/http-exporter-transport.ts

View workflow job for this annotation

GitHub Actions / node-tests (23)

Expression expected.

Check failure on line 65 in experimental/packages/otlp-exporter-base/src/transport/http-exporter-transport.ts

View workflow job for this annotation

GitHub Actions / node-tests (23)

Expression expected.

Check failure on line 65 in experimental/packages/otlp-exporter-base/src/transport/http-exporter-transport.ts

View workflow job for this annotation

GitHub Actions / node-tests (23)

Expression expected.

Check failure on line 65 in experimental/packages/otlp-exporter-base/src/transport/http-exporter-transport.ts

View workflow job for this annotation

GitHub Actions / node-windows-tests

Expression expected.

Check failure on line 65 in experimental/packages/otlp-exporter-base/src/transport/http-exporter-transport.ts

View workflow job for this annotation

GitHub Actions / node-windows-tests

Expression expected.

Check failure on line 65 in experimental/packages/otlp-exporter-base/src/transport/http-exporter-transport.ts

View workflow job for this annotation

GitHub Actions / node-windows-tests

Expression expected.

Check failure on line 65 in experimental/packages/otlp-exporter-base/src/transport/http-exporter-transport.ts

View workflow job for this annotation

GitHub Actions / webworker-tests

Expression expected.

Check failure on line 65 in experimental/packages/otlp-exporter-base/src/transport/http-exporter-transport.ts

View workflow job for this annotation

GitHub Actions / webworker-tests

Expression expected.

Check failure on line 65 in experimental/packages/otlp-exporter-base/src/transport/http-exporter-transport.ts

View workflow job for this annotation

GitHub Actions / webworker-tests

Expression expected.
sendWithHttp,
createHttpAgent,
// eslint-disable-next-line @typescript-eslint/no-var-requires
} = require('./http-transport-utils');
} = await import(
'./http-transport-utils'
);

utils = this._utils = {
agent: createHttpAgent(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"compilerOptions": {
"outDir": "build/esm",
"rootDir": "src",
"tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo"
"tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo",
"module": "es2020"
},
"include": [
"src/**/*.ts"
Expand Down
Loading