sync to develop

.github/workflows/L2-tests.yml

@@ -63,13 +63,11 @@ jobs:
         with:
           install: true
 
-      - name: Run RDK CI Container
-        run: |
-          docker run -d --name ci-container -e AUTOMATICS_UNAME=${{ secrets.AUTOMATICS_UNAME }} -e AUTOMATICS_PASSCODE=${{ secrets.AUTOMATICS_PASSCODE }} -v /tmp/L2_TEST_RESULTS:/tmp/L2_TEST_RESULTS ghcr.io/rdkcentral/docker-rdk-ci:latest tail -f /dev/null
+      - name: Run CI container
+        run: docker run -e AUTOMATICS_UNAME=${{ secrets.AUTOMATICS_UNAME }} -e AUTOMATICS_PASSCODE=${{ secrets.AUTOMATICS_PASSCODE }} -v ${{ github.workspace }}:/mnt/L2_CONTAINER_SHARED_VOLUME --name ci-container -d ghcr.io/rdkcentral/docker-rdk-ci:latest tail -f /dev/null
 
       - name: Upload Results to Automatics
         if: github.repository_owner == 'rdkcentral'
         run: |
           docker cp /tmp/L2_TEST_RESULTS ci-container:/tmp/L2_TEST_RESULTS
-          docker exec -i ci-container bash -c "echo 'Contents in workspace directory' && ls -l && echo '===============================' && echo 'Contents in /tmp/L2_TEST_RESULTS' && ls -l /tmp/L2_TEST_RESULTS && echo '===============================' && git config --global --add safe.directory /mnt/L2_CONTAINER_SHARED_VOLUME && gtest-json-result-push.py /tmp/L2_TEST_RESULTS https://rdkeorchestrationservice.apps.cloud.comcast.net/rdke_orchestration_api/push_unit_test_results /mnt/L2_CONTAINER_SHARED_VOLUME"
-
+          docker exec -i ci-container bash -c "cd /mnt/L2_CONTAINER_SHARED_VOLUME && echo 'Contents in workspace directory' && ls -l . && echo '===============================' && echo 'Contents in /tmp/L2_TEST_RESULTS' && ls -l /tmp/L2_TEST_RESULTS && echo '===============================' && git config --global --add safe.directory /mnt/L2_CONTAINER_SHARED_VOLUME && gtest-json-result-push.py /tmp/L2_TEST_RESULTS https://rdkeorchestrationservice.apps.cloud.comcast.net/rdke_orchestration_api/push_unit_test_results /mnt/L2_CONTAINER_SHARED_VOLUME"

CHANGELOG.md

