zuul/zuul
Code Issues Proposed changes

Merge "Annotate "reporting start|enqueue|dequeue" log messages with event UUID"

Browse Source
This commit is contained in:
Zuul
2025-04-08 21:41:51 +00:00
committed by Gerrit Code Review
parent 39f0ee7a3c f3552306b1
commit dad87c1e99
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
zuul/manager/__init__.py
View File

@@ -362,21 +362,22 @@ class PipelineManager(metaclass=ABCMeta):
def reportEnqueue(self, item):
if not self.state.disabled:
self.log.info("Reporting enqueue, action %s item %s" %
(self.pipeline.enqueue_actions, item))
log = get_annotated_logger(self.log, item.event)
log.info("Reporting enqueue, action %s item %s" %
(self.pipeline.enqueue_actions, item))
ret = self.sendReport(self.pipeline.enqueue_actions, item)
if ret:
self.log.error("Reporting item enqueued %s received: %s" %
(item, ret))
log.error("Reporting item enqueued %s received: %s" %
(item, ret))
def reportStart(self, item):
if not self.state.disabled:
self.log.info("Reporting start, action %s item %s" %
(self.pipeline.start_actions, item))
log = get_annotated_logger(self.log, item.event)
log.info("Reporting start, action %s item %s" %
(self.pipeline.start_actions, item))
ret = self.sendReport(self.pipeline.start_actions, item)
if ret:
self.log.error("Reporting item start %s received: %s" %
(item, ret))
log.error("Reporting item start %s received: %s" % (item, ret))
def reportNormalBuildsetEnd(self, build_set, action, final, result=None):
# Report a buildset end if there are jobs or errors
@@ -388,14 +389,15 @@ class PipelineManager(metaclass=ABCMeta):
def reportDequeue(self, item, quiet=False):
if not (self.state.disabled or quiet):
self.log.info(
log = get_annotated_logger(self.log, item.event)
log.info(
"Reporting dequeue, action %s item%s",
self.pipeline.dequeue_actions,
item,
)
ret = self.sendReport(self.pipeline.dequeue_actions, item)
if ret:
self.log.error(
log.error(
"Reporting item dequeue %s received: %s", item, ret
)
# This might be called after canceljobs, which also sets a