ref(objectstore): Stop using sentry.options internally

src/sentry/objectstore/__init__.py

@@ -1,3 +1,5 @@
+from sentry import options as options_store
 from sentry.objectstore.service import ClientBuilder
 
-attachments = ClientBuilder("attachments")
+options = options_store.get("objectstore.config")
+attachments = ClientBuilder(options["base_url"], "attachments", options)

src/sentry/objectstore/service.py

@@ -33,18 +33,21 @@ class GetResult(NamedTuple):
 
 
 class ClientBuilder:
-    def __init__(self, usecase: str, options: dict | None = None, propagate_traces: bool = False):
+    def __init__(
+        self,
+        objectstore_base_url: str,
+        usecase: str,
+        options: dict | None = None,
+        propagate_traces: bool = False,
+    ):
+        self._base_url = objectstore_base_url
         self._usecase = usecase
-        self._options = options
         self._default_compression: Compression = "zstd"
         self._propagate_traces = propagate_traces
+        _ = options
 
     def _make_client(self, scope: str) -> Client:
-        from sentry import options as options_store
-
-        options = self._options or options_store.get("objectstore.config")
-        pool = urllib3.connectionpool.connection_from_url(options["base_url"])
-
+        pool = urllib3.connectionpool.connection_from_url(self._base_url)
         return Client(pool, self._default_compression, self._usecase, scope, self._propagate_traces)
 
     def default_compression(self, default_compression: Compression) -> Self:
@@ -59,6 +62,8 @@ def for_project(self, organization_id: int, project_id: int) -> Client:
 
 
 class Client:
+    _default_compression: Compression
+
     def __init__(
         self,
         pool: HTTPConnectionPool,

tests/sentry/objectstore/test_objectstore.py

@@ -14,7 +14,7 @@ class Testserver:
 
 def test_object_url() -> None:
     server = Testserver()
-    client = ClientBuilder("test", {"base_url": server.url}).for_project(123, 456)
+    client = ClientBuilder(server.url, "test").for_project(123, 456)
 
     assert (
         client.object_url("foo")
@@ -24,7 +24,7 @@ def test_object_url() -> None:
 
 def test_stores_uncompressed() -> None:
     server = Testserver()
-    client = ClientBuilder("test", {"base_url": server.url}).for_organization(12345)
+    client = ClientBuilder(server.url, "test").for_organization(12345)
 
     body = b"oh hai!"
     stored_id = client.put(body, "foo", compression="none")
@@ -38,7 +38,7 @@ def test_stores_uncompressed() -> None:
 
 def test_uses_zstd_by_default() -> None:
     server = Testserver()
-    client = ClientBuilder("test", {"base_url": server.url}).for_organization(12345)
+    client = ClientBuilder(server.url, "test").for_organization(12345)
 
     body = b"oh hai!"
     stored_id = client.put(body, "foo")
@@ -59,7 +59,7 @@ def test_uses_zstd_by_default() -> None:
 
 def test_deletes_stored_stuff() -> None:
     server = Testserver()
-    client = ClientBuilder("test", {"base_url": server.url}).for_organization(12345)
+    client = ClientBuilder(server.url, "test").for_organization(12345)
 
     body = b"oh hai!"
     stored_id = client.put(body, "foo")