Call OTel instrument_app in Flask integration

Author: sentrivana

sentry_sdk/integrations/flask.py

@@ -7,13 +7,15 @@
     RequestExtractor,
 )
 from sentry_sdk.integrations.wsgi import SentryWsgiMiddleware
+from sentry_sdk.opentelemetry.tracing import SENTRY_TRACER_PROVIDER
 from sentry_sdk.scope import should_send_default_pii
 from sentry_sdk.utils import (
     capture_internal_exceptions,
     ensure_integration_enabled,
     event_from_exception,
     package_version,
 )
+from opentelemetry.instrumentation.flask import FlaskInstrumentor
 
 from typing import TYPE_CHECKING
 
@@ -91,6 +93,7 @@ def setup_once() -> None:
         got_request_exception.connect(_capture_exception)
 
         old_app = Flask.__call__
+        old_app_init = Flask.__init__
 
         def sentry_patched_wsgi_app(
             self: Any, environ: Dict[str, str], start_response: Callable[..., Any]
@@ -109,9 +112,17 @@ def sentry_patched_wsgi_app(
                     else DEFAULT_HTTP_METHODS_TO_CAPTURE
                 ),
             )
+
             return middleware(environ, start_response)
 
+        def sentry_patched_flask_init(self, *args, **kwargs) -> Any:
+            old_app_init(self, *args, **kwargs)
+            FlaskInstrumentor.instrument_app(
+                self, tracer_provider=SENTRY_TRACER_PROVIDER
+            )
+
         Flask.__call__ = sentry_patched_wsgi_app
+        Flask.__init__ = sentry_patched_flask_init
 
 
 def _add_sentry_trace(

sentry_sdk/opentelemetry/tracing.py

@@ -20,6 +20,17 @@
 
 READABLE_SPAN_PATCHED = False
 
+SENTRY_TRACER_PROVIDER = TracerProvider(
+    sampler=SentrySampler(),
+    resource=Resource.create(
+        {
+            RESOURCE_SERVICE_NAME: "sentry-python",
+            RESOURCE_SERVICE_VERSION: VERSION,
+            RESOURCE_SERVICE_NAMESPACE: "sentry",
+        }
+    ),
+)
+
 
 def patch_readable_span() -> None:
     """
@@ -51,16 +62,7 @@ def setup_sentry_tracing() -> None:
 
     else:
         logger.debug("[Tracing] No TracerProvider set, creating a new one")
-        tracer_provider = TracerProvider(
-            sampler=SentrySampler(),
-            resource=Resource.create(
-                {
-                    RESOURCE_SERVICE_NAME: "sentry-python",
-                    RESOURCE_SERVICE_VERSION: VERSION,
-                    RESOURCE_SERVICE_NAMESPACE: "sentry",
-                }
-            ),
-        )
+        tracer_provider = SENTRY_TRACER_PROVIDER
         trace.set_tracer_provider(tracer_provider)
 
     try:

setup.py

@@ -42,6 +42,7 @@ def get_file_text(file_name):
         "urllib3>=1.26.11",
         "certifi",
         "opentelemetry-sdk>=1.4.0",
+        "opentelemetry-instrumentation-flask",
     ],
     extras_require={
         "aiohttp": ["aiohttp>=3.5"],