Skip to content

Commit

Permalink
Merge branch 'update-core' of github.com:dyladan/opentelemetry-js int…
Browse files Browse the repository at this point in the history
…o update-core
  • Loading branch information
dyladan committed Jun 4, 2021
2 parents a77713d + 55914ee commit 369c4e0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Expand Up @@ -45,6 +45,8 @@ All notable changes to this project will be documented in this file.
* [#2134](https://github.com/open-telemetry/opentelemetry-js/pull/2134) feat(instrumentation-xhr): add applyCustomAttributesOnSpan hook ([@mhennoch](https://github.com/mhennoch))
* `opentelemetry-exporter-prometheus`
* [#2122](https://github.com/open-telemetry/opentelemetry-js/pull/2122) feat: add diag warning when metric name is invalid ([@weyert](https://github.com/weyert))
* `opentelemetry-api-metrics`, `opentelemetry-exporter-collector-grpc`, `opentelemetry-exporter-collector-proto`, `opentelemetry-exporter-collector`, `opentelemetry-metrics`
* [#2118](https://github.com/open-telemetry/opentelemetry-js/pull/2118) chore(deps): support cumulative, delta, and pass-through exporters ([@sergeylanzman](https://github.com/sergeylanzman))

### :bug: (Bug Fix)

Expand Down
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -48,8 +48,8 @@ This is the JavaScript version of [OpenTelemetry](https://opentelemetry.io/), a

| API Version | Core version | Contrib Version |
| ----------- |--------------|-------------------------|
| 0.20.x | 0.20.x | ------ |
| v1.0.0-rc.0 | 0.19.x | ------ |
| 0.20.x | 0.20.x | 0.20.x |
| v1.0.0-rc.3 | 0.19.x | 0.16.x |
| 0.18.x | 0.18.x | 0.14.x |
| | 0.17.x | ------ |
| | 0.16.x | ------ |
Expand Down

0 comments on commit 369c4e0

Please sign in to comment.