@@ -4,12 +4,23 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [1.4.9](https://github.com/rdkcentral/tr69hostif/compare/1.4.8...1.4.9)
+
+- RDK-61871: Add OTEL source code and recipe changes to RDKE [`#511`](https://github.com/rdkcentral/tr69hostif/pull/511)
+- RDKEMW-20790 : L2 Coverage for tr69hostif update [`#513`](https://github.com/rdkcentral/tr69hostif/pull/513)
+- RDKEMW-20790 : Improve L2 Coverage for tr69hostif [`#507`](https://github.com/rdkcentral/tr69hostif/pull/507)
+- RDKEMW-21374: Fix L2 Upload Results to Automatics Error [`#508`](https://github.com/rdkcentral/tr69hostif/pull/508)
+- Merge tag '1.4.8' into develop [`78e90eb`](https://github.com/rdkcentral/tr69hostif/commit/78e90eb7cfb0bfe74597e3be7d80f9a0af761c73)
+
 #### [1.4.8](https://github.com/rdkcentral/tr69hostif/compare/1.4.7...1.4.8)
 
+> 10 July 2026
+
 - RDKEMW-19296 :  Deprecated DataModel Removal for HWSelftest and SNMP code from RDKE [`#505`](https://github.com/rdkcentral/tr69hostif/pull/505)
 - updated the L2_Test_Coverage.md [`#504`](https://github.com/rdkcentral/tr69hostif/pull/504)
 - RDKEMW-19857 : Control Manager Deprecate RFC Code Removal from RDKE [`#497`](https://github.com/rdkcentral/tr69hostif/pull/497)
 - RDK-44337 : Test Gap Analysis on tr69hostif for L2 Framework with Regression Coverage [`#487`](https://github.com/rdkcentral/tr69hostif/pull/487)
+- tr69hostif 1.4.8 release changelog updates [`69f54df`](https://github.com/rdkcentral/tr69hostif/commit/69f54df2c68eb246836d054e538e246a06072e8e)
 - Merge tag '1.4.7' into develop [`642ccbb`](https://github.com/rdkcentral/tr69hostif/commit/642ccbb6f6625b680b0b20ca39acb1d6f235fb33)
 
 #### [1.4.7](https://github.com/rdkcentral/tr69hostif/compare/1.4.6...1.4.7)

run_l2.sh

@@ -44,6 +44,7 @@ echo "Status|Download In Progress" >> /opt/fwdnldstatus.txt
 echo "DnldFile|TESTIMAGE_DEV.bin" >> /opt/fwdnldstatus.txt
 echo "DnldURL|https://mockserver.tv/Images" >> /opt/fwdnldstatus.txt
 echo "FwUpdateState|Download complete" >> /opt/fwdnldstatus.txt
+echo "uploaded" > /opt/loguploadstatus.txt
 
 cp ./src/integrationtest/conf/mgrlist.conf /etc/
 
@@ -95,6 +96,12 @@ pytest --json-report --json-report-summary --json-report-file $RESULT_DIR/custom
 pytest --json-report --json-report-summary --json-report-file $RESULT_DIR/dhcpv4.json test/functional-tests/tests/tr69hostif_dhcpv4.py
 pytest --json-report --json-report-summary --json-report-file $RESULT_DIR/moca.json test/functional-tests/tests/tr69hostif_moca.py
 
+pytest --json-report --json-report-summary --json-report-file $RESULT_DIR/device_info.json test/functional-tests/tests/tr69hostif_device_info.py
+pytest --json-report --json-report-summary --json-report-file $RESULT_DIR/interfacestack.json test/functional-tests/tests/tr69hostif_interfacestack.py
+pytest --json-report --json-report-summary --json-report-file $RESULT_DIR/opsdevicemgmt_logging.json test/functional-tests/tests/tr69hostif_opsdevicemgmt_logging.py
+pytest --json-report --json-report-summary --json-report-file $RESULT_DIR/opsdevicemgmt_rpc.json test/functional-tests/tests/tr69hostif_opsdevicemgmt_rpc.py
+pytest --json-report --json-report-summary --json-report-file $RESULT_DIR/storageservice.json test/functional-tests/tests/tr69hostif_storageservice.py
+pytest --json-report --json-report-summary --json-report-file $RESULT_DIR/bluetooth.json test/functional-tests/tests/tr69hostif_bluetooth.py
 pkill -f thunder-mock-server.js
 pytest --json-report --json-report-summary --json-report-file $RESULT_DIR/thunder_negative_edge.json test/functional-tests/tests/tr69hostif_thunder_negative_edge_cases.py
 

src/hostif/parodusClient/waldb/data-model/data-model-generic.xml

@@ -2827,6 +2827,14 @@
         </syntax>
       </parameter>
     </object>
+    <object base="Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.DistributedTracing." access="readOnly" minEntries="1" maxEntries="1" >
+      <parameter base="Enable" access="readWrite" notification="0" maxNotification="2" >
+        <syntax>
+          <boolean/>
+          <default type="factory" value="false"/>
+        </syntax>
+      </parameter>
+    </object>
     <object base="Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.RDKRemoteDebugger." access="readOnly" minEntries="1" maxEntries="1" >
       <parameter base="Enable" access="readWrite" notification="0" maxNotification="2" >
         <syntax>

src/hostif/profiles/DeviceInfo/Device_DeviceInfo.cpp

@@ -41,6 +41,7 @@
 #include <cmath>
 #include <cstring>
 #include <sys/stat.h>
+#include <fcntl.h>
 #include <sys/sysinfo.h>
 #include <sys/ioctl.h>
 #include <net/if.h>
@@ -3797,6 +3798,10 @@ int hostIf_DeviceInfo::set_xRDKCentralComRFC(HOSTIF_MsgData_t * stMsgData)
     {
         ret = set_xRDKCentralComNewNtpEnable(stMsgData);
     }
+    else if (!strcasecmp(stMsgData->paramName, DISTRIBUTED_TRACING_RFC_ENABLE))
+    {
+        ret = set_xRDKCentralComRFCDistributedTracingEnable(stMsgData);
+    }
     return ret;
 }
 
@@ -3845,6 +3850,78 @@ int hostIf_DeviceInfo::set_xRDKCentralComNewNtpEnable(HOSTIF_MsgData_t *stMsgDat
     return ret;
 }
 
+int hostIf_DeviceInfo::set_xRDKCentralComRFCDistributedTracingEnable(HOSTIF_MsgData_t *stMsgData)
+{
+    int ret = NOK;
+    bool enable = false;
+    LOG_ENTRY_EXIT;
+
+    if (stMsgData->paramtype != hostIf_BooleanType)
+    {
+        RDK_LOG(RDK_LOG_ERROR, LOG_TR69HOSTIF,
+                "[%s:%d] Wrong type for %s, expected boolean.\n",
+                __FUNCTION__, __LINE__, stMsgData->paramName);
+        return NOK;
+    }
+
+    enable = get_boolean(stMsgData->paramValue);
+    RDK_LOG(RDK_LOG_INFO, LOG_TR69HOSTIF,
+            "[%s] DistributedTracing RFC: %s\n", __FUNCTION__, enable ? "ENABLE" : "DISABLE");
+
+    if (enable)
+    {
+        /* Create flag file watched by librdk_otlp.so via inotify in all processes */
+        int fd = open(RDK_TRACING_FLAG_FILE, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
+        if (fd >= 0)
+        {
+            FILE *fp = fdopen(fd, "w");
+            if (fp)
+            {
+                fclose(fp);
+                RDK_LOG(RDK_LOG_INFO, LOG_TR69HOSTIF,
+                        "[%s] Created tracing flag file %s\n", __FUNCTION__, RDK_TRACING_FLAG_FILE);
+            }
+            else
+            {
+                close(fd);
+                RDK_LOG(RDK_LOG_ERROR, LOG_TR69HOSTIF,
+                        "[%s] Failed to create tracing flag file %s: %s\n",
+                        __FUNCTION__, RDK_TRACING_FLAG_FILE, strerror(errno));
+            }
+        }
+        else
+        {
+            RDK_LOG(RDK_LOG_ERROR, LOG_TR69HOSTIF,
+                    "[%s] Failed to create tracing flag file %s: %s\n",
+                    __FUNCTION__, RDK_TRACING_FLAG_FILE, strerror(errno));
+        }
+        v_secure_system("systemctl start rdk-otel-collector.service");
+        RDK_LOG(RDK_LOG_INFO, LOG_TR69HOSTIF,
+                "[%s] Started rdk-otel-collector.service\n", __FUNCTION__);
+    }
+    else
+    {
+        v_secure_system("systemctl stop rdk-otel-collector.service");
+        RDK_LOG(RDK_LOG_INFO, LOG_TR69HOSTIF,
+                "[%s] Stopped rdk-otel-collector.service\n", __FUNCTION__);
+        /* Remove flag file - inotify IN_DELETE fires in all processes */
+        if (remove(RDK_TRACING_FLAG_FILE) != 0 && errno != ENOENT)
+        {
+            RDK_LOG(RDK_LOG_ERROR, LOG_TR69HOSTIF,
+                    "[%s] Failed to remove tracing flag file %s: %s\n",
+                    __FUNCTION__, RDK_TRACING_FLAG_FILE, strerror(errno));
+        }
+        else
+        {
+            RDK_LOG(RDK_LOG_INFO, LOG_TR69HOSTIF,
+                    "[%s] Removed tracing flag file %s\n", __FUNCTION__, RDK_TRACING_FLAG_FILE);
+        }
+    }
+
+    ret = OK;
+    return ret;
+}
+
 int hostIf_DeviceInfo::get_xRDKCentralComBootstrap(HOSTIF_MsgData_t *stMsgData)
 {
     return m_bsStore->getValue(stMsgData);

src/hostif/profiles/DeviceInfo/Device_DeviceInfo.h

@@ -193,6 +193,10 @@
 #define RDK_REMOTE_DEBUGGER_WEBCFGDATA                  "Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.RDKRemoteDebugger.WebCfgData"
 #endif
 
+/* Profile: X_RDKCENTRAL-COM_RFC.Feature.DistributedTracing */
+#define DISTRIBUTED_TRACING_RFC_ENABLE              "Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.DistributedTracing.Enable"
+#define RDK_TRACING_FLAG_FILE                       "/tmp/rdk_distributed_tracing_enabled"
+
 /* Profile: X_RDKCENTRAL-COM_RFC.Feature.RebootStop */
 #define RDK_REBOOTSTOP_ENABLE                      "Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.RebootStop.Enable"
 
@@ -306,6 +310,7 @@ class hostIf_DeviceInfo {
     int ScheduleAutoReboot(bool);
 
     int set_xRDKCentralComNewNtpEnable(HOSTIF_MsgData_t *);
+    int set_xRDKCentralComRFCDistributedTracingEnable(HOSTIF_MsgData_t *);
 
     int get_xRDKCentralComRFCAccountId (HOSTIF_MsgData_t *);
     int get_xOpsDeviceMgmtRPCRebootNow (HOSTIF_MsgData_t *);