commit 109b4a5c1f1a9cad8176a05dc2066a61e5cf22ea
author Patrick Williams <patrick@stwcx.xyz> Thu Mar 20 20:19:36 2025 -0400
committer Patrick Williams <patrick@stwcx.xyz> Thu Mar 20 20:22:01 2025 -0400
tree 573e59749ab94783eb9ad341236258d54342420f
parent 991e2b0d082e433572554ff341435f50ed935fcd

entry: remove AdditionalData2

The 'AdditionalData2' property was a temporary addition to ease the
transition from an array to a dictionary for the additional data.
All users have been migrated to use the dictionary style and from the
'AdditionalData' property, so the '2' property can be removed.

Tested: Loaded an existing log database and observed dbus objects
are created successfully and with the 'AdditionalData2' field missing.
Created a new event with `log-create` CLI and observed new entry is
created successfully in dbus.

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Ica3a9e5730eca8a7cf7755b769189347220e1639

elog_entry.hpp

diff --git a/elog_entry.hpp b/elog_entry.hpp
index 185c14e..d5f12a5 100644
--- a/elog_entry.hpp
+++ b/elog_entry.hpp
@@ -77,7 +77,6 @@
         updateTimestamp(timestampErr, true);
         message(std::move(msgErr), true);
         additionalData(std::move(additionalDataErr), true);
-        additionalData2(additionalData(), true);
         associations(std::move(objects), true);
         // Store a copy of associations in case we need to recreate
         assocs = associations();

elog_serialize.cpp

diff --git a/elog_serialize.cpp b/elog_serialize.cpp
index 80cb27a..414fb4b 100644
--- a/elog_serialize.cpp
+++ b/elog_serialize.cpp
@@ -31,7 +31,7 @@
 template <class Archive>
 void save(Archive& a, const Entry& e, const std::uint32_t /*version*/)
 {
-    a(e.id(), e.severity(), e.timestamp(), e.message(), e.additionalData2(),
+    a(e.id(), e.severity(), e.timestamp(), e.message(), e.additionalData(),
       e.associations(), e.resolved(), e.version(), e.updateTimestamp(),
       e.eventId(), e.resolution());
 }
@@ -109,7 +109,6 @@
     e.timestamp(timestamp, true);
     e.message(message, true);
     e.additionalData(additionalData, true);
-    e.additionalData2(additionalData, true);
     e.sdbusplus::server::xyz::openbmc_project::logging::Entry::resolved(
         resolved, true);
     e.associations(associations, true);

log_manager.cpp

diff --git a/log_manager.cpp b/log_manager.cpp
index 40c263c..bd902c3 100644
--- a/log_manager.cpp
+++ b/log_manager.cpp
@@ -454,7 +454,7 @@
         try
         {
             create(entry.message(), entry.id(), entry.timestamp(),
-                   entry.severity(), entry.additionalData2(), assocs, ffdc);
+                   entry.severity(), entry.additionalData(), assocs, ffdc);
         }
         catch (const std::exception& e)
         {

test/serialization_test_properties.cpp

diff --git a/test/serialization_test_properties.cpp b/test/serialization_test_properties.cpp
index f769c93..bf108fe 100644
--- a/test/serialization_test_properties.cpp
+++ b/test/serialization_test_properties.cpp
@@ -37,7 +37,6 @@
     EXPECT_EQ(input->timestamp(), output->timestamp());
     EXPECT_EQ(input->message(), output->message());
     EXPECT_EQ(input->additionalData(), output->additionalData());
-    EXPECT_EQ(input->additionalData2(), output->additionalData2());
     EXPECT_EQ(input->resolved(), output->resolved());
     EXPECT_EQ(input->associations(), output->associations());
     EXPECT_EQ(input->version(), output->version());