Revert "ref(browser reporting): Use option to control Reporting-Endpoints header (#93560)"

This reverts commit 74dfdaf.

Co-authored-by: asottile-sentry <[email protected]>

Author: 2 people

src/sentry/middleware/reporting_endpoint.py

@@ -3,8 +3,6 @@
 from django.http.request import HttpRequest
 from django.http.response import HttpResponseBase
 
-from sentry import options
-
 
 class ReportingEndpointMiddleware:
     """
@@ -21,14 +19,10 @@ def __call__(self, request: HttpRequest) -> HttpResponseBase:
     def process_response(
         self, request: HttpRequest, response: HttpResponseBase
     ) -> HttpResponseBase:
-        # There are some Relay endpoints which need to be able to run without touching the database
-        # (so the `options` check below is no good), and besides, Relay has no use for a
-        # browser-specific header, so we need to (but also can) bail early.
-        if "api/0/relays" in request.path:
-            return response
-
-        if options.get("issues.browser_reporting.reporting_endpoints_header_enabled"):
-            # This will enable crashes and intervention and deprecation reports
+        # Check if the request has staff attribute and if staff is active
+        staff = getattr(request, "staff", None)
+        if staff and staff.is_active:
+            # This will enable crashes, intervention and deprecation warnings
             # They always report to the default endpoint
             response["Reporting-Endpoints"] = (
                 "default=https://sentry.my.sentry.io/api/0/reporting-api-experiment/"

src/sentry/options/defaults.py

@@ -3458,15 +3458,6 @@
     flags=FLAG_ALLOW_EMPTY | FLAG_AUTOMATOR_MODIFIABLE,
 )
 
-# Enable adding the `Reporting-Endpoints` header, which will in turn enable the sending of Reporting
-# API reports from the browser (as long as it's Chrome).
-register(
-    "issues.browser_reporting.reporting_endpoints_header_enabled",
-    type=Bool,
-    default=False,
-    flags=FLAG_AUTOMATOR_MODIFIABLE,
-)
-
 # Enable the collection of Reporting API reports via the `/api/0/reporting-api-experiment/`
 # endpoint. When this is false, the endpoint will just 404.
 register(

tests/sentry/middleware/test_reporting_endpoint.py

@@ -1,45 +1,68 @@
-from unittest.mock import MagicMock, patch
+from unittest.mock import Mock
 
-from django.http import HttpResponse
+from django.http import HttpResponse, HttpResponseBase
 from django.test import RequestFactory
 
 from sentry.middleware.reporting_endpoint import ReportingEndpointMiddleware
 from sentry.testutils.cases import TestCase
-from sentry.testutils.helpers.options import override_options
 
 
 class ReportingEndpointMiddlewareTestCase(TestCase):
     def setUp(self) -> None:
         self.middleware = ReportingEndpointMiddleware(lambda request: HttpResponse())
         self.factory = RequestFactory()
 
-    def test_obeys_option(self) -> None:
-        with override_options(
-            {"issues.browser_reporting.reporting_endpoints_header_enabled": True}
-        ):
-            request = self.factory.get("/")
-            response = self.middleware.process_response(request, HttpResponse())
-
-            assert (
-                response.get("Reporting-Endpoints")
-                == "default=https://sentry.my.sentry.io/api/0/reporting-api-experiment/"
-            )
-
-        with override_options(
-            {"issues.browser_reporting.reporting_endpoints_header_enabled": False}
-        ):
-            request = self.factory.get("/")
-            response = self.middleware.process_response(request, HttpResponse())
-
-            assert response.get("Reporting-Endpoints") is None
-
-    @patch("src.sentry.middleware.reporting_endpoint.options.get")
-    def test_no_options_check_in_relay_endpoints(self, mock_options_get: MagicMock) -> None:
-        with override_options(
-            {"issues.browser_reporting.reporting_endpoints_header_enabled": True}
-        ):
-            request = self.factory.get("/api/0/relays/register/challenge/")
-            response = self.middleware.process_response(request, HttpResponse())
-
-            mock_options_get.assert_not_called()
-            assert response.get("Reporting-Endpoints") is None
+    def _no_header_set(self, result: HttpResponseBase) -> None:
+        assert "Reporting-Endpoints" not in result
+
+    def test_adds_header_for_staff_user(self) -> None:
+        """Test that the ReportingEndpoint header is added when user is Sentry staff."""
+        request = self.factory.get("/")
+
+        # Mock staff object with is_active = True
+        staff_mock = Mock()
+        staff_mock.is_active = True
+        setattr(request, "staff", staff_mock)
+
+        response = HttpResponse()
+        result = self.middleware.process_response(request, response)
+
+        assert "Reporting-Endpoints" in result
+        assert (
+            result["Reporting-Endpoints"]
+            == "default=https://sentry.my.sentry.io/api/0/reporting-api-experiment/"
+        )
+
+    def test_no_header_for_non_staff_user(self) -> None:
+        """Test that the ReportingEndpoint header is not added when user is not Sentry staff."""
+        request = self.factory.get("/")
+
+        # Mock staff object with is_active = False
+        staff_mock = Mock()
+        staff_mock.is_active = False
+        setattr(request, "staff", staff_mock)
+
+        response = HttpResponse()
+        result = self.middleware.process_response(request, response)
+
+        self._no_header_set(result)
+
+    def test_no_header_when_no_staff_attribute(self) -> None:
+        """Test that the ReportingEndpoint header is not added when request has no staff attribute."""
+        request = self.factory.get("/")
+
+        # No staff attribute on request
+        response = HttpResponse()
+        result = self.middleware.process_response(request, response)
+
+        self._no_header_set(result)
+
+    def test_no_header_when_staff_is_none(self) -> None:
+        """Test that the ReportingEndpoint header is not added when staff is None."""
+        request = self.factory.get("/")
+        setattr(request, "staff", None)
+
+        response = HttpResponse()
+        result = self.middleware.process_response(request, response)
+
+        self._no_header_set(result)