Signed-off-by:czl<chenzhaolin1@h-partners.com>

This commit is contained in:
czl 2025-01-11 15:46:58 +08:00
parent a33f114f37
commit dd73915e05
5 changed files with 23 additions and 12 deletions

View File

@ -233,14 +233,14 @@ COOPERTATE_BEHAVIOR:
__BASE: {type: BEHAVIOR, level: CRITICAL, desc: Cooperate, preserve: false}
ORG_PKG: {type: STRING, desc: business pkg name}
FUNC: {type: STRING, desc: current function name}
BIZ_SCENE: {type: INT32, desc: business scene}
BIZ_STATE: {type: INT32, desc: business state}
BIZ_STAGE: {type: INT32, desc: business stage}
STAGE_RES: {type: INT32, desc: stage result}
BIZ_SCENE: {type: INT32, desc: business scene}
ERROR_CODE: {type: INT32, desc: error code}
TO_CALL_PKG: {type: STRING, desc: to call package}
HOST_PKG: {type: STRING, desc: host module name}
LOCAL_NET_ID: {type: STRING, desc: local device network id}
PEER_NET_ID: {type: STRING, desc: peer device network id}
TO_CALL_PKG: {type: STRING, desc: to call package}
LOCAL_DEV_TYPE: {type: STRING, desc: local device type}
PEER_DEV_TYPE: {type: STRING, desc: peer device type}

View File

@ -168,14 +168,14 @@ int32_t Cooperate::Start(int32_t pid, int32_t userData, const std::string &remot
.funcName = __FUNCTION__,
.bizScene = static_cast<int32_t> (BizCooperateScene::SCENE_ACTIVE),
.bizState = static_cast<int32_t> (BizState::STATE_END),
.bizStage = static_cast<int32_t> (BizCooperateStage::STAGE_CALLING_COOPERATE),
.stageRes = static_cast<int32_t> (BizCooperateStageRes::RES_FAIL),
.errCode = static_cast<int32_t> (CooperateRadarErrCode::CALLING_COOPERATE_FAILED),
.hostName = "",
.localNetId = Utility::DFXRadarAnonymize(context_.Local().c_str()),
.peerNetId = Utility::DFXRadarAnonymize(remoteNetworkId.c_str())
};
if (!sm_.IsCooperateEnable()) {
radarInfo.bizStage = static_cast<int32_t> (BizCooperateStage::STAGE_CHECK_LOCAL_SWITCH);
radarInfo.stageRes = static_cast<int32_t> (BizCooperateStageRes::RES_FAIL);
radarInfo.errCode = static_cast<int32_t> (CooperateRadarErrCode::CHECK_LOCAL_SWITCH_FAILED);
CooperateRadar::ReportCooperateRadarInfo(radarInfo);
}
#ifdef ENABLE_PERFORMANCE_CHECK
@ -196,6 +196,9 @@ int32_t Cooperate::Start(int32_t pid, int32_t userData, const std::string &remot
FI_HILOGE("Failed to send event via channel, error:%{public}d", ret);
}
if (ret != RET_OK) {
radarInfo.bizStage = static_cast<int32_t> (BizCooperateStage::STAGE_CALLING_COOPERATE);
radarInfo.stageRes = static_cast<int32_t> (BizCooperateStageRes::RES_FAIL);
radarInfo.errCode = static_cast<int32_t> (CooperateRadarErrCode::CALLING_COOPERATE_FAILED);
CooperateRadar::ReportCooperateRadarInfo(radarInfo);
};
radarInfo.bizState = static_cast<int32_t> (BizState::STATE_BEGIN),

View File

@ -136,7 +136,7 @@ void CooperateFree::Initial::OnStart(Context &context, const CooperateEvent &eve
.bizState = static_cast<int32_t> (BizState::STATE_END),
.bizStage = static_cast<int32_t> (BizCooperateStage::STAGE_OPEN_DSOFTBUS_SESSION),
.stageRes = static_cast<int32_t> (BizCooperateStageRes::RES_FAIL),
.errCode = static_cast<int32_t> (CooperateRadarErrCode::OPEN_DSOFTBUS_SESSION_FAILED), .hostName = "",
.errCode = static_cast<int32_t> (CooperateRadarErrCode::OPEN_DSOFTBUS_SESSION_FAILED),
.localNetId = Utility::DFXRadarAnonymize(context.Local().c_str()),
.peerNetId = Utility::DFXRadarAnonymize(notice.remoteNetworkId.c_str())
};

View File

@ -51,8 +51,8 @@ enum class BizCooperateStage {
};
enum class CooperateRadarErrCode {
CALLING_COOPERATE_SUCCESS = 61145108,
CALLING_COOPERATE_FAILED,
CALLING_COOPERATE_SUCCESS = 0,
CALLING_COOPERATE_FAILED = 61145108,
CHECK_SAME_ACCOUNT_FAILED,
CHECK_LOCAL_SWITCH_FAILED,
CHECK_ALLOW_COOPERATE_FAILED,
@ -65,18 +65,23 @@ enum class CooperateRadarErrCode {
SET_CURSOR_VISIBILITY_FAILED,
SRV_EVENT_MGR_NOTIFY_FAILED,
CLIENT_ON_MESSAGE_RCVD_FAILED
};
struct CooperateRadarInfo {
std::string funcName;
int32_t bizScene { -1 };
int32_t bizState { -1 };
int32_t bizStage { -1 };
int32_t stageRes { -1 };
int32_t bizScene { -1 };
int32_t errCode { -1 };
std::string hostName;
std::string localNetId;
std::string peerNetId;
std::string toCallPkg;
std::string localDeviceType;
std::string peerDeviceType;
};
class CooperateRadar {

View File

@ -35,15 +35,18 @@ void CooperateRadar::ReportCooperateRadarInfo(struct CooperateRadarInfo &coopera
HiviewDFX::HiSysEvent::EventType::BEHAVIOR,
"ORG_PKG", ORG_PKG_NAME,
"FUNC", cooperateRadarInfo.funcName,
"BIZ_SCENE", cooperateRadarInfo.bizScene,
"BIZ_STATE", cooperateRadarInfo.bizState,
"BIZ_STAGE", cooperateRadarInfo.bizStage,
"STAGE_RES", cooperateRadarInfo.stageRes,
"BIZ_SCENE", cooperateRadarInfo.bizScene,
"ERROR_CODE", cooperateRadarInfo.errCode,
"HOST_PKG", cooperateRadarInfo.hostName,
"LOCAL_NET_ID", cooperateRadarInfo.localNetId,
"PEER_NET_ID", cooperateRadarInfo.peerNetId);
}
"PEER_NET_ID", cooperateRadarInfo.peerNetId,
"TO_CALL_PKG", cooperateRadarInfo.toCallPkg,
"LOCAL_DEV_TYPE", cooperateRadarInfo.localDeviceType,
"PEER_DEV_TYPE", cooperateRadarInfo.peerDeviceType);
} // namespace DeviceStatus
} // namespace Msdp