Skip to content

[Fix] Improve report logging and fix reporting #2952

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
junaway merged 5 commits into from
Nov 13, 2025
Merged

[Fix] Improve report logging and fix reporting #2952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2c92133
removing report cache
jp-agenta Nov 13, 2025
4898814
fixed meters cron
jp-agenta Nov 13, 2025
ae45994
more logs
jp-agenta Nov 13, 2025
fa7c3ca
back to 1 h
jp-agenta Nov 13, 2025
d020558
final touches
jp-agenta Nov 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 50 additions & 34 deletions api/ee/src/apis/fastapi/billing/router.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,48 +809,64 @@ async def report_usage(
):
log.info("[report] [endpoint] Trigger")

report_ongoing = await get_cache(
namespace="meters:report",
key={},
)

if report_ongoing:
log.info("[report] [endpoint] Skipped (ongoing)")

return JSONResponse(
status_code=status.HTTP_200_OK,
content={"status": "skipped"},
try:
report_ongoing = await get_cache(
namespace="meters:report",
key={},
)

await set_cache(
namespace="meters:report",
key={},
value=True,
ttl=60 * 60, # 1 hour
)
if report_ongoing:
log.info("[report] [endpoint] Skipped (ongoing)")
return JSONResponse(
status_code=status.HTTP_200_OK,
content={"status": "skipped"},
)

log.info("[report] [endpoint] Lock acquired")
# await set_cache(
# namespace="meters:report",
# key={},
# value=True,
# ttl=60 * 60, # 1 hour
# )
log.info("[report] [endpoint] Lock acquired")

try:
log.info("[report] [endpoint] Reporting usage started")
await self.subscription_service.meters_service.report()
log.info("[report] [endpoint] Reporting usage completed")
try:
log.info("[report] [endpoint] Reporting usage started")
await self.subscription_service.meters_service.report()
log.info("[report] [endpoint] Reporting usage completed")

return JSONResponse(
status_code=status.HTTP_200_OK,
content={"status": "success"},
)
return JSONResponse(
status_code=status.HTTP_200_OK,
content={"status": "success"},
)

except Exception as e:
raise HTTPException(status_code=500, detail="unexpected error") from e
except Exception:
log.error(
"[report] [endpoint] Report failed:",
exc_info=True,
)
return JSONResponse(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
content={"status": "error", "message": "Report failed"},
)

finally:
await invalidate_cache(
namespace="meters:report",
key={},
)
finally:
await invalidate_cache(
namespace="meters:report",
key={},
)
log.info("[report] [endpoint] Lock released")

log.info("[report] [endpoint] Lock released")
except Exception:
# Catch-all for any errors, including cache errors
log.error(
"[report] [endpoint] Fatal error:",
exc_info=True,
)
return JSONResponse(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
content={"status": "error", "message": "Fatal error"},
)

# ROUTES

Expand Down
1 change: 1 addition & 0 deletions api/ee/src/core/meters/interfaces.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ def __init__(self):

async def dump(
self,
limit: Optional[int] = None,
) -> list[MeterDTO]:
"""
Dump all meters where 'synced' != 'value'.
Expand Down
Loading