Trace Pagure connection events

Change-Id: I4f031d9ab4e1a25bc14807a4251e3fab922038c5
This commit is contained in:
Simon Westphahl 2022-09-26 12:40:39 +02:00
parent c2063cebea
commit 5ee975995e
No known key found for this signature in database

View File

@ -23,12 +23,15 @@ import requests
import cherrypy
import voluptuous as v
from opentelemetry import trace
from zuul.connection import (
BaseConnection, ZKChangeCacheMixin, ZKBranchCacheMixin
)
from zuul.lib.logutil import get_annotated_logger
from zuul.web.handler import BaseWebController
from zuul.model import Ref, Branch, Tag
from zuul.lib import tracing
from zuul.lib import dependson
from zuul.zk.branch_cache import BranchCache
from zuul.zk.change_cache import (
@ -118,6 +121,7 @@ class PagureEventConnector(threading.Thread):
"""Move events from Pagure into the scheduler"""
log = logging.getLogger("zuul.PagureEventConnector")
tracer = trace.get_tracer("zuul")
def __init__(self, connection):
super(PagureEventConnector, self).__init__()
@ -170,10 +174,17 @@ class PagureEventConnector(threading.Thread):
def _run(self):
while not self._stopped:
for event in self.event_queue:
try:
self._handleEvent(event)
finally:
self.event_queue.ack(event)
event_span = tracing.restoreSpanContext(
event.get("span_context"))
attributes = {"rel": "PagureEvent"}
link = trace.Link(event_span.get_span_context(),
attributes=attributes)
with self.tracer.start_as_current_span(
"PagureEventProcessing", links=[link]):
try:
self._handleEvent(event)
finally:
self.event_queue.ack(event)
if self._stopped:
return
self._process_event.wait(10)
@ -826,6 +837,7 @@ class PagureConnection(ZKChangeCacheMixin, ZKBranchCacheMixin, BaseConnection):
class PagureWebController(BaseWebController):
log = logging.getLogger("zuul.PagureWebController")
tracer = trace.get_tracer("zuul")
def __init__(self, zuul_web, connection):
self.connection = connection
@ -874,6 +886,7 @@ class PagureWebController(BaseWebController):
@cherrypy.expose
@cherrypy.tools.json_out(content_type='application/json; charset=utf-8')
@tracer.start_as_current_span("PagureEvent")
def payload(self):
# https://docs.pagure.org/pagure/usage/using_webhooks.html
headers = dict()
@ -889,7 +902,10 @@ class PagureWebController(BaseWebController):
"Payload origin IP address whitelisted. Skip verify")
json_payload = json.loads(body.decode('utf-8'))
data = {'payload': json_payload}
data = {
'payload': json_payload,
'span_context': tracing.getSpanContext(trace.get_current_span()),
}
self.event_queue.put(data)
return data