fix re-enabling enabled integration

sentrivana · sentrivana · commit b2358eb468ac · 2026-01-08T14:49:05.000+01:00
diff --git a/sentry_sdk/integrations/__init__.py b/sentry_sdk/integrations/__init__.py
@@ -282,11 +282,14 @@ def setup_integrations(
 
 def _enable_integration(integration: "Integration") -> "Optional[Integration]":
     with _installer_lock:
-        if integration.identifier in _installed_integrations:
-            return integration
-
         client = sentry_sdk.get_client()
 
+        if (
+            integration.identifier in _installed_integrations
+            and integration.identifier in client.integrations
+        ):
+            return client.integrations[integration.identifier]
+
         logger.debug(
             "Setting up previously not enabled integration %s", integration.identifier
         )
diff --git a/tests/test_basics.py b/tests/test_basics.py
@@ -1005,13 +1005,15 @@ def test_enable_integration(sentry_init):
 def test_enable_enabled_integration(sentry_init):
     from sentry_sdk.integrations.gnu_backtrace import GnuBacktraceIntegration
 
-    sentry_init(integrations=[GnuBacktraceIntegration()])
+    integration = GnuBacktraceIntegration()
+    sentry_init(integrations=[integration])
 
     assert "gnu_backtrace" in get_client().integrations
 
     # Second call should not raise or cause issues
     sentry_sdk.enable_integration(GnuBacktraceIntegration())
     assert "gnu_backtrace" in get_client().integrations
+    assert get_client().integrations["gnu_backtrace"] == integration
 
 
 def test_enable_integration_twice(sentry_init):
@@ -1021,12 +1023,14 @@ def test_enable_integration_twice(sentry_init):
 
     assert "gnu_backtrace" not in get_client().integrations
 
-    sentry_sdk.enable_integration(GnuBacktraceIntegration())
+    integration = GnuBacktraceIntegration()
+    sentry_sdk.enable_integration(integration)
     assert "gnu_backtrace" in get_client().integrations
 
     # Second call should not raise or cause issues
     sentry_sdk.enable_integration(GnuBacktraceIntegration())
     assert "gnu_backtrace" in get_client().integrations
+    assert get_client().integrations["gnu_backtrace"] == integration
 
 
 def test_enable_integration_did_not_enable(sentry_init):
