diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c8072af818..2716f9a58eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ For notes on migrating to 2.x / 0.200.x see [the upgrade guide](doc/upgrade-to-2 * perf(sdk-trace-base): use Uint8Array for browser RandomIdGenerator [#6209](https://github.com/open-telemetry/opentelemetry-js/pull/6209) @overbalance * test(sdk-trace-base): remove obsolete TypeScript and platform workarounds [#6327](https://github.com/open-telemetry/opentelemetry-js/pull/6327) @overbalance +* fix(example-web): update Docker config and deps for collector [#6342](https://github.com/open-telemetry/opentelemetry-js/pull/6342) @overbalance ## 2.5.0 diff --git a/examples/opentelemetry-web/docker/collector-config.yaml b/examples/opentelemetry-web/docker/collector-config.yaml index ca0a8decaa9..14f7df3c7a0 100644 --- a/examples/opentelemetry-web/docker/collector-config.yaml +++ b/examples/opentelemetry-web/docker/collector-config.yaml @@ -2,17 +2,20 @@ receivers: otlp: protocols: grpc: + endpoint: 0.0.0.0:4317 http: + endpoint: 0.0.0.0:4318 cors: allowed_origins: - http://* - https://* +processors: + batch: + exporters: zipkin: endpoint: "http://zipkin-all-in-one:9411/api/v2/spans" - sending_queue: - batch: prometheus: endpoint: "0.0.0.0:9464" diff --git a/examples/opentelemetry-web/docker/docker-compose.yaml b/examples/opentelemetry-web/docker/docker-compose.yaml index 68910b7ba4f..a4dbb169de0 100644 --- a/examples/opentelemetry-web/docker/docker-compose.yaml +++ b/examples/opentelemetry-web/docker/docker-compose.yaml @@ -1,9 +1,7 @@ -version: "3" services: # Collector collector: - image: otel/opentelemetry-collector-contrib:0.53.0 -# image: otel/opentelemetry-collector-contrib:latest + image: otel/opentelemetry-collector-contrib:latest command: ["--config=/conf/collector-config.yaml"] volumes: - ./collector-config.yaml:/conf/collector-config.yaml diff --git a/examples/opentelemetry-web/package.json b/examples/opentelemetry-web/package.json index 1adca04b982..4108a5e4070 100644 --- a/examples/opentelemetry-web/package.json +++ b/examples/opentelemetry-web/package.json @@ -1,11 +1,10 @@ { - "name": "web-opentelemetry-example", + "name": "opentelemetry-web-example", "private": true, "version": "0.211.0", "description": "Example of using @opentelemetry/sdk-trace-web and @opentelemetry/sdk-metrics in browser", - "main": "index.js", "scripts": { - "start": "webpack serve --progress --color --port 8090 --config webpack.dev.config.js --hot --host 0.0.0.0 --compress", + "start": "webpack serve --progress --color --port 8090 --config webpack.dev.config.js --hot --host 0.0.0.0 --compress --open", "start-nc": "webpack serve --progress --color --port 8090 --config webpack.dev.config.js --hot --host 0.0.0.0 --no-compress", "start-prod": "webpack serve --progress --color --port 8090 --config webpack.prod.config.js --hot --host 0.0.0.0 --compress", "start-prodnc": "webpack serve --progress --color --port 8090 --config webpack.prod.config.js --hot --host 0.0.0.0 --no-compress", @@ -35,7 +34,7 @@ "devDependencies": { "@babel/core": "^7.23.6", "@babel/preset-env": "^7.22.20", - "babel-loader": "^8.0.6", + "babel-loader": "^10.0.0", "ts-loader": "^9.2.6", "typescript": "5.0.4", "webpack": "^5.89.0", diff --git a/package-lock.json b/package-lock.json index 0bb93563cba..c801744658c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -173,7 +173,7 @@ } }, "examples/opentelemetry-web": { - "name": "web-opentelemetry-example", + "name": "opentelemetry-web-example", "version": "0.211.0", "license": "Apache-2.0", "dependencies": { @@ -196,7 +196,7 @@ "devDependencies": { "@babel/core": "^7.23.6", "@babel/preset-env": "^7.22.20", - "babel-loader": "^8.0.6", + "babel-loader": "^10.0.0", "ts-loader": "^9.2.6", "typescript": "5.0.4", "webpack": "^5.89.0", @@ -255,26 +255,6 @@ } } }, - "examples/opentelemetry-web/node_modules/babel-loader": { - "version": "8.4.1", - "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.4.1.tgz", - "integrity": "sha512-nXzRChX+Z1GoE6yWavBQg6jDslyFF3SDjl2paADuoQtQW10JqShJt62R6eJQ5m/pjJFDT8xgKIWSP85OY8eXeA==", - "dev": true, - "license": "MIT", - "dependencies": { - "find-cache-dir": "^3.3.1", - "loader-utils": "^2.0.4", - "make-dir": "^3.1.0", - "schema-utils": "^2.6.5" - }, - "engines": { - "node": ">= 8.9" - }, - "peerDependencies": { - "@babel/core": "^7.0.0", - "webpack": ">=2" - } - }, "examples/opentelemetry-web/node_modules/webpack-cli": { "version": "5.1.4", "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.4.tgz", @@ -7972,16 +7952,6 @@ "dev": true, "license": "MIT" }, - "node_modules/ajv-keywords": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "ajv": "^6.9.1" - } - }, "node_modules/ansi-color": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/ansi-color/-/ansi-color-0.2.2.tgz", @@ -8517,16 +8487,6 @@ "platform": "^1.3.3" } }, - "node_modules/big.js": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", - "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": "*" - } - }, "node_modules/bin-links": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/bin-links/-/bin-links-5.0.0.tgz", @@ -10748,16 +10708,6 @@ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "license": "MIT" }, - "node_modules/emojis-list": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", - "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4" - } - }, "node_modules/encodeurl": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", @@ -15526,21 +15476,6 @@ "url": "https://opencollective.com/webpack" } }, - "node_modules/loader-utils": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", - "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", - "dev": true, - "license": "MIT", - "dependencies": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - }, - "engines": { - "node": ">=8.9.0" - } - }, "node_modules/locate-path": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", @@ -18471,6 +18406,10 @@ "resolved": "experimental/examples/opencensus-shim", "link": true }, + "node_modules/opentelemetry-web-example": { + "resolved": "examples/opentelemetry-web", + "link": true + }, "node_modules/opentracing": { "version": "0.14.7", "resolved": "https://registry.npmjs.org/opentracing/-/opentracing-0.14.7.tgz", @@ -20483,25 +20422,6 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "license": "MIT" }, - "node_modules/schema-utils": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz", - "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/json-schema": "^7.0.5", - "ajv": "^6.12.4", - "ajv-keywords": "^3.5.2" - }, - "engines": { - "node": ">= 8.9.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - } - }, "node_modules/select-hose": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", @@ -23054,10 +22974,6 @@ "defaults": "^1.0.3" } }, - "node_modules/web-opentelemetry-example": { - "resolved": "examples/opentelemetry-web", - "link": true - }, "node_modules/webdriver-bidi-protocol": { "version": "0.2.11", "resolved": "https://registry.npmjs.org/webdriver-bidi-protocol/-/webdriver-bidi-protocol-0.2.11.tgz",