logos-messaging/logos-messaging-interop-tests
1
0
Fork 0
mirror of https://github.com/logos-messaging/logos-messaging-interop-tests.git synced 2026-08-24 23:21:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(metrics): follow the waku_ -> logos_delivery_ metric rename

Browse Source 
logos-delivery#4074 renamed the node's own metrics from waku_* to
logos_delivery_* on 2026-07-29. The four names this suite asserts on were
left behind, so every metrics test has failed against a current node ever
since; check_metric stops at the first missing name, which is why only
three of the four ever showed up in the reports.

The libp2p_* names are untouched: they come from nim-libp2p and did not
change. No fallback to the old names is added - there is one node and one
name, and accepting both would hide the next such drift.

Sibling files still carrying old names, none of which affect the nightly
result: tests/filter/test_idle_subscriptions.py (class is skipped) and
src/test_data.py (feeds an xfail test only).
This commit is contained in:
Egor Rachkovskii
2026-08-24 09:21:03 +01:00
parent ec118816fa
commit 8987124e1b
1 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/metrics/test_metrics.py
+22 -20
View File
@@ -30,9 +30,9 @@ class TestMetrics(StepsRelay, StepsMetrics, StepsFilter, StepsLightPush, StepsSt
self.check_metric(node, "libp2p_pubsub_topics", 1)
self.check_metric(node, "libp2p_pubsub_subscriptions_total", 1)
self.check_metric(node, 'libp2p_gossipsub_peers_per_topic_mesh{topic="other"}', 1)
self.check_metric(node, "waku_peer_store_size", 1)
self.check_metric(node, "waku_histogram_message_size_count", 1)
self.check_metric(node, 'waku_node_messages_total{type="relay"}', 1)
self.check_metric(node, "logos_delivery_peer_store_size", 1)
self.check_metric(node, "logos_delivery_histogram_message_size_count", 1)
self.check_metric(node, 'logos_delivery_node_messages_total{type="relay"}', 1)
@pytest.mark.usefixtures("setup_main_relay_node", "setup_main_filter_node", "subscribe_main_nodes")
def test_metrics_after_filter_get(self):
@@ -45,16 +45,18 @@ class TestMetrics(StepsRelay, StepsMetrics, StepsFilter, StepsLightPush, StepsSt
self.check_metric(self.node1, "libp2p_pubsub_peers", 1)
self.check_metric(self.node1, "libp2p_pubsub_topics", 1)
self.check_metric(self.node1, "libp2p_pubsub_subscriptions_total", 1)
self.check_metric(self.node1, "waku_peer_store_size", 1)
self.check_metric(self.node1, "waku_histogram_message_size_count", 1)
self.check_metric(self.node1, 'waku_node_messages_total{type="relay"}', 1)
self.check_metric(self.node1, "logos_delivery_peer_store_size", 1)
self.check_metric(self.node1, "logos_delivery_histogram_message_size_count", 1)
self.check_metric(self.node1, 'logos_delivery_node_messages_total{type="relay"}', 1)
if self.node2.is_nwaku():
self.check_metric(
self.node2, f'waku_service_peers{{protocol="/vac/waku/filter-subscribe/2.0.0-beta1",peerId="{self.node1.get_tcp_address()}"}}', 1
self.node2,
f'logos_delivery_service_peers{{protocol="/vac/waku/filter-subscribe/2.0.0-beta1",peerId="{self.node1.get_tcp_address()}"}}',
1,
)
self.check_metric(self.node2, "libp2p_peers", 1)
self.check_metric(self.node2, "libp2p_total_dial_attempts_total", 1)
self.check_metric(self.node2, "waku_peer_store_size", 1)
self.check_metric(self.node2, "logos_delivery_peer_store_size", 1)
def test_metrics_after_light_push(self):
self.setup_first_receiving_node()
@@ -69,19 +71,19 @@ class TestMetrics(StepsRelay, StepsMetrics, StepsFilter, StepsLightPush, StepsSt
if self.light_push_node1.is_nwaku():
self.check_metric(
self.light_push_node1,
f'waku_service_peers{{protocol="/vac/waku/lightpush/2.0.0-beta1",peerId="{self.receiving_node1.get_tcp_address()}"}}',
f'logos_delivery_service_peers{{protocol="/vac/waku/lightpush/2.0.0-beta1",peerId="{self.receiving_node1.get_tcp_address()}"}}',
1,
)
self.check_metric(self.light_push_node1, "libp2p_peers", 1)
self.check_metric(self.light_push_node1, "waku_peer_store_size", 1)
self.check_metric(self.light_push_node1, "logos_delivery_peer_store_size", 1)
if self.receiving_node1.is_nwaku():
self.check_metric(self.receiving_node1, "libp2p_peers", 1)
self.check_metric(self.receiving_node1, "libp2p_pubsub_peers", 1)
self.check_metric(self.receiving_node1, "libp2p_pubsub_topics", 1)
self.check_metric(self.receiving_node1, "libp2p_pubsub_subscriptions_total", 1)
self.check_metric(self.receiving_node1, "waku_peer_store_size", 1)
self.check_metric(self.receiving_node1, "waku_histogram_message_size_count", 1)
self.check_metric(self.receiving_node1, 'waku_node_messages_total{type="relay"}', 1)
self.check_metric(self.receiving_node1, "logos_delivery_peer_store_size", 1)
self.check_metric(self.receiving_node1, "logos_delivery_histogram_message_size_count", 1)
self.check_metric(self.receiving_node1, 'logos_delivery_node_messages_total{type="relay"}', 1)
def test_metrics_after_store_get(self, node_setup):
self.publish_message(message=self.create_message())
@@ -91,19 +93,19 @@ class TestMetrics(StepsRelay, StepsMetrics, StepsFilter, StepsLightPush, StepsSt
self.check_metric(self.publishing_node1, "libp2p_pubsub_peers", 1)
self.check_metric(self.publishing_node1, "libp2p_pubsub_topics", 1)
self.check_metric(self.publishing_node1, "libp2p_pubsub_subscriptions_total", 1)
self.check_metric(self.publishing_node1, "waku_peer_store_size", 1)
self.check_metric(self.publishing_node1, "waku_histogram_message_size_count", 1)
self.check_metric(self.publishing_node1, 'waku_node_messages_total{type="relay"}', 1)
self.check_metric(self.publishing_node1, "logos_delivery_peer_store_size", 1)
self.check_metric(self.publishing_node1, "logos_delivery_histogram_message_size_count", 1)
self.check_metric(self.publishing_node1, 'logos_delivery_node_messages_total{type="relay"}', 1)
if self.store_node1.is_nwaku():
self.check_metric(
self.store_node1,
f'waku_service_peers{{protocol="/vac/waku/store-query/3.0.0",peerId="{self.publishing_node1.get_tcp_address()}"}}',
f'logos_delivery_service_peers{{protocol="/vac/waku/store-query/3.0.0",peerId="{self.publishing_node1.get_tcp_address()}"}}',
1,
)
self.check_metric(self.store_node1, "libp2p_peers", 1)
self.check_metric(self.store_node1, "libp2p_pubsub_peers", 1)
self.check_metric(self.store_node1, "libp2p_pubsub_topics", 1)
self.check_metric(self.store_node1, "libp2p_pubsub_subscriptions_total", 1)
self.check_metric(self.store_node1, "waku_peer_store_size", 1)
self.check_metric(self.store_node1, "waku_histogram_message_size_count", 1)
self.check_metric(self.store_node1, 'waku_node_messages_total{type="relay"}', 1)
self.check_metric(self.store_node1, "logos_delivery_peer_store_size", 1)
self.check_metric(self.store_node1, "logos_delivery_histogram_message_size_count", 1)
self.check_metric(self.store_node1, 'logos_delivery_node_messages_total{type="relay"}', 1)