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

[22657] Fix log category name macro collision in MacOS (backport #5585) #5595

Merged
merged 2 commits into from
Jan 31, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 24, 2025

Description

During MacOs testing in other PR, it was detected that the DOMAIN category used in some logs EPROSIMA_LOG_...(DOMAIN) collides with a #define DOMAIN in math.h in the DeveoperTools under MacOs.
This PR solves the issue by adding a prefix depending on the domain.

@Mergifyio backport 3.1.x 3.0.x 2.14.x 2.10.x

Contributor Checklist

  • Commit messages follow the project guidelines.

  • The code follows the style guidelines of this project.

  • 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.

  • 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 #5585 done by [Mergify](https://mergify.com).

* Refs #22657: BB test

Signed-off-by: Mario Domínguez López <mariodominguez@eprosima.com>

* Refs #22657: Fix

Signed-off-by: Mario Domínguez López <mariodominguez@eprosima.com>

* Refs #22657: Make test available in all platforms

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

* Refs #22657: Apply missing Miguels suggestion

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

---------

Signed-off-by: Mario Domínguez López <mariodominguez@eprosima.com>
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
(cherry picked from commit a59d32f)

# Conflicts:
#	src/cpp/rtps/RTPSDomain.cpp
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Jan 24, 2025
Copy link
Contributor Author

mergify bot commented Jan 24, 2025

Cherry-pick of a59d32f has failed:

On branch mergify/bp/3.1.x/pr-5585
Your branch is up to date with 'origin/3.1.x'.

You are currently cherry-picking commit a59d32fc.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/cpp/fastdds/domain/DomainParticipantFactory.cpp
	modified:   test/blackbox/common/DDSBlackboxTestsBasic.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/rtps/RTPSDomain.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany MiguelCompany removed the conflicts Backport PR wich git cherry pick failed label Jan 24, 2025
@MiguelCompany MiguelCompany self-requested a review January 24, 2025 08:16
Copy link
Member

@MiguelCompany MiguelCompany left a comment

Choose a reason for hiding this comment

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

LGTM with green CI

@github-actions github-actions bot added the ci-pending PR which CI is running label Jan 24, 2025
@MiguelCompany
Copy link
Member

@Mergifyio backport 3.0.x 2.14.x 2.10.x

Copy link
Contributor Author

mergify bot commented Jan 24, 2025

backport 3.0.x 2.14.x 2.10.x

✅ Backports have been created

@MiguelCompany MiguelCompany self-requested a review January 31, 2025 07:28
@MiguelCompany MiguelCompany merged commit 55cf7b2 into 3.1.x Jan 31, 2025
26 of 31 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/3.1.x/pr-5585 branch January 31, 2025 12:03
mergify bot added a commit that referenced this pull request Jan 31, 2025
* Fix log category name macro collision in `MacOS`  (#5585)

* Refs #22657: BB test

Signed-off-by: Mario Domínguez López <mariodominguez@eprosima.com>

* Refs #22657: Fix

Signed-off-by: Mario Domínguez López <mariodominguez@eprosima.com>

* Refs #22657: Make test available in all platforms

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

* Refs #22657: Apply missing Miguels suggestion

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

---------

Signed-off-by: Mario Domínguez López <mariodominguez@eprosima.com>
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
(cherry picked from commit a59d32f)

# Conflicts:
#	src/cpp/rtps/RTPSDomain.cpp

* Fix conflicts

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 55cf7b2)

# Conflicts:
#	src/cpp/fastdds/domain/DomainParticipantFactory.cpp
mergify bot added a commit that referenced this pull request Jan 31, 2025
* Fix log category name macro collision in `MacOS`  (#5585)

* Refs #22657: BB test

Signed-off-by: Mario Domínguez López <mariodominguez@eprosima.com>

* Refs #22657: Fix

Signed-off-by: Mario Domínguez López <mariodominguez@eprosima.com>

* Refs #22657: Make test available in all platforms

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

* Refs #22657: Apply missing Miguels suggestion

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

---------

Signed-off-by: Mario Domínguez López <mariodominguez@eprosima.com>
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
(cherry picked from commit a59d32f)

# Conflicts:
#	src/cpp/rtps/RTPSDomain.cpp

* Fix conflicts

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 55cf7b2)

# Conflicts:
#	src/cpp/fastdds/domain/DomainParticipantFactory.cpp
mergify bot added a commit that referenced this pull request Jan 31, 2025
* Fix log category name macro collision in `MacOS`  (#5585)

* Refs #22657: BB test

Signed-off-by: Mario Domínguez López <mariodominguez@eprosima.com>

* Refs #22657: Fix

Signed-off-by: Mario Domínguez López <mariodominguez@eprosima.com>

* Refs #22657: Make test available in all platforms

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

* Refs #22657: Apply missing Miguels suggestion

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

---------

Signed-off-by: Mario Domínguez López <mariodominguez@eprosima.com>
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
(cherry picked from commit a59d32f)

# Conflicts:
#	src/cpp/rtps/RTPSDomain.cpp

* Fix conflicts

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 55cf7b2)

# Conflicts:
#	src/cpp/fastdds/domain/DomainParticipantFactory.cpp
#	test/blackbox/common/DDSBlackboxTestsBasic.cpp
EugenioCollado added a commit that referenced this pull request Feb 5, 2025
* Fix log category name macro collision in `MacOS`  (#5585) (#5595)

* Fix log category name macro collision in `MacOS`  (#5585)

* Refs #22657: BB test

Signed-off-by: Mario Domínguez López <mariodominguez@eprosima.com>

* Refs #22657: Fix

Signed-off-by: Mario Domínguez López <mariodominguez@eprosima.com>

* Refs #22657: Make test available in all platforms

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

* Refs #22657: Apply missing Miguels suggestion

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

---------

Signed-off-by: Mario Domínguez López <mariodominguez@eprosima.com>
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
(cherry picked from commit a59d32f)

# Conflicts:
#	src/cpp/rtps/RTPSDomain.cpp

* Fix conflicts

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 55cf7b2)

# Conflicts:
#	src/cpp/fastdds/domain/DomainParticipantFactory.cpp

* Fix conflicts

Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>

* Colcon Fix

Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>

---------

Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Eugenio Collado <eugeniocollado@eprosima.com>
Javgilavi pushed a commit that referenced this pull request Feb 7, 2025
* Fix log category name macro collision in `MacOS`  (#5585)

* Refs #22657: BB test

Signed-off-by: Mario Domínguez López <mariodominguez@eprosima.com>

* Refs #22657: Fix

Signed-off-by: Mario Domínguez López <mariodominguez@eprosima.com>

* Refs #22657: Make test available in all platforms

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

* Refs #22657: Apply missing Miguels suggestion

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

---------

Signed-off-by: Mario Domínguez López <mariodominguez@eprosima.com>
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
(cherry picked from commit a59d32f)

# Conflicts:
#	src/cpp/rtps/RTPSDomain.cpp

* Fix conflicts

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 55cf7b2)

# Conflicts:
#	src/cpp/fastdds/domain/DomainParticipantFactory.cpp
Javgilavi added a commit that referenced this pull request Feb 7, 2025
…ckport #5595) (#5619)

* Fix log category name macro collision in `MacOS`  (#5585) (#5595)

* Fix log category name macro collision in `MacOS`  (#5585)

* Refs #22657: BB test

Signed-off-by: Mario Domínguez López <mariodominguez@eprosima.com>

* Refs #22657: Fix

Signed-off-by: Mario Domínguez López <mariodominguez@eprosima.com>

* Refs #22657: Make test available in all platforms

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

* Refs #22657: Apply missing Miguels suggestion

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

---------

Signed-off-by: Mario Domínguez López <mariodominguez@eprosima.com>
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
(cherry picked from commit a59d32f)

# Conflicts:
#	src/cpp/rtps/RTPSDomain.cpp

* Fix conflicts

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 55cf7b2)

# Conflicts:
#	src/cpp/fastdds/domain/DomainParticipantFactory.cpp

* Fix conflict

Signed-off-by: Javier Gil Aviles <javiergil@eprosima.com>

* Fix conflicts

Signed-off-by: Javier Gil Aviles <javiergil@eprosima.com>

---------

Signed-off-by: Javier Gil Aviles <javiergil@eprosima.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Javier Gil Aviles <javiergil@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.

2 participants