Refactor telemetry service payload field names for consistency
This commit is contained in:
parent
f5835152b3
commit
2020a356dd
3 changed files with 41 additions and 32 deletions
|
|
@ -121,9 +121,9 @@ async def retrieve_vertices_order(
|
||||||
background_tasks.add_task(
|
background_tasks.add_task(
|
||||||
telemetry_service.log_package_playground,
|
telemetry_service.log_package_playground,
|
||||||
PlaygroundPayload(
|
PlaygroundPayload(
|
||||||
seconds=int(time.perf_counter() - start_time),
|
playgroundSeconds=int(time.perf_counter() - start_time),
|
||||||
componentCount=components_count,
|
playgroundComponentCount=components_count,
|
||||||
success=True,
|
playgroundSuccess=True,
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
return VerticesOrderResponse(ids=first_layer, run_id=graph._run_id, vertices_to_run=vertices_to_run)
|
return VerticesOrderResponse(ids=first_layer, run_id=graph._run_id, vertices_to_run=vertices_to_run)
|
||||||
|
|
@ -131,10 +131,10 @@ async def retrieve_vertices_order(
|
||||||
background_tasks.add_task(
|
background_tasks.add_task(
|
||||||
telemetry_service.log_package_playground,
|
telemetry_service.log_package_playground,
|
||||||
PlaygroundPayload(
|
PlaygroundPayload(
|
||||||
seconds=int(time.perf_counter() - start_time),
|
playgroundSeconds=int(time.perf_counter() - start_time),
|
||||||
componentCount=components_count,
|
playgroundComponentCount=components_count,
|
||||||
success=False,
|
playgroundSuccess=False,
|
||||||
errorMessage=str(exc),
|
playgroundErrorMessage=str(exc),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
if "stream or streaming set to True" in str(exc):
|
if "stream or streaming set to True" in str(exc):
|
||||||
|
|
@ -280,10 +280,10 @@ async def build_vertex(
|
||||||
background_tasks.add_task(
|
background_tasks.add_task(
|
||||||
telemetry_service.log_package_component,
|
telemetry_service.log_package_component,
|
||||||
ComponentPayload(
|
ComponentPayload(
|
||||||
name=vertex_id,
|
componentName=vertex_id,
|
||||||
seconds=int(time.perf_counter() - start_time),
|
componentSeconds=int(time.perf_counter() - start_time),
|
||||||
success=valid,
|
componentSuccess=valid,
|
||||||
errorMessage=params,
|
componentErrorMessage=params,
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
return build_response
|
return build_response
|
||||||
|
|
@ -291,10 +291,10 @@ async def build_vertex(
|
||||||
background_tasks.add_task(
|
background_tasks.add_task(
|
||||||
telemetry_service.log_package_component,
|
telemetry_service.log_package_component,
|
||||||
ComponentPayload(
|
ComponentPayload(
|
||||||
name=vertex_id,
|
componentName=vertex_id,
|
||||||
seconds=int(time.perf_counter() - start_time),
|
componentSeconds=int(time.perf_counter() - start_time),
|
||||||
success=False,
|
componentSuccess=False,
|
||||||
errorMessage=str(exc),
|
componentErrorMessage=str(exc),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
logger.error(f"Error building Component:\n\n{exc}")
|
logger.error(f"Error building Component:\n\n{exc}")
|
||||||
|
|
|
||||||
|
|
@ -209,7 +209,7 @@ async def simplified_run_flow(
|
||||||
end_time = time.perf_counter()
|
end_time = time.perf_counter()
|
||||||
background_tasks.add_task(
|
background_tasks.add_task(
|
||||||
telemetry_service.log_package_run,
|
telemetry_service.log_package_run,
|
||||||
RunPayload(IsWebhook=False, seconds=int(end_time - start_time), success=True, errorMessage=""),
|
RunPayload(runIsWebhook=False, runSeconds=int(end_time - start_time), runSuccess=True, runErrorMessage=""),
|
||||||
)
|
)
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
|
@ -217,7 +217,9 @@ async def simplified_run_flow(
|
||||||
end_time = time.perf_counter()
|
end_time = time.perf_counter()
|
||||||
background_tasks.add_task(
|
background_tasks.add_task(
|
||||||
telemetry_service.log_package_run,
|
telemetry_service.log_package_run,
|
||||||
RunPayload(IsWebhook=False, seconds=int(end_time - start_time), success=False, errorMessage=str(exc)),
|
RunPayload(
|
||||||
|
runIsWebhook=False, runSeconds=int(end_time - start_time), runSuccess=False, runErrorMessage=str(exc)
|
||||||
|
),
|
||||||
)
|
)
|
||||||
if "badly formed hexadecimal UUID string" in str(exc):
|
if "badly formed hexadecimal UUID string" in str(exc):
|
||||||
# This means the Flow ID is not a valid UUID which means it can't find the flow
|
# This means the Flow ID is not a valid UUID which means it can't find the flow
|
||||||
|
|
@ -231,7 +233,9 @@ async def simplified_run_flow(
|
||||||
logger.exception(exc)
|
logger.exception(exc)
|
||||||
background_tasks.add_task(
|
background_tasks.add_task(
|
||||||
telemetry_service.log_package_run,
|
telemetry_service.log_package_run,
|
||||||
RunPayload(IsWebhook=False, seconds=int(end_time - start_time), success=False, errorMessage=str(exc)),
|
RunPayload(
|
||||||
|
runIsWebhook=False, runSeconds=int(end_time - start_time), runSuccess=False, runErrorMessage=str(exc)
|
||||||
|
),
|
||||||
)
|
)
|
||||||
raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=str(exc)) from exc
|
raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=str(exc)) from exc
|
||||||
|
|
||||||
|
|
@ -290,14 +294,19 @@ async def webhook_run_flow(
|
||||||
)
|
)
|
||||||
background_tasks.add_task(
|
background_tasks.add_task(
|
||||||
telemetry_service.log_package_run,
|
telemetry_service.log_package_run,
|
||||||
RunPayload(IsWebhook=True, seconds=int(time.perf_counter() - start_time), success=True, errorMessage=""),
|
RunPayload(
|
||||||
|
runIsWebhook=True, runSeconds=int(time.perf_counter() - start_time), runSuccess=True, runErrorMessage=""
|
||||||
|
),
|
||||||
)
|
)
|
||||||
return {"message": "Task started in the background", "status": "in progress"}
|
return {"message": "Task started in the background", "status": "in progress"}
|
||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
background_tasks.add_task(
|
background_tasks.add_task(
|
||||||
telemetry_service.log_package_run,
|
telemetry_service.log_package_run,
|
||||||
RunPayload(
|
RunPayload(
|
||||||
IsWebhook=True, seconds=int(time.perf_counter() - start_time), success=False, errorMessage=str(exc)
|
runIsWebhook=True,
|
||||||
|
runSeconds=int(time.perf_counter() - start_time),
|
||||||
|
runSuccess=False,
|
||||||
|
runErrorMessage=str(exc),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
if "Flow ID is required" in str(exc) or "Request body is empty" in str(exc):
|
if "Flow ID is required" in str(exc) or "Request body is empty" in str(exc):
|
||||||
|
|
|
||||||
|
|
@ -2,10 +2,10 @@ from pydantic import BaseModel
|
||||||
|
|
||||||
|
|
||||||
class RunPayload(BaseModel):
|
class RunPayload(BaseModel):
|
||||||
IsWebhook: bool = False
|
runIsWebhook: bool = False
|
||||||
seconds: int
|
runSeconds: int
|
||||||
success: bool
|
runSuccess: bool
|
||||||
errorMessage: str = ""
|
runErrorMessage: str = ""
|
||||||
|
|
||||||
|
|
||||||
class ShutdownPayload(BaseModel):
|
class ShutdownPayload(BaseModel):
|
||||||
|
|
@ -23,14 +23,14 @@ class VersionPayload(BaseModel):
|
||||||
|
|
||||||
|
|
||||||
class PlaygroundPayload(BaseModel):
|
class PlaygroundPayload(BaseModel):
|
||||||
seconds: int
|
playgroundSeconds: int
|
||||||
componentCount: int | None = None
|
playgroundComponentCount: int | None = None
|
||||||
success: bool
|
playgroundSuccess: bool
|
||||||
errorMessage: str = ""
|
playgroundErrorMessage: str = ""
|
||||||
|
|
||||||
|
|
||||||
class ComponentPayload(BaseModel):
|
class ComponentPayload(BaseModel):
|
||||||
name: str
|
componentName: str
|
||||||
seconds: int
|
componentSeconds: int
|
||||||
success: bool
|
componentSuccess: bool
|
||||||
errorMessage: str
|
componentErrorMessage: str
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue