Telemetry integration

cmake/Findtelemetry.cmake

@@ -0,0 +1,39 @@
+#
+# If not stated otherwise in this file or this component's LICENSE file the
+# following copyright and licenses apply:
+#
+# Copyright 2026 Sky UK
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+if(NOT NATIVE_BUILD)
+  find_path(TELEMETRY_INCLUDE_DIR NAMES telemetry_busmessage_sender.h)
+  find_library(TELEMETRY_LIBRARY NAMES telemetry_msgsender)
+
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(TELEMETRY DEFAULT_MSG TELEMETRY_LIBRARY TELEMETRY_INCLUDE_DIR)
+
+  mark_as_advanced(TELEMETRY_INCLUDE_DIR TELEMETRY_LIBRARY)
+
+  if(TELEMETRY_FOUND)
+    set(TELEMETRY_LIBRARIES ${TELEMETRY_LIBRARY})
+    set(TELEMETRY_INCLUDE_DIRS ${TELEMETRY_INCLUDE_DIR})
+  else()
+    set(TELEMETRY_LIBRARIES "")
+    set(TELEMETRY_INCLUDE_DIRS "")
+  endif()
+else()
+  set(TELEMETRY_INCLUDE_DIRS "")
+  set(TELEMETRY_LIBRARIES "")
+endif()

logging/CMakeLists.txt

