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

[21371] Change monitor service writer entity id (backport #5070) #5089

Open
wants to merge 2 commits into
base: 2.14.x
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 19, 2024

Description

The EntityID of the MonitorService DataWriter is 0x004000D2, which is not included in the statistics data writer range (GuidUtils.hpp::37).

Hence, the discovery database fails to recognize the DataWriter and issues an error (DiscoveryDataBase.cpp::400) when the writer is discovered.

@Mergifyio 2.14.x

Contributor Checklist

  • Commit messages follow the project guidelines.

  • The code follows the style guidelines of this project.

  • N/A Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally

  • N/A Any new/modified methods have been properly documented using Doxygen.

  • N/A Any new configuration API has an equivalent XML API (with the corresponding XSD extension)

  • Changes are backport compatible: they do NOT break ABI nor change library core behavior.

  • Changes are API compatible.

  • N/A New feature has been added to the versions.md file (if applicable).

  • N/A New feature has been documented/Current behavior is correctly described in the documentation.

  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • If this is a critical bug fix, backports to the critical-only supported branches have been requested.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

This is an automatic backport of pull request #5070 done by [Mergify](https://mergify.com).

* Refs #21371: Change monitor service writer entity id

Signed-off-by: Raul Sanchez-Mateos <[email protected]>

* Add monitor service writer check

Signed-off-by: Raul Sanchez-Mateos <[email protected]>

* Revert monitor service entity_id

Signed-off-by: Raul Sanchez-Mateos <[email protected]>

* Uncrustify

Signed-off-by: Raul Sanchez-Mateos <[email protected]>

* Remove extra header file

Signed-off-by: Raul Sanchez-Mateos <[email protected]>

* Change return when statistics is not defined

Signed-off-by: Raul Sanchez-Mateos <[email protected]>

* Fix windows unreachable code warning

Signed-off-by: Raul Sanchez-Mateos <[email protected]>

---------

Signed-off-by: Raul Sanchez-Mateos <[email protected]>
(cherry picked from commit 0bdc1cc)
@rsanchez15 rsanchez15 self-requested a review July 19, 2024 09:31
@github-actions github-actions bot added ci-pending PR which CI is running labels Jul 19, 2024
Signed-off-by: Raul Sanchez-Mateos <[email protected]>
@rsanchez15 rsanchez15 requested review from rsanchez15 and removed request for rsanchez15 July 19, 2024 10:53
@JesusPoderoso JesusPoderoso added this to the v2.14.4 milestone Aug 5, 2024
@JesusPoderoso JesusPoderoso added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels Aug 5, 2024
@JesusPoderoso
Copy link
Contributor

CI issues unrelated to the PR backport.
Ready to merge!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants