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 @@ -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

Expand Down
7 changes: 5 additions & 2 deletions examples/opentelemetry-web/docker/collector-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 1 addition & 3 deletions examples/opentelemetry-web/docker/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 3 additions & 4 deletions examples/opentelemetry-web/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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",
Expand Down
96 changes: 6 additions & 90 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.