Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ For notes on migrating to 2.x / 0.200.x see [the upgrade guide](doc/upgrade-to-2
* chore: enforce `import type` for type-only imports via ESLint [#6467](https://github.com/open-telemetry/opentelemetry-js/pull/6467) @overbalance
* perf(sdk-trace-base): avoid Object.entries in Span.setAttributes [#6514](https://github.com/open-telemetry/opentelemetry-js/pull/6514) @daniellockyer
* perf(sdk-trace-base): optimize `Span.{addEvent,addLink}` performance [#6516](https://github.com/open-telemetry/opentelemetry-js/pull/6516) @daniellockyer
* test(bundlers): broaden bundler test coverage and assert known protobuf dynamic-require failures [#6482](https://github.com/open-telemetry/opentelemetry-js/pull/6482) @overbalance

## 2.6.0

Expand Down
46 changes: 45 additions & 1 deletion bundler-tests/browser/nextjs-15-edge/middleware.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,52 @@
import { DiagConsoleLogger, diag } from '@opentelemetry/api';
import { logs } from '@opentelemetry/api-logs';
import { W3CTraceContextPropagator } from '@opentelemetry/core';
import { OTLPLogExporter } from '@opentelemetry/exporter-logs-otlp-http';
import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-http';
import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
import { InstrumentationBase } from '@opentelemetry/instrumentation';
import { FetchInstrumentation } from '@opentelemetry/instrumentation-fetch';
import { XMLHttpRequestInstrumentation } from '@opentelemetry/instrumentation-xml-http-request';
import { browserDetector } from '@opentelemetry/opentelemetry-browser-detector';
import { B3Propagator } from '@opentelemetry/propagator-b3';
import { defaultServiceName } from '@opentelemetry/resources';
import {
LoggerProvider,
SimpleLogRecordProcessor,
} from '@opentelemetry/sdk-logs';
import { MeterProvider } from '@opentelemetry/sdk-metrics';
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import { WebTracerProvider } from '@opentelemetry/sdk-trace-web';

diag.setLogger(new DiagConsoleLogger());

logs.setGlobalLoggerProvider(
new LoggerProvider({
processors: [new SimpleLogRecordProcessor(new OTLPLogExporter())],
})
);

class TestInstrumentation extends InstrumentationBase {
init() {
return [];
}
}

export function middleware(request) {
const serviceName = defaultServiceName();
console.log('Service name:', serviceName);
const logger = logs.getLogger('bundle-test-nextjs-edge');
logger.emit({ body: serviceName, eventName: 'custom.event' });
new TestInstrumentation('test', '0.0.0');
new BasicTracerProvider();
new MeterProvider();
new OTLPTraceExporter();
new OTLPMetricExporter();
new W3CTraceContextPropagator();
new B3Propagator();
new WebTracerProvider();
new FetchInstrumentation();
new XMLHttpRequestInstrumentation();
void browserDetector;
return Response.next();
}

Expand Down
19 changes: 17 additions & 2 deletions bundler-tests/browser/nextjs-15-edge/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,28 @@
{
"name": "nextjs-15-edge-bundle-test",
"name": "bundler-tests-browser-nextjs-15-edge",
"type": "module",
"private": true,
"scripts": {
"build": "rm -rf .next && next build",
"test:bundle": "npm i && npm run build"
"test:bundle": "npm i && node test-bundle.mjs"
},
"dependencies": {
"@opentelemetry/api": "file:../../../api",
"@opentelemetry/api-logs": "file:../../../experimental/packages/api-logs",
"@opentelemetry/core": "file:../../../packages/opentelemetry-core",
"@opentelemetry/exporter-logs-otlp-http": "file:../../../experimental/packages/exporter-logs-otlp-http",
"@opentelemetry/exporter-metrics-otlp-http": "file:../../../experimental/packages/opentelemetry-exporter-metrics-otlp-http",
"@opentelemetry/exporter-trace-otlp-http": "file:../../../experimental/packages/exporter-trace-otlp-http",
"@opentelemetry/instrumentation": "file:../../../experimental/packages/opentelemetry-instrumentation",
"@opentelemetry/instrumentation-fetch": "file:../../../experimental/packages/opentelemetry-instrumentation-fetch",
"@opentelemetry/instrumentation-xml-http-request": "file:../../../experimental/packages/opentelemetry-instrumentation-xml-http-request",
"@opentelemetry/opentelemetry-browser-detector": "file:../../../experimental/packages/opentelemetry-browser-detector",
"@opentelemetry/propagator-b3": "file:../../../packages/opentelemetry-propagator-b3",
"@opentelemetry/resources": "file:../../../packages/opentelemetry-resources",
"@opentelemetry/sdk-logs": "file:../../../experimental/packages/sdk-logs",
"@opentelemetry/sdk-metrics": "file:../../../packages/sdk-metrics",
"@opentelemetry/sdk-trace-base": "file:../../../packages/opentelemetry-sdk-trace-base",
"@opentelemetry/sdk-trace-web": "file:../../../packages/opentelemetry-sdk-trace-web",
"next": "^15",
"react": "^18",
"react-dom": "^18"
Expand Down
2 changes: 1 addition & 1 deletion bundler-tests/browser/nextjs-15-edge/project.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"name": "nextjs-15-edge-bundle-test"
"name": "bundler-tests-browser-nextjs-15-edge"
}
37 changes: 37 additions & 0 deletions bundler-tests/browser/nextjs-15-edge/test-bundle.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/**
* Runs the Next.js 15 edge build and asserts the known protobuf Dynamic Code
* Evaluation error. This exit(0) is intentional: the test passes while the bug
* exists and will break when it is fixed, signalling that this file should be
* removed and test:bundle should revert to just `npm run build`.
*/
import { spawnSync } from 'node:child_process';
import { fileURLToPath } from 'node:url';
import { dirname } from 'node:path';

const testDir = dirname(fileURLToPath(import.meta.url));

const result = spawnSync('npm', ['run', 'build'], {
cwd: testDir,
encoding: 'utf-8',
shell: false,
});

const output = (result.stdout ?? '') + (result.stderr ?? '');
const buildFailed = result.status !== 0;
const hasExpectedError =
/Dynamic Code Evaluation/.test(output) && /protobuf/i.test(output);

if (!buildFailed) {
console.error(
'Build succeeded — expected protobuf Dynamic Code Evaluation error.\n' +
'The underlying bug may be fixed. Update this test.'
);
process.exit(1);
}

if (!hasExpectedError) {
console.error('Build failed for an unexpected reason:\n', output);
process.exit(1);
}

console.log('Known protobuf Dynamic Code Evaluation build failure confirmed');
45 changes: 45 additions & 0 deletions bundler-tests/browser/nextjs-16-edge/app/api/test/route.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,54 @@
import { DiagConsoleLogger, diag } from '@opentelemetry/api';
import { logs } from '@opentelemetry/api-logs';
import { W3CTraceContextPropagator } from '@opentelemetry/core';
import { OTLPLogExporter } from '@opentelemetry/exporter-logs-otlp-http';
import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-http';
import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
import { InstrumentationBase } from '@opentelemetry/instrumentation';
import { FetchInstrumentation } from '@opentelemetry/instrumentation-fetch';
import { XMLHttpRequestInstrumentation } from '@opentelemetry/instrumentation-xml-http-request';
import { browserDetector } from '@opentelemetry/opentelemetry-browser-detector';
import { B3Propagator } from '@opentelemetry/propagator-b3';
import { defaultServiceName } from '@opentelemetry/resources';
import {
LoggerProvider,
SimpleLogRecordProcessor,
} from '@opentelemetry/sdk-logs';
import { MeterProvider } from '@opentelemetry/sdk-metrics';
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import { WebTracerProvider } from '@opentelemetry/sdk-trace-web';

export const runtime = 'edge';

diag.setLogger(new DiagConsoleLogger());

logs.setGlobalLoggerProvider(
new LoggerProvider({
processors: [new SimpleLogRecordProcessor(new OTLPLogExporter())],
})
);

class TestInstrumentation extends InstrumentationBase {
init() {
return [];
}
}

export function GET(request) {
const serviceName = defaultServiceName();
const logger = logs.getLogger('bundle-test-nextjs-edge');
logger.emit({ body: 'test-event-body', eventName: 'custom.event' });
new TestInstrumentation('test', '0.0.0');
new BasicTracerProvider();
new MeterProvider();
new OTLPTraceExporter();
new OTLPMetricExporter();
new W3CTraceContextPropagator();
new B3Propagator();
new WebTracerProvider();
new FetchInstrumentation();
new XMLHttpRequestInstrumentation();
void browserDetector;
return new Response(JSON.stringify({ serviceName }), {
headers: { 'Content-Type': 'application/json' },
});
Expand Down
19 changes: 17 additions & 2 deletions bundler-tests/browser/nextjs-16-edge/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,28 @@
{
"name": "nextjs-16-edge-bundle-test",
"name": "bundler-tests-browser-nextjs-16-edge",
"type": "module",
"private": true,
"scripts": {
"build": "rm -rf .next && next build",
"test:bundle": "npm i && npx tsx next.test.ts"
"test:bundle": "npm i && node test-bundle.mjs"
},
"dependencies": {
"@opentelemetry/api": "file:../../../api",
"@opentelemetry/api-logs": "file:../../../experimental/packages/api-logs",
"@opentelemetry/core": "file:../../../packages/opentelemetry-core",
"@opentelemetry/exporter-logs-otlp-http": "file:../../../experimental/packages/exporter-logs-otlp-http",
"@opentelemetry/exporter-metrics-otlp-http": "file:../../../experimental/packages/opentelemetry-exporter-metrics-otlp-http",
"@opentelemetry/exporter-trace-otlp-http": "file:../../../experimental/packages/exporter-trace-otlp-http",
"@opentelemetry/instrumentation": "file:../../../experimental/packages/opentelemetry-instrumentation",
"@opentelemetry/instrumentation-fetch": "file:../../../experimental/packages/opentelemetry-instrumentation-fetch",
"@opentelemetry/instrumentation-xml-http-request": "file:../../../experimental/packages/opentelemetry-instrumentation-xml-http-request",
"@opentelemetry/opentelemetry-browser-detector": "file:../../../experimental/packages/opentelemetry-browser-detector",
"@opentelemetry/propagator-b3": "file:../../../packages/opentelemetry-propagator-b3",
"@opentelemetry/resources": "file:../../../packages/opentelemetry-resources",
"@opentelemetry/sdk-logs": "file:../../../experimental/packages/sdk-logs",
"@opentelemetry/sdk-metrics": "file:../../../packages/sdk-metrics",
"@opentelemetry/sdk-trace-base": "file:../../../packages/opentelemetry-sdk-trace-base",
"@opentelemetry/sdk-trace-web": "file:../../../packages/opentelemetry-sdk-trace-web",
"next": "^16",
"react": "^19",
"react-dom": "^19"
Expand Down
2 changes: 1 addition & 1 deletion bundler-tests/browser/nextjs-16-edge/project.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"name": "nextjs-16-edge-bundle-test"
"name": "bundler-tests-browser-nextjs-16-edge"
}
14 changes: 0 additions & 14 deletions bundler-tests/browser/webpack-4/index.html

This file was deleted.

50 changes: 21 additions & 29 deletions bundler-tests/browser/webpack-4/package.json
Original file line number Diff line number Diff line change
@@ -1,42 +1,34 @@
{
"name": "webpack-4-bundle-test",
"name": "bundler-tests-browser-webpack-4",
"private": true,
"version": "0.208.0",
"description": "Test app for logs in webpack 4",
"type": "module",
"scripts": {
"test:bundle": "npm i && webpack --config webpack.config.mjs"
"test:bundle": "npm i && node test-bundle.mjs"
},
"repository": {
"type": "git",
"url": "git+ssh://git@github.com/open-telemetry/opentelemetry-js.git"
},
"keywords": [
"opentelemetry",
"web",
"events"
],
"engines": {
"node": "^18.19.0 || >=20.6.0"
},
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
"bugs": {
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
"dependencies": {
"@opentelemetry/api": "file:../../../api",
"@opentelemetry/api-logs": "file:../../../experimental/packages/api-logs",
"@opentelemetry/core": "file:../../../packages/opentelemetry-core",
"@opentelemetry/exporter-logs-otlp-http": "file:../../../experimental/packages/exporter-logs-otlp-http",
"@opentelemetry/exporter-metrics-otlp-http": "file:../../../experimental/packages/opentelemetry-exporter-metrics-otlp-http",
"@opentelemetry/exporter-trace-otlp-http": "file:../../../experimental/packages/exporter-trace-otlp-http",
"@opentelemetry/instrumentation": "file:../../../experimental/packages/opentelemetry-instrumentation",
"@opentelemetry/instrumentation-fetch": "file:../../../experimental/packages/opentelemetry-instrumentation-fetch",
"@opentelemetry/instrumentation-xml-http-request": "file:../../../experimental/packages/opentelemetry-instrumentation-xml-http-request",
"@opentelemetry/opentelemetry-browser-detector": "file:../../../experimental/packages/opentelemetry-browser-detector",
"@opentelemetry/propagator-b3": "file:../../../packages/opentelemetry-propagator-b3",
"@opentelemetry/resources": "file:../../../packages/opentelemetry-resources",
"@opentelemetry/sdk-logs": "file:../../../experimental/packages/sdk-logs",
"@opentelemetry/sdk-metrics": "file:../../../packages/sdk-metrics",
"@opentelemetry/sdk-trace-base": "file:../../../packages/opentelemetry-sdk-trace-base",
"@opentelemetry/sdk-trace-web": "file:../../../packages/opentelemetry-sdk-trace-web"
},
"devDependencies": {
"@babel/core": "^7.28.5",
"@babel/preset-env": "^7.28.5",
"@types/webpack": "^4",
"babel-loader": "^8.0.0",
"html-webpack-plugin": "^4.5.2",
"webpack": "^4",
"webpack-cli": "^4"
},
"dependencies": {
"@opentelemetry/api": "file:../../../api",
"@opentelemetry/api-logs": "file:../../../experimental/packages/api-logs",
"@opentelemetry/exporter-logs-otlp-http": "file:../../../experimental/packages/exporter-logs-otlp-http",
"@opentelemetry/sdk-logs": "file:../../../experimental/packages/sdk-logs"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/bundler-tests/browser/webpack-4"
}
}
2 changes: 1 addition & 1 deletion bundler-tests/browser/webpack-4/project.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"name": "webpack-4-bundle-test"
"name": "bundler-tests-browser-webpack-4"
}
61 changes: 47 additions & 14 deletions bundler-tests/browser/webpack-4/src/index.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,51 @@
import { setupOpenTelemetry } from './opentelemetry.js';
import { DiagConsoleLogger, diag } from '@opentelemetry/api';
import { logs } from '@opentelemetry/api-logs';
import { W3CTraceContextPropagator } from '@opentelemetry/core';
import { OTLPLogExporter } from '@opentelemetry/exporter-logs-otlp-http';
import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-http';
import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
import { InstrumentationBase } from '@opentelemetry/instrumentation';
import { FetchInstrumentation } from '@opentelemetry/instrumentation-fetch';
import { XMLHttpRequestInstrumentation } from '@opentelemetry/instrumentation-xml-http-request';
import { browserDetector } from '@opentelemetry/opentelemetry-browser-detector';
import { B3Propagator } from '@opentelemetry/propagator-b3';
import { defaultServiceName } from '@opentelemetry/resources';
import {
LoggerProvider,
SimpleLogRecordProcessor,
} from '@opentelemetry/sdk-logs';
import { MeterProvider } from '@opentelemetry/sdk-metrics';
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import { WebTracerProvider } from '@opentelemetry/sdk-trace-web';

// Setup SDK and register with API, then obtain logger from API.
setupOpenTelemetry();
const logger = logs.getLogger('bundle-test-webpack');
diag.setLogger(new DiagConsoleLogger());

logs.setGlobalLoggerProvider(
new LoggerProvider({
processors: [new SimpleLogRecordProcessor(new OTLPLogExporter())],
})
);

window.addEventListener('load', () => {
console.log('loaded');
const emitEventButton = document.getElementById('emit-event-button');
emitEventButton.addEventListener('click', () => {
console.log('clicked');
logger.emit({
body: 'test-event-body',
eventName: 'custom.event',
});
});
const logger = logs.getLogger('bundle-test-webpack');
logger.emit({
body: defaultServiceName(),
eventName: 'custom.event',
});

class TestInstrumentation extends InstrumentationBase {
init() {
return [];
}
}

new TestInstrumentation('test', '0.0.0');
new BasicTracerProvider();
new MeterProvider();
new OTLPTraceExporter();
new OTLPMetricExporter();
new W3CTraceContextPropagator();
new B3Propagator();
new WebTracerProvider();
new FetchInstrumentation();
new XMLHttpRequestInstrumentation();
void browserDetector;
Loading
Loading