@@ -83,6 +83,7 @@ def get_default_span_name():
83
83
span_name = otel_wsgi .get_default_span_name (flask .request .environ )
84
84
return span_name
85
85
86
+
86
87
def _rewrapped_app (wsgi_app , response_hook = None ):
87
88
def _wrapped_app (wrapped_app_environ , start_response ):
88
89
# We want to measure the time for route matching, etc.
@@ -113,7 +114,7 @@ def _start_response(status, response_headers, *args, **kwargs):
113
114
status ,
114
115
)
115
116
if response_hook :
116
- response_hook (span , status , response_headers )
117
+ response_hook (span , status , response_headers )
117
118
return start_response (status , response_headers , * args , ** kwargs )
118
119
119
120
return wsgi_app (wrapped_app_environ , _start_response )
@@ -122,11 +123,9 @@ def _start_response(status, response_headers, *args, **kwargs):
122
123
123
124
124
125
def _wrapped_before_request (request_hook = None , tracer = None ):
125
-
126
126
def _before_request ():
127
127
if _excluded_urls .url_disabled (flask .request .url ):
128
128
return
129
-
130
129
flask_request_environ = flask .request .environ
131
130
span_name = get_default_span_name ()
132
131
token = context .attach (
@@ -159,8 +158,7 @@ def _before_request():
159
158
flask_request_environ [_ENVIRON_ACTIVATION_KEY ] = activation
160
159
flask_request_environ [_ENVIRON_SPAN_KEY ] = span
161
160
flask_request_environ [_ENVIRON_TOKEN ] = token
162
-
163
-
161
+
164
162
return _before_request
165
163
166
164
@@ -190,20 +188,23 @@ class _InstrumentedFlask(flask.Flask):
190
188
_tracer_provider = None
191
189
_request_hook = None
192
190
_response_hook = None
193
-
191
+
194
192
def __init__ (self , * args , ** kwargs ):
195
193
super ().__init__ (* args , ** kwargs )
196
194
197
195
self ._original_wsgi_ = self .wsgi_app
198
-
199
- self .wsgi_app = _rewrapped_app (self .wsgi_app , _InstrumentedFlask ._response_hook )
196
+
197
+ self .wsgi_app = _rewrapped_app (
198
+ self .wsgi_app , _InstrumentedFlask ._response_hook
199
+ )
200
200
201
201
tracer = trace .get_tracer (
202
202
__name__ , __version__ , _InstrumentedFlask ._tracer_provider
203
203
)
204
204
205
205
_before_request = _wrapped_before_request (
206
- _InstrumentedFlask ._request_hook , tracer ,
206
+ _InstrumentedFlask ._request_hook ,
207
+ tracer ,
207
208
)
208
209
self ._before_request = _before_request
209
210
self .before_request (_before_request )
@@ -216,6 +217,7 @@ class FlaskInstrumentor(BaseInstrumentor):
216
217
217
218
See `BaseInstrumentor`
218
219
"""
220
+
219
221
def _instrument (self , ** kwargs ):
220
222
self ._original_flask = flask .Flask
221
223
request_hook = kwargs .get ("request_hook" )
0 commit comments