refactor(eventreporter): use x_linglong() for linglong detection and improve error reporting

重构事件上报模块：将玲珑包判断从 appId 前缀匹配改为由调用方传入 x_linglong() 结果，
内化包信息查询逻辑，新增 app_package_type 字段上报，优化错误信息并添加命令失败日志。

Rework the event reporting logic in removeInstance to use richer systemd unit
exit info (result, execMainCode, execMainStatus, timestamps) via UnitExitInfo,
replacing the previous simple string-based result matching. Split the ambiguous
exit results into launch-failed vs abnormal-exit using systemd result semantics
and a 3-second duration heuristic. Remove the premature reportAppLaunchFailed
call from the app-launch-helper exit code check in Launch(), since invalid
desktop files would produce noisy data at that stage.

- Replace appId.startsWith("org.") with caller-provided x_linglong() for linglong detection
- Internalize package info query (version + pakType) into queryAppPackageInfo()
- Add app_package_type field to all event reports
- Collect full UnitExitInfo (result, execMainCode, execMainStatus, timestamps)
  via UnitResultWatcher instead of just the result string
- Classify systemd results into launchFailedResults and ambiguousResults,
  use 3s duration threshold to distinguish launch failure from abnormal exit
- Remove reportAppLaunchFailed from Launch() app-launch-helper error path
  to avoid noise from invalid desktop files
- Remove reportAppLaunchDuration and getAppVersion() API
- Add qCWarning logs for failed dpkg-query/ll-cli commands
- Cache both version and pakType (including empty results) to avoid redundant queries
- Reduce waitForFinished timeout from 3s/5s to 1s

PMS: TASK-389405

Author: Ivy233

src/dbus/applicationmanager1service.cpp

@@ -15,12 +15,14 @@
 #include "systemdsignaldispatcher.h"
 #include <DUtil>
 #include <QDBusMessage>
+#include <QDBusVariant>
 #include <QDirIterator>
 #include <QFile>
 #include <QGuiApplication>
 #include <QHash>
 #include <QLoggingCategory>
 #include <QProcess>
+#include <QSet>
 #include <QStringBuilder>
 #include <unistd.h>
 
