feat(dock): integrate optional event logging support

Add conditional event logging support for dock-related modules and wire
the required build detection and package dependency. The implementation
keeps the logging integration optional when the event logger headers are
unavailable.

Refactor event logging code to reduce duplication and fix a UI-blocking
issue: extract shared logDockConfig() helper in DockSettings and
updateAndLogTrayPluginList() helper in DockDBusProxy, unify
visiblePluginList/visiblePluginCount into VisiblePluginStats, simplify
timer wiring, and move dpkg-query off the UI thread using
QtConcurrent::run with pre-start in the constructor.

Consolidate EventLogger::init() into DockPanel::load() so it runs
before any sub-component writes events, and move startup log calls
from constructors to init() methods to ensure the logger is ready.
Minimize #ifdef HAVE_DDE_API_EVENTLOGGER to only guard the
dde-api/eventlogger.hpp include and writeEventLog() calls; logging
functions are always compiled and become no-ops when the header is
absent. Use find_path with NO_CACHE for better portability.

feat(dock): 集成可选事件日志支持

为 dock 相关模块添加条件事件日志支持，并接入所需的构建检测与包依赖。
该实现会在缺少事件日志头文件时保持日志集成可选。

重构事件日志代码以减少重复并修复 UI 阻塞问题：在 DockSettings 中
提取 logDockConfig() 辅助方法，在 DockDBusProxy 中提取
updateAndLogTrayPluginList() 辅助方法，将 visiblePluginList 和
visiblePluginCount 统一为 VisiblePluginStats，简化定时器连接，
并使用 QtConcurrent::run 将 dpkg-query 移至后台线程，在构造函数
中预启动以确保首次使用时结果已就绪。

将 EventLogger::init() 统一到 DockPanel::load() 中，确保在任何
子组件写入事件前完成初始化；将启动日志调用从构造函数移至 init()
方法以保证 logger 已就绪。将 #ifdef HAVE_DDE_API_EVENTLOGGER
缩减至仅包裹 dde-api/eventlogger.hpp 的 include 和 writeEventLog()
调用，日志函数始终编译，在缺少头文件时为空操作。使用 find_path
的 NO_CACHE 提升可移植性。

PMS: TASK-388657

Author: heysion

CMakeLists.txt

@@ -61,6 +61,15 @@ find_package(ICU 74.2 REQUIRED COMPONENTS uc i18n io)
 find_package(WaylandProtocols REQUIRED)
 find_package(PkgConfig REQUIRED)
 
+# Check if dde-api eventlogger.hpp exists
+find_path(DDE_API_EVENTLOGGER_INCLUDE_DIR NAMES dde-api/eventlogger.hpp NO_CACHE)
+if(DDE_API_EVENTLOGGER_INCLUDE_DIR)
+    set(HAVE_DDE_API_EVENTLOGGER ON)
+    message(STATUS "Found dde-api eventlogger.hpp: ${DDE_API_EVENTLOGGER_INCLUDE_DIR}")
+else()
+    message(STATUS "dde-api eventlogger.hpp not found, event logging will be disabled")
+endif()
+
 qt_policy(SET QTP0001 NEW)
 
 try_compile(COMPILE_RESULT

debian/control

@@ -6,6 +6,7 @@ Build-Depends:
  debhelper-compat (= 13),
  cmake,
  dde-application-manager-api (>= 1.2.48),
+ dde-api-dev (>> 6.0.39),
  dde-tray-loader-dev (> 2.0.24),
  extra-cmake-modules,
  libdtk6core-bin,

panels/dock/CMakeLists.txt

@@ -75,6 +75,10 @@ target_link_libraries(dockpanel PRIVATE
     dde-shell-dock
 )
 
+if (HAVE_DDE_API_EVENTLOGGER)
+    target_compile_definitions(dockpanel PRIVATE HAVE_DDE_API_EVENTLOGGER)
+endif()
+
 if (BUILD_WITH_X11)
     target_compile_definitions(dockpanel PRIVATE BUILD_WITH_X11=)
     pkg_check_modules(XCB REQUIRED IMPORTED_TARGET xcb xcb-aux xcb-res xcb-ewmh)

panels/dock/dockdbusproxy.cpp

@@ -9,6 +9,11 @@
 #include "dockdbusproxy.h"
 
 #include <QObject>
+#include <QJsonObject>
+
+#ifdef HAVE_DDE_API_EVENTLOGGER
+#include <dde-api/eventlogger.hpp>
+#endif
 
 #include <DWindowManagerHelper>
 #include <appletbridge.h>
@@ -17,6 +22,7 @@ DGUI_USE_NAMESPACE
 DS_USE_NAMESPACE
 namespace {
 constexpr auto DockVersionV1 = "1.0";
+constexpr qint64 EVENT_LOGGER_TRAY_PLUGIN_LIST = 1000610007;
 
 QList<DS_NAMESPACE::DAppletDock *> dockApplets(dock::DockPanel *panel)
 {
@@ -47,6 +53,7 @@ DockDBusProxy::DockDBusProxy(DockPanel* parent)
     connect(parent, &DockPanel::rootObjectChanged, this, [this]() {
         auto pluginsVisible = DockSettings::instance()->pluginsVisible();
         updateDockPluginsVisible(pluginsVisible);
+        logInitialPluginState();
     });
 
     for (auto *dockApplet : dockApplets(parent)) {
@@ -75,6 +82,7 @@ DockDBusProxy::DockDBusProxy(DockPanel* parent)
             timer->stop();
             timer->deleteLater();
             connect(m_trayApplet, SIGNAL(pluginsChanged()), this, SIGNAL(pluginsChanged()));
+            logInitialPluginState();
         }
     });
     timer->start();
@@ -255,6 +263,43 @@ DockItemInfos DockDBusProxy::plugins()
     return iteminfos;
 }
 
