yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.4.4][apm] 注释掉apm相关逻辑

Browse Source
This commit is contained in:
renwj
2024-06-12 15:46:36 +08:00
parent 26f8349cb9
commit 507e6ae642
8 changed files with 277 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt
View File

@@ -18,7 +18,7 @@ import com.mogo.eagle.core.data.deva.scene.SceneModule
import com.mogo.eagle.core.data.deva.scene.SceneTAG import com.mogo.eagle.core.data.deva.scene.SceneTAG
import com.mogo.eagle.core.data.msgbox.MsgBoxBean import com.mogo.eagle.core.data.msgbox.MsgBoxBean
import com.mogo.eagle.core.function.api.devatools.IDevaToolsProvider import com.mogo.eagle.core.function.api.devatools.IDevaToolsProvider
import com.mogo.eagle.core.function.api.devatools.apm.* //import com.mogo.eagle.core.function.api.devatools.apm.*
import com.mogo.eagle.core.function.api.devatools.block.* import com.mogo.eagle.core.function.api.devatools.block.*
import com.mogo.eagle.core.function.api.devatools.strict.* import com.mogo.eagle.core.function.api.devatools.strict.*
import com.mogo.eagle.core.function.api.devatools.download.* import com.mogo.eagle.core.function.api.devatools.download.*
@@ -37,7 +37,7 @@ import com.tencent.matrix.report.Issue
import com.tencent.matrix.trace.TracePlugin import com.tencent.matrix.trace.TracePlugin
import com.tencent.matrix.trace.config.SharePluginInfo import com.tencent.matrix.trace.config.SharePluginInfo
import com.tencent.matrix.trace.config.TraceConfig import com.tencent.matrix.trace.config.TraceConfig
import com.zhjt.mogo_core_function_devatools.apm.* //import com.zhjt.mogo_core_function_devatools.apm.*
import com.mogo.eagle.core.function.api.upgrade.* import com.mogo.eagle.core.function.api.upgrade.*
import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
import com.mogo.eagle.core.utilcode.kotlin.lifeCycleScope import com.mogo.eagle.core.utilcode.kotlin.lifeCycleScope
@@ -90,7 +90,7 @@ class DevaToolsProvider : IDevaToolsProvider, IAppStateListener {
private var mContext: Context? = null private var mContext: Context? = null
private val apmEnvProvider by lazy { ApmEnvProviderImpl() } // private val apmEnvProvider by lazy { ApmEnvProviderImpl() }
private val strictModeProvider by lazy { StrictModeProviderImpl() } private val strictModeProvider by lazy { StrictModeProviderImpl() }
@@ -159,7 +159,7 @@ class DevaToolsProvider : IDevaToolsProvider, IAppStateListener {
//升级(鹰眼/工控)与监控服务 //升级(鹰眼/工控)与监控服务
iPCReportManager.initServer() iPCReportManager.initServer()
BindingCarManager.init(mContext!!) BindingCarManager.init(mContext!!)
apmEnvProvider.init(if(DebugConfig.isDebug()) "0" else "1", "${ DebugConfig.getNetMode() }", mDockerVersion ?: "") // apmEnvProvider.init(if(DebugConfig.isDebug()) "0" else "1", "${ DebugConfig.getNetMode() }", mDockerVersion ?: "")
BadCaseManager.init(mContext!!) BadCaseManager.init(mContext!!)
if (DebugConfig.isDebug()) { if (DebugConfig.isDebug()) {
SdtManager.init(mContext!!, true, DetectResultImpl()) SdtManager.init(mContext!!, true, DetectResultImpl())
@@ -513,13 +513,13 @@ class DevaToolsProvider : IDevaToolsProvider, IAppStateListener {
} }
override fun envConfigChange(cityCode: String, netMode: Int) { override fun envConfigChange(cityCode: String, netMode: Int) {
apmEnvProvider.onEnvChanged(if(DebugConfig.isDebug()) "0" else "1", "${ DebugConfig.getNetMode() }", mDockerVersion ?: "") // apmEnvProvider.onEnvChanged(if(DebugConfig.isDebug()) "0" else "1", "${ DebugConfig.getNetMode() }", mDockerVersion ?: "")
EnvChangeManager.changeTo(cityCode, netMode) EnvChangeManager.changeTo(cityCode, netMode)
} }
override fun dockerVersion(dockerVersion: String?) { override fun dockerVersion(dockerVersion: String?) {
mDockerVersion = dockerVersion mDockerVersion = dockerVersion
apmEnvProvider.onEnvChanged(if(DebugConfig.isDebug()) "0" else "1","${ DebugConfig.getNetMode() }", dockerVersion ?: "") // apmEnvProvider.onEnvChanged(if(DebugConfig.isDebug()) "0" else "1","${ DebugConfig.getNetMode() }", dockerVersion ?: "")
BadCaseConfig.dockerVersion = dockerVersion BadCaseConfig.dockerVersion = dockerVersion
} }
@@ -550,7 +550,7 @@ class DevaToolsProvider : IDevaToolsProvider, IAppStateListener {
BindingCarManager.queryAppUpgrade() BindingCarManager.queryAppUpgrade()
} }
override fun apmEnvProvider(): IApmEnvProvider = apmEnvProvider // override fun apmEnvProvider(): IApmEnvProvider = apmEnvProvider
override fun queryObuUpgrade(obuVersionName: String) { override fun queryObuUpgrade(obuVersionName: String) {
BindingCarManager.queryObuUpgrade(obuVersionName) BindingCarManager.queryObuUpgrade(obuVersionName)

290
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/apm/ApmEnvProviderImpl.kt
View File

@@ -1,145 +1,145 @@
package com.zhjt.mogo_core_function_devatools.apm //package com.zhjt.mogo_core_function_devatools.apm
//
import android.os.Process //import android.os.Process
import android.text.TextUtils //import android.text.TextUtils
import android.widget.Toast //import android.widget.Toast
import com.mogo.commons.debug.DebugConfig //import com.mogo.commons.debug.DebugConfig
import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_INIT_ENV_RESTART //import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_INIT_ENV_RESTART
import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_SOURCE_INIT //import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_SOURCE_INIT
import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_TYPE_STATUS //import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_TYPE_STATUS
import com.mogo.eagle.core.function.api.devatools.apm.* ////import com.mogo.eagle.core.function.api.devatools.apm.*
import com.mogo.eagle.core.utilcode.util.* //import com.mogo.eagle.core.utilcode.util.*
import com.zhjt.mogo_core_function_devatools.apm.config.* //import com.zhjt.mogo_core_function_devatools.apm.config.*
import com.zhjt.service.chain.ChainLog //import com.zhjt.service.chain.ChainLog
import kotlinx.coroutines.* //import kotlinx.coroutines.*
import java.util.concurrent.atomic.AtomicBoolean //import java.util.concurrent.atomic.AtomicBoolean
import java.util.concurrent.atomic.AtomicReference //import java.util.concurrent.atomic.AtomicReference
import kotlin.coroutines.* //import kotlin.coroutines.*
//
class ApmEnvProviderImpl: IApmEnvProvider, CoroutineScope { //class ApmEnvProviderImpl: IApmEnvProvider, CoroutineScope {
//
private val TAG = "ApmEnvProvider" // private val TAG = "ApmEnvProvider"
//
private val scope by lazy { CoroutineScope(Dispatchers.IO + SupervisorJob()) } // private val scope by lazy { CoroutineScope(Dispatchers.IO + SupervisorJob()) }
//
private val hasInit by lazy { AtomicBoolean(false) } // private val hasInit by lazy { AtomicBoolean(false) }
//
private val mBuildType by lazy { AtomicReference<String>() } // private val mBuildType by lazy { AtomicReference<String>() }
private val mNetType by lazy { AtomicReference<String>() } // private val mNetType by lazy { AtomicReference<String>() }
private val mDockerVersion by lazy { AtomicReference<String>() } // private val mDockerVersion by lazy { AtomicReference<String>() }
//
override val coroutineContext: CoroutineContext // override val coroutineContext: CoroutineContext
get() = scope.coroutineContext // get() = scope.coroutineContext
//
override fun init(buildType: String, netType: String, dockerVersion: String) { // override fun init(buildType: String, netType: String, dockerVersion: String) {
launch { // launch {
if (ApmEnvConfig.isFirstEnter()) { // if (ApmEnvConfig.isFirstEnter()) {
if (!TextUtils.isEmpty(buildType)) { // if (!TextUtils.isEmpty(buildType)) {
ApmEnvConfig.setBuildType(buildType) // ApmEnvConfig.setBuildType(buildType)
} // }
if (!TextUtils.isEmpty(netType)) { // if (!TextUtils.isEmpty(netType)) {
ApmEnvConfig.setNetType(netType) // ApmEnvConfig.setNetType(netType)
} // }
if (!TextUtils.isEmpty(dockerVersion)) { // if (!TextUtils.isEmpty(dockerVersion)) {
ApmEnvConfig.setDockerVersion(dockerVersion) // ApmEnvConfig.setDockerVersion(dockerVersion)
} // }
} // }
hasInit.set(true) // hasInit.set(true)
} // }
} // }
//
override fun onEnvChanged(buildType: String, netType: String, dockerVersion: String) { // override fun onEnvChanged(buildType: String, netType: String, dockerVersion: String) {
if (!hasInit.get()) { // if (!hasInit.get()) {
return // return
} // }
if (mBuildType.get() == buildType && mNetType.get() == netType && mDockerVersion.get() == dockerVersion) { // if (mBuildType.get() == buildType && mNetType.get() == netType && mDockerVersion.get() == dockerVersion) {
return // return
} // }
launch { // launch {
var buildTypeChanged = false // var buildTypeChanged = false
if (ApmEnvConfig.getBuildType() != buildType) { // if (ApmEnvConfig.getBuildType() != buildType) {
buildTypeChanged = true // buildTypeChanged = true
ApmEnvConfig.setBuildType(buildType) // ApmEnvConfig.setBuildType(buildType)
} // }
var netTypeChanged = false // var netTypeChanged = false
if (ApmEnvConfig.getNetType() != netType) { // if (ApmEnvConfig.getNetType() != netType) {
netTypeChanged = true // netTypeChanged = true
ApmEnvConfig.setNetType(netType) // ApmEnvConfig.setNetType(netType)
} // }
var dockerVersionChanged = false // var dockerVersionChanged = false
val version = ApmEnvConfig.getDockerVersion() // val version = ApmEnvConfig.getDockerVersion()
if (!TextUtils.isEmpty(version) && !TextUtils.isEmpty(dockerVersion) && version != dockerVersion) { // if (!TextUtils.isEmpty(version) && !TextUtils.isEmpty(dockerVersion) && version != dockerVersion) {
val f1 = version?.endsWith("release", true) == true // val f1 = version?.endsWith("release", true) == true
val f2 = dockerVersion.endsWith("release", true) // val f2 = dockerVersion.endsWith("release", true)
dockerVersionChanged = if (f1 && f2) false else f1 || f2 // dockerVersionChanged = if (f1 && f2) false else f1 || f2
if (dockerVersionChanged) { // if (dockerVersionChanged) {
ApmEnvConfig.setDockerVersion(dockerVersion) // ApmEnvConfig.setDockerVersion(dockerVersion)
} // }
} // }
var isFirstDockerVersionSet = false // var isFirstDockerVersionSet = false
if (TextUtils.isEmpty(version) && !TextUtils.isEmpty(dockerVersion)) { // if (TextUtils.isEmpty(version) && !TextUtils.isEmpty(dockerVersion)) {
isFirstDockerVersionSet = true // isFirstDockerVersionSet = true
ApmEnvConfig.setDockerVersion(dockerVersion) // ApmEnvConfig.setDockerVersion(dockerVersion)
} // }
var isEnvValid = true // var isEnvValid = true
if (dockerVersionChanged || isFirstDockerVersionSet) { // if (dockerVersionChanged || isFirstDockerVersionSet) {
isEnvValid = buildType == "0" || (buildType == "1" && netType == DebugConfig.NET_MODE_RELEASE.toString() && dockerVersion.endsWith("release", true)) // isEnvValid = buildType == "0" || (buildType == "1" && netType == DebugConfig.NET_MODE_RELEASE.toString() && dockerVersion.endsWith("release", true))
} // }
val appRelaunched = ApmEnvConfig.isAppRelaunched() // val appRelaunched = ApmEnvConfig.isAppRelaunched()
if ((!isEnvValid || (buildTypeChanged || netTypeChanged || dockerVersionChanged)) && !appRelaunched) { // if ((!isEnvValid || (buildTypeChanged || netTypeChanged || dockerVersionChanged)) && !appRelaunched) {
ApmEnvConfig.setAppRelaunched(true) // ApmEnvConfig.setAppRelaunched(true)
restartApp(mapOf<String,Any>("buildType" to buildType, "netType" to netType,"dockerVersion" to dockerVersion)) // restartApp(mapOf<String,Any>("buildType" to buildType, "netType" to netType,"dockerVersion" to dockerVersion))
return@launch // return@launch
} // }
if (isFirstDockerVersionSet) { // if (isFirstDockerVersionSet) {
return@launch // return@launch
} // }
//
if (appRelaunched) { // if (appRelaunched) {
ApmEnvConfig.setAppRelaunched(false) // ApmEnvConfig.setAppRelaunched(false)
} // }
//
if (!TextUtils.isEmpty(buildType)) { // if (!TextUtils.isEmpty(buildType)) {
mBuildType.set(buildType) // mBuildType.set(buildType)
} // }
//
if (!TextUtils.isEmpty(netType)) { // if (!TextUtils.isEmpty(netType)) {
mNetType.set(netType) // mNetType.set(netType)
} // }
//
if (!TextUtils.isEmpty(dockerVersion)) { // if (!TextUtils.isEmpty(dockerVersion)) {
mDockerVersion.set(dockerVersion) // mDockerVersion.set(dockerVersion)
} // }
} // }
} // }
//
@ChainLog( // @ChainLog(
linkChainLog = CHAIN_TYPE_STATUS, // linkChainLog = CHAIN_TYPE_STATUS,
linkCode = CHAIN_SOURCE_INIT, // linkCode = CHAIN_SOURCE_INIT,
nodeAliasCode = CHAIN_CODE_INIT_ENV_RESTART, // nodeAliasCode = CHAIN_CODE_INIT_ENV_RESTART,
paramIndexes = [0] // paramIndexes = [0]
) // )
private fun restartApp(envStr:Map<String,Any>) { // private fun restartApp(envStr:Map<String,Any>) {
launch(Dispatchers.Main) { // launch(Dispatchers.Main) {
Toast.makeText(Utils.getApp(), "发现系统环境不一致，正在重启...", Toast.LENGTH_SHORT).show() // Toast.makeText(Utils.getApp(), "发现系统环境不一致，正在重启...", Toast.LENGTH_SHORT).show()
delay(50) // delay(50)
Utils.getApp().packageManager.getLaunchIntentForPackage(Utils.getApp().packageName)?.also { // Utils.getApp().packageManager.getLaunchIntentForPackage(Utils.getApp().packageName)?.also {
ActivityUtils.startActivity(it) // ActivityUtils.startActivity(it)
} // }
Process.killProcess(Process.myPid()) // Process.killProcess(Process.myPid())
} // }
} // }
//
override fun isDebugEnabled(): Boolean? { // override fun isDebugEnabled(): Boolean? {
return runBlocking { // return runBlocking {
val oldBuildType = ApmEnvConfig.getBuildType() // val oldBuildType = ApmEnvConfig.getBuildType()
val oldNetType = ApmEnvConfig.getNetType() // val oldNetType = ApmEnvConfig.getNetType()
val oldDockerVersion = ApmEnvConfig.getDockerVersion() // val oldDockerVersion = ApmEnvConfig.getDockerVersion()
if (TextUtils.isEmpty(oldBuildType) || TextUtils.isEmpty(oldNetType) || TextUtils.isEmpty(oldDockerVersion)) { // if (TextUtils.isEmpty(oldBuildType) || TextUtils.isEmpty(oldNetType) || TextUtils.isEmpty(oldDockerVersion)) {
null // null
} else { // } else {
DebugConfig.isDebug() || (oldBuildType != "1" || oldNetType != DebugConfig.NET_MODE_RELEASE.toString() || !(oldDockerVersion?.endsWith("release", true) ?: false)) // DebugConfig.isDebug() || (oldBuildType != "1" || oldNetType != DebugConfig.NET_MODE_RELEASE.toString() || !(oldDockerVersion?.endsWith("release", true) ?: false))
} // }
} // }
} // }
} //}

172
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
View File

@@ -1626,46 +1626,46 @@ internal class DebugSettingView @JvmOverloads constructor(
}.show() }.show()
} }
if (JunkConfig.isSupportJunkDetect) { // if (JunkConfig.isSupportJunkDetect) {
// 上传APM日志 // // 上传APM日志
upload_apm_log_group?.visibility = View.VISIBLE // upload_apm_log_group?.visibility = View.VISIBLE
upload_apm_log?.onClick { v -> // upload_apm_log?.onClick { v ->
ListPopupWindow(v.context).also { p -> // ListPopupWindow(v.context).also { p ->
val items = ApmVLogUploadDuration.values() // val items = ApmVLogUploadDuration.values()
p.setAdapter(ApmVLogUploadAdapter(v.context, items)) // p.setAdapter(ApmVLogUploadAdapter(v.context, items))
p.anchorView = v // p.anchorView = v
p.isModal = true // p.isModal = true
p.setBackgroundDrawable(ColorDrawable(Color.WHITE)) // p.setBackgroundDrawable(ColorDrawable(Color.WHITE))
p.setOnItemClickListener { _, _, position, _ -> // p.setOnItemClickListener { _, _, position, _ ->
val provider = (ARouter.getInstance().build(CrashReportConstants.PATH).navigation() as? ITestCrashReportProvider) ?: return@setOnItemClickListener // val provider = (ARouter.getInstance().build(CrashReportConstants.PATH).navigation() as? ITestCrashReportProvider) ?: return@setOnItemClickListener
val item = items[position] // val item = items[position]
v.visibility = View.INVISIBLE // v.visibility = View.INVISIBLE
upload_apm_log_loading?.visibility = View.VISIBLE // upload_apm_log_loading?.visibility = View.VISIBLE
p.dismiss() // p.dismiss()
v.scope.launch(Dispatchers.IO) { // v.scope.launch(Dispatchers.IO) {
val endTime = System.currentTimeMillis() // val endTime = System.currentTimeMillis()
val startTime = when(item) { // val startTime = when(item) {
ApmVLogUploadDuration.IN_15M -> endTime - TimeUnit.MINUTES.toMillis(15) // ApmVLogUploadDuration.IN_15M -> endTime - TimeUnit.MINUTES.toMillis(15)
ApmVLogUploadDuration.IN_45M -> endTime - TimeUnit.MINUTES.toMillis(45) // ApmVLogUploadDuration.IN_45M -> endTime - TimeUnit.MINUTES.toMillis(45)
ApmVLogUploadDuration.IN_1H -> endTime - TimeUnit.HOURS.toMillis(1) // ApmVLogUploadDuration.IN_1H -> endTime - TimeUnit.HOURS.toMillis(1)
ApmVLogUploadDuration.IN_2H -> endTime - TimeUnit.HOURS.toMillis(2) // ApmVLogUploadDuration.IN_2H -> endTime - TimeUnit.HOURS.toMillis(2)
ApmVLogUploadDuration.IN_3H -> endTime - TimeUnit.HOURS.toMillis(3) // ApmVLogUploadDuration.IN_3H -> endTime - TimeUnit.HOURS.toMillis(3)
ApmVLogUploadDuration.IN_6H -> endTime - TimeUnit.HOURS.toMillis(6) // ApmVLogUploadDuration.IN_6H -> endTime - TimeUnit.HOURS.toMillis(6)
ApmVLogUploadDuration.ALL -> 0 // ApmVLogUploadDuration.ALL -> 0
} // }
provider.uploadVlog(startTime, endTime) // provider.uploadVlog(startTime, endTime)
withContext(Dispatchers.Main) { // withContext(Dispatchers.Main) {
ToastUtils.showShort("上传成功") // ToastUtils.showShort("上传成功")
upload_apm_log_loading?.visibility = View.INVISIBLE // upload_apm_log_loading?.visibility = View.INVISIBLE
upload_apm_log?.visibility = View.VISIBLE // upload_apm_log?.visibility = View.VISIBLE
} // }
} // }
} // }
}.show() // }.show()
} // }
} else { // } else {
upload_apm_log_group?.visibility = View.GONE // upload_apm_log_group?.visibility = View.GONE
} // }
/** /**
* 展示、关闭日志过滤面板 * 展示、关闭日志过滤面板
@@ -1807,52 +1807,52 @@ internal class DebugSettingView @JvmOverloads constructor(
private inner class Holder(val text: TextView? = null) private inner class Holder(val text: TextView? = null)
} }
private enum class ApmVLogUploadDuration(val text: String) { // private enum class ApmVLogUploadDuration(val text: String) {
IN_15M("15分钟内"), // IN_15M("15分钟内"),
IN_45M("45分钟内"), // IN_45M("45分钟内"),
IN_1H("1小时内"), // IN_1H("1小时内"),
IN_2H("2小时内"), // IN_2H("2小时内"),
IN_3H("3小时内"), // IN_3H("3小时内"),
IN_6H("6小时内"), // IN_6H("6小时内"),
ALL("上传所有") // ALL("上传所有")
} // }
//
private class ApmVLogUploadAdapter(private val ctx: Context, private val items: Array<ApmVLogUploadDuration>): BaseAdapter() { // private class ApmVLogUploadAdapter(private val ctx: Context, private val items: Array<ApmVLogUploadDuration>): BaseAdapter() {
override fun getCount(): Int { // override fun getCount(): Int {
return items.size // return items.size
} // }
//
override fun getItem(position: Int): Any { // override fun getItem(position: Int): Any {
return items[position] // return items[position]
} // }
//
override fun getItemId(position: Int): Long { // override fun getItemId(position: Int): Long {
return items[position].ordinal.toLong() // return items[position].ordinal.toLong()
} // }
//
override fun getView(position: Int, convertView: View?, parent: ViewGroup?): View { // override fun getView(position: Int, convertView: View?, parent: ViewGroup?): View {
var result = convertView // var result = convertView
val duration = items[position] // val duration = items[position]
if (result == null) { // if (result == null) {
val temp = View.inflate(ctx, android.R.layout.simple_list_item_1, null) // val temp = View.inflate(ctx, android.R.layout.simple_list_item_1, null)
temp.tag = Holder(temp.findViewById(android.R.id.text1)) // temp.tag = Holder(temp.findViewById(android.R.id.text1))
result = temp // result = temp
} // }
val holder = result?.tag as? Holder // val holder = result?.tag as? Holder
if (holder != null) { // if (holder != null) {
holder.text?.setTextColor(Color.BLACK) // holder.text?.setTextColor(Color.BLACK)
holder.text?.text = duration.text // holder.text?.text = duration.text
} else { // } else {
val text = result?.findViewById<TextView>(android.R.id.text1) // val text = result?.findViewById<TextView>(android.R.id.text1)
text?.setTextColor(Color.BLACK) // text?.setTextColor(Color.BLACK)
text?.text = duration.text // text?.text = duration.text
result?.tag = Holder(text) // result?.tag = Holder(text)
} // }
return result!! // return result!!
} // }
//
private inner class Holder(val text: TextView? = null) // private inner class Holder(val text: TextView? = null)
} // }
private fun refreshTraceInfo() { private fun refreshTraceInfo() {
val traceInfoMap = CallerDevaToolsManager.getTraceInfo() val traceInfoMap = CallerDevaToolsManager.getTraceInfo()

2
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt
View File

@@ -267,7 +267,7 @@ interface IDevaToolsProvider : IProvider {
fun dockerVersion(dockerVersion: String?) fun dockerVersion(dockerVersion: String?)
fun apmEnvProvider(): IApmEnvProvider // fun apmEnvProvider(): IApmEnvProvider
/** /**
* 升级相关状态查询 * 升级相关状态查询

18
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/apm/IApmEnvProvider.kt
View File

@@ -2,12 +2,12 @@ package com.mogo.eagle.core.function.api.devatools.apm
import androidx.annotation.WorkerThread import androidx.annotation.WorkerThread
interface IApmEnvProvider { //interface IApmEnvProvider {
//
fun init(buildType: String, netType: String, dockerVersion: String) // fun init(buildType: String, netType: String, dockerVersion: String)
//
fun onEnvChanged(buildType: String, netType: String, dockerVersion: String) // fun onEnvChanged(buildType: String, netType: String, dockerVersion: String)
//
@WorkerThread // @WorkerThread
fun isDebugEnabled(): Boolean? // fun isDebugEnabled(): Boolean?
} //}

3
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt
View File

@@ -14,7 +14,6 @@ import com.mogo.eagle.core.data.deva.scene.SceneModule
import com.mogo.eagle.core.data.deva.scene.SceneTAG import com.mogo.eagle.core.data.deva.scene.SceneTAG
import com.mogo.eagle.core.data.msgbox.MsgBoxBean import com.mogo.eagle.core.data.msgbox.MsgBoxBean
import com.mogo.eagle.core.function.api.devatools.IDevaToolsProvider import com.mogo.eagle.core.function.api.devatools.IDevaToolsProvider
import com.mogo.eagle.core.function.api.devatools.apm.*
import com.mogo.eagle.core.function.api.devatools.block.* import com.mogo.eagle.core.function.api.devatools.block.*
import com.mogo.eagle.core.function.api.devatools.download.* import com.mogo.eagle.core.function.api.devatools.download.*
import com.mogo.eagle.core.function.api.devatools.logcat.* import com.mogo.eagle.core.function.api.devatools.logcat.*
@@ -350,7 +349,7 @@ object CallerDevaToolsManager {
devaToolsProviderApi?.queryAppUpgrade() devaToolsProviderApi?.queryAppUpgrade()
} }
fun apmEnvProvider(): IApmEnvProvider? = devaToolsProviderApi?.apmEnvProvider() // fun apmEnvProvider(): IApmEnvProvider? = devaToolsProviderApi?.apmEnvProvider()
fun queryObuUpgrade(obuVersionName: String) { fun queryObuUpgrade(obuVersionName: String) {
devaToolsProviderApi?.queryObuUpgrade(obuVersionName) devaToolsProviderApi?.queryObuUpgrade(obuVersionName)

54
test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java
View File

@@ -9,7 +9,7 @@ import com.mogo.commons.debug.DebugConfig;
import com.mogo.eagle.core.data.app.AppConfigInfo; import com.mogo.eagle.core.data.app.AppConfigInfo;
import com.mogo.eagle.core.data.config.FunctionBuildConfig; import com.mogo.eagle.core.data.config.FunctionBuildConfig;
import com.mogo.eagle.core.data.deva.bindingcar.CarInfo; import com.mogo.eagle.core.data.deva.bindingcar.CarInfo;
import com.mogo.eagle.core.function.api.devatools.apm.IApmEnvProvider; //import com.mogo.eagle.core.function.api.devatools.apm.IApmEnvProvider;
import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager; import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager;
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils; import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
@@ -51,37 +51,37 @@ public class ApmCrashReportProvider implements ITestCrashReportProvider {
@Override @Override
public void init(Context context) { public void init(Context context) {
Observable.defer(() -> { // Observable.defer(() -> {
IApmEnvProvider provider = CallerDevaToolsManager.INSTANCE.apmEnvProvider(); // IApmEnvProvider provider = CallerDevaToolsManager.INSTANCE.apmEnvProvider();
boolean isDebug = DebugConfig.isDebug(); // boolean isDebug = DebugConfig.isDebug();
if (provider != null) { // if (provider != null) {
Boolean enabled = provider.isDebugEnabled(); // Boolean enabled = provider.isDebugEnabled();
if (enabled != null) { // if (enabled != null) {
isDebug = enabled; // isDebug = enabled;
} // }
} // }
return Observable.just(isDebug); // return Observable.just(isDebug);
}) // })
.subscribeOn(Schedulers.io()) // .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) // .observeOn(AndroidSchedulers.mainThread())
.subscribe(); // .subscribe();
//
} }
@Override // @Override
public boolean uploadVlog(long startTime, long endTime) { // public boolean uploadVlog(long startTime, long endTime) {
AtomicBoolean result = new AtomicBoolean(false); // AtomicBoolean result = new AtomicBoolean(false);
CountDownLatch latch = new CountDownLatch(1); // CountDownLatch latch = new CountDownLatch(1);
try { // try {
latch.await(); // latch.await();
} catch (InterruptedException e) { // } catch (InterruptedException e) {
throw new RuntimeException(e); // throw new RuntimeException(e);
} // }
return result.get(); // return result.get();
} // }
} }

2
test/crashreport/src/main/java/com/mogo/test/crashreport/ITestCrashReportProvider.kt
View File

@@ -14,5 +14,5 @@ interface ITestCrashReportProvider : IProvider {
* @param startTime 开始时间 * @param startTime 开始时间
* @param endTime 结束时间 * @param endTime 结束时间
*/ */
fun uploadVlog(startTime: Long, endTime: Long): Boolean // fun uploadVlog(startTime: Long, endTime: Long): Boolean
} }