@@ -19,6 +19,7 @@
 
 set(RialtoLogging_HEADERS
     include/RialtoLogging.h
+    include/RialtoTelemetry.h
     )
 
 set(RialtoLogging_SOURCES
@@ -27,27 +28,60 @@ set(RialtoLogging_SOURCES
     source/LogFileHandle.cpp
     source/LogFileHandle.h
     source/RialtoLogging.cpp
+    source/RialtoTelemetry.cpp
     )
 
 set(RialtoLogging_INCLUDES
     "${CMAKE_CURRENT_SOURCE_DIR}/include"
     )
 
 add_library(RialtoLogging STATIC ${RialtoLogging_HEADERS} ${RialtoLogging_SOURCES})
-target_include_directories(RialtoLogging PUBLIC "$<BUILD_INTERFACE:${RialtoLogging_INCLUDES}>")
-set_target_properties(RialtoLogging PROPERTIES CXX_STANDARD 17 CXX_STANDARD_REQUIRED ON CXX_EXTENSIONS OFF)
-set_target_properties(RialtoLogging PROPERTIES POSITION_INDEPENDENT_CODE ON)
+target_include_directories(RialtoLogging PUBLIC
+    "$<BUILD_INTERFACE:${RialtoLogging_INCLUDES}>"
+)
 
+# Telemetry support
+if(CMAKE_TELEMETRY_2_0_REQUIRED)
+    message(STATUS "Telemetry 2.0 support enabled")
+    find_package(telemetry REQUIRED)
+    add_definitions( -DRIALTO_TELEMETRY_SUPPORT=1 )
+    target_compile_definitions(RialtoLogging PUBLIC RIALTO_TELEMETRY_SUPPORT=1)
+    target_include_directories(RialtoLogging PUBLIC ${TELEMETRY_INCLUDE_DIRS})
+    target_link_libraries(RialtoLogging PUBLIC ${TELEMETRY_LIBRARIES})
+else()
+    message(STATUS "Telemetry support disabled (stub mode)")
+endif()
+
+set_target_properties(RialtoLogging PROPERTIES
+    CXX_STANDARD 17
+    CXX_STANDARD_REQUIRED ON
+    CXX_EXTENSIONS OFF
+    POSITION_INDEPENDENT_CODE ON
+)
+
+# EthanLog support
 find_package(EthanLog)
 if (EthanLog_FOUND AND RIALTO_ENABLE_ETHAN_LOG)
     message(STATUS "EthanLog is enabled")
     add_library(RialtoEthanLog STATIC ${RialtoLogging_HEADERS} ${RialtoLogging_SOURCES})
     target_include_directories(RialtoEthanLog PUBLIC "$<BUILD_INTERFACE:${RialtoLogging_INCLUDES}>")
     target_compile_definitions(RialtoEthanLog PRIVATE USE_ETHANLOG)
     target_link_libraries(RialtoEthanLog PUBLIC EthanLog::EthanLog)
-    set_target_properties(RialtoEthanLog PROPERTIES CXX_STANDARD 17 CXX_STANDARD_REQUIRED ON CXX_EXTENSIONS OFF)
-    set_target_properties(RialtoEthanLog PROPERTIES POSITION_INDEPENDENT_CODE ON)
-else ()
+    if(CMAKE_TELEMETRY_2_0_REQUIRED)
+        message(STATUS "Telemetry 2.0 support enabled")
+        target_compile_definitions(RialtoEthanLog PUBLIC RIALTO_TELEMETRY_SUPPORT=1)
+        target_include_directories(RialtoEthanLog PUBLIC ${TELEMETRY_INCLUDE_DIRS})
+        target_link_libraries(RialtoEthanLog PUBLIC ${TELEMETRY_LIBRARIES})
+    else()
+        message(STATUS "Telemetry support disabled (stub mode)")
+    endif()
+    set_target_properties(RialtoEthanLog PROPERTIES
+        CXX_STANDARD 17
+        CXX_STANDARD_REQUIRED ON
+        CXX_EXTENSIONS OFF
+        POSITION_INDEPENDENT_CODE ON
+    )
+else()
     message(STATUS "EthanLog is disabled")
     add_library(RialtoEthanLog ALIAS RialtoLogging)
-endif ()
+endif()

logging/include/RialtoLogging.h

@@ -25,6 +25,7 @@ extern "C"
 {
 #endif
 
+#include "RialtoTelemetry.h"
 #include <stdarg.h>
 #include <stdint.h>
 

logging/include/RialtoTelemetry.h

@@ -0,0 +1,54 @@
+/*
+ * If not stated otherwise in this file or this component's LICENSE file the
+ * following copyright and licenses apply:
+ *
+ * Copyright 2026 Sky UK
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef RIALTO_TELEMETRY_H_
+#define RIALTO_TELEMETRY_H_
+
+#ifdef RIALTO_TELEMETRY_SUPPORT
+#include <telemetry_busmessage_sender.h>
+#endif
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#ifdef RIALTO_TELEMETRY_SUPPORT
+
+void TELEMETRY_INIT(const char* component);
+void TELEMETRY_UNINIT();
+void TELEMETRY_EVENT_STRING(const char* marker, const char* value);
+void TELEMETRY_EVENT_FLOAT(const char* marker, float value);
+void TELEMETRY_EVENT_INT(const char* marker, int value);
+
+#else /* stub implementation if telemetry not enabled */
+
+inline void TELEMETRY_INIT(const char* component) {}
+inline void TELEMETRY_UNINIT() {}
+inline void TELEMETRY_EVENT_STRING(const char* marker, const char* value) {}
+inline void TELEMETRY_EVENT_FLOAT(const char* marker, float value) {}
+inline void TELEMETRY_EVENT_INT(const char* marker, int value) {}
+
+#endif /* RIALTO_TELEMETRY_SUPPORT */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* RIALTO_TELEMETRY_H_ */

logging/source/RialtoTelemetry.cpp

@@ -0,0 +1,71 @@
+/*
+ * If not stated otherwise in this file or this component's LICENSE file the
+ * following copyright and licenses apply:
+ *
+ * Copyright 2026 Sky UK
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "RialtoLogging.h"
+#include <cstring>
+#include <cstdio>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#define RIALTO_TELEMETRY_LOG_MIL(fmt, args...) RIALTO_LOG_MIL(RIALTO_COMPONENT_SERVER, fmt, ##args)
+
+#ifdef __cplusplus
+}
+#endif
+
+#ifdef RIALTO_TELEMETRY_SUPPORT
+
+void TELEMETRY_INIT(const char* component)
+{
+    RIALTO_TELEMETRY_LOG_MIL("Telemetry initialized for: %s", component);
+    printf("Telemetry initialized for: %s", component);
+    // Copy into a mutable buffer: t2_init takes char* and may write to it,
+    // so passing a const/string-literal directly is undefined behavior.
+    char buf[64];
+    strncpy(buf, component, sizeof(buf) - 1);
+    buf[sizeof(buf) - 1] = '\0';
+    t2_init(buf);
+}
+
+void TELEMETRY_UNINIT()
+{
+    t2_uninit();
+}
+
+void TELEMETRY_EVENT_STRING(const char* marker, const char* value)
+{
+    RIALTO_LOG_MIL(RIALTO_COMPONENT_SERVER, "Telemetry marker: %s, value: %s", marker, value);
+    printf("Telemetry marker: %s, value: %s", marker, value);
+    t2_event_s(const_cast<char*>(marker), const_cast<char*>(value));
+}
+
+void TELEMETRY_EVENT_FLOAT(const char* marker, float value)
+{
+    t2_event_f(const_cast<char*>(marker), static_cast<double>(value));
+}
+
+void TELEMETRY_EVENT_INT(const char* marker, int value)
+{
+    t2_event_d(const_cast<char*>(marker), static_cast<int>(value));
+}
+
+#endif /* RIALTO_TELEMETRY_SUPPORT */

media/client/common/include/RialtoClientLogging.h

@@ -21,6 +21,7 @@
 #define RIALTO_CLIENT_LOGGING_H_
 
 #include "RialtoLogging.h"
+#include <cstdio>
 
 #ifdef __cplusplus
 extern "C"

media/client/ipc/source/ControlIpc.cpp

@@ -115,6 +115,10 @@ bool ControlIpc::getSharedMemory(int32_t &fd, uint32_t &size)
     if (ipcController->Failed())
     {
         RIALTO_CLIENT_LOG_ERROR("failed to get the shared memory due to '%s'", ipcController->ErrorText().c_str());
+        char telemetryBuff[128] = {0};
+        snprintf(telemetryBuff, sizeof(telemetryBuff), "Failed to get the shared memory due to '%s'",
+                 ipcController->ErrorText().c_str());
+        TELEMETRY_EVENT_STRING("Rialto Client - ControllIpc", telemetryBuff);
         return false;
     }
 
@@ -152,6 +156,10 @@ bool ControlIpc::registerClient()
     if (ipcController->Failed())
     {
         RIALTO_CLIENT_LOG_ERROR("failed to register client due to '%s'", ipcController->ErrorText().c_str());
+        char telemetryBuff[128] = {0};
+        snprintf(telemetryBuff, sizeof(telemetryBuff), "Failed to register client due to '%s'",
+                 ipcController->ErrorText().c_str());
+        TELEMETRY_EVENT_STRING("Rialto Client - ControllIpc", telemetryBuff);
         return false;
     }
 
@@ -181,6 +189,13 @@ bool ControlIpc::registerClient()
         RIALTO_CLIENT_LOG_ERROR("Server and Client proto schema versions are not compatible. Server schema version: "
                                 "%s, Client schema version: %s",
                                 kServerSchemaVersion.str().c_str(), kCurrentSchemaVersion.str().c_str());
+        char telemetryBuff[128] = {0};
+        snprintf(telemetryBuff, sizeof(telemetryBuff),
+                 "Server and Client proto schema versions are not compatible. Server schema version: "
+                 "%s, Client schema version: %s",
+                 kServerSchemaVersion.str().c_str(), kCurrentSchemaVersion.str().c_str());
+        TELEMETRY_EVENT_STRING("Rialto Client - ControllIpc", telemetryBuff);
+
         return false;
     }
 
@@ -260,6 +275,9 @@ void ControlIpc::onPing(const std::shared_ptr<firebolt::rialto::PingEvent> &even
     if (ipcController->Failed())
     {
         RIALTO_CLIENT_LOG_ERROR("failed to ack due to '%s'", ipcController->ErrorText().c_str());
+        char telemetryBuff[128] = {0};
+        snprintf(telemetryBuff, sizeof(telemetryBuff), "Failed to ack due to '%s'", ipcController->ErrorText().c_str());
+        TELEMETRY_EVENT_STRING("Rialto Client - ControllIpc", telemetryBuff);
     }
 }
 }; // namespace firebolt::rialto::client

