[22657] Fix log category name macro collision in `MacOS` #5585

Mario-DL · 2025-01-21T10:46:32Z

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.

test/blackbox/common/DDSBlackboxTestsBasic.cpp

MiguelCompany

LGTM with green CI

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

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

MiguelCompany

LGTM with green CI

MiguelCompany · 2025-01-24T07:29:05Z

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

mergify · 2025-01-24T07:29:14Z

backport 3.1.x 3.0.x 2.14.x 2.10.x

✅ Backports have been created

#5595 [22657] Fix log category name macro collision in MacOS (backport #5585) has been created for branch 3.1.x but encountered conflicts
#5596 [22657] Fix log category name macro collision in MacOS (backport #5585) has been created for branch 3.0.x but encountered conflicts
#5597 [22657] Fix log category name macro collision in MacOS (backport #5585) has been created for branch 2.14.x but encountered conflicts
#5598 [22657] Fix log category name macro collision in MacOS (backport #5585) has been created for branch 2.10.x but encountered conflicts

* 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

* 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/fastdds/domain/DomainParticipantFactory.cpp # src/cpp/rtps/RTPSDomain.cpp

* 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/fastdds/domain/DomainParticipantFactory.cpp # src/cpp/rtps/RTPSDomain.cpp # test/blackbox/common/DDSBlackboxTestsBasic.cpp

* 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>

* 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 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

* 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>

* 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

…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>

Mario-DL requested review from richiprosima and removed request for richiprosima January 21, 2025 10:50

github-actions bot added the ci-pending PR which CI is running label Jan 21, 2025

Mario-DL requested review from MiguelCompany and removed request for MiguelCompany January 22, 2025 08:17

MiguelCompany added this to the v3.2.0 milestone Jan 22, 2025

MiguelCompany requested changes Jan 22, 2025

View reviewed changes

test/blackbox/common/DDSBlackboxTestsBasic.cpp Show resolved Hide resolved

Mario-DL requested a review from MiguelCompany January 22, 2025 09:12

MiguelCompany previously approved these changes Jan 22, 2025

View reviewed changes

Mario-DL added 3 commits January 23, 2025 09:39

Refs #22657: BB test

7f9897f

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

Refs #22657: Fix

0573f1e

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

Refs #22657: Make test available in all platforms

94dbe54

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

Mario-DL dismissed MiguelCompany’s stale review via 94dbe54 January 23, 2025 09:03

Mario-DL force-pushed the bugfix/22657 branch from 0da3521 to 94dbe54 Compare January 23, 2025 09:03

Mario-DL requested review from MiguelCompany and removed request for MiguelCompany January 23, 2025 09:04

Refs #22657: Apply missing Miguels suggestion

c8d5d43

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

Mario-DL requested review from MiguelCompany and removed request for MiguelCompany January 23, 2025 11:23

MiguelCompany approved these changes Jan 23, 2025

View reviewed changes

MiguelCompany merged commit a59d32f into master Jan 24, 2025
15 of 17 checks passed

MiguelCompany deleted the bugfix/22657 branch January 24, 2025 07:28

This was referenced Jan 24, 2025

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

Merged

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

Closed

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

Closed

mergify bot mentioned this pull request Jan 24, 2025

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

Closed

13 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[22657] Fix log category name macro collision in `MacOS` #5585

[22657] Fix log category name macro collision in `MacOS` #5585

Mario-DL commented Jan 21, 2025 •

edited by MiguelCompany

Loading

MiguelCompany left a comment

MiguelCompany left a comment

MiguelCompany commented Jan 24, 2025

mergify bot commented Jan 24, 2025 •

edited

Loading

[22657] Fix log category name macro collision in MacOS #5585

[22657] Fix log category name macro collision in MacOS #5585

Conversation

Mario-DL commented Jan 21, 2025 • edited by MiguelCompany Loading

Description

Contributor Checklist

Reviewer Checklist

MiguelCompany left a comment

Choose a reason for hiding this comment

MiguelCompany left a comment

Choose a reason for hiding this comment

MiguelCompany commented Jan 24, 2025

mergify bot commented Jan 24, 2025 • edited Loading

✅ Backports have been created

[22657] Fix log category name macro collision in `MacOS` #5585

[22657] Fix log category name macro collision in `MacOS` #5585

Mario-DL commented Jan 21, 2025 •

edited by MiguelCompany

Loading

mergify bot commented Jan 24, 2025 •

edited

Loading