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

[20334] Report internal DdsRouter information with the DdsPipe's Monitor module #431

Merged
merged 17 commits into from
Mar 19, 2024
Merged
Prev Previous commit
Next Next commit
Apply suggestions
Signed-off-by: tempate <danieldiaz@eprosima.com>
Tempate committed Mar 7, 2024
commit 78676cf05156dab4a03a2df72c8556c07281b41c
7 changes: 3 additions & 4 deletions tools/ddsrouter_tool/src/cpp/main.cpp
Original file line number Diff line number Diff line change
@@ -31,6 +31,7 @@
#include <ddspipe_core/logging/DdsLogConsumer.hpp>
#include <ddspipe_core/monitoring/Monitor.hpp>
#include <ddspipe_core/monitoring/consumers/DdsMonitorConsumer.hpp>
#include <ddspipe_core/monitoring/consumers/DdsMonitorParticipantRegistry.hpp>
#include <ddspipe_core/monitoring/consumers/StdoutMonitorConsumer.hpp>
#include <ddspipe_core/monitoring/producers/StatusMonitorProducer.hpp>
#include <ddspipe_core/monitoring/producers/TopicsMonitorProducer.hpp>
@@ -249,23 +250,21 @@ int main(

// Monitoring
ddspipe::core::Monitor monitor;
ddspipe::core::DdsMonitorParticipantRegistry registry;

if (router_configuration.advanced_options.monitor.producers["topics"].enabled)
{
// Register the Topics Monitor Producer
auto topics_producer = ddspipe::core::TopicsMonitorProducer::get_instance();
topics_producer->init(router_configuration.advanced_options.monitor.producers["topics"]);

// Register the type object
registerMonitoringTopicsTypes();

// Register the type
fastdds::dds::TypeSupport type(new MonitoringTopicsPubSubType());

// Register the consumers
topics_producer->register_consumer(std::make_unique<ddspipe::core::StdoutMonitorConsumer<MonitoringTopics>>());
topics_producer->register_consumer(std::make_unique<ddspipe::core::DdsMonitorConsumer<MonitoringTopics>>(
router_configuration.advanced_options.monitor.consumers["topics"], type));
router_configuration.advanced_options.monitor.consumers["topics"], registry, type));

monitor.register_producer(topics_producer);
}