From 3ca953cb11c177f25b2e848ea7544c9ebd1c6fdb Mon Sep 17 00:00:00 2001
From: Koudai Yamasaki <114902604+ymski@users.noreply.github.com>
Date: Tue, 7 Jan 2025 19:06:58 +0900
Subject: [PATCH] fix: remove rmw_take column

---
 src/caret_analyze/infra/lttng/records_provider_lttng.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/caret_analyze/infra/lttng/records_provider_lttng.py b/src/caret_analyze/infra/lttng/records_provider_lttng.py
index b1a87877b..5b2dd3fdc 100644
--- a/src/caret_analyze/infra/lttng/records_provider_lttng.py
+++ b/src/caret_analyze/infra/lttng/records_provider_lttng.py
@@ -1379,9 +1379,11 @@ def fill_source_timestamp_with_latest_timestamp(records):
             f'{self._node_path.publish_topic_name}/rclcpp_publish_timestamp',
         ]
         left_key = sub_records.columns[0]
-        if COLUMN_NAME.RMW_TAKE_TIMESTAMP in columns:
-            columns.remove(COLUMN_NAME.RMW_TAKE_TIMESTAMP)
-            left_key = COLUMN_NAME.RMW_TAKE_TIMESTAMP
+        for column in sub_records.columns:
+            if column.endswith(COLUMN_NAME.RMW_TAKE_TIMESTAMP):
+                columns.remove(column)
+                left_key = column
+                break
 
         pub_sub_records = merge_sequential(
             left_records=sub_records,