Skip to content

[20739] Refactor IStatusQueryable and make monitor service interfaces private - #4651

Merged
EduPonz merged 10 commits into
masterfrom
fix/20739
Apr 17, 2024
Merged

[20739] Refactor IStatusQueryable and make monitor service interfaces private#4651
EduPonz merged 10 commits into
masterfrom
fix/20739

Conversation

@Mario-DL

@Mario-DL Mario-DL commented Apr 4, 2024

Copy link
Copy Markdown
Contributor

Description

This PR brings to master the work from #4640 commit a2f4664 and 7a0c328. It refactors the IStatusQueryable() interface and make monitor service interfaces private (except from IProxyQueryable.hpp as PDP.h is still public in master and implements it).

@Mergifyio backport 2.13.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.
  • Changes are ABI compatible.
  • 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.
    Related documentation PR: [20739] Remove ddsentitystatus from docs Fast-DDS-docs#745
  • 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.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

Mario-DL added 4 commits April 4, 2024 10:16
…eryable)

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
@Mario-DL Mario-DL added this to the v2.14.1 milestone Apr 4, 2024
@Mario-DL
Mario-DL requested a review from JLBuenoLopez April 4, 2024 08:27
@github-actions github-actions Bot added the ci-pending PR which CI is running label Apr 4, 2024
@Mario-DL
Mario-DL requested a review from richiware April 4, 2024 08:33
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

@JLBuenoLopez JLBuenoLopez left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two nitpicks

Comment thread src/cpp/fastdds/subscriber/SubscriberImpl.hpp Outdated
Comment thread src/cpp/statistics/rtps/monitor-service/MonitorService.cpp
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
@Mario-DL
Mario-DL requested a review from JLBuenoLopez April 4, 2024 13:11
@Mario-DL

Mario-DL commented Apr 4, 2024

Copy link
Copy Markdown
Contributor Author

@richiprosima please test this

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
Comment thread src/cpp/fastdds/subscriber/SubscriberImpl.hpp Outdated
Comment thread src/cpp/statistics/rtps/monitor-service/MonitorService.cpp Outdated
Comment thread src/cpp/statistics/rtps/monitor-service/MonitorService.cpp
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
@Mario-DL
Mario-DL requested a review from JLBuenoLopez April 5, 2024 10:06
@Mario-DL

Mario-DL commented Apr 5, 2024

Copy link
Copy Markdown
Contributor Author

@richiprosima please test this

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
@Mario-DL
Mario-DL requested review from JLBuenoLopez and removed request for JLBuenoLopez April 9, 2024 05:39
JLBuenoLopez
JLBuenoLopez previously approved these changes Apr 9, 2024

@JLBuenoLopez JLBuenoLopez left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Mario-DL

Mario-DL commented Apr 9, 2024

Copy link
Copy Markdown
Contributor Author

@richiprosima please test this

@EduPonz EduPonz left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Mario-DL please address documentation build failure

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

@EduPonz EduPonz left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with green CI

@EduPonz

EduPonz commented Apr 17, 2024

Copy link
Copy Markdown

I'm seeing the same Github Windows errors in nightlies and other PR and seem to have something to do with the runners infra, so I'm merging this one.

@EduPonz
EduPonz merged commit fb841b9 into master Apr 17, 2024
@EduPonz
EduPonz deleted the fix/20739 branch April 17, 2024 04:57
@EduPonz

EduPonz commented Apr 17, 2024

Copy link
Copy Markdown

@Mergifyio backport 2.13.x

@mergify

mergify Bot commented Apr 17, 2024

Copy link
Copy Markdown
Contributor

backport 2.13.x

✅ Backports have been created

Details

mergify Bot pushed a commit that referenced this pull request Apr 17, 2024
…#4651)

* Refs #20739: Make monitor service interfaces private (except IProxyQueryable)

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #20739: Replace tabs with spaces in monitorservice_types.idl

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #20739: Refactor include and src files

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #20739: Refactor tests

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #20739: Apply suggestion regarding asserts

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs 20739: Rev 2 changes

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs 20739: Linter

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs 20739: Rev 3 changes

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #20739: Remove status assert

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #20739: Comment typo

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

---------

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
(cherry picked from commit fb841b9)

# Conflicts:
#	include/fastdds/rtps/reader/RTPSReader.h
#	include/fastdds/rtps/writer/RTPSWriter.h
EduPonz pushed a commit that referenced this pull request May 24, 2024
…#4651) (#4687)

* Refactor IStatusQueryable and make monitor service interfaces private (#4651)

* Refs #20739: Make monitor service interfaces private (except IProxyQueryable)

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #20739: Replace tabs with spaces in monitorservice_types.idl

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #20739: Refactor include and src files

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #20739: Refactor tests

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #20739: Apply suggestion regarding asserts

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs 20739: Rev 2 changes

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs 20739: Linter

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs 20739: Rev 3 changes

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #20739: Remove status assert

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #20739: Comment typo

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

---------

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
(cherry picked from commit fb841b9)

# Conflicts:
#	include/fastdds/rtps/reader/RTPSReader.h
#	include/fastdds/rtps/writer/RTPSWriter.h

* Fix conflicts based on original PR

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

---------

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com>
Co-authored-by: JesusPoderoso <jesuspoderoso@eprosima.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci-pending PR which CI is running

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants