Merge pull request #370 from lsst-sqre/tickets/DM-48760

DM-48760: Simplify if underlying exception has no message

CHANGELOG.md

@@ -14,8 +14,7 @@ Changes for the upcoming release can be found in [changelog.d](https://github.co
 
 ### New features
 
-- Sentry instrumentation helpers
-
+- Add a new `safir.sentry` module that provides helper functions and custom exception types for improved Sentry integration.
 - Allow the encryption key to be passed to `safir.redis.EncryptedPydanticRedisStorage` as a `pydantic.SecretStr` instead of `str`. This allows easier integration with secrets that come from Pydantic-parsed settings.
 
 <a id='changelog-9.1.1'></a>

safir/src/safir/sentry/_exceptions.py

@@ -88,15 +88,16 @@ def from_exception(cls, exc: HTTPError, user: str | None = None) -> Self:
                 body=exc.response.text,
             )
         else:
-            message = f"{type(exc).__name__}: {exc!s}"
+            exc_name = type(exc).__name__
+            message = f"{exc_name}: {exc!s}" if str(exc) else exc_name
 
             # All httpx.HTTPError exceptions have a slot for the request,
             # initialized to None and then sometimes added by child
             # constructors or during exception processing. The request
             # property is a property method that raises RuntimeError if
-            # request has not been set, so we can't just check for None.
-            # Hence this approach of attempting to use the request and falling
-            # back on reporting less data if that raised any exception.
+            # request has not been set, so we can't just check for None. Hence
+            # this approach of attempting to use the request and falling back
+            # on reporting less data if that raised any exception.
             try:
                 return cls(
                     message,

safir/src/safir/slack/blockkit.py

@@ -358,15 +358,16 @@ def from_exception(cls, exc: HTTPError, user: str | None = None) -> Self:
                 body=exc.response.text,
             )
         else:
-            message = f"{type(exc).__name__}: {exc!s}"
+            exc_name = type(exc).__name__
+            message = f"{exc_name}: {exc!s}" if str(exc) else exc_name
 
             # All httpx.HTTPError exceptions have a slot for the request,
             # initialized to None and then sometimes added by child
             # constructors or during exception processing. The request
             # property is a property method that raises RuntimeError if
-            # request has not been set, so we can't just check for None.
-            # Hence this approach of attempting to use the request and falling
-            # back on reporting less data if that raised any exception.
+            # request has not been set, so we can't just check for None. Hence
+            # this approach of attempting to use the request and falling back
+            # on reporting less data if that raised any exception.
             try:
                 return cls(
                     message,