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.

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

[Do Not Merge] Dotnet Counters + Dotnet Monitor Unification #5398

Closed
wants to merge 75 commits into from

Conversation

kkeirstead
Copy link
Member

@kkeirstead kkeirstead commented Sep 22, 2023

Summary

This PR was co-developed with @wiktork.

Dotnet-Counters and the metrics functionality within Dotnet-Monitor currently share a lot of common logic, and keeping the code separate has resulted in a lot of duplicated work as new features are added to both tools.

This PR encompasses the unification work that takes place in dotnet-monitor. If you notice any behavior that seems to be inconsistent with what you'd expect, just let us know and we'll look into it - the intent is for this to not be a breaking change for either tool. I plan to do a final round of manual testing prior to merging in these changes, once all other feedback has been resolved.

The change in the diagnostics repo can be found here.

Release Notes Entry

kkeirstead and others added 26 commits September 28, 2023 13:14
…230929.1 (dotnet#5447)

[main] Update dependencies from dotnet/installer
* update release information

* Update Versions.props

---------

Co-authored-by: github-actions <[email protected]>
Co-authored-by: Justin Anderson <[email protected]>
…20230929.1 (dotnet#5451)

[main] Update dependencies from dotnet/diagnostics
…230929.3 (dotnet#5452)

[main] Update dependencies from dotnet/installer
Bumps [dotnet-dump](https://github.com/dotnet/diagnostics) from 7.0.442301 to 7.0.447801.
- [Release notes](https://github.com/dotnet/diagnostics/releases)
- [Commits](dotnet/diagnostics@v7.0.442301...v7.0.447801)

---
updated-dependencies:
- dependency-name: dotnet-dump
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…20231002.1 (dotnet#5467)

[main] Update dependencies from dotnet/diagnostics
…231002.10 (dotnet#5468)

[main] Update dependencies from dotnet/installer
- Coherency Updates:
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-rtm.23477.14 to 8.0.0-rtm.23479.3 (parent: Microsoft.Dotnet.Sdk.Internal)
  - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-rtm.23477.9 to 8.0.0-rtm.23478.17 (parent: Microsoft.Dotnet.Sdk.Internal)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-rtm.23477.14 to 8.0.0-rtm.23479.3 (parent: Microsoft.Dotnet.Sdk.Internal)
  - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-rtm.23477.9 to 8.0.0-rtm.23478.17 (parent: Microsoft.Dotnet.Sdk.Internal)
…20231003.1 (dotnet#5477)

[main] Update dependencies from dotnet/diagnostics
…231003.6 (dotnet#5478)

[main] Update dependencies from dotnet/installer
- Coherency Updates:
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-rtm.23479.3 to 8.0.0-rtm.23502.22 (parent: Microsoft.Dotnet.Sdk.Internal)
  - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-rtm.23478.17 to 8.0.0-rtm.23502.11 (parent: Microsoft.Dotnet.Sdk.Internal)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-rtm.23479.3 to 8.0.0-rtm.23502.22 (parent: Microsoft.Dotnet.Sdk.Internal)
  - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-rtm.23478.17 to 8.0.0-rtm.23502.11 (parent: Microsoft.Dotnet.Sdk.Internal)
…004.4 (dotnet#5481)

[main] Update dependencies from dotnet/arcade
…231004.11 (dotnet#5482)

[main] Update dependencies from dotnet/installer
- Coherency Updates:
  - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-rtm.23502.11 to 8.0.0-rtm.23503.15 (parent: Microsoft.Dotnet.Sdk.Internal)
  - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-rtm.23502.11 to 8.0.0-rtm.23503.15 (parent: Microsoft.Dotnet.Sdk.Internal)
…20231005.1 (dotnet#5488)

[main] Update dependencies from dotnet/diagnostics
…006.1 (dotnet#5489)

[main] Update dependencies from dotnet/arcade
…231005.1 (dotnet#5490)

[main] Update dependencies from dotnet/installer
…231006.1 (dotnet#5500)

[main] Update dependencies from dotnet/installer
- Coherency Updates:
  - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-rtm.23503.15 to 8.0.0-rtm.23504.8 (parent: Microsoft.Dotnet.Sdk.Internal)
  - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-rtm.23503.15 to 8.0.0-rtm.23504.8 (parent: Microsoft.Dotnet.Sdk.Internal)
…20231006.1 (dotnet#5498)

[main] Update dependencies from dotnet/diagnostics
@wiktork
Copy link
Member

wiktork commented Oct 13, 2023

@kkeirstead I've folded this PR into #5533

@ghost ghost removed the needs-review label Oct 13, 2023
dotnet-maestro bot and others added 25 commits October 14, 2023 13:32
…231013.4 (dotnet#5536)

[main] Update dependencies from dotnet/installer
…31016.1 (dotnet#5542)

[main] Update dependencies from dotnet/symstore
[main] Update dependencies from dotnet/roslyn-analyzers
…231016.5 (dotnet#5545)

[main] Update dependencies from dotnet/installer
…016.4 (dotnet#5553)

[main] Update dependencies from dotnet/arcade
…231017.25 (dotnet#5556)

[main] Update dependencies from dotnet/installer
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@8ade135...b4ffde6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps the identity-dependencies group in /eng/dependabot with 1 update: [Microsoft.Identity.Web](https://github.com/AzureAD/microsoft-identity-web).

- [Release notes](https://github.com/AzureAD/microsoft-identity-web/releases)
- [Changelog](https://github.com/AzureAD/microsoft-identity-web/blob/master/changelog.md)
- [Commits](AzureAD/microsoft-identity-web@2.15.1...2.15.2)

---
updated-dependencies:
- dependency-name: Microsoft.Identity.Web
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: identity-dependencies
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…231018.33 (dotnet#5562)

[main] Update dependencies from dotnet/installer
- Coherency Updates:
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-rtm.23512.10 to 8.0.0-rtm.23518.3 (parent: Microsoft.Dotnet.Sdk.Internal)
  - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-rtm.23511.16 to 8.0.0-rtm.23517.16 (parent: Microsoft.Dotnet.Sdk.Internal)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-rtm.23512.10 to 8.0.0-rtm.23518.3 (parent: Microsoft.Dotnet.Sdk.Internal)
  - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-rtm.23511.16 to 8.0.0-rtm.23517.16 (parent: Microsoft.Dotnet.Sdk.Internal)
Bumps the identity-dependencies group in /eng/dependabot with 1 update: [Azure.Identity](https://github.com/Azure/azure-sdk-for-net).

- [Release notes](https://github.com/Azure/azure-sdk-for-net/releases)
- [Commits](Azure/azure-sdk-for-net@Azure.Identity_1.10.2...Azure.Identity_1.10.3)

---
updated-dependencies:
- dependency-name: Azure.Identity
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: identity-dependencies
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…231019.30 (dotnet#5568)

[main] Update dependencies from dotnet/installer
Bumps [streetsidesoftware/cspell-action](https://github.com/streetsidesoftware/cspell-action) from 3.1.0 to 4.0.0.
- [Release notes](https://github.com/streetsidesoftware/cspell-action/releases)
- [Changelog](https://github.com/streetsidesoftware/cspell-action/blob/main/CHANGELOG.md)
- [Commits](streetsidesoftware/cspell-action@22e32eb...adb9472)

---
updated-dependencies:
- dependency-name: streetsidesoftware/cspell-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…231020.38 (dotnet#5571)

[main] Update dependencies from dotnet/installer
- Coherency Updates:
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-rtm.23518.3 to 8.0.0-rtm.23519.14 (parent: Microsoft.Dotnet.Sdk.Internal)
  - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-rtm.23517.16 to 8.0.0-rtm.23518.26 (parent: Microsoft.Dotnet.Sdk.Internal)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-rtm.23518.3 to 8.0.0-rtm.23519.14 (parent: Microsoft.Dotnet.Sdk.Internal)
  - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-rtm.23517.16 to 8.0.0-rtm.23518.26 (parent: Microsoft.Dotnet.Sdk.Internal)
…231022.1 (dotnet#5575)

[main] Update dependencies from dotnet/installer
- Coherency Updates:
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-rtm.23519.14 to 8.0.0-rtm.23520.10 (parent: Microsoft.Dotnet.Sdk.Internal)
  - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-rtm.23518.26 to 8.0.0-rtm.23519.13 (parent: Microsoft.Dotnet.Sdk.Internal)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-rtm.23519.14 to 8.0.0-rtm.23520.10 (parent: Microsoft.Dotnet.Sdk.Internal)
  - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-rtm.23518.26 to 8.0.0-rtm.23519.13 (parent: Microsoft.Dotnet.Sdk.Internal)
Bumps the identity-dependencies group in /eng/dependabot with 1 update: [Microsoft.Identity.Web](https://github.com/AzureAD/microsoft-identity-web).

- [Release notes](https://github.com/AzureAD/microsoft-identity-web/releases)
- [Changelog](https://github.com/AzureAD/microsoft-identity-web/blob/master/changelog.md)
- [Commits](AzureAD/microsoft-identity-web@2.15.2...2.15.3)

---
updated-dependencies:
- dependency-name: Microsoft.Identity.Web
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: identity-dependencies
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@ghost ghost added the needs-review label Oct 23, 2023
@kkeirstead kkeirstead closed this Oct 27, 2023
@ghost ghost removed the needs-review label Oct 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants