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.

Sign up for GitHub

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

[AutoMerge][Staging] Merging change(s) from otel-js; #252

Merged
merged 2 commits into from
Mar 12, 2025
Merged

[AutoMerge][Staging] Merging change(s) from otel-js; #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eaebf76
chore: prepare release 2.0.0-rc.1/0.200.0-rc.1 (#5534)
pichlermarc Mar 12, 2025
0523bb5
[AutoMerge] ## Merging otel-js @ [eaebf76...](https://github.com/open…
opentelemetrybot Mar 12, 2025
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
14 changes: 7 additions & 7 deletions auto-merge/js/examples/esm-http-ts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "esm-http-ts",
"private": true,
"version": "0.200.0-dev.1",
"version": "0.200.0-rc.1",
"description": "Example of HTTP integration with OpenTelemetry using ESM and TypeScript",
"main": "build/index.js",
"type": "module",
Expand Down Expand Up @@ -32,12 +32,12 @@
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/",
"dependencies": {
"@opentelemetry/api": "1.9.0",
"@opentelemetry/exporter-trace-otlp-proto": "0.200.0-dev.1",
"@opentelemetry/instrumentation": "0.200.0-dev.1",
"@opentelemetry/instrumentation-http": "0.200.0-dev.1",
"@opentelemetry/resources": "2.0.0-dev.1",
"@opentelemetry/sdk-trace-base": "2.0.0-dev.1",
"@opentelemetry/sdk-trace-node": "2.0.0-dev.1",
"@opentelemetry/exporter-trace-otlp-proto": "0.200.0-rc.1",
"@opentelemetry/instrumentation": "0.200.0-rc.1",
"@opentelemetry/instrumentation-http": "0.200.0-rc.1",
"@opentelemetry/resources": "2.0.0-rc.1",
"@opentelemetry/sdk-trace-base": "2.0.0-rc.1",
"@opentelemetry/sdk-trace-node": "2.0.0-rc.1",
"@opentelemetry/semantic-conventions": "^1.29.0"
}
}
16 changes: 8 additions & 8 deletions auto-merge/js/examples/http/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "http-example",
"private": true,
"version": "0.200.0-dev.1",
"version": "0.200.0-rc.1",
"description": "Example of HTTP integration with OpenTelemetry",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -30,13 +30,13 @@
},
"dependencies": {
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/exporter-jaeger": "2.0.0-dev.1",
"@opentelemetry/exporter-zipkin": "2.0.0-dev.1",
"@opentelemetry/instrumentation": "0.200.0-dev.1",
"@opentelemetry/instrumentation-http": "0.200.0-dev.1",
"@opentelemetry/resources": "2.0.0-dev.1",
"@opentelemetry/sdk-trace-base": "2.0.0-dev.1",
"@opentelemetry/sdk-trace-node": "2.0.0-dev.1",
"@opentelemetry/exporter-jaeger": "2.0.0-rc.1",
"@opentelemetry/exporter-zipkin": "2.0.0-rc.1",
"@opentelemetry/instrumentation": "0.200.0-rc.1",
"@opentelemetry/instrumentation-http": "0.200.0-rc.1",
"@opentelemetry/resources": "2.0.0-rc.1",
"@opentelemetry/sdk-trace-base": "2.0.0-rc.1",
"@opentelemetry/sdk-trace-node": "2.0.0-rc.1",
"@opentelemetry/semantic-conventions": "^1.29.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/http",
Expand Down
16 changes: 8 additions & 8 deletions auto-merge/js/examples/https/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "https-example",
"private": true,
"version": "0.200.0-dev.1",
"version": "0.200.0-rc.1",
"description": "Example of HTTPs integration with OpenTelemetry",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand Down Expand Up @@ -34,13 +34,13 @@
},
"dependencies": {
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/exporter-jaeger": "2.0.0-dev.1",
"@opentelemetry/exporter-zipkin": "2.0.0-dev.1",
"@opentelemetry/instrumentation": "0.200.0-dev.1",
"@opentelemetry/instrumentation-http": "0.200.0-dev.1",
"@opentelemetry/resources": "2.0.0-dev.1",
"@opentelemetry/sdk-trace-base": "2.0.0-dev.1",
"@opentelemetry/sdk-trace-node": "2.0.0-dev.1",
"@opentelemetry/exporter-jaeger": "2.0.0-rc.1",
"@opentelemetry/exporter-zipkin": "2.0.0-rc.1",
"@opentelemetry/instrumentation": "0.200.0-rc.1",
"@opentelemetry/instrumentation-http": "0.200.0-rc.1",
"@opentelemetry/resources": "2.0.0-rc.1",
"@opentelemetry/sdk-trace-base": "2.0.0-rc.1",
"@opentelemetry/sdk-trace-node": "2.0.0-rc.1",
"@opentelemetry/semantic-conventions": "^1.29.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/https",
Expand Down
28 changes: 14 additions & 14 deletions auto-merge/js/examples/opentelemetry-web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "web-opentelemetry-example",
"private": true,
"version": "0.200.0-dev.1",
"version": "0.200.0-rc.1",
"description": "Example of using @opentelemetry/sdk-trace-web and @opentelemetry/sdk-metrics in browser",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -45,19 +45,19 @@
},
"dependencies": {
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/context-zone": "2.0.0-dev.1",
"@opentelemetry/core": "2.0.0-dev.1",
"@opentelemetry/exporter-metrics-otlp-http": "0.200.0-dev.1",
"@opentelemetry/exporter-trace-otlp-http": "0.200.0-dev.1",
"@opentelemetry/exporter-trace-otlp-proto": "0.200.0-dev.1",
"@opentelemetry/exporter-zipkin": "2.0.0-dev.1",
"@opentelemetry/instrumentation": "0.200.0-dev.1",
"@opentelemetry/instrumentation-fetch": "0.200.0-dev.1",
"@opentelemetry/instrumentation-xml-http-request": "0.200.0-dev.1",
"@opentelemetry/propagator-b3": "2.0.0-dev.1",
"@opentelemetry/sdk-metrics": "2.0.0-dev.1",
"@opentelemetry/sdk-trace-base": "2.0.0-dev.1",
"@opentelemetry/sdk-trace-web": "2.0.0-dev.1",
"@opentelemetry/context-zone": "2.0.0-rc.1",
"@opentelemetry/core": "2.0.0-rc.1",
"@opentelemetry/exporter-metrics-otlp-http": "0.200.0-rc.1",
"@opentelemetry/exporter-trace-otlp-http": "0.200.0-rc.1",
"@opentelemetry/exporter-trace-otlp-proto": "0.200.0-rc.1",
"@opentelemetry/exporter-zipkin": "2.0.0-rc.1",
"@opentelemetry/instrumentation": "0.200.0-rc.1",
"@opentelemetry/instrumentation-fetch": "0.200.0-rc.1",
"@opentelemetry/instrumentation-xml-http-request": "0.200.0-rc.1",
"@opentelemetry/propagator-b3": "2.0.0-rc.1",
"@opentelemetry/sdk-metrics": "2.0.0-rc.1",
"@opentelemetry/sdk-trace-base": "2.0.0-rc.1",
"@opentelemetry/sdk-trace-web": "2.0.0-rc.1",
"@opentelemetry/semantic-conventions": "^1.29.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/tracer-web"
Expand Down
22 changes: 11 additions & 11 deletions auto-merge/js/examples/otlp-exporter-node/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "example-otlp-exporter-node",
"private": true,
"version": "0.200.0-dev.1",
"version": "0.200.0-rc.1",
"description": "Example of using @opentelemetry/collector-exporter in Node.js",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -30,16 +30,16 @@
},
"dependencies": {
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/core": "2.0.0-dev.1",
"@opentelemetry/exporter-metrics-otlp-grpc": "0.200.0-dev.1",
"@opentelemetry/exporter-metrics-otlp-http": "0.200.0-dev.1",
"@opentelemetry/exporter-metrics-otlp-proto": "0.200.0-dev.1",
"@opentelemetry/exporter-trace-otlp-grpc": "0.200.0-dev.1",
"@opentelemetry/exporter-trace-otlp-http": "0.200.0-dev.1",
"@opentelemetry/exporter-trace-otlp-proto": "0.200.0-dev.1",
"@opentelemetry/resources": "2.0.0-dev.1",
"@opentelemetry/sdk-metrics": "2.0.0-dev.1",
"@opentelemetry/sdk-trace-base": "2.0.0-dev.1",
"@opentelemetry/core": "2.0.0-rc.1",
"@opentelemetry/exporter-metrics-otlp-grpc": "0.200.0-rc.1",
"@opentelemetry/exporter-metrics-otlp-http": "0.200.0-rc.1",
"@opentelemetry/exporter-metrics-otlp-proto": "0.200.0-rc.1",
"@opentelemetry/exporter-trace-otlp-grpc": "0.200.0-rc.1",
"@opentelemetry/exporter-trace-otlp-http": "0.200.0-rc.1",
"@opentelemetry/exporter-trace-otlp-proto": "0.200.0-rc.1",
"@opentelemetry/resources": "2.0.0-rc.1",
"@opentelemetry/sdk-metrics": "2.0.0-rc.1",
"@opentelemetry/sdk-trace-base": "2.0.0-rc.1",
"@opentelemetry/semantic-conventions": "^1.29.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/otlp-exporter-node"
Expand Down
6 changes: 3 additions & 3 deletions auto-merge/js/experimental/backwards-compatibility/node14/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "backcompat-node14",
"version": "0.200.0-dev.1",
"version": "0.200.0-rc.1",
"private": true,
"description": "Backwards compatibility app for node 14 types and the OpenTelemetry Node.js SDK",
"main": "index.js",
Expand All @@ -10,8 +10,8 @@
"align-api-deps": "node ../../../scripts/align-api-deps.js"
},
"dependencies": {
"@opentelemetry/sdk-node": "0.200.0-dev.1",
"@opentelemetry/sdk-trace-base": "2.0.0-dev.1"
"@opentelemetry/sdk-node": "0.200.0-rc.1",
"@opentelemetry/sdk-trace-base": "2.0.0-rc.1"
},
"devDependencies": {
"@types/node": "14.18.25",
Expand Down
6 changes: 3 additions & 3 deletions auto-merge/js/experimental/backwards-compatibility/node16/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "backcompat-node16",
"version": "0.200.0-dev.1",
"version": "0.200.0-rc.1",
"private": true,
"description": "Backwards compatibility app for node 16 types and the OpenTelemetry Node.js SDK",
"main": "index.js",
Expand All @@ -10,8 +10,8 @@
"align-api-deps": "node ../../../scripts/align-api-deps.js"
},
"dependencies": {
"@opentelemetry/sdk-node": "0.200.0-dev.1",
"@opentelemetry/sdk-trace-base": "2.0.0-dev.1"
"@opentelemetry/sdk-node": "0.200.0-rc.1",
"@opentelemetry/sdk-trace-base": "2.0.0-rc.1"
},
"devDependencies": {
"@types/node": "16.11.52",
Expand Down
12 changes: 6 additions & 6 deletions auto-merge/js/experimental/examples/events/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"name": "events-example",
"version": "0.200.0-dev.1",
"version": "0.200.0-rc.1",
"private": true,
"scripts": {
"start": "ts-node index.ts"
},
"dependencies": {
"@opentelemetry/api": "^1.7.0",
"@opentelemetry/api-events": "0.200.0-dev.1",
"@opentelemetry/api-logs": "0.200.0-dev.1",
"@opentelemetry/exporter-logs-otlp-http": "0.200.0-dev.1",
"@opentelemetry/sdk-events": "0.200.0-dev.1",
"@opentelemetry/sdk-logs": "0.200.0-dev.1"
"@opentelemetry/api-events": "0.200.0-rc.1",
"@opentelemetry/api-logs": "0.200.0-rc.1",
"@opentelemetry/exporter-logs-otlp-http": "0.200.0-rc.1",
"@opentelemetry/sdk-events": "0.200.0-rc.1",
"@opentelemetry/sdk-logs": "0.200.0-rc.1"
},
"devDependencies": {
"@types/node": "18.6.5",
Expand Down
6 changes: 3 additions & 3 deletions auto-merge/js/experimental/examples/logs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "logs-example",
"version": "0.200.0-dev.1",
"version": "0.200.0-rc.1",
"private": true,
"scripts": {
"start": "ts-node index.ts",
"align-api-deps": "node ../../../scripts/align-api-deps.js"
},
"dependencies": {
"@opentelemetry/api": "^1.7.0",
"@opentelemetry/api-logs": "0.200.0-dev.1",
"@opentelemetry/sdk-logs": "0.200.0-dev.1"
"@opentelemetry/api-logs": "0.200.0-rc.1",
"@opentelemetry/sdk-logs": "0.200.0-rc.1"
},
"devDependencies": {
"@types/node": "18.6.5",
Expand Down
14 changes: 7 additions & 7 deletions auto-merge/js/experimental/examples/opencensus-shim/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "opencensus-shim",
"private": true,
"version": "0.200.0-dev.1",
"version": "0.200.0-rc.1",
"description": "Example of using @opentelemetry/shim-opencensus in Node.js",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -32,13 +32,13 @@
"@opencensus/instrumentation-http": "0.1.0",
"@opencensus/nodejs-base": "0.1.0",
"@opentelemetry/api": "1.9.0",
"@opentelemetry/exporter-prometheus": "0.200.0-dev.1",
"@opentelemetry/exporter-trace-otlp-grpc": "0.200.0-dev.1",
"@opentelemetry/resources": "2.0.0-dev.1",
"@opentelemetry/sdk-metrics": "2.0.0-dev.1",
"@opentelemetry/sdk-trace-node": "2.0.0-dev.1",
"@opentelemetry/exporter-prometheus": "0.200.0-rc.1",
"@opentelemetry/exporter-trace-otlp-grpc": "0.200.0-rc.1",
"@opentelemetry/resources": "2.0.0-rc.1",
"@opentelemetry/sdk-metrics": "2.0.0-rc.1",
"@opentelemetry/sdk-trace-node": "2.0.0-rc.1",
"@opentelemetry/semantic-conventions": "^1.29.0",
"@opentelemetry/shim-opencensus": "0.200.0-dev.1"
"@opentelemetry/shim-opencensus": "0.200.0-rc.1"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/examples/opencensus-shim"
}
6 changes: 3 additions & 3 deletions auto-merge/js/experimental/examples/prometheus/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "prometheus-example",
"version": "0.200.0-dev.1",
"version": "0.200.0-rc.1",
"private": true,
"description": "Example of using @opentelemetry/sdk-metrics and @opentelemetry/exporter-prometheus",
"main": "index.js",
Expand All @@ -12,7 +12,7 @@
"license": "Apache-2.0",
"dependencies": {
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/exporter-prometheus": "0.200.0-dev.1",
"@opentelemetry/sdk-metrics": "2.0.0-dev.1"
"@opentelemetry/exporter-prometheus": "0.200.0-rc.1",
"@opentelemetry/sdk-metrics": "2.0.0-rc.1"
}
}
4 changes: 2 additions & 2 deletions auto-merge/js/experimental/packages/api-events/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/api-events",
"version": "0.200.0-dev.1",
"version": "0.200.0-rc.1",
"description": "Public events API for OpenTelemetry",
"main": "build/src/index.js",
"module": "build/esm/index.js",
Expand Down Expand Up @@ -61,7 +61,7 @@
},
"dependencies": {
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/api-logs": "0.200.0-dev.1"
"@opentelemetry/api-logs": "0.200.0-rc.1"
},
"devDependencies": {
"@types/mocha": "10.0.10",
Expand Down
2 changes: 1 addition & 1 deletion auto-merge/js/experimental/packages/api-logs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/api-logs",
"version": "0.200.0-dev.1",
"version": "0.200.0-rc.1",
"description": "Public logs API for OpenTelemetry",
"main": "build/src/index.js",
"module": "build/esm/index.js",
Expand Down
16 changes: 8 additions & 8 deletions auto-merge/js/experimental/packages/exporter-logs-otlp-grpc/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/exporter-logs-otlp-grpc",
"version": "0.200.0-dev.1",
"version": "0.200.0-rc.1",
"description": "OpenTelemetry Collector Exporter allows user to send collected log records to the OpenTelemetry Collector",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand Down Expand Up @@ -50,8 +50,8 @@
"devDependencies": {
"@grpc/proto-loader": "^0.7.10",
"@opentelemetry/api": "1.9.0",
"@opentelemetry/api-logs": "0.200.0-dev.1",
"@opentelemetry/resources": "2.0.0-dev.1",
"@opentelemetry/api-logs": "0.200.0-rc.1",
"@opentelemetry/resources": "2.0.0-rc.1",
"@types/mocha": "10.0.10",
"@types/node": "18.6.5",
"@types/sinon": "17.0.4",
Expand All @@ -68,11 +68,11 @@
},
"dependencies": {
"@grpc/grpc-js": "^1.7.1",
"@opentelemetry/core": "2.0.0-dev.1",
"@opentelemetry/otlp-exporter-base": "0.200.0-dev.1",
"@opentelemetry/otlp-grpc-exporter-base": "0.200.0-dev.1",
"@opentelemetry/otlp-transformer": "0.200.0-dev.1",
"@opentelemetry/sdk-logs": "0.200.0-dev.1"
"@opentelemetry/core": "2.0.0-rc.1",
"@opentelemetry/otlp-exporter-base": "0.200.0-rc.1",
"@opentelemetry/otlp-grpc-exporter-base": "0.200.0-rc.1",
"@opentelemetry/otlp-transformer": "0.200.0-rc.1",
"@opentelemetry/sdk-logs": "0.200.0-rc.1"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-logs-otlp-grpc",
"sideEffects": false
Expand Down
14 changes: 7 additions & 7 deletions auto-merge/js/experimental/packages/exporter-logs-otlp-http/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/exporter-logs-otlp-http",
"version": "0.200.0-dev.1",
"version": "0.200.0-rc.1",
"publishConfig": {
"access": "public"
},
Expand Down Expand Up @@ -73,7 +73,7 @@
"@babel/core": "7.26.9",
"@babel/preset-env": "7.26.9",
"@opentelemetry/api": "1.9.0",
"@opentelemetry/resources": "2.0.0-dev.1",
"@opentelemetry/resources": "2.0.0-rc.1",
"@types/mocha": "10.0.10",
"@types/node": "18.6.5",
"@types/sinon": "17.0.4",
Expand All @@ -100,10 +100,10 @@
"@opentelemetry/api": "^1.3.0"
},
"dependencies": {
"@opentelemetry/api-logs": "0.200.0-dev.1",
"@opentelemetry/core": "2.0.0-dev.1",
"@opentelemetry/otlp-exporter-base": "0.200.0-dev.1",
"@opentelemetry/otlp-transformer": "0.200.0-dev.1",
"@opentelemetry/sdk-logs": "0.200.0-dev.1"
"@opentelemetry/api-logs": "0.200.0-rc.1",
"@opentelemetry/core": "2.0.0-rc.1",
"@opentelemetry/otlp-exporter-base": "0.200.0-rc.1",
"@opentelemetry/otlp-transformer": "0.200.0-rc.1",
"@opentelemetry/sdk-logs": "0.200.0-rc.1"
}
}
Loading