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

chore: update versions to 1.24.1/0.51.1, carry over changelog adjustments #4705

Merged
merged 10 commits into from
May 15, 2024
Merged

chore: update versions to 1.24.1/0.51.1, carry over changelog adjustments #4705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
307e33a
fix(resources): prevent circular import (resource -> detector -> reso…
pichlermarc Apr 26, 2024
fe132d7
fix(core): align inconsistent behavior of getEnv() and getEnvWithoutD…
pichlermarc Apr 26, 2024
75817d7
fix(deps): update dependency import-in-the-middle to v1.7.4 (#4667)
renovate-bot Apr 30, 2024
dfc883c
fix(exporter-metrics-otlp-grpc) Add explicit otlp-exporter-base depen…
AkselAllas May 6, 2024
8a6d03f
chore: sync package-lock.json, adapt changelog
pichlermarc May 6, 2024
7cb72a6
chore: prepare release 1.24.1/0.51.1
pichlermarc May 6, 2024
41c2626
Merge pull request #4682 from dynatrace-oss-contrib/release/1.24.x-0.…
pichlermarc May 7, 2024
5e02fc4
Merge branch 'main' into release/1.24.x-0.51.x
pichlermarc May 14, 2024
5403675
chore: adjust changelog
pichlermarc May 14, 2024
72f0c54
chore: sync package-lock.json
pichlermarc May 14, 2024
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
12 changes: 8 additions & 4 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,20 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/

### :bug: (Bug Fix)

### :books: (Refine Doc)

### :house: (Internal)

## 1.24.1

### :bug: (Bug Fix)

* fix(core): align inconsistent behavior of `getEnv()` and `getEnvWithoutDefaults()` when a `process` polyfill is used [#4648](https://github.com/open-telemetry/opentelemetry-js/pull/4648) @pichlermarc
* `getEnvWithoutDefaults()` would use `process.env` if it was defined when running in a browser, while `getEnv()` would always use `_globalThis`. Now both use `_globalThis` when running in a browser.
* fix(resources): prevent circular import (resource -> detector -> resource -> ...) [#4653](https://github.com/open-telemetry/opentelemetry-js/pull/4653) @pichlermarc
* fixes a circular import warning which would appear in rollup when bundling `@opentelemetry/resources`
* fix(exporter-metrics-otlp-grpc): add explicit otlp-exporter-base dependency to exporter-metrics-otlp-grpc [#4678](https://github.com/open-telemetry/opentelemetry-js/pull/4678) @AkselAllas

### :books: (Refine Doc)

### :house: (Internal)

## 1.24.0

### :rocket: (Enhancement)
Expand Down
16 changes: 8 additions & 8 deletions 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.51.0",
"version": "0.51.1",
"description": "Example of HTTP integration with OpenTelemetry using ESM and TypeScript",
"main": "build/index.js",
"type": "module",
Expand Down Expand Up @@ -31,12 +31,12 @@
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/",
"dependencies": {
"@opentelemetry/api": "1.8.0",
"@opentelemetry/exporter-trace-otlp-proto": "0.51.0",
"@opentelemetry/instrumentation": "0.51.0",
"@opentelemetry/instrumentation-http": "0.51.0",
"@opentelemetry/resources": "1.24.0",
"@opentelemetry/sdk-trace-base": "1.24.0",
"@opentelemetry/sdk-trace-node": "1.24.0",
"@opentelemetry/semantic-conventions": "1.24.0"
"@opentelemetry/exporter-trace-otlp-proto": "0.51.1",
"@opentelemetry/instrumentation": "0.51.1",
"@opentelemetry/instrumentation-http": "0.51.1",
"@opentelemetry/resources": "1.24.1",
"@opentelemetry/sdk-trace-base": "1.24.1",
"@opentelemetry/sdk-trace-node": "1.24.1",
"@opentelemetry/semantic-conventions": "1.24.1"
}
}
18 changes: 9 additions & 9 deletions 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.51.0",
"version": "0.51.1",
"description": "Example of HTTP integration with OpenTelemetry",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -29,14 +29,14 @@
},
"dependencies": {
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/exporter-jaeger": "1.24.0",
"@opentelemetry/exporter-zipkin": "1.24.0",
"@opentelemetry/instrumentation": "0.51.0",
"@opentelemetry/instrumentation-http": "0.51.0",
"@opentelemetry/resources": "1.24.0",
"@opentelemetry/sdk-trace-base": "1.24.0",
"@opentelemetry/sdk-trace-node": "1.24.0",
"@opentelemetry/semantic-conventions": "1.24.0"
"@opentelemetry/exporter-jaeger": "1.24.1",
"@opentelemetry/exporter-zipkin": "1.24.1",
"@opentelemetry/instrumentation": "0.51.1",
"@opentelemetry/instrumentation-http": "0.51.1",
"@opentelemetry/resources": "1.24.1",
"@opentelemetry/sdk-trace-base": "1.24.1",
"@opentelemetry/sdk-trace-node": "1.24.1",
"@opentelemetry/semantic-conventions": "1.24.1"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/http",
"devDependencies": {
Expand Down
18 changes: 9 additions & 9 deletions 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.51.0",
"version": "0.51.1",
"description": "Example of HTTPs integration with OpenTelemetry",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand Down Expand Up @@ -33,14 +33,14 @@
},
"dependencies": {
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/exporter-jaeger": "1.24.0",
"@opentelemetry/exporter-zipkin": "1.24.0",
"@opentelemetry/instrumentation": "0.51.0",
"@opentelemetry/instrumentation-http": "0.51.0",
"@opentelemetry/resources": "1.24.0",
"@opentelemetry/sdk-trace-base": "1.24.0",
"@opentelemetry/sdk-trace-node": "1.24.0",
"@opentelemetry/semantic-conventions": "1.24.0"
"@opentelemetry/exporter-jaeger": "1.24.1",
"@opentelemetry/exporter-zipkin": "1.24.1",
"@opentelemetry/instrumentation": "0.51.1",
"@opentelemetry/instrumentation-http": "0.51.1",
"@opentelemetry/resources": "1.24.1",
"@opentelemetry/sdk-trace-base": "1.24.1",
"@opentelemetry/sdk-trace-node": "1.24.1",
"@opentelemetry/semantic-conventions": "1.24.1"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/https",
"devDependencies": {
Expand Down
30 changes: 15 additions & 15 deletions 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.51.0",
"version": "0.51.1",
"description": "Example of using @opentelemetry/sdk-trace-web and @opentelemetry/sdk-metrics in browser",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -44,20 +44,20 @@
},
"dependencies": {
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/context-zone": "1.24.0",
"@opentelemetry/core": "1.24.0",
"@opentelemetry/exporter-metrics-otlp-http": "0.51.0",
"@opentelemetry/exporter-trace-otlp-http": "0.51.0",
"@opentelemetry/exporter-trace-otlp-proto": "0.51.0",
"@opentelemetry/exporter-zipkin": "1.24.0",
"@opentelemetry/instrumentation": "0.51.0",
"@opentelemetry/instrumentation-fetch": "0.51.0",
"@opentelemetry/instrumentation-xml-http-request": "0.51.0",
"@opentelemetry/propagator-b3": "1.24.0",
"@opentelemetry/sdk-metrics": "1.24.0",
"@opentelemetry/sdk-trace-base": "1.24.0",
"@opentelemetry/sdk-trace-web": "1.24.0",
"@opentelemetry/semantic-conventions": "1.24.0"
"@opentelemetry/context-zone": "1.24.1",
"@opentelemetry/core": "1.24.1",
"@opentelemetry/exporter-metrics-otlp-http": "0.51.1",
"@opentelemetry/exporter-trace-otlp-http": "0.51.1",
"@opentelemetry/exporter-trace-otlp-proto": "0.51.1",
"@opentelemetry/exporter-zipkin": "1.24.1",
"@opentelemetry/instrumentation": "0.51.1",
"@opentelemetry/instrumentation-fetch": "0.51.1",
"@opentelemetry/instrumentation-xml-http-request": "0.51.1",
"@opentelemetry/propagator-b3": "1.24.1",
"@opentelemetry/sdk-metrics": "1.24.1",
"@opentelemetry/sdk-trace-base": "1.24.1",
"@opentelemetry/sdk-trace-web": "1.24.1",
"@opentelemetry/semantic-conventions": "1.24.1"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/tracer-web"
}
24 changes: 12 additions & 12 deletions 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.51.0",
"version": "0.51.1",
"description": "Example of using @opentelemetry/collector-exporter in Node.js",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -29,17 +29,17 @@
},
"dependencies": {
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/core": "1.24.0",
"@opentelemetry/exporter-metrics-otlp-grpc": "0.51.0",
"@opentelemetry/exporter-metrics-otlp-http": "0.51.0",
"@opentelemetry/exporter-metrics-otlp-proto": "0.51.0",
"@opentelemetry/exporter-trace-otlp-grpc": "0.51.0",
"@opentelemetry/exporter-trace-otlp-http": "0.51.0",
"@opentelemetry/exporter-trace-otlp-proto": "0.51.0",
"@opentelemetry/resources": "1.24.0",
"@opentelemetry/sdk-metrics": "1.24.0",
"@opentelemetry/sdk-trace-base": "1.24.0",
"@opentelemetry/semantic-conventions": "1.24.0"
"@opentelemetry/core": "1.24.1",
"@opentelemetry/exporter-metrics-otlp-grpc": "0.51.1",
"@opentelemetry/exporter-metrics-otlp-http": "0.51.1",
"@opentelemetry/exporter-metrics-otlp-proto": "0.51.1",
"@opentelemetry/exporter-trace-otlp-grpc": "0.51.1",
"@opentelemetry/exporter-trace-otlp-http": "0.51.1",
"@opentelemetry/exporter-trace-otlp-proto": "0.51.1",
"@opentelemetry/resources": "1.24.1",
"@opentelemetry/sdk-metrics": "1.24.1",
"@opentelemetry/sdk-trace-base": "1.24.1",
"@opentelemetry/semantic-conventions": "1.24.1"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/otlp-exporter-node"
}
6 changes: 6 additions & 0 deletions experimental/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ All notable changes to experimental packages in this project will be documented

### :house: (Internal)

## 0.51.1

### :bug: (Bug Fix)

* fix(instrumentation): update import-in-the-middle to 1.7.4

## 0.51.0

### :boom: Breaking Change
Expand Down
6 changes: 3 additions & 3 deletions 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.51.0",
"version": "0.51.1",
"private": true,
"description": "Backwards compatibility app for node 14 types and the OpenTelemetry Node.js SDK",
"main": "index.js",
Expand All @@ -9,8 +9,8 @@
"peer-api-check": "node ../../../scripts/peer-api-check.js"
},
"dependencies": {
"@opentelemetry/sdk-node": "0.51.0",
"@opentelemetry/sdk-trace-base": "1.24.0"
"@opentelemetry/sdk-node": "0.51.1",
"@opentelemetry/sdk-trace-base": "1.24.1"
},
"devDependencies": {
"@types/node": "14.18.25",
Expand Down
6 changes: 3 additions & 3 deletions 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.51.0",
"version": "0.51.1",
"private": true,
"description": "Backwards compatibility app for node 16 types and the OpenTelemetry Node.js SDK",
"main": "index.js",
Expand All @@ -9,8 +9,8 @@
"peer-api-check": "node ../../../scripts/peer-api-check.js"
},
"dependencies": {
"@opentelemetry/sdk-node": "0.51.0",
"@opentelemetry/sdk-trace-base": "1.24.0"
"@opentelemetry/sdk-node": "0.51.1",
"@opentelemetry/sdk-trace-base": "1.24.1"
},
"devDependencies": {
"@types/node": "16.11.52",
Expand Down
6 changes: 3 additions & 3 deletions experimental/examples/logs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "logs-example",
"version": "0.51.0",
"version": "0.51.1",
"private": true,
"scripts": {
"start": "ts-node index.ts"
},
"dependencies": {
"@opentelemetry/api": "^1.7.0",
"@opentelemetry/api-logs": "0.51.0",
"@opentelemetry/sdk-logs": "0.51.0"
"@opentelemetry/api-logs": "0.51.1",
"@opentelemetry/sdk-logs": "0.51.1"
},
"devDependencies": {
"@types/node": "18.6.5",
Expand Down
16 changes: 8 additions & 8 deletions 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.51.0",
"version": "0.51.1",
"description": "Example of using @opentelemetry/shim-opencensus in Node.js",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -31,13 +31,13 @@
"@opencensus/instrumentation-http": "0.1.0",
"@opencensus/nodejs-base": "0.1.0",
"@opentelemetry/api": "1.8.0",
"@opentelemetry/exporter-prometheus": "0.51.0",
"@opentelemetry/exporter-trace-otlp-grpc": "0.51.0",
"@opentelemetry/resources": "1.24.0",
"@opentelemetry/sdk-metrics": "1.24.0",
"@opentelemetry/sdk-trace-node": "1.24.0",
"@opentelemetry/semantic-conventions": "1.24.0",
"@opentelemetry/shim-opencensus": "0.51.0"
"@opentelemetry/exporter-prometheus": "0.51.1",
"@opentelemetry/exporter-trace-otlp-grpc": "0.51.1",
"@opentelemetry/resources": "1.24.1",
"@opentelemetry/sdk-metrics": "1.24.1",
"@opentelemetry/sdk-trace-node": "1.24.1",
"@opentelemetry/semantic-conventions": "1.24.1",
"@opentelemetry/shim-opencensus": "0.51.1"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/examples/opencensus-shim"
}
6 changes: 3 additions & 3 deletions 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.51.0",
"version": "0.51.1",
"private": true,
"description": "Example of using @opentelemetry/sdk-metrics and @opentelemetry/exporter-prometheus",
"main": "index.js",
Expand All @@ -11,7 +11,7 @@
"license": "Apache-2.0",
"dependencies": {
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/exporter-prometheus": "0.51.0",
"@opentelemetry/sdk-metrics": "1.24.0"
"@opentelemetry/exporter-prometheus": "0.51.1",
"@opentelemetry/sdk-metrics": "1.24.1"
}
}
4 changes: 2 additions & 2 deletions 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.51.0",
"version": "0.51.1",
"description": "Public events API for OpenTelemetry",
"main": "build/src/index.js",
"module": "build/esm/index.js",
Expand Down Expand Up @@ -62,7 +62,7 @@
},
"dependencies": {
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/api-logs": "0.51.0"
"@opentelemetry/api-logs": "0.51.1"
},
"devDependencies": {
"@types/mocha": "10.0.6",
Expand Down
2 changes: 1 addition & 1 deletion 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.51.0",
"version": "0.51.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 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.51.0",
"version": "0.51.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,9 +50,9 @@
"devDependencies": {
"@grpc/proto-loader": "^0.7.10",
"@opentelemetry/api": "1.8.0",
"@opentelemetry/api-logs": "0.51.0",
"@opentelemetry/otlp-exporter-base": "0.51.0",
"@opentelemetry/resources": "1.24.0",
"@opentelemetry/api-logs": "0.51.1",
"@opentelemetry/otlp-exporter-base": "0.51.1",
"@opentelemetry/resources": "1.24.1",
"@types/mocha": "10.0.6",
"@types/node": "18.6.5",
"@types/sinon": "10.0.20",
Expand All @@ -72,10 +72,10 @@
},
"dependencies": {
"@grpc/grpc-js": "^1.7.1",
"@opentelemetry/core": "1.24.0",
"@opentelemetry/otlp-grpc-exporter-base": "0.51.0",
"@opentelemetry/otlp-transformer": "0.51.0",
"@opentelemetry/sdk-logs": "0.51.0"
"@opentelemetry/core": "1.24.1",
"@opentelemetry/otlp-grpc-exporter-base": "0.51.1",
"@opentelemetry/otlp-transformer": "0.51.1",
"@opentelemetry/sdk-logs": "0.51.1"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-logs-otlp-grpc",
"sideEffects": false
Expand Down
Loading