media/client/ipc/source/IpcClient.cpp

@@ -159,6 +159,10 @@ void IpcClient::processIpcThread()
     if (!m_disconnecting)
     {
         RIALTO_CLIENT_LOG_ERROR("The ipc channel unexpectedly disconnected, destroying the channel");
+        char telemetryBuff[128] = {0};
+        snprintf(telemetryBuff, sizeof(telemetryBuff),
+                 "The ipc channel unexpectedly disconnected, destroying the channel");
+        TELEMETRY_EVENT_STRING("Rialto Client - IpcClient", telemetryBuff);
 
         // Safe to destroy the ipc objects in the ipc thread as the client has already disconnected.
         // This ensures the channel is destructed and that all ongoing ipc calls are unblocked.

media/client/ipc/source/MediaKeysCapabilitiesIpc.cpp

@@ -36,6 +36,10 @@ std::shared_ptr<IMediaKeysCapabilitiesIpcFactory> IMediaKeysCapabilitiesIpcFacto
     catch (const std::exception &e)
     {
         RIALTO_CLIENT_LOG_ERROR("Failed to create the media keys capabilities ipc factory, reason: %s", e.what());
+        char telemetryBuff[128] = {0};
+        snprintf(telemetryBuff, sizeof(telemetryBuff),
+                 "Failed to create the media keys capabilities ipc factory, reason: %s", e.what());
+        TELEMETRY_EVENT_STRING("Rialto Client - MediaKeysCapabilitiesIpc", telemetryBuff);
     }
 
     return factory;
@@ -58,6 +62,10 @@ std::shared_ptr<IMediaKeysCapabilities> MediaKeysCapabilitiesIpcFactory::getMedi
         catch (const std::exception &e)
         {
             RIALTO_CLIENT_LOG_ERROR("Failed to create the media keys capabilities ipc, reason: %s", e.what());
+            char telemetryBuff[128] = {0};
+            snprintf(telemetryBuff, sizeof(telemetryBuff),
+                     "Failed to create the media keys capabilities ipc, reason: %s", e.what());
+            TELEMETRY_EVENT_STRING("Rialto Client - MediaKeysCapabilitiesIpc", telemetryBuff);
         }
 
         MediaKeysCapabilitiesIpcFactory::m_mediaKeysCapabilitiesIpc = mediaKeysCapabilitiesIpc;
@@ -115,6 +123,10 @@ std::vector<std::string> MediaKeysCapabilitiesIpc::getSupportedKeySystems()
     if (ipcController->Failed())
     {
         RIALTO_CLIENT_LOG_ERROR("failed to get supported key systems due to '%s'", ipcController->ErrorText().c_str());
+        char telemetryBuff[128] = {0};
+        snprintf(telemetryBuff, sizeof(telemetryBuff), "Failed to get supported key systems due to '%s'",
+                 ipcController->ErrorText().c_str());
+        TELEMETRY_EVENT_STRING("Rialto Client - MediaKeysCapabilitiesIpc", telemetryBuff);
         return {};
     }
 
@@ -144,6 +156,10 @@ bool MediaKeysCapabilitiesIpc::supportsKeySystem(const std::string &keySystem)
     if (ipcController->Failed())
     {
         RIALTO_CLIENT_LOG_ERROR("failed to supports key system due to '%s'", ipcController->ErrorText().c_str());
+        char telemetryBuff[128] = {0};
+        snprintf(telemetryBuff, sizeof(telemetryBuff), "Failed to support key systems due to '%s'",
+                 ipcController->ErrorText().c_str());
+        TELEMETRY_EVENT_STRING("Rialto Client - MediaKeysCapabilitiesIpc", telemetryBuff);
         return false;
     }
 
@@ -175,6 +191,10 @@ bool MediaKeysCapabilitiesIpc::getSupportedKeySystemVersion(const std::string &k
     {
         RIALTO_CLIENT_LOG_ERROR("failed to get supported key system version due to '%s'",
                                 ipcController->ErrorText().c_str());
+        char telemetryBuff[128] = {0};
+        snprintf(telemetryBuff, sizeof(telemetryBuff), "Failed to get supported key system versions due to '%s'",
+                 ipcController->ErrorText().c_str());
+        TELEMETRY_EVENT_STRING("Rialto Client - MediaKeysCapabilitiesIpc", telemetryBuff);
         return false;
     }
     version = response.version();
@@ -207,6 +227,10 @@ bool MediaKeysCapabilitiesIpc::isServerCertificateSupported(const std::string &k
     {
         RIALTO_CLIENT_LOG_ERROR("failed to check if server certificate is supported due to '%s'",
                                 ipcController->ErrorText().c_str());
+        char telemetryBuff[128] = {0};
+        snprintf(telemetryBuff, sizeof(telemetryBuff), "Failed to check if server certificate is supported due to '%s'",
+                 ipcController->ErrorText().c_str());
+        TELEMETRY_EVENT_STRING("Rialto Client - MediaKeysCapabilitiesIpc", telemetryBuff);
         return false;
     }