ci: Enable Objectstore

devservices/config.yml

@@ -170,7 +170,8 @@ x-sentry-service-config:
     taskbroker: [snuba, postgres, relay, spotlight, taskbroker]
     taskworker:
       [snuba, postgres, relay, taskbroker, spotlight, taskworker, taskworker-scheduler]
-    backend-ci: [snuba, postgres, redis, bigtable, redis-cluster, symbolicator]
+    backend-ci:
+      [snuba, postgres, redis, bigtable, redis-cluster, symbolicator, objectstore]
     symbolicator: [postgres, snuba, symbolicator, spotlight]
     memcached: [postgres, snuba, memcached, spotlight]
     tracing:

src/sentry/lang/native/symbolicator.py

@@ -29,6 +29,7 @@
 from sentry.objectstore import get_attachments_session
 from sentry.options.rollout import in_random_rollout
 from sentry.utils import metrics
+from sentry.utils.env import in_test_environment
 
 MAX_ATTEMPTS = 3
 
@@ -186,6 +187,7 @@ def process_minidump(
         if minidump.stored_id:
             session = get_attachments_session(self.project.organization_id, self.project.id)
             storage_url = session.object_url(minidump.stored_id)
+            storage_url = maybe_rewrite_objectstore_url(storage_url)
             json: dict[str, Any] = {
                 "platform": platform,
                 "sources": sources,
@@ -231,6 +233,7 @@ def process_applecrashreport(self, platform: str, report: CachedAttachment):
         if report.stored_id:
             session = get_attachments_session(self.project.organization_id, self.project.id)
             storage_url = session.object_url(report.stored_id)
+            storage_url = maybe_rewrite_objectstore_url(storage_url)
             json: dict[str, Any] = {
                 "platform": platform,
                 "sources": sources,
@@ -488,3 +491,15 @@ def query_task(self, task_id):
 
     def reset_worker_id(self):
         self.worker_id = uuid.uuid4().hex
+
+
+def maybe_rewrite_objectstore_url(url: str) -> str:
+    """
+    This is needed during development/testing to make Symbolicator reach Objectstore.
+    This is because Sentry can reach Objectstore on 127.0.0.1 but Symbolicator cannot, as it's running in its own container.
+
+    Note: if you are using a local (not containerized) instance of Symbolicator, you need to disable this logic.
+    """
+    if settings.IS_DEV or in_test_environment():
+        url = url.replace("127.0.0.1", "objectstore")
+    return url

src/sentry/testutils/skips.py

@@ -46,7 +46,7 @@ def _requires_objectstore() -> None:
     # TODO: ability to ask devservices what port a service is on
     if not _service_available("127.0.0.1", 8888):
         service_message = "requires 'objectstore' server running\n\t💡 Hint: run `devservices up --mode=objectstore`"
-        pytest.skip(service_message)
+        pytest.fail(service_message)
 
 
 requires_snuba = pytest.mark.usefixtures("_requires_snuba")