Skip to content

Commit

Permalink
Merge branch 'main' into fix/await-when-async-is-pending
Browse files Browse the repository at this point in the history
  • Loading branch information
pichlermarc authored Nov 8, 2024
2 parents 0a7e0e7 + 72c9af9 commit e81e944
Show file tree
Hide file tree
Showing 46 changed files with 437 additions and 358 deletions.
8 changes: 4 additions & 4 deletions examples/esm-http-ts/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "esm-http-ts",
"private": true,
"version": "0.54.1",
"version": "0.54.2",
"description": "Example of HTTP integration with OpenTelemetry using ESM and TypeScript",
"main": "build/index.js",
"type": "module",
Expand Down Expand Up @@ -32,9 +32,9 @@
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/",
"dependencies": {
"@opentelemetry/api": "1.9.0",
"@opentelemetry/exporter-trace-otlp-proto": "0.54.1",
"@opentelemetry/instrumentation": "0.54.1",
"@opentelemetry/instrumentation-http": "0.54.1",
"@opentelemetry/exporter-trace-otlp-proto": "0.54.2",
"@opentelemetry/instrumentation": "0.54.2",
"@opentelemetry/instrumentation-http": "0.54.2",
"@opentelemetry/resources": "1.27.0",
"@opentelemetry/sdk-trace-base": "1.27.0",
"@opentelemetry/sdk-trace-node": "1.27.0",
Expand Down
6 changes: 3 additions & 3 deletions examples/http/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "http-example",
"private": true,
"version": "0.54.1",
"version": "0.54.2",
"description": "Example of HTTP integration with OpenTelemetry",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -32,8 +32,8 @@
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/exporter-jaeger": "1.27.0",
"@opentelemetry/exporter-zipkin": "1.27.0",
"@opentelemetry/instrumentation": "0.54.1",
"@opentelemetry/instrumentation-http": "0.54.1",
"@opentelemetry/instrumentation": "0.54.2",
"@opentelemetry/instrumentation-http": "0.54.2",
"@opentelemetry/resources": "1.27.0",
"@opentelemetry/sdk-trace-base": "1.27.0",
"@opentelemetry/sdk-trace-node": "1.27.0",
Expand Down
6 changes: 3 additions & 3 deletions examples/https/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "https-example",
"private": true,
"version": "0.54.1",
"version": "0.54.2",
"description": "Example of HTTPs integration with OpenTelemetry",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand Down Expand Up @@ -36,8 +36,8 @@
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/exporter-jaeger": "1.27.0",
"@opentelemetry/exporter-zipkin": "1.27.0",
"@opentelemetry/instrumentation": "0.54.1",
"@opentelemetry/instrumentation-http": "0.54.1",
"@opentelemetry/instrumentation": "0.54.2",
"@opentelemetry/instrumentation-http": "0.54.2",
"@opentelemetry/resources": "1.27.0",
"@opentelemetry/sdk-trace-base": "1.27.0",
"@opentelemetry/sdk-trace-node": "1.27.0",
Expand Down
14 changes: 7 additions & 7 deletions examples/opentelemetry-web/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "web-opentelemetry-example",
"private": true,
"version": "0.54.1",
"version": "0.54.2",
"description": "Example of using @opentelemetry/sdk-trace-web and @opentelemetry/sdk-metrics in browser",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -47,13 +47,13 @@
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/context-zone": "1.27.0",
"@opentelemetry/core": "1.27.0",
"@opentelemetry/exporter-metrics-otlp-http": "0.54.1",
"@opentelemetry/exporter-trace-otlp-http": "0.54.1",
"@opentelemetry/exporter-trace-otlp-proto": "0.54.1",
"@opentelemetry/exporter-metrics-otlp-http": "0.54.2",
"@opentelemetry/exporter-trace-otlp-http": "0.54.2",
"@opentelemetry/exporter-trace-otlp-proto": "0.54.2",
"@opentelemetry/exporter-zipkin": "1.27.0",
"@opentelemetry/instrumentation": "0.54.1",
"@opentelemetry/instrumentation-fetch": "0.54.1",
"@opentelemetry/instrumentation-xml-http-request": "0.54.1",
"@opentelemetry/instrumentation": "0.54.2",
"@opentelemetry/instrumentation-fetch": "0.54.2",
"@opentelemetry/instrumentation-xml-http-request": "0.54.2",
"@opentelemetry/propagator-b3": "1.27.0",
"@opentelemetry/sdk-metrics": "1.27.0",
"@opentelemetry/sdk-trace-base": "1.27.0",
Expand Down
14 changes: 7 additions & 7 deletions examples/otlp-exporter-node/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "example-otlp-exporter-node",
"private": true,
"version": "0.54.1",
"version": "0.54.2",
"description": "Example of using @opentelemetry/collector-exporter in Node.js",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -31,12 +31,12 @@
"dependencies": {
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/core": "1.27.0",
"@opentelemetry/exporter-metrics-otlp-grpc": "0.54.1",
"@opentelemetry/exporter-metrics-otlp-http": "0.54.1",
"@opentelemetry/exporter-metrics-otlp-proto": "0.54.1",
"@opentelemetry/exporter-trace-otlp-grpc": "0.54.1",
"@opentelemetry/exporter-trace-otlp-http": "0.54.1",
"@opentelemetry/exporter-trace-otlp-proto": "0.54.1",
"@opentelemetry/exporter-metrics-otlp-grpc": "0.54.2",
"@opentelemetry/exporter-metrics-otlp-http": "0.54.2",
"@opentelemetry/exporter-metrics-otlp-proto": "0.54.2",
"@opentelemetry/exporter-trace-otlp-grpc": "0.54.2",
"@opentelemetry/exporter-trace-otlp-http": "0.54.2",
"@opentelemetry/exporter-trace-otlp-proto": "0.54.2",
"@opentelemetry/resources": "1.27.0",
"@opentelemetry/sdk-metrics": "1.27.0",
"@opentelemetry/sdk-trace-base": "1.27.0",
Expand Down
6 changes: 6 additions & 0 deletions experimental/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ All notable changes to experimental packages in this project will be documented

### :house: (Internal)

## 0.54.2

### :bug: (Bug Fix)

* fix(instrumentation): Fix wrapping ESM files with absolute path [#5094](https://github.com/open-telemetry/opentelemetry-js/pull/5094) @serkan-ozal

## 0.54.1

### :bug: (Bug Fix)
Expand Down
4 changes: 2 additions & 2 deletions experimental/backwards-compatibility/node14/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "backcompat-node14",
"version": "0.54.1",
"version": "0.54.2",
"private": true,
"description": "Backwards compatibility app for node 14 types and the OpenTelemetry Node.js SDK",
"main": "index.js",
Expand All @@ -10,7 +10,7 @@
"align-api-deps": "node ../../../scripts/align-api-deps.js"
},
"dependencies": {
"@opentelemetry/sdk-node": "0.54.1",
"@opentelemetry/sdk-node": "0.54.2",
"@opentelemetry/sdk-trace-base": "1.27.0"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions experimental/backwards-compatibility/node16/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "backcompat-node16",
"version": "0.54.1",
"version": "0.54.2",
"private": true,
"description": "Backwards compatibility app for node 16 types and the OpenTelemetry Node.js SDK",
"main": "index.js",
Expand All @@ -10,7 +10,7 @@
"align-api-deps": "node ../../../scripts/align-api-deps.js"
},
"dependencies": {
"@opentelemetry/sdk-node": "0.54.1",
"@opentelemetry/sdk-node": "0.54.2",
"@opentelemetry/sdk-trace-base": "1.27.0"
},
"devDependencies": {
Expand Down
12 changes: 6 additions & 6 deletions experimental/examples/events/package.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"name": "events-example",
"version": "0.54.1",
"version": "0.54.2",
"private": true,
"scripts": {
"start": "ts-node index.ts"
},
"dependencies": {
"@opentelemetry/api": "^1.7.0",
"@opentelemetry/api-events": "0.54.1",
"@opentelemetry/api-logs": "0.54.1",
"@opentelemetry/exporter-logs-otlp-http": "0.54.1",
"@opentelemetry/sdk-events": "0.54.1",
"@opentelemetry/sdk-logs": "0.54.1"
"@opentelemetry/api-events": "0.54.2",
"@opentelemetry/api-logs": "0.54.2",
"@opentelemetry/exporter-logs-otlp-http": "0.54.2",
"@opentelemetry/sdk-events": "0.54.2",
"@opentelemetry/sdk-logs": "0.54.2"
},
"devDependencies": {
"@types/node": "18.6.5",
Expand Down
6 changes: 3 additions & 3 deletions experimental/examples/logs/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "logs-example",
"version": "0.54.1",
"version": "0.54.2",
"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.54.1",
"@opentelemetry/sdk-logs": "0.54.1"
"@opentelemetry/api-logs": "0.54.2",
"@opentelemetry/sdk-logs": "0.54.2"
},
"devDependencies": {
"@types/node": "18.6.5",
Expand Down
8 changes: 4 additions & 4 deletions experimental/examples/opencensus-shim/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "opencensus-shim",
"private": true,
"version": "0.54.1",
"version": "0.54.2",
"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.54.1",
"@opentelemetry/exporter-trace-otlp-grpc": "0.54.1",
"@opentelemetry/exporter-prometheus": "0.54.2",
"@opentelemetry/exporter-trace-otlp-grpc": "0.54.2",
"@opentelemetry/resources": "1.27.0",
"@opentelemetry/sdk-metrics": "1.27.0",
"@opentelemetry/sdk-trace-node": "1.27.0",
"@opentelemetry/semantic-conventions": "1.27.0",
"@opentelemetry/shim-opencensus": "0.54.1"
"@opentelemetry/shim-opencensus": "0.54.2"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/examples/opencensus-shim"
}
4 changes: 2 additions & 2 deletions experimental/examples/prometheus/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "prometheus-example",
"version": "0.54.1",
"version": "0.54.2",
"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.54.1",
"@opentelemetry/exporter-prometheus": "0.54.2",
"@opentelemetry/sdk-metrics": "1.27.0"
}
}
4 changes: 2 additions & 2 deletions experimental/packages/api-events/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/api-events",
"version": "0.54.1",
"version": "0.54.2",
"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.54.1"
"@opentelemetry/api-logs": "0.54.2"
},
"devDependencies": {
"@types/mocha": "10.0.8",
Expand Down
2 changes: 1 addition & 1 deletion experimental/packages/api-logs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/api-logs",
"version": "0.54.1",
"version": "0.54.2",
"description": "Public logs API for OpenTelemetry",
"main": "build/src/index.js",
"module": "build/esm/index.js",
Expand Down
12 changes: 6 additions & 6 deletions experimental/packages/exporter-logs-otlp-grpc/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/exporter-logs-otlp-grpc",
"version": "0.54.1",
"version": "0.54.2",
"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 @@ -51,8 +51,8 @@
"devDependencies": {
"@grpc/proto-loader": "^0.7.10",
"@opentelemetry/api": "1.9.0",
"@opentelemetry/api-logs": "0.54.1",
"@opentelemetry/otlp-exporter-base": "0.54.1",
"@opentelemetry/api-logs": "0.54.2",
"@opentelemetry/otlp-exporter-base": "0.54.2",
"@opentelemetry/resources": "1.27.0",
"@types/mocha": "10.0.8",
"@types/node": "18.6.5",
Expand All @@ -71,9 +71,9 @@
"dependencies": {
"@grpc/grpc-js": "^1.7.1",
"@opentelemetry/core": "1.27.0",
"@opentelemetry/otlp-grpc-exporter-base": "0.54.1",
"@opentelemetry/otlp-transformer": "0.54.1",
"@opentelemetry/sdk-logs": "0.54.1"
"@opentelemetry/otlp-grpc-exporter-base": "0.54.2",
"@opentelemetry/otlp-transformer": "0.54.2",
"@opentelemetry/sdk-logs": "0.54.2"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-logs-otlp-grpc",
"sideEffects": false
Expand Down
10 changes: 5 additions & 5 deletions experimental/packages/exporter-logs-otlp-http/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/exporter-logs-otlp-http",
"version": "0.54.1",
"version": "0.54.2",
"publishConfig": {
"access": "public"
},
Expand Down Expand Up @@ -101,10 +101,10 @@
"@opentelemetry/api": "^1.3.0"
},
"dependencies": {
"@opentelemetry/api-logs": "0.54.1",
"@opentelemetry/api-logs": "0.54.2",
"@opentelemetry/core": "1.27.0",
"@opentelemetry/otlp-exporter-base": "0.54.1",
"@opentelemetry/otlp-transformer": "0.54.1",
"@opentelemetry/sdk-logs": "0.54.1"
"@opentelemetry/otlp-exporter-base": "0.54.2",
"@opentelemetry/otlp-transformer": "0.54.2",
"@opentelemetry/sdk-logs": "0.54.2"
}
}
10 changes: 5 additions & 5 deletions experimental/packages/exporter-logs-otlp-proto/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/exporter-logs-otlp-proto",
"version": "0.54.1",
"version": "0.54.2",
"description": "An OTLP exporter to send logs using protobuf over HTTP",
"main": "build/src/index.js",
"module": "build/esm/index.js",
Expand Down Expand Up @@ -91,12 +91,12 @@
"@opentelemetry/api": "^1.3.0"
},
"dependencies": {
"@opentelemetry/api-logs": "0.54.1",
"@opentelemetry/api-logs": "0.54.2",
"@opentelemetry/core": "1.27.0",
"@opentelemetry/otlp-exporter-base": "0.54.1",
"@opentelemetry/otlp-transformer": "0.54.1",
"@opentelemetry/otlp-exporter-base": "0.54.2",
"@opentelemetry/otlp-transformer": "0.54.2",
"@opentelemetry/resources": "1.27.0",
"@opentelemetry/sdk-logs": "0.54.1",
"@opentelemetry/sdk-logs": "0.54.2",
"@opentelemetry/sdk-trace-base": "1.27.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-logs-otlp-proto",
Expand Down
8 changes: 4 additions & 4 deletions experimental/packages/exporter-trace-otlp-grpc/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/exporter-trace-otlp-grpc",
"version": "0.54.1",
"version": "0.54.2",
"description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand Down Expand Up @@ -50,7 +50,7 @@
"devDependencies": {
"@grpc/proto-loader": "^0.7.10",
"@opentelemetry/api": "1.9.0",
"@opentelemetry/otlp-exporter-base": "0.54.1",
"@opentelemetry/otlp-exporter-base": "0.54.2",
"@types/mocha": "10.0.8",
"@types/node": "18.6.5",
"@types/sinon": "17.0.3",
Expand All @@ -68,8 +68,8 @@
"dependencies": {
"@grpc/grpc-js": "^1.7.1",
"@opentelemetry/core": "1.27.0",
"@opentelemetry/otlp-grpc-exporter-base": "0.54.1",
"@opentelemetry/otlp-transformer": "0.54.1",
"@opentelemetry/otlp-grpc-exporter-base": "0.54.2",
"@opentelemetry/otlp-transformer": "0.54.2",
"@opentelemetry/resources": "1.27.0",
"@opentelemetry/sdk-trace-base": "1.27.0"
},
Expand Down
Loading

0 comments on commit e81e944

Please sign in to comment.