From 68376a6ac27c84c2a98290f01caf271e3e072d6d Mon Sep 17 00:00:00 2001
From: grahamalama <gbeckley@mozilla.com>
Date: Wed, 8 Feb 2023 16:19:44 -0500
Subject: [PATCH] Fix SQLAlchemy integration (#3136)

* Use documented way to enable SQLAlchemy integration

* Reinstall project when `setup.cfg` changes

* Update changelog
---
 CHANGELOG.rst                | 4 +++-
 Makefile                     | 2 +-
 kinto/core/initialization.py | 3 ++-
 setup.cfg                    | 2 +-
 tox.ini                      | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 3317305d0..bd6906fe1 100644
--- 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
index f81d0a059..b579c031d 100644
--- 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
index 984401f51..872ed6206 100644
--- 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
index 0215da8f5..72fcc25ca 100644
--- 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
index d1e3d7bb2..36ddbf9b3 100644
--- 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