Add support for Flask 2.2

* Keeps backwards compatibility with 2.1, 2.0, 1.x

Signed-off-by: Ferenc Géczi <[email protected]>

Author: Ferenc-

instana/instrumentation/flask/common.py

@@ -14,15 +14,16 @@
 
 @wrapt.patch_function_wrapper('flask', 'templating._render')
 def render_with_instana(wrapped, instance, argv, kwargs):
-    ctx = argv[1]
-
     # If we're not tracing, just return
-    if not hasattr(ctx['g'], 'scope'):
+    if not (hasattr(flask, 'g') and hasattr(flask.g, 'scope')):
         return wrapped(*argv, **kwargs)
 
-    with tracer.start_active_span("render", child_of=ctx['g'].scope.span) as rscope:
+    parent_span = flask.g.scope.span
+
+    with tracer.start_active_span("render", child_of=parent_span) as rscope:
         try:
-            template = argv[0]
+            flask_version = tuple(map(int, flask.__version__.split('.')))
+            template = argv[1] if flask_version >= (2, 2, 0) else argv[0]
 
             rscope.span.set_tag("type", "template")
             if template.name is None:

tests/requirements-310.txt

@@ -5,13 +5,16 @@ celery>=5.0.5
 coverage>=5.5
 Django>=3.2.10
 fastapi>=0.65.1
-flask>=1.1.4,<2.0.0
+flask>=2.2.0
+markupsafe>=2.1.0
 grpcio>=1.37.1
 google-cloud-pubsub<=2.1.0
 google-cloud-storage>=1.24.0
 lxml>=4.6.3
 mock>=4.0.3
-moto>=1.3.16,<2.0
+# We have to increase the minimum moto version so we can keep markupsafe on the required minimum
+# TODO: This appears to break 'test_get_secret_value' in test_boto3_secretsmanager.py
+moto>=2.0
 mysqlclient>=2.0.3
 nose>=1.3.7
 PyMySQL[rsa]>=1.0.2