Skip to content

Commit

Permalink
Merge branch 'main' into release/prepare-Instrumentation.Quartz-1.0.0…
Browse files Browse the repository at this point in the history
…-beta.3-release
  • Loading branch information
Kielek committed Jun 18, 2024
2 parents d485dd8 + a966b22 commit 54c50c0
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Unreleased

## 1.0.0-beta.12

Released 2024-Jun-18

* Update `Microsoft.Extensions.Options` to `8.0.0`.
([#1830](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1830))

Expand Down
4 changes: 4 additions & 0 deletions src/OpenTelemetry.Instrumentation.Process/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Unreleased

## 0.5.0-beta.6

Released 2024-Jun-18

* Following changes related to [Semantic Convention v1.25.0](https://github.com/open-telemetry/semantic-conventions/blob/v1.25.0/docs/system/process-metrics.md)
* `process.cpu.time` metric attribute renamed from `state` to `process.cpu.state`,
* Metric descriptions fixed for `process.memory.usage` and `process.memory.virtual`,
Expand Down

0 comments on commit 54c50c0

Please sign in to comment.