make mypy happy

Author: ldruschk

src/enochecker3/enochecker.py

@@ -494,7 +494,9 @@ async def _call_putflag(
         attack_info: Optional[str | bytes] = await self._call_method(task)
         if isinstance(attack_info, bytes):
             attack_info = attack_info.decode()
-        get_current_span().set_attribute("enochecker.result.attack_info", attack_info)
+        get_current_span().set_attribute(
+            "enochecker.result.attack_info", attack_info if attack_info else "None"
+        )
         return CheckerResultMessage(
             result=CheckerTaskResult.OK, attack_info=attack_info
         )
@@ -929,7 +931,9 @@ async def checker(task: CheckerTaskMessage) -> CheckerResultMessage:
                 except MumbleException as e:
                     span.record_exception(e)
                     span.set_attribute("enochecker.result", "MUMBLE")
-                    span.set_attribute("enochecker.result.message", e.message)
+                    span.set_attribute(
+                        "enochecker.result.message", e.message if e.message else "None"
+                    )
                     trace = traceback.format_exc()
                     if e.log_message:
                         logger.info(e.log_message)
@@ -940,7 +944,9 @@ async def checker(task: CheckerTaskMessage) -> CheckerResultMessage:
                 except OfflineException as e:
                     span.record_exception(e)
                     span.set_attribute("enochecker.result", "OFFLINE")
-                    span.set_attribute("enochecker.result.message", e.message)
+                    span.set_attribute(
+                        "enochecker.result.message", e.message if e.message else "None"
+                    )
                     trace = traceback.format_exc()
                     if e.log_message:
                         logger.info(e.log_message)
@@ -952,7 +958,9 @@ async def checker(task: CheckerTaskMessage) -> CheckerResultMessage:
                     span.record_exception(e)
                     span.set_status(StatusCode.ERROR)
                     span.set_attribute("enochecker.result", "INTERNAL_ERROR")
-                    span.set_attribute("enochecker.result.message", e.message)
+                    span.set_attribute(
+                        "enochecker.result.message", e.message if e.message else "None"
+                    )
                     trace = traceback.format_exc()
                     if e.log_message:
                         logger.info(e.log_message)

src/enochecker3/telemetry.py

@@ -13,6 +13,7 @@
 from opentelemetry.sdk._logs._internal.export import (
     BatchLogRecordProcessor,
     LogRecordExporter,
+    LogRecordProcessor,
     SimpleLogRecordProcessor,
 )
 from opentelemetry.sdk.resources import SERVICE_NAME, Resource
@@ -22,6 +23,7 @@
     BatchSpanProcessor,
     SimpleSpanProcessor,
     SpanExporter,
+    SpanProcessor,
 )
 from opentelemetry.sdk.trace.sampling import ALWAYS_ON
 from opentelemetry.trace import Span, SpanKind, Tracer, _Links
@@ -34,7 +36,7 @@
 def _setup_logging(resource: Resource, log_exporter: LogRecordExporter) -> None:
     provider = LoggerProvider(resource=resource)
     if os.environ.get("OTEL_EXPORTER_DISABLE_BATCH", default=False):
-        processor = SimpleLogRecordProcessor(log_exporter)
+        processor: LogRecordProcessor = SimpleLogRecordProcessor(log_exporter)
     else:
         processor = BatchLogRecordProcessor(log_exporter)
     provider.add_log_record_processor(processor)
@@ -48,7 +50,7 @@ def _setup_logging(resource: Resource, log_exporter: LogRecordExporter) -> None:
 def _setup_tracing(resource: Resource, span_exporter: SpanExporter) -> None:
     provider = SaarctfTracerProvider(sampler=ALWAYS_ON, resource=resource)
     if os.environ.get("OTEL_EXPORTER_DISABLE_BATCH", default=False):
-        processor = SimpleSpanProcessor(span_exporter)
+        processor: SpanProcessor = SimpleSpanProcessor(span_exporter)
     else:
         processor = BatchSpanProcessor(span_exporter)
     provider.add_span_processor(processor)
@@ -194,8 +196,9 @@ async def async_request_hook(span: Span, request: RequestInfo):
     print(type(span))
     print(type(request))
     span.update_name(f"{request.method.decode()} {request.url}")
-    for k, v in request.headers.items():
-        span.set_attribute(f"http.headers.{k}", v)
+    if request.headers:
+        for k, v in request.headers.items():
+            span.set_attribute(f"http.headers.{k}", v)
     print(request.method)
     print(request.url)
     print(request.headers)