Fix SQLAlchemy integration (#3136)

* Use documented way to enable SQLAlchemy integration * Reinstall project when `setup.cfg` changes * Update changelog
Kinto · Feb 8, 2023 · 68376a6 · 68376a6
1 parent c3d1bfa
commit 68376a6
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -6,7 +6,9 @@ This document describes changes between each past release.
 15.1.1 (unreleased)
 -------------------
 
-- Nothing changed yet.
+**Bug Fixes**
+
+- Use correct import path for SQLAlchemy Sentry integration
 
 
 15.1.0 (2023-02-08)

diff --git a/Makefile b/Makefile
@@ -38,7 +38,7 @@ help:
 
 all: install
 install: $(INSTALL_STAMP)
-$(INSTALL_STAMP): $(PYTHON) setup.py requirements.txt
+$(INSTALL_STAMP): $(PYTHON) setup.py requirements.txt setup.cfg
 	$(VENV)/bin/pip install -U pip
 	$(VENV)/bin/pip install -Ue . -c requirements.txt
 	touch $(INSTALL_STAMP)

diff --git a/kinto/core/initialization.py b/kinto/core/initialization.py
@@ -28,7 +28,8 @@
     ProfilerMiddleware = False
 try:
     import sentry_sdk
-    from sentry_sdk.integrations.pyramid import PyramidIntegration, SqlalchemyIntegration
+    from sentry_sdk.integrations.pyramid import PyramidIntegration
+    from sentry_sdk.integrations.sqlalchemy import SqlalchemyIntegration
 except ImportError:  # pragma: no cover
     sentry_sdk = None
 

diff --git a/setup.cfg b/setup.cfg
@@ -77,7 +77,7 @@ postgresql =
     zope.sqlalchemy
 monitoring =
     newrelic
-    sentry-sdk
+    sentry-sdk[sqlalchemy]
     statsd
     werkzeug
 

diff --git a/tox.ini b/tox.ini
@@ -13,7 +13,7 @@ deps =
     -r{toxinidir}/dev-requirements.txt
     psycopg2
     newrelic
-    sentry-sdk
+    sentry-sdk[sqlalchemy]
     statsd
 install_command = pip install {opts} {packages} -c{toxinidir}/requirements.txt