Merge "Trace Zuul trigger events"

This commit is contained in:
Zuul
2022-10-04 10:37:12 +00:00
committed by Gerrit Code Review
2 changed files with 35 additions and 16 deletions

View File

@@ -623,8 +623,9 @@ class PipelineManager(metaclass=ABCMeta):
zuul_driver = self.sched.connections.drivers['zuul']
tenant = self.pipeline.tenant
zuul_driver.onChangeEnqueued(
tenant, item.change, self.pipeline, event)
with trace.use_span(tracing.restoreSpan(item.span_info)):
zuul_driver.onChangeEnqueued(
tenant, item.change, self.pipeline, event)
self.dequeueSupercededItems(item)
return True
@@ -2036,7 +2037,8 @@ class PipelineManager(metaclass=ABCMeta):
zuul_driver = self.sched.connections.drivers['zuul']
tenant = self.pipeline.tenant
zuul_driver.onChangeMerged(tenant, item.change, source)
with trace.use_span(tracing.restoreSpan(item.span_info)):
zuul_driver.onChangeMerged(tenant, item.change, source)
elif action:
self.reportNormalBuildsetEnd(item.current_build_set,
action, final=True)