plainx-sentry 0.6.0__tar.gz → 0.8.0__tar.gz

{plainx_sentry-0.6.0 → plainx_sentry-0.8.0}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: plainx-sentry
-Version: 0.6.0
+Version: 0.8.0
 Author-email: Dave Gaeddert <dave.gaeddert@gmail.com>
 Requires-Python: >=3.11
-Requires-Dist: sentry-sdk>=2.24.0
+Requires-Dist: sentry-sdk[opentelemetry]>=2.24.0
 Description-Content-Type: text/markdown
 
 # plainx-sentry
@@ -20,12 +20,6 @@ INSTALLED_PACKAGES = [
   # ...
   "plainx.sentry",
 ]
-
-MIDDLEWARE = [
-  # Put SentryMiddleware as early as possible in the middleware stack
-  "plainx.sentry.SentryMiddleware",
-  # ...
-]
 ```
 
 In your `base.html`, load `sentry` and include the `sentry_js` tag:

{plainx_sentry-0.6.0 → plainx_sentry-0.8.0}/README.md

@@ -12,12 +12,6 @@ INSTALLED_PACKAGES = [
   # ...
   "plainx.sentry",
 ]
-
-MIDDLEWARE = [
-  # Put SentryMiddleware as early as possible in the middleware stack
-  "plainx.sentry.SentryMiddleware",
-  # ...
-]
 ```
 
 In your `base.html`, load `sentry` and include the `sentry_js` tag:

plainx_sentry-0.8.0/plainx/sentry/CHANGELOG.md

@@ -0,0 +1,11 @@
+# plainx-sentry changelog
+
+## [0.7.0](https://github.com/davegaeddert/plainx-sentry/releases/plainx-sentry@0.7.0) (2025-07-19)
+
+### What's changed
+
+- Middleware was removed in favor of using the OpenTelemetry integration and new otel instrumentation in Plain.
+
+### Upgrade instructions
+
+- Remove `SentryMiddleware` and `SentryWorkerMiddleware` from your `app/settings.py`.

plainx_sentry-0.8.0/plainx/sentry/config.py

@@ -0,0 +1,38 @@
+import sentry_sdk
+from opentelemetry import trace
+from opentelemetry.propagate import set_global_textmap
+from opentelemetry.sdk.trace import TracerProvider
+from plain.packages import PackageConfig, register_config
+from plain.runtime import settings
+from sentry_sdk.integrations.opentelemetry import SentryPropagator, SentrySpanProcessor
+
+
+@register_config
+class PlainxSentryConfig(PackageConfig):
+    label = "plainxsentry"
+
+    def ready(self):
+        if settings.SENTRY_DSN and settings.SENTRY_AUTO_INIT:
+            sentry_sdk.init(
+                settings.SENTRY_DSN,
+                release=settings.SENTRY_RELEASE,
+                environment=settings.SENTRY_ENVIRONMENT,
+                send_default_pii=settings.SENTRY_PII_ENABLED,
+                traces_sample_rate=settings.SENTRY_TRACES_SAMPLE_RATE,
+                profiles_sample_rate=settings.SENTRY_PROFILES_SAMPLE_RATE,
+                instrumenter="otel",
+                **settings.SENTRY_INIT_KWARGS,
+            )
+
+            # Set up OpenTelemetry tracing with Sentry
+            if trace.get_tracer_provider() and not isinstance(
+                trace.get_tracer_provider(), trace.ProxyTracerProvider
+            ):
+                raise RuntimeError(
+                    "A tracer provider already exists. Sentry's OpenTelemetry integration requires a clean tracer provider."
+                )
+
+            provider = TracerProvider()
+            provider.add_span_processor(SentrySpanProcessor())
+            trace.set_tracer_provider(provider)
+            set_global_textmap(SentryPropagator())

{plainx_sentry-0.6.0 → plainx_sentry-0.8.0}/plainx/sentry/templates.py

@@ -1,4 +1,5 @@
 import sentry_sdk
+from plain.auth import get_request_user
 from plain.runtime import settings
 from plain.templates import register_template_extension
 from plain.templates.jinja.extensions import InclusionTagExtension
@@ -25,8 +26,8 @@ class SentryJSExtension(InclusionTagExtension):
         }
 
         if "request" in context:
-            # Use request.user by default (avoids accidental "user" variable confusion)
-            user = getattr(context["request"], "user", None)
+            # Get the authenticated user from the request
+            user = get_request_user(context["request"])
         else:
             # Get user directly if no request (like in server error context)
             user = context.get("user", None)

{plainx_sentry-0.6.0 → plainx_sentry-0.8.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "plainx-sentry"
-version = "0.6.0"
+version = "0.8.0"
 description = ""
 readme = "README.md"
 authors = [
@@ -8,7 +8,7 @@ authors = [
 ]
 requires-python = ">=3.11"
 dependencies = [
-    "sentry-sdk>=2.24.0",
+    "sentry-sdk[opentelemetry]>=2.24.0",
 ]
 
 [dependency-groups]
@@ -22,6 +22,9 @@ dev = [
 [tool.hatch.build.targets.wheel]
 packages = ["plainx"]
 
+
+[tool.plain.code.biome]
+version = "2.1.2"
 [build-system]
 requires = ["hatchling"]
 build-backend = "hatchling.build"

{plainx_sentry-0.6.0 → plainx_sentry-0.8.0}/tests/settings.py

@@ -17,7 +17,6 @@ MIDDLEWARE = [
     "plain.sessions.middleware.SessionMiddleware",
     "plain.middleware.common.CommonMiddleware",
     "plain.csrf.middleware.CsrfViewMiddleware",
-    "plain.auth.middleware.AuthenticationMiddleware",
     "plain.middleware.clickjacking.XFrameOptionsMiddleware",
     "plainx.sentry.middleware.SentryFeedbackMiddleware",
 ]

{plainx_sentry-0.6.0 → plainx_sentry-0.8.0}/tests/test_sentry.py

@@ -1,5 +1,6 @@
 import sentry_sdk
 from plain.auth import get_user_model
+from plain.auth.requests import set_request_user
 from plain.views import TemplateView
 
 from plainx.sentry.templatetags.sentry import sentry_js
@@ -39,7 +40,7 @@ def test_sentry_pii_enabled(settings, rf):
     settings.SENTRY_PII_ENABLED = True
 
     request = rf.get("/")
-    request.user = get_user_model()(id=1, email="test@example.com", username="test")
+    set_request_user(request, get_user_model()(id=1, email="test@example.com", username="test"))
 
     assert sentry_js({"request": request}) == {
         "sentry_js_enabled": True,
@@ -83,7 +84,7 @@ def test_sentry_pii_disabled(settings, rf):
     settings.SENTRY_PII_ENABLED = False
 
     request = rf.get("/")
-    request.user = get_user_model()(id=1, email="test@example.com", username="test")
+    set_request_user(request, get_user_model()(id=1, email="test@example.com", username="test"))
 
     assert sentry_js({"request": request}) == {
         "sentry_js_enabled": True,
@@ -104,7 +105,7 @@ def test_sentry_release_env(settings, rf):
     settings.SENTRY_ENVIRONMENT = "production"
 
     request = rf.get("/")
-    request.user = get_user_model()(id=1, email="test@example.com", username="test")
+    set_request_user(request, get_user_model()(id=1, email="test@example.com", username="test"))
 
     assert sentry_js({"request": request}) == {
         "sentry_js_enabled": True,