Replace score::cpp with std for tracing

- Replace score::cpp::optional with std::optional in all tracing
  interfaces, mocks, and tests
- Add std::optional to score::cpp::optional conversion bridge in
  tracing_runtime.cpp for baselibs API compatibility
- Replace static_cast<EventIdType/FieldIdType>() with brace init
  EventIdType{}/FieldIdType{} in lola tracing runtime and test
- Migrate to StdVariantType with EventId{} struct wrapper
- Revert std::get_if/std::get to score::cpp::get_if/score::cpp::get
  where MetaInfoVariants::Type (score::cpp::variant) is used
- Remove #include <score/optional.hpp>, add #include <optional>

Author: marwan275

score/mw/com/impl/bindings/lola/tracing/tracing_runtime.cpp

@@ -226,7 +226,7 @@ void TracingRuntime::CacheFileDescriptorForReregisteringShmObject(
     }
 }
 
-score::cpp::optional<std::pair<memory::shared::ISharedMemoryResource::FileDescriptor, void*>>
+std::optional<std::pair<memory::shared::ISharedMemoryResource::FileDescriptor, void*>>
 TracingRuntime::GetCachedFileDescriptorForReregisteringShmObject(
     const impl::tracing::ServiceElementInstanceIdentifierView& service_element_instance_identifier_view) const noexcept
 {
@@ -290,12 +290,12 @@ analysis::tracing::ServiceInstanceElement TracingRuntime::ConvertToTracingServic
     if (service_element_type == impl::ServiceElementType::EVENT)
     {
         const auto lola_event_id = lola_service_type_deployment->events_.at(std::string{service_element_name});
-        output_service_instance_element.element_id = static_cast<ServiceInstanceElement::EventIdType>(lola_event_id);
+        output_service_instance_element.element_id = ServiceInstanceElement::EventIdType{lola_event_id};
     }
     else if (service_element_type == impl::ServiceElementType::FIELD)
     {
         const auto lola_field_id = lola_service_type_deployment->fields_.at(std::string{service_element_name});
-        output_service_instance_element.element_id = static_cast<ServiceInstanceElement::FieldIdType>(lola_field_id);
+        output_service_instance_element.element_id = ServiceInstanceElement::FieldIdType{lola_field_id};
     }
     else
     {
@@ -322,7 +322,7 @@ analysis::tracing::ServiceInstanceElement TracingRuntime::ConvertToTracingServic
     return output_service_instance_element;
 }
 
-score::cpp::optional<analysis::tracing::ShmObjectHandle> TracingRuntime::GetShmObjectHandle(
+std::optional<analysis::tracing::ShmObjectHandle> TracingRuntime::GetShmObjectHandle(
     const impl::tracing::ServiceElementInstanceIdentifierView& service_element_instance_identifier_view) const noexcept
 {
     impl::tracing::ServiceElementInstanceIdentifierView lolaBindingSpecificIdentifier =
@@ -336,7 +336,7 @@ score::cpp::optional<analysis::tracing::ShmObjectHandle> TracingRuntime::GetShmO
     return find_result->second.first;
 }
 
-score::cpp::optional<void*> TracingRuntime::GetShmRegionStartAddress(
+std::optional<void*> TracingRuntime::GetShmRegionStartAddress(
     const impl::tracing::ServiceElementInstanceIdentifierView& service_element_instance_identifier_view) const noexcept
 {
     impl::tracing::ServiceElementInstanceIdentifierView simplifiedIdentifier =

score/mw/com/impl/bindings/lola/tracing/tracing_runtime.h

@@ -23,8 +23,6 @@
 #include "score/language/safecpp/scoped_function/scope.h"
 #include "score/memory/shared/i_shared_memory_resource.h"
 
-#include <score/optional.hpp>
-
 #include <cstddef>
 #include <mutex>
 #include <optional>
@@ -102,11 +100,11 @@ class TracingRuntime : public impl::tracing::IBindingTracingRuntime
     void UnregisterShmObject(const impl::tracing::ServiceElementInstanceIdentifierView&
                                  service_element_instance_identifier_view) noexcept override;
 
-    score::cpp::optional<analysis::tracing::ShmObjectHandle> GetShmObjectHandle(
+    std::optional<analysis::tracing::ShmObjectHandle> GetShmObjectHandle(
         const impl::tracing::ServiceElementInstanceIdentifierView& service_element_instance_identifier_view)
         const noexcept override;
 
-    score::cpp::optional<void*> GetShmRegionStartAddress(
+    std::optional<void*> GetShmRegionStartAddress(
         const impl::tracing::ServiceElementInstanceIdentifierView& service_element_instance_identifier_view)
         const noexcept override;
 
@@ -115,7 +113,7 @@ class TracingRuntime : public impl::tracing::IBindingTracingRuntime
         const memory::shared::ISharedMemoryResource::FileDescriptor shm_file_descriptor,
         void* const shm_memory_start_address) noexcept override;
 
-    score::cpp::optional<std::pair<memory::shared::ISharedMemoryResource::FileDescriptor, void*>>
+    std::optional<std::pair<memory::shared::ISharedMemoryResource::FileDescriptor, void*>>
     GetCachedFileDescriptorForReregisteringShmObject(
         const impl::tracing::ServiceElementInstanceIdentifierView& service_element_instance_identifier_view)
         const noexcept override;
@@ -151,7 +149,7 @@ class TracingRuntime : public impl::tracing::IBindingTracingRuntime
         // Suppress "AUTOSAR C++14 M11-0-1" rule findings. This rule states: "Member data in non-POD class types shall
         // be private.". We need these data elements to be organized into a coherent organized data structure.
         // coverity[autosar_cpp14_m11_0_1_violation]
-        score::cpp::optional<impl::tracing::TypeErasedSamplePtr> sample_ptr;
+        std::optional<impl::tracing::TypeErasedSamplePtr> sample_ptr;
         // coverity[autosar_cpp14_m11_0_1_violation]
         std::mutex mutex;
     };
@@ -170,7 +168,7 @@ class TracingRuntime : public impl::tracing::IBindingTracingRuntime
         -> std::optional<TraceContextId>;
 
     const Configuration& configuration_;
-    score::cpp::optional<analysis::tracing::TraceClientId> trace_client_id_;
+    std::optional<analysis::tracing::TraceClientId> trace_client_id_;
     bool data_loss_flag_;
 
     /// \brief Array of type erased sample pointers containing one element per service element that registers itself via

score/mw/com/impl/bindings/lola/tracing/tracing_runtime_test.cpp

@@ -1035,13 +1035,13 @@ TEST_F(TracingRuntimeConvertToTracingServiceInstanceElementFixture,
         major_version_number_,
         minor_version_number_,
         static_cast<ServiceInstanceElement::InstanceIdType>(instance_id_),
-        static_cast<ServiceInstanceElement::EventIdType>(event_id_)};
+        ServiceInstanceElement::EventIdType{event_id_}};
     const ServiceInstanceElement expected_service_instance_element_field{
         static_cast<ServiceInstanceElement::ServiceIdType>(service_id_),
         major_version_number_,
         minor_version_number_,
         static_cast<ServiceInstanceElement::InstanceIdType>(instance_id_),
-        static_cast<ServiceInstanceElement::FieldIdType>(field_id_)};
+        ServiceInstanceElement::FieldIdType{field_id_}};
 
     // Given a TracingRuntimeObject with a provided configuration object
     TracingRuntime tracing_runtime{kNumberOfTotalConfiguredTracingSlots, configuration};

score/mw/com/impl/bindings/mock_binding/tracing/tracing_runtime.h

@@ -36,11 +36,11 @@ class TracingRuntime : public IBindingTracingRuntime
                 UnregisterShmObject,
                 (const impl::tracing::ServiceElementInstanceIdentifierView&),
                 (noexcept, override));
-    MOCK_METHOD(score::cpp::optional<analysis::tracing::ShmObjectHandle>,
+    MOCK_METHOD(std::optional<analysis::tracing::ShmObjectHandle>,
                 GetShmObjectHandle,
                 (const impl::tracing::ServiceElementInstanceIdentifierView&),
                 (const, noexcept, override));
-    MOCK_METHOD(score::cpp::optional<void*>,
+    MOCK_METHOD(std::optional<void*>,
                 GetShmRegionStartAddress,
                 (const impl::tracing::ServiceElementInstanceIdentifierView&),
                 (const, noexcept, override));
@@ -50,7 +50,7 @@ class TracingRuntime : public IBindingTracingRuntime
                  memory::shared::ISharedMemoryResource::FileDescriptor,
                  void*),
                 (noexcept, override));
-    MOCK_METHOD((score::cpp::optional<std::pair<memory::shared::ISharedMemoryResource::FileDescriptor, void*>>),
+    MOCK_METHOD((std::optional<std::pair<memory::shared::ISharedMemoryResource::FileDescriptor, void*>>),
                 GetCachedFileDescriptorForReregisteringShmObject,
                 (const impl::tracing::ServiceElementInstanceIdentifierView&),
                 (const, noexcept, override));

score/mw/com/impl/tracing/common_event_tracing.cpp

@@ -46,7 +46,7 @@ ResultBlank TraceData(const ServiceElementInstanceIdentifierView service_element
                       const TracingRuntime::TracePointType trace_point,
                       const BindingType binding_type,
                       const std::pair<const void*, std::size_t>& local_data_chunk,
-                      const score::cpp::optional<TracingRuntime::TracePointDataId> trace_point_data_id) noexcept
+                      const std::optional<TracingRuntime::TracePointDataId> trace_point_data_id) noexcept
 {
     auto* const tracing_runtime = impl::Runtime::getInstance().GetTracingRuntime();
     SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(tracing_runtime != nullptr);

score/mw/com/impl/tracing/common_event_tracing.h

@@ -18,9 +18,8 @@
 #include "score/mw/com/impl/tracing/configuration/service_element_instance_identifier_view.h"
 #include "score/mw/com/impl/tracing/tracing_runtime.h"
 
-#include <score/optional.hpp>
-
 #include <cstdint>
+#include <optional>
 #include <string_view>
 #include <utility>
 
@@ -39,7 +38,7 @@ ResultBlank TraceData(const ServiceElementInstanceIdentifierView service_element
                       const TracingRuntime::TracePointType trace_point,
                       const BindingType binding_type,
                       const std::pair<const void*, std::size_t>& local_data_chunk = {nullptr, 0U},
-                      const score::cpp::optional<TracingRuntime::TracePointDataId> trace_point_data_id = {}) noexcept;
+                      const std::optional<TracingRuntime::TracePointDataId> trace_point_data_id = {}) noexcept;
 
 ResultBlank TraceShmData(const BindingType binding_type,
                          const ServiceElementTracingData service_element_tracing_data,

score/mw/com/impl/tracing/common_event_tracing_test.cpp

@@ -119,7 +119,7 @@ TEST_F(CommonEventTracingLocalTraceDataFixture, CallingTraceDataWillDispatchToBi
                 Trace(binding_type_,
                       service_element_instance_identifier_view_,
                       trace_point_,
-                      score::cpp::optional<TracingRuntime::TracePointDataId>{trace_point_data_id_},
+                      std::optional<TracingRuntime::TracePointDataId>{trace_point_data_id_},
                       local_data_chunk_.first,
                       local_data_chunk_.second));
 

score/mw/com/impl/tracing/configuration/tracing_filter_config_test.cpp

@@ -18,6 +18,7 @@
 #include <cstddef>
 #include <cstdint>
 #include <limits>
+#include <optional>
 #include <string>
 #include <string_view>
 
@@ -33,7 +34,7 @@ const std::string kEventName{"my_event_name"};
 const std::string kFieldName{"my_field_name"};
 const auto kInstanceSpecifiersv = "abc/abc/TirePressurePort"sv;
 const ITracingFilterConfig::InstanceSpecifierView kInstanceSpecifierView{"my_instance_specifier"};
-const score::cpp::optional<ITracingFilterConfig::InstanceSpecifierView> kEnableAllInstanceSpecifiers{};
+const std::optional<ITracingFilterConfig::InstanceSpecifierView> kEnableAllInstanceSpecifiers{};
 constexpr auto kDummyTracePointType = SkeletonEventTracePointType::SEND;
 
 // Trace point type constants
@@ -705,7 +706,7 @@ class ConfigurationFixture : public ::testing::Test
         PrepareMinimalConfiguration(valid_instance_specifier, service_type_, events, fields);
     }
 
-    score::cpp::optional<Configuration> configuration_{};
+    std::optional<Configuration> configuration_{};
     TracingFilterConfig tracing_filter_config_{};
     const std::string_view service_type_ = "/score/ncar/services/TirePressureService";
     const std::string event_name_ = "CurrentPressureFrontLeft";

score/mw/com/impl/tracing/i_binding_tracing_runtime.h

@@ -21,9 +21,9 @@
 #include "score/mw/com/impl/tracing/type_erased_sample_ptr.h"
 
 #include <score/callback.hpp>
-#include <score/optional.hpp>
 
 #include <cstdint>
+#include <optional>
 
 namespace score::mw::com::impl::tracing
 {
@@ -84,18 +84,18 @@ class IBindingTracingRuntime
     virtual void UnregisterShmObject(const impl::tracing::ServiceElementInstanceIdentifierView&
                                          service_element_instance_identifier_view) noexcept = 0;
 
-    virtual score::cpp::optional<analysis::tracing::ShmObjectHandle> GetShmObjectHandle(
+    virtual std::optional<analysis::tracing::ShmObjectHandle> GetShmObjectHandle(
         const impl::tracing::ServiceElementInstanceIdentifierView& service_element_instance_identifier_view)
         const noexcept = 0;
-    virtual score::cpp::optional<void*> GetShmRegionStartAddress(
+    virtual std::optional<void*> GetShmRegionStartAddress(
         const impl::tracing::ServiceElementInstanceIdentifierView& service_element_instance_identifier_view)
         const noexcept = 0;
 
     virtual void CacheFileDescriptorForReregisteringShmObject(
         const impl::tracing::ServiceElementInstanceIdentifierView& service_element_instance_identifier_view,
         const memory::shared::ISharedMemoryResource::FileDescriptor shm_file_descriptor,
         void* const shm_memory_start_address) noexcept = 0;
-    virtual score::cpp::optional<std::pair<memory::shared::ISharedMemoryResource::FileDescriptor, void*>>
+    virtual std::optional<std::pair<memory::shared::ISharedMemoryResource::FileDescriptor, void*>>
     GetCachedFileDescriptorForReregisteringShmObject(const impl::tracing::ServiceElementInstanceIdentifierView&
                                                          service_element_instance_identifier_view) const noexcept = 0;
     virtual void ClearCachedFileDescriptorForReregisteringShmObject(

score/mw/com/impl/tracing/i_tracing_runtime.h

@@ -26,6 +26,7 @@
 #include "score/result/result.h"
 
 #include <cstdint>
+#include <optional>
 #include <variant>
 
 namespace score::mw::com::impl::tracing
@@ -72,7 +73,7 @@ class ITracingRuntime
     virtual ResultBlank Trace(const BindingType binding_type,
                               const ServiceElementInstanceIdentifierView service_element_instance_identifier,
                               const TracePointType trace_point_type,
-                              const score::cpp::optional<TracePointDataId> trace_point_data_id,
+                              const std::optional<TracePointDataId> trace_point_data_id,
                               const void* const local_data_ptr,
                               const std::size_t local_data_size) noexcept = 0;