feat(objectstore): enable token generator in objectstore client

Author: matt-codecov

pyproject.toml

@@ -50,7 +50,7 @@ dependencies = [
     "mmh3>=4.0.0",
     "msgspec>=0.19.0",
     "msgpack>=1.1.0",
-    "objectstore-client>=0.0.14",
+    "objectstore-client>=0.0.15",
     "openai>=1.3.5",
     "orjson>=3.10.10",
     "p4python>=2025.1.2767466",

src/sentry/objectstore/__init__.py

@@ -3,7 +3,7 @@
 from urllib.parse import urlparse, urlunparse
 
 from django.conf import settings
-from objectstore_client import Client, MetricsBackend, Session, TimeToLive, Usecase
+from objectstore_client import Client, MetricsBackend, Session, TimeToLive, TokenGenerator, Usecase
 from objectstore_client.metrics import Tags
 
 from sentry.utils import metrics as sentry_metrics
@@ -48,13 +48,27 @@ def create_client() -> Client:
     from sentry import options as options_store
 
     options = options_store.get("objectstore.config")
+
+    # Initialize the `TokenGenerator` if key parameters are found.
+    token_generator = None
+    if signing_key_options := options.get("token_generator"):
+        kid = signing_key_options.pop("kid")
+        secret_key = signing_key_options.pop("secret_key")
+        if kid and secret_key:
+            token_generator = TokenGenerator(
+                kid,
+                secret_key,
+                **signing_key_options,
+            )
+
     return Client(
         options["base_url"],
         metrics_backend=SentryMetricsBackend(),
         propagate_traces=options.get("propagate_traces", False),
         retries=options.get("retries", None),
         timeout_ms=options.get("timeout_ms", None),
         connection_kwargs=options.get("connection_kwargs", {}),
+        token_generator=token_generator,
     )
 
 

src/sentry/options/defaults.py

@@ -388,6 +388,7 @@
 #  - retries: int | None = None,
 #  - timeout_ms: float | None = None,
 #  - connection_kwargs: Mapping[str, Any] | None = None,
+#  - token_generator: Mapping[str, Any] | None = None,
 #
 # For an always up-to-date list, see:
 # https://getsentry.github.io/objectstore/python/objectstore_client.html#objectstore_client.Client