More WIP

Author: ocelotl

ext/opentelemetry-ext-flask/src/opentelemetry/ext/flask/__init__.py

@@ -96,6 +96,8 @@ def _start_response(status, response_headers, *args, **kwargs):
 
 
 def _before_request():
+    from ipdb import set_trace
+    set_trace
     environ = flask.request.environ
     span_name = (
         flask.request.endpoint
@@ -165,23 +167,20 @@ class FlaskInstrumentor(BaseInstrumentor):
     def _instrument(self, **kwargs):
         app = kwargs.get("app")
 
-        if app is not None:
+        if app is None:
+            flask.Flask = _InstrumentedFlask
 
         else:
+
             app.wsgi_app = _rewrapped_app(app.wsgi_app)
 
             app.before_request(_before_request)
             app.teardown_request(_teardown_request)
 
-        else:
-            flask.Flask = _InstrumentedFlask
-
-        return None
-
     def _uninstrument(self, **kwargs):
         app = kwargs.get("app")
 
-        if app is not None:
+        if app is None:
             pass
 
         else:

…xt-flask/tests/test_flask_integration.py …lask/tests/test_flask_instrumentation.pyext/opentelemetry-ext-flask/tests/test_flask_integration.py renamed to ext/opentelemetry-ext-flask/tests/test_flask_instrumentation.py ext/opentelemetry-ext-flask/tests/test_flask_integration.py renamed to ext/opentelemetry-ext-flask/tests/test_flask_instrumentation.py

@@ -22,8 +22,6 @@
 from opentelemetry.ext.flask import FlaskInstrumentor
 from opentelemetry.test.wsgitestutil import WsgiTestBase
 
-Flask = FlaskInstrumentor().instrument(flask_class=Flask)
-
 
 def expected_attributes(override_attributes):
     default_attributes = {
@@ -43,14 +41,16 @@ def expected_attributes(override_attributes):
     return default_attributes
 
 
-class TestFlaskIntegration(WsgiTestBase):
+class TestFlaskInstrumentation(WsgiTestBase):
     def setUp(self):
         # No instrumentation code is here because it is present in the
         # conftest.py file next to this file.
         super().setUp()
 
         self.app = Flask(__name__)
 
+        FlaskInstrumentor().instrument(app=self.app)
+
         def hello_endpoint(helloid):
             if helloid == 500:
                 raise ValueError(":-(")
@@ -60,6 +60,9 @@ def hello_endpoint(helloid):
 
         self.client = Client(self.app, BaseResponse)
 
+    def tearDown(self):
+        FlaskInstrumentor().uninstrument(app=self.app)
+
     def test_only_strings_in_environ(self):
         """
         Some WSGI servers (such as Gunicorn) expect keys in the environ object