Added tracing
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Pünkösd Marcell 2021-08-10 16:44:01 +02:00
parent c26aa1be43
commit 90fa74ca91
2 changed files with 59 additions and 30 deletions

View File

@ -2,3 +2,7 @@ sentry_sdk
pika pika
requests requests
paho-mqtt paho-mqtt
opentracing~=2.4.0
jaeger-client
requests-opentracing

View File

@ -8,6 +8,12 @@ import pika
import requests import requests
from sentry_sdk.integrations.logging import LoggingIntegration from sentry_sdk.integrations.logging import LoggingIntegration
import jaeger_client
import opentracing
from opentracing.ext import tags
from opentracing.propagation import Format
from requests_opentracing import SessionTracing
import config import config
import uuid import uuid
from mqtt_helper import MQTT from mqtt_helper import MQTT
@ -48,6 +54,8 @@ def on_message_creator(mqtt_: MQTT):
This generator is used, so that the mqtt object can be injected just when the callback is registered This generator is used, so that the mqtt object can be injected just when the callback is registered
""" """
requests_session = SessionTracing(propagate=True)
def on_message( def on_message(
channel: pika.channel.Channel, channel: pika.channel.Channel,
method: pika.spec.Basic.Deliver, method: pika.spec.Basic.Deliver,
@ -61,6 +69,13 @@ def on_message_creator(mqtt_: MQTT):
channel.basic_ack(delivery_tag=method.delivery_tag) channel.basic_ack(delivery_tag=method.delivery_tag)
return return
span_ctx = opentracing.tracer.extract(Format.TEXT_MAP, msg_json)
span_tags = {tags.SPAN_KIND: tags.SPAN_KIND_CONSUMER}
with opentracing.tracer.start_active_span(
'handleMessage', finish_on_close=True, child_of=span_ctx, tags=span_tags
) as scope:
if ('probability' not in msg_json) or ('class' not in msg_json): if ('probability' not in msg_json) or ('class' not in msg_json):
logging.error("Malformed message from classifier: Missing fields") logging.error("Malformed message from classifier: Missing fields")
channel.basic_ack(delivery_tag=method.delivery_tag) channel.basic_ack(delivery_tag=method.delivery_tag)
@ -68,8 +83,9 @@ def on_message_creator(mqtt_: MQTT):
# TODO: strurnus should not be hardcoded here # TODO: strurnus should not be hardcoded here
if (msg_json['class'] == 'sturnus') and (msg_json['probability'] > config.TRIGGER_LEVEL): if (msg_json['class'] == 'sturnus') and (msg_json['probability'] > config.TRIGGER_LEVEL):
scope.span.log_kv({'event': 'decisionMade', 'alerting': True})
try: try:
r = requests.get( r = requests_session.get(
f"http://{config.INPUT_HOSTNAME}/sample/{msg_json['tag']}", f"http://{config.INPUT_HOSTNAME}/sample/{msg_json['tag']}",
timeout=config.INPUT_TIMEOUT timeout=config.INPUT_TIMEOUT
) )
@ -89,12 +105,20 @@ def on_message_creator(mqtt_: MQTT):
return return
logging.info(f"Sending alert command to device {r.json()['device_id']}...") logging.info(f"Sending alert command to device {r.json()['device_id']}...")
with opentracing.tracer.start_active_span(
'publishAlert',
tags={
tags.SPAN_KIND: tags.SPAN_KIND_PRODUCER,
"device_id": r.json()['device_id']
}
):
mqtt_.publish( mqtt_.publish(
subtopic=r.json()['device_id'], subtopic=r.json()['device_id'],
message=json.dumps({"command": "doAlert"}) message=json.dumps({"command": "doAlert"})
) )
else: else:
scope.span.log_kv({'event': 'decisionMade', 'alerting': False})
logging.debug(f"Probability is either bellow trigger level, or not the target class. Nothing to do.") logging.debug(f"Probability is either bellow trigger level, or not the target class. Nothing to do.")
# This concludes the job # This concludes the job
@ -123,6 +147,7 @@ def main():
environment=config.RELEASEMODE, environment=config.RELEASEMODE,
_experiments={"auto_enabling_integrations": True} _experiments={"auto_enabling_integrations": True}
) )
jaeger_client.Config(config={}, service_name='guard-service', validate=True).initialize_tracer()
logging.info("Guard service starting...") logging.info("Guard service starting...")
mqtt = MQTT() mqtt = MQTT()
mqtt.topic = config.MQTT_TOPIC mqtt.topic = config.MQTT_TOPIC