linting + fix prometheus server test

Author: kalaspuff

tests/test_opentelemetry_distro_configurator.py

@@ -111,6 +111,7 @@ def _start_http_server(*a: Any, **kw: Any) -> None:
             catched_values.append(kw)
 
         setattr(prometheus_client, "start_http_server", _start_http_server)
+        setattr(meter_provider, "_start_prometheus_server_without_instrumented_service", True)
 
         meter_provider.get_meter("tomodachi")
         assert getattr(meter_provider, "_prometheus_server_started", None) is True
@@ -123,3 +124,4 @@ def _start_http_server(*a: Any, **kw: Any) -> None:
         for k, v in environ.items():
             os.environ[k] = v
         setattr(prometheus_client, "start_http_server", start_http_server)
+        setattr(meter_provider, "_start_prometheus_server_without_instrumented_service", False)

tomodachi/opentelemetry/distro.py

@@ -17,8 +17,9 @@
 from opentelemetry.instrumentation.distro import BaseDistro  # type: ignore
 from opentelemetry.instrumentation.environment_variables import OTEL_PYTHON_CONFIGURATOR
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor  # type: ignore
-from opentelemetry.metrics import Instrument, set_meter_provider
+from opentelemetry.metrics import Instrument
 from opentelemetry.metrics import _internal as metrics_internal
+from opentelemetry.metrics import set_meter_provider
 from opentelemetry.sdk._configuration import (
     _BaseConfigurator,
     _get_exporter_names,

tomodachi/opentelemetry/prometheus.py

@@ -346,6 +346,7 @@ def _receive_metrics(
 class TomodachiPrometheusMeterProvider(MeterProvider):
     def __init__(self, prefix: Optional[str] = None, registry: CollectorRegistry = REGISTRY_) -> None:
         self._prometheus_server_started = False
+        self._start_prometheus_server_without_instrumented_service = False
         self._prometheus_registry = registry
         self._non_letters_digits_underscore_re = compile(r"[^\w]", UNICODE | IGNORECASE)
 
@@ -443,7 +444,7 @@ def _start_prometheus_http_server(self) -> None:
         try:
             prometheus_client.start_http_server(port=port, addr=addr, registry=self._prometheus_registry)
         except OSError as e:
-            error_message = re.sub(".*: ", "", e.strerror)
+            error_message = re.sub(".*: ", "", e.strerror) if e.strerror else str(e)
             logging.get_logger("tomodachi.opentelemetry").warning(
                 "unable to bind prometheus http server [http] to http://{}:{}/ in otel metric provider".format(
                     "localhost" if addr in ("0.0.0.0", "127.0.0.1") else addr, port
@@ -478,7 +479,7 @@ def get_meter(
     ) -> Meter:
         from .instrumentation import TomodachiInstrumentor
 
-        if TomodachiInstrumentor._instrumented_services:
+        if TomodachiInstrumentor._instrumented_services or self._start_prometheus_server_without_instrumented_service:
             self._start_prometheus_http_server()
 
         return super().get_meter(name, version=version, schema_url=schema_url)

tomodachi/transport/amqp.py

@@ -497,7 +497,7 @@ async def connect(cls, obj: Any, context: Dict) -> Any:
             logger.warning("Unable to connect [amqp] to {}:{} ({})".format(host, port, error_message))
             raise AmqpConnectionException(str(e), log_level=context.get("log_level")) from e
         except OSError as e:
-            error_message = e.strerror
+            error_message = e.strerror if e.strerror else str(e)
             logger.warning("Unable to connect [amqp] to {}:{} ({})".format(host, port, error_message))
             raise AmqpConnectionException(str(e), log_level=context.get("log_level")) from e
 

tomodachi/transport/aws_sns_sqs.py

@@ -607,8 +607,9 @@ async def send_message(
                     await cls.create_client("sqs", service.context)
 
                 async with connector("tomodachi.sqs", service_name="sqs") as client:
-                    botocore_error_type = cast(
-                        Type[botocore.exceptions.ClientError], client.exceptions.QueueDoesNotExist
+                    botocore_error_type = cast(  # type: ignore[redundant-cast]
+                        Type[botocore.exceptions.ClientError],
+                        client.exceptions.QueueDoesNotExist,
                     )
             except Exception as e:
                 logging.getLogger("exception").exception(
@@ -2175,8 +2176,7 @@ async def create_queue(
         if fifo is not queue_fifo:
             queue_types = {False: "Standard", True: "FIFO"}
             error_message = (
-                f"AWS SQS queue configured as {queue_types[queue_fifo]}, "
-                f"but the handler expected {queue_types[fifo]}."
+                f"AWS SQS queue configured as {queue_types[queue_fifo]}, but the handler expected {queue_types[fifo]}."
             )
             logger.warning("Queue [sqs] type mismatch ({})".format(error_message))
             raise AWSSNSSQSException(error_message, log_level=context.get("log_level"))

tomodachi/transport/http.py

@@ -1440,7 +1440,7 @@ async def middleware(request: web.Request, handler: Callable) -> Union[web.Respo
                 server = await server_task
             except OSError as e:
                 context["_http_accept_new_requests"] = False
-                error_message = re.sub(".*: ", "", e.strerror)
+                error_message = re.sub(".*: ", "", e.strerror) if e.strerror else str(e)
                 logger.warning(
                     "unable to bind service [http] to http://{}:{}/".format(
                         "localhost" if host in ("0.0.0.0", "127.0.0.1") else host, port