Revert Logging UUID for the run

This commit is contained in:
Scott Pfeil 2024-02-14 15:48:33 -05:00
parent 94b2f5b1e3
commit fc0bd385c6

View File

@ -76,6 +76,7 @@
let timeout = model.timeout ?? Self.DefaultTimeout let timeout = model.timeout ?? Self.DefaultTimeout
let parameterHandlerList = model.list.compactMap { createParametersHandler($0) } let parameterHandlerList = model.list.compactMap { createParametersHandler($0) }
let requestUUID = (0..<parameterHandlerList.count).map { _ in UUID().uuidString }
var returnedList = [[String: AnyHashable]?](repeating: nil, count: parameterHandlerList.count) var returnedList = [[String: AnyHashable]?](repeating: nil, count: parameterHandlerList.count)
// Dispatch setup on queue to ensure setup is complete before completion callbacks. // Dispatch setup on queue to ensure setup is complete before completion callbacks.
@ -88,7 +89,7 @@
let handler = parameterHandlerList[index] let handler = parameterHandlerList[index]
MVMCoreLoggingHandler.shared()?.logCoreEvent(.clientParameterTimeout( MVMCoreLoggingHandler.shared()?.logCoreEvent(.clientParameterTimeout(
name: handler.clientParameterModel.type, name: handler.clientParameterModel.type,
uuid: handler.clientParameterModel.id, uuid: requestUUID[index],
actionId: actionId)) actionId: actionId))
return handler.valueOnTimeout() return handler.valueOnTimeout()
} }
@ -120,8 +121,7 @@
// Setup the parameter execution. // Setup the parameter execution.
for (index, parameterHandler) in parameterHandlerList.enumerated() { for (index, parameterHandler) in parameterHandlerList.enumerated() {
let parameterType = parameterHandler.clientParameterModel.type let parameterType = parameterHandler.clientParameterModel.type
let id = parameterHandler.clientParameterModel.id MVMCoreLoggingHandler.shared()?.logCoreEvent(.clientParameterStartFetch(name: parameterType, uuid: requestUUID[index], actionId: actionId))
MVMCoreLoggingHandler.shared()?.logCoreEvent(.clientParameterStartFetch(name: parameterType, uuid: id, actionId: actionId))
group.enter() group.enter()
parameterHandler.fetchClientParametersBridge(requestParameters: requestParameters, parameterHandler.fetchClientParametersBridge(requestParameters: requestParameters,
timingOutIn: timeout) { (receivedParameter) in timingOutIn: timeout) { (receivedParameter) in
@ -135,7 +135,7 @@
MVMCoreLoggingHandler.shared()?.addError(toLog: MVMCoreErrorObject(title: nil, message: "Client parameter \(parameterType) has already executed. The completion handler should only be called once!", code: ErrorCode.default.rawValue, domain: ErrorDomainNative, location: String(describing: ClientParameterHandler.self))!) MVMCoreLoggingHandler.shared()?.addError(toLog: MVMCoreErrorObject(title: nil, message: "Client parameter \(parameterType) has already executed. The completion handler should only be called once!", code: ErrorCode.default.rawValue, domain: ErrorDomainNative, location: String(describing: ClientParameterHandler.self))!)
return return
} }
MVMCoreLoggingHandler.shared()?.logCoreEvent(.clientParameterFetchComplete(name: parameterType, uuid: id, actionId: actionId)) MVMCoreLoggingHandler.shared()?.logCoreEvent(.clientParameterFetchComplete(name: parameterType, uuid: requestUUID[index], actionId: actionId))
returnedList[index] = receivedParameter returnedList[index] = receivedParameter
group.leave() // Leaving is only done after setup (barriered). group.leave() // Leaving is only done after setup (barriered).
} }