+void DockDBusProxy::logInitialPluginState()
+{
+    QStringList visibleItemKeys;
+    for (const auto &info : plugins()) {
+        if (info.visible) {
+            visibleItemKeys.append(info.itemKey);
+        }
+    }
+
+#ifdef HAVE_DDE_API_EVENTLOGGER
+    DDE_EventLogger::EventLogger::instance().writeEventLog(
+        DDE_EventLogger::EventLoggerData(EVENT_LOGGER_TRAY_PLUGIN_LIST, QStringLiteral("dock_init"), {
+            {QStringLiteral("tray_plugin_list"), visibleItemKeys.join(QStringLiteral(","))}
+        }));
+#endif
+}
+
+void DockDBusProxy::logCurrentVisiblePluginList(const QString &changedItemKey, bool changedVisible)
+{
+    QStringList visibleItemKeys;
+    for (const auto &info : plugins()) {
+        if (info.itemKey == changedItemKey) {
+            if (changedVisible)
+                visibleItemKeys.append(info.itemKey);
+        } else if (info.visible) {
+            visibleItemKeys.append(info.itemKey);
+        }
+    }
+
+#ifdef HAVE_DDE_API_EVENTLOGGER
+    DDE_EventLogger::EventLogger::instance().writeEventLog(
+        DDE_EventLogger::EventLoggerData(EVENT_LOGGER_TRAY_PLUGIN_LIST, QStringLiteral("dock_plugins_changed"), {
+            {QStringLiteral("tray_plugin_list"), visibleItemKeys.join(QStringLiteral(","))}
+        }));
+#endif
+}
+
 void DockDBusProxy::ReloadPlugins()
 {
     parent()->ReloadPlugins();
@@ -274,13 +319,15 @@ void DockDBusProxy::setItemOnDock(const QString &settingKey, const QString &item
             pluginsVisible[itemKey] = visible;
             DockSettings::instance()->setPluginsVisible(pluginsVisible);
             Q_EMIT pluginVisibleChanged(itemKey, visible);
+            logCurrentVisiblePluginList(itemKey, visible);
             return;
         }
     }
 
     if (m_trayApplet) {
         Q_EMIT pluginVisibleChanged(itemKey, visible);
         QMetaObject::invokeMethod(m_trayApplet, "setItemOnDock", Qt::QueuedConnection, settingKey, itemKey, visible);
+        logCurrentVisiblePluginList(itemKey, visible);
     }
 }
 
@@ -340,4 +387,3 @@ void DockDBusProxy::setLocked(bool newLocked)
 }
 
 }