@@ -468,17 +470,40 @@ void ApplicationManager1Service::removeInstanceFromApplication(const QString &un
         });
 
     if (instanceIt != appIns.cend()) {
-        auto result = m_unitResults.take(systemdUnitPath.path());
-        qCDebug(DDEAM) << "removeInstance: unitPath=" << systemdUnitPath.path() << "cached result=" << result;
-        if (result == u"failed" || result == u"canceled" || result == u"timeout"
-            || result == u"signal" || result == u"core-dump" || result == u"exit-code") {
-            QStringList logArgs{QStringLiteral("--unit=%1").arg(unitName),
+        auto exitInfo = m_unitResults.take(systemdUnitPath.path());
+        qCDebug(DDEAM) << "removeInstance: unitPath=" << systemdUnitPath.path() << "cached result=" << exitInfo.result
+                       << "execMainCode=" << exitInfo.execMainCode << "execMainStatus=" << exitInfo.execMainStatus
+                       << "execMainDuration=" << (exitInfo.execMainExitTimestamp - exitInfo.execMainStartTimestamp) / 1000 << "ms";
+
+        static const QSet<QString> launchFailedResults{u"start-limit-hit"_s, u"resources"_s, u"exec-condition"_s, u"protocol"_s, u"timeout"_s};
+        static const QSet<QString> ambiguousResults{u"exit-code"_s, u"signal"_s, u"core-dump"_s, u"oom-kill"_s, u"watchdog"_s};
+
+        auto doReport = [&](bool isLaunchFailed) {
+            QStringList logArgs{"--user", QStringLiteral("--unit=%1").arg(unitName),
                                 "-n", "20", "-o", "cat", "-o", "with-unit", "--no-pager"};
             QProcess logProc;
             logProc.start("journalctl", logArgs);
             logProc.waitForFinished(3000);
             QString logInfo = QString::fromUtf8(logProc.readAllStandardOutput());
-            EventReporter::reportAppAbnormalExit(app->eventAppId(), (*instanceIt)->launchType(), unitName, logInfo, (*instanceIt)->launchUniqueId());
+
+            if (isLaunchFailed) {
+                EventReporter::reportAppLaunchFailed(app->eventAppId(),
+                    QStringLiteral("systemd result: %1, execMainCode: %2, execMainStatus: %3")
+                        .arg(exitInfo.result)
+                        .arg(exitInfo.execMainCode)
+                        .arg(exitInfo.execMainStatus),
+                    app->x_linglong(), (*instanceIt)->launchType(), (*instanceIt)->launchUniqueId());
+            } else {
+                EventReporter::reportAppAbnormalExit(app->eventAppId(), (*instanceIt)->launchType(), unitName, logInfo, app->x_linglong(), (*instanceIt)->launchUniqueId());
+            }
+        };
+
+        if (launchFailedResults.contains(exitInfo.result)) {
+            doReport(true);
+        } else if (ambiguousResults.contains(exitInfo.result)) {
+            auto durationUs = exitInfo.execMainExitTimestamp - exitInfo.execMainStartTimestamp;
+            constexpr qulonglong launchPhaseThresholdUs = 3'000'000; // 3 seconds
+            doReport(durationUs < launchPhaseThresholdUs);
         }
 
         app->removeOneInstance(instanceIt.key());
@@ -490,10 +515,11 @@ void ApplicationManager1Service::removeInstanceFromApplication(const QString &un
     });
 }
 
-void ApplicationManager1Service::onUnitResultReady(const QDBusObjectPath &unitPath, const QString &result)
+void ApplicationManager1Service::onUnitResultReady(const QDBusObjectPath &unitPath, const UnitExitInfo &info)
 {
-    qCDebug(DDEAM) << "onUnitResultReady: unitPath=" << unitPath.path() << "result=" << result;
-    m_unitResults.insert(unitPath.path(), result);
+    qCDebug(DDEAM) << "onUnitResultReady: unitPath=" << unitPath.path() << "result=" << info.result
+                   << "execMainCode=" << info.execMainCode << "execMainStatus=" << info.execMainStatus;
+    m_unitResults.insert(unitPath.path(), info);
 }
 
 void ApplicationManager1Service::scanMimeInfos() noexcept

src/dbus/applicationmanager1service.h

@@ -26,6 +26,14 @@ Q_DECLARE_LOGGING_CATEGORY(DDEAM)
 
 class ApplicationService;
 
+struct UnitExitInfo {
+    QString result;
+    uint execMainCode{0};
+    uint execMainStatus{0};
+    qulonglong execMainStartTimestamp{0};
+    qulonglong execMainExitTimestamp{0};
+};
+
 class UnitResultWatcher : public QObject
 {
     Q_OBJECT
@@ -36,18 +44,38 @@ class UnitResultWatcher : public QObject
 public Q_SLOTS:
     void handlePropertyChanged(const QString &interface, const QVariantMap &changed, const QStringList &invalidated)
     {
-        if ((interface == QStringLiteral("org.freedesktop.systemd1.Unit")
-             || interface == QStringLiteral("org.freedesktop.systemd1.Service"))
-            && changed.contains(QStringLiteral("Result"))) {
-            emit resultReady(m_unitPath, changed.value(QStringLiteral("Result")).toString());
+        if (interface != QStringLiteral("org.freedesktop.systemd1.Unit")
+            && interface != QStringLiteral("org.freedesktop.systemd1.Service")) {
+            return;
+        }
+
+        if (changed.contains(QStringLiteral("Result"))) {
+            m_info.result = changed.value(QStringLiteral("Result")).toString();
+        }
+        if (changed.contains(QStringLiteral("ExecMainCode"))) {
+            m_info.execMainCode = changed.value(QStringLiteral("ExecMainCode")).toUInt();
+        }
+        if (changed.contains(QStringLiteral("ExecMainStatus"))) {
+            m_info.execMainStatus = changed.value(QStringLiteral("ExecMainStatus")).toUInt();
+        }
+        if (changed.contains(QStringLiteral("ExecMainStartTimestamp"))) {
+            m_info.execMainStartTimestamp = changed.value(QStringLiteral("ExecMainStartTimestamp")).toULongLong();
+        }
+        if (changed.contains(QStringLiteral("ExecMainExitTimestamp"))) {
+            m_info.execMainExitTimestamp = changed.value(QStringLiteral("ExecMainExitTimestamp")).toULongLong();
+        }
+
+        if (!m_info.result.isNull()) {
+            emit resultReady(m_unitPath, m_info);
         }
     }
 
 Q_SIGNALS:
-    void resultReady(const QDBusObjectPath &unitPath, const QString &result);
+    void resultReady(const QDBusObjectPath &unitPath, const UnitExitInfo &info);
 
 private:
     QDBusObjectPath m_unitPath;
+    UnitExitInfo m_info;
 };
 
 class ApplicationManager1Service final : public QObject, protected QDBusContext
@@ -108,7 +136,7 @@ public Q_SLOTS:
 
 private Q_SLOTS:
     void doReloadApplications();
-    void onUnitResultReady(const QDBusObjectPath &unitPath, const QString &result);
+    void onUnitResultReady(const QDBusObjectPath &unitPath, const UnitExitInfo &info);
 
 private:
     bool m_startupPhase{true};
@@ -124,7 +152,7 @@ private Q_SLOTS:
     bool m_isReloading{false};
     bool m_pendingReload{false};
     QHash<QString, QSharedPointer<ApplicationService>> m_applicationList;
-    QHash<QString, QString> m_unitResults;
+    QHash<QString, UnitExitInfo> m_unitResults;
     QSharedPointer<CompatibilityManager> m_compatibilityManager;
     std::unique_ptr<PrelaunchSplashHelper> m_splashHelper;
 

src/dbus/applicationservice.cpp

@@ -408,7 +408,6 @@ QDBusObjectPath ApplicationService::Launch(const QString &action, const QStringL
     }();
 
     if (desktopEntry == nullptr) {
-        EventReporter::reportAppLaunchFailed(eventAppId(), EventReporter::getAppVersion(id()), "This application is not set to autostart.", launchType, launchUniqueId);
         safe_sendErrorReply(QDBusError::Failed, "This application is not set to autostart.");
     }
 
@@ -438,7 +437,6 @@ QDBusObjectPath ApplicationService::Launch(const QString &action, const QStringL
         if (!Actions) {
             const QString msg{"application can't be executed."};
             qWarning() << msg;
-            EventReporter::reportAppLaunchFailed(eventAppId(), EventReporter::getAppVersion(id()), msg, launchType, launchUniqueId);
             safe_sendErrorReply(QDBusError::Failed, msg);
             return {};
         }
@@ -447,7 +445,6 @@ QDBusObjectPath ApplicationService::Launch(const QString &action, const QStringL
         if (execStr.isEmpty()) {
             const QString msg{"maybe entry actions's format is invalid, abort launch."};
             qWarning() << msg;
-            EventReporter::reportAppLaunchFailed(eventAppId(), EventReporter::getAppVersion(id()), msg, launchType, launchUniqueId);
             safe_sendErrorReply(QDBusError::Failed, msg);
             return {};
         }
@@ -462,8 +459,6 @@ QDBusObjectPath ApplicationService::Launch(const QString &action, const QStringL
         }
     }
 
-    EventReporter::getAppVersion(eventAppId());
-
     const bool isSingleton =
         findEntryValue(fromStaticRaw(DesktopFileEntryKey), fromStaticRaw(DesktopEntryXDeepinSingleton), EntryValueType::Boolean)
             .toBool();
@@ -499,14 +494,12 @@ QDBusObjectPath ApplicationService::Launch(const QString &action, const QStringL
     auto cmds = generateCommand(optionsMap);
     auto task = processExec(execStr, fields, workingDir);
     if (!task) {
-        EventReporter::reportAppLaunchFailed(eventAppId(), EventReporter::getAppVersion(id()), "Invalid Command.", launchType, launchUniqueId);
         safe_sendErrorReply(QDBusError::InternalError, "Invalid Command.");
         return {};
     }
 
     if (task.LaunchBin.isEmpty()) {
         qCritical() << "error command is detected, abort.";
-        EventReporter::reportAppLaunchFailed(eventAppId(), EventReporter::getAppVersion(id()), "error command is detected, abort.", launchType, launchUniqueId);
         safe_sendErrorReply(QDBusError::Failed);
         return {};
     }
@@ -521,7 +514,7 @@ QDBusObjectPath ApplicationService::Launch(const QString &action, const QStringL
     // Generate instance UUID early so splash and job lambda share the same id.
     auto instanceRandomUUID = QUuid::createUuid().toString(QUuid::Id128);
 
-    EventReporter::reportAppLaunch(eventAppId(), EventReporter::getAppVersion(eventAppId()), QDateTime::currentMSecsSinceEpoch(), launchType, launchUniqueId);
+    EventReporter::reportAppLaunch(eventAppId(), QDateTime::currentMSecsSinceEpoch(), x_linglong(), launchType, launchUniqueId);
 
     // Notify the compositor to show a splash screen (after validation passes).
     if (isAutostartLaunch) {
@@ -614,7 +607,6 @@ QDBusObjectPath ApplicationService::Launch(const QString &action, const QStringL
             auto exitCode = process.exitCode();
             if (exitCode != 0) {
                 qWarning() << "Launch Application Failed";
-                EventReporter::reportAppLaunchFailed(eventAppId(), EventReporter::getAppVersion(eventAppId()), "app-launch-helper exited with code " + QString::number(exitCode), m_launchType, m_launchUniqueId);
                 return QDBusError::Failed;
             }
 
@@ -1123,8 +1115,6 @@ bool ApplicationService::addOneInstance(const QString &instanceId,
                                 QVariant::fromValue(interfaces));
     }
 
-    EventReporter::reportAppLaunchDuration(eventAppId(), EventReporter::getAppVersion(eventAppId()), QDateTime::currentMSecsSinceEpoch(), launchType, uniqueId);
-
     return true;
 }