diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f9d73a2a9..e804dec319 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,20 +10,18 @@ For notes on migrating to 2.x / 0.200.x see [the upgrade guide](doc/upgrade-to-2 ## Unreleased -* feat(sdk-metrics): adds the cardinalitySelector argument to PeriodicExportingMetricReaders - [#6460](https://github.com/open-telemetry/opentelemetry-js/pull/6460) @starzlocker -* feat(opentelemetry-core): add extra checks on internal merge function for safety [#6587](https://github.com/open-telemetry/opentelemetry-js/pull/6587) @maryliag - ### :boom: Breaking Changes ### :rocket: Features * feat(sdk-logs): implement log creation metrics [#6433](https://github.com/open-telemetry/opentelemetry-js/pull/6433) @anuraaga +* feat(sdk-metrics): add the cardinalitySelector argument to PeriodicExportingMetricReaders + [#6460](https://github.com/open-telemetry/opentelemetry-js/pull/6460) @starzlocker +* feat(opentelemetry-core): add extra checks on internal merge function for safety [#6587](https://github.com/open-telemetry/opentelemetry-js/pull/6587) @maryliag ### :bug: Bug Fixes * fix(opentelemetry-resources): do not discard OTEL_RESOURCE_ATTRIBUTES when it contains empty kv pairs -* fix(otlp-transformer): add check for possible unsafe json parse [#6588](https://github.com/open-telemetry/opentelemetry-js/pull/6588) @maryliag ### :books: Documentation diff --git a/experimental/CHANGELOG.md b/experimental/CHANGELOG.md index 5d9636d4fa..d59cab361f 100644 --- a/experimental/CHANGELOG.md +++ b/experimental/CHANGELOG.md @@ -22,6 +22,7 @@ For notes on migrating to 2.x / 0.200.x see [the upgrade guide](doc/upgrade-to-2 * fix(instrumentation-fetch): preserve init overrides when input is a Request object [#6421](https://github.com/open-telemetry/opentelemetry-js/issues/6421) @akandic47 * fix(otlp-exporter-base): limit Node.js HTTP transport response body to 4 MiB [#6552](https://github.com/open-telemetry/opentelemetry-js/pull/6552) @kartikgola * fix(web-common): add check for possible unsafe json parse [#6589](https://github.com/open-telemetry/opentelemetry-js/pull/6589) @maryliag +* fix(otlp-transformer): add check for possible unsafe json parse [#6588](https://github.com/open-telemetry/opentelemetry-js/pull/6588) @maryliag ### :books: Documentation