-

panels/dock/dockdbusproxy.h

@@ -15,6 +15,7 @@
 #include <QObject>
 #include <QDBusContext>
 #include <QDBusArgument>
+#include <QTimer>
 
 /** this class used for old dock api compatible
   * it will forward old dbus call to new implementation
@@ -88,6 +89,8 @@ class DockDBusProxy final: public QObject, public QDBusContext
     DockPanel* parent() const;
     QString getAppID(const QString &desktopfile);
     void updateDockPluginsVisible(const QVariantMap &pluginsVisible);
+    void logInitialPluginState();
+    void logCurrentVisiblePluginList(const QString &changedItemKey = QString(), bool changedVisible = true);
 
     DS_NAMESPACE::DAppletProxy *m_oldDockApplet;
     DS_NAMESPACE::DAppletProxy *m_trayApplet;

panels/dock/dockpanel.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -24,6 +24,10 @@
 #include <QQuickItem>
 #include <DGuiApplicationHelper>
 
+#ifdef HAVE_DDE_API_EVENTLOGGER
+#include <dde-api/eventlogger.hpp>
+#endif
+
 #define SETTINGS DockSettings::instance()
 
 Q_LOGGING_CATEGORY(dockLog, "org.deepin.dde.shell.dock")
@@ -50,6 +54,9 @@ DockPanel::DockPanel(QObject *parent)
 bool DockPanel::load()
 {
     DPanel::load();
+#ifdef HAVE_DDE_API_EVENTLOGGER
+    DDE_EventLogger::EventLogger::instance().init("org.deepin.dde.shell", false);
+#endif
     return true;
 }
 

panels/dock/docksettings.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -9,6 +9,14 @@
 #include <QTimer>
 #include <QLoggingCategory>
 
+#include <QJsonObject>
+#ifdef HAVE_DDE_API_EVENTLOGGER
+#include <dde-api/eventlogger.hpp>
+#endif
+
+// Event IDs for dock settings (10-digit numbers)
+constexpr qint64 EVENT_LOGGER_DOCK_CONFIG = 1000610006;
+
 Q_LOGGING_CATEGORY(dockSettingsLog, "org.deepin.dde.shell.dock.docksettings")
 
 const static QString keyPosition                = "Position";
@@ -82,6 +90,21 @@ static QString itemAlignment2String(const ItemAlignment& alignment)
     return "center";
 }
 
+void DockSettings::logDockConfig(std::optional<Position> pos, std::optional<ItemAlignment> align, const QString &reason) const
+{
+    QJsonObject payload;
+    if (pos)
+        payload.insert(QStringLiteral("shell_pos"), position2String(*pos));
+    if (align)
+        payload.insert(QStringLiteral("shell_dock_mode"), itemAlignment2String(*align));
+
+#ifdef HAVE_DDE_API_EVENTLOGGER
+    DDE_EventLogger::EventLogger::instance().writeEventLog(
+        DDE_EventLogger::EventLoggerData(EVENT_LOGGER_DOCK_CONFIG, QStringLiteral("dock_config"), payload));
+#endif
+    qCInfo(dockSettingsLog) << "EventLogger: dock config" << reason << payload;
+}
+
 static ItemAlignment string2ItenAlignment(const QString& alignmentStr)
 {
     if (alignmentStr == "left")
@@ -136,6 +159,7 @@ DockSettings::DockSettings(QObject* parent)
 {
     m_writeTimer->setSingleShot(true);
     m_writeTimer->setInterval(1000);
+    qCInfo(dockSettingsLog) << "EventLogger initialized";
     init();
 }
 
@@ -151,6 +175,9 @@ void DockSettings::init()
         m_showInPrimary = m_dockConfig->value(keyShowInPrimary).toBool();
         m_locked = m_dockConfig->value(keyLocked).toBool();
 
+        // Log dock config on startup - merge shell_pos and shell_dock_mode into one log entry
+        logDockConfig(m_dockPosition, m_alignment, QStringLiteral("on startup"));
+
         connect(m_dockConfig.data(), &DConfig::valueChanged, this, [this](const QString& key){
             if (keyDockSize == key) {
                 auto size = m_dockConfig->value(keyDockSize).toUInt();
@@ -237,6 +264,7 @@ void DockSettings::setPosition(const Position& position)
     m_dockPosition = position;
     Q_EMIT positionChanged(m_dockPosition);
     addWriteJob(positionJob);
+    logDockConfig(position, std::nullopt, QStringLiteral("position changed"));
 }
 
 ItemAlignment DockSettings::itemAlignment()
@@ -251,6 +279,7 @@ void DockSettings::setItemAlignment(const ItemAlignment& alignment)
     m_alignment = alignment;
     Q_EMIT itemAlignmentChanged(m_alignment);
     addWriteJob(itemAlignmentJob);
+    logDockConfig(std::nullopt, alignment, QStringLiteral("itemAlignment changed"));
 }
 
 IndicatorStyle DockSettings::indicatorStyle()

panels/dock/docksettings.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -10,6 +10,7 @@
 #include <QObject>
 #include <DConfig>
 #include <QScopedPointer>
+#include <optional>
 
 DCORE_USE_NAMESPACE
 
@@ -62,6 +63,7 @@ class DockSettings : public QObject
     void init();
 
     void addWriteJob(WriteJob job);
+    void logDockConfig(std::optional<Position> pos, std::optional<ItemAlignment> align, const QString &reason) const;
     inline void checkWriteJob();
 
 Q_SIGNALS:

panels/dock/multitaskview/CMakeLists.txt

@@ -32,6 +32,10 @@ target_link_libraries(dock-multitaskview PRIVATE
     dde-shell-dock
 )
 
+if (HAVE_DDE_API_EVENTLOGGER)
+    target_compile_definitions(dock-multitaskview PRIVATE HAVE_DDE_API_EVENTLOGGER)
+endif()
+
 ds_install_package(PACKAGE org.deepin.ds.dock.multitaskview TARGET dock-multitaskview)
 ds_handle_package_translation(PACKAGE org.deepin.ds.dock.multitaskview)
 

panels/dock/multitaskview/multitaskview.cpp

@@ -7,15 +7,35 @@
 #include "../constants.h"
 
 #include <QBuffer>
+#include <QProcess>
 
 #include <DDciIcon>
 #include <DDBusSender>
 #include <DWindowManagerHelper>
 #include <DGuiApplicationHelper>
 
+#ifdef HAVE_DDE_API_EVENTLOGGER
+#include <dde-api/eventlogger.hpp>
+#endif
+
 DGUI_USE_NAMESPACE
 DCORE_USE_NAMESPACE
 
+namespace {
+constexpr qint64 EVENT_LOGGER_KWIN_MULTITASK_VIEW = 1000300000;
+constexpr int EventLaunchTypeDockIcon = 2;
+
+QString queryKwinVersion()
+{
+    QProcess process;
+    process.start(QStringLiteral("dpkg-query"), { QStringLiteral("-W"), QStringLiteral("-f=${Version}"), QStringLiteral("kwin-x11") });
+    if (!process.waitForFinished(1000) || process.exitStatus() != QProcess::NormalExit || process.exitCode() != 0) {
+        return QString();
+    }
+    return QString::fromLocal8Bit(process.readAllStandardOutput()).trimmed();
+}
+}
+
 namespace dock {
 
 constexpr int KWinOptimalPerformance = 4;
@@ -50,12 +70,20 @@ MultiTaskView::MultiTaskView(QObject *parent)
 bool MultiTaskView::init()
 {
     setSupported(m_kWinEffect && DWindowManagerHelper::instance()->hasComposite());
+    m_kwinVersion = queryKwinVersion();
     DAppletDock::init();
     return true;
 }
 
 void MultiTaskView::openWorkspace()
 {
+#ifdef HAVE_DDE_API_EVENTLOGGER
+    DDE_EventLogger::EventLogger::instance().writeEventLog(
+        DDE_EventLogger::EventLoggerData(EVENT_LOGGER_KWIN_MULTITASK_VIEW, QStringLiteral("kwin_multitask_view"), {
+            {QStringLiteral("launch_type"), EventLaunchTypeDockIcon},
+            {QStringLiteral("kwin_version"), m_kwinVersion}
+        }));
+#endif
     if (m_multitaskview) {
         m_multitaskview->toggle();
         return;