ci(tornado): run on the latest version

Signed-off-by: Varsha GS <varsha.gs@ibm.com>

Author: GSVarsha

src/instana/instrumentation/tornado/client.py

@@ -1,18 +1,19 @@
 # (c) Copyright IBM Corp. 2021
 # (c) Copyright Instana Inc. 2019
 
+try:
+    import tornado
 
-import wrapt
-import functools
+    import wrapt
+    import functools
 
-from instana.log import logger
-from instana.singletons import agent, tracer
-from instana.util.secrets import strip_secrets_from_query
-from instana.propagators.format import Format
-from instana.span.span import get_current_span
+    from opentelemetry.semconv.trace import SpanAttributes
 
-try:
-    import tornado
+    from instana.log import logger
+    from instana.singletons import agent, tracer
+    from instana.util.secrets import strip_secrets_from_query
+    from instana.propagators.format import Format
+    from instana.span.span import get_current_span
 
     @wrapt.patch_function_wrapper('tornado.httpclient', 'AsyncHTTPClient.fetch')
     def fetch_with_instana(wrapped, instance, argv, kwargs):
@@ -49,8 +50,8 @@ def fetch_with_instana(wrapped, instance, argv, kwargs):
                                                       agent.options.secrets_list)
                 span.set_attribute("http.params", cleaned_qp)
 
-            span.set_attribute("http.url", parts[0])
-            span.set_attribute("http.method", request.method)
+            span.set_attribute(SpanAttributes.HTTP_URL, parts[0])
+            span.set_attribute(SpanAttributes.HTTP_METHOD, request.method)
 
             future = wrapped(request, **kwargs)
 
@@ -66,9 +67,9 @@ def fetch_with_instana(wrapped, instance, argv, kwargs):
     def finish_tracing(future, span):
         try:
             response = future.result()
-            span.set_attribute("http.status_code", response.code)
+            span.set_attribute(SpanAttributes.HTTP_STATUS_CODE, response.code)
         except tornado.httpclient.HTTPClientError as e:
-            span.set_attribute("http.status_code", e.code)
+            span.set_attribute(SpanAttributes.HTTP_STATUS_CODE, e.code)
             span.record_exception(e)
             logger.debug("Tornado finish_tracing HTTPClientError: ", exc_info=True)
         finally:

src/instana/instrumentation/tornado/server.py

@@ -7,6 +7,8 @@
 
     import wrapt
 
+    from opentelemetry.semconv.trace import SpanAttributes
+
     from instana.log import logger
     from instana.singletons import agent, tracer
     from instana.util.secrets import strip_secrets_from_query
@@ -41,8 +43,8 @@ def execute_with_instana(wrapped, instance, argv, kwargs):
                 span.set_attribute("http.params", cleaned_qp)
 
             url = f"{instance.request.protocol}://{instance.request.host}{instance.request.path}"
-            span.set_attribute("http.url", url)
-            span.set_attribute("http.method", instance.request.method)
+            span.set_attribute(SpanAttributes.HTTP_URL, url)
+            span.set_attribute(SpanAttributes.HTTP_METHOD, instance.request.method)
 
             span.set_attribute("handler", instance.__class__.__name__)
 
@@ -87,7 +89,7 @@ def on_finish_with_instana(wrapped, instance, argv, kwargs):
             if 500 <= status_code:
                 span.mark_as_errored()
 
-            span.set_attribute("http.status_code", status_code)
+            span.set_attribute(SpanAttributes.HTTP_STATUS_CODE, status_code)
             if span.is_recording():
                 span.end()
 

tests/conftest.py

@@ -34,7 +34,6 @@
 collect_ignore_glob.append("*frameworks/test_celery*")
 collect_ignore_glob.append("*frameworks/test_gevent*")
 collect_ignore_glob.append("*frameworks/test_grpcio*")
-collect_ignore_glob.append("*frameworks/test_tornado*")
 
 # # Cassandra and gevent tests are run in dedicated jobs on CircleCI and will
 # # be run explicitly.  (So always exclude them here)
@@ -48,14 +47,6 @@
 #     collect_ignore_glob.append("*test_gevent*")
 #     collect_ignore_glob.append("*test_starlette*")
 
-# Python 3.10 support is incomplete yet
-# TODO: Remove this once we start supporting Tornado >= 6.0
-if sys.version_info >= (3, 10):
-    collect_ignore_glob.append("*test_tornado*")
-    # Furthermore on Python 3.11 the above TC is skipped:
-    # tests/opentracing/test_ot_span.py::TestOTSpan::test_stacks
-    # TODO: Remove that once we find a workaround or DROP opentracing!
-
 if sys.version_info >= (3, 11):
     if not os.environ.get("GOOGLE_CLOUD_TEST"):
         collect_ignore_glob.append("*test_google-cloud*")
@@ -64,6 +55,7 @@
     # TODO: Test Case failures for unknown reason:
     collect_ignore_glob.append("*test_aiohttp_server*")
     collect_ignore_glob.append("*test_celery*")
+    collect_ignore_glob.append("*frameworks/test_tornado_server*")
 
     # Currently there is a runtime incompatibility caused by the library:
     # `undefined symbol: _PyErr_WriteUnraisableMsg`

tests/requirements-310-with-tornado.txt

@@ -38,6 +38,7 @@ responses<=0.17.0
 sanic>=19.9.0
 sanic-testing>=24.6.0
 sqlalchemy>=2.0.0
+tornado>=6.4.1
 
 uvicorn>=0.13.4
 urllib3>=1.26.5

tests/requirements-310.txt

@@ -36,6 +36,7 @@ responses<=0.17.0
 sanic>=19.9.0
 sanic-testing>=24.6.0
 sqlalchemy>=2.0.0
+tornado>=6.4.1
 
 uvicorn>=0.13.4
 urllib3>=1.26.5

tests/requirements-312.txt

@@ -48,6 +48,7 @@ responses<=0.17.0
 #sanic>=19.9.0
 #sanic-testing>=24.6.0
 sqlalchemy>=2.0.0
+tornado>=6.4.1
 
 uvicorn>=0.13.4
 urllib3>=1.26.5

tests/requirements-313.txt

@@ -37,7 +37,7 @@ responses<=0.17.0
 sanic>=19.9.0
 sanic-testing>=24.6.0
 sqlalchemy>=2.0.0
-tornado>=4.5.3,<6.0
+tornado>=6.4.1
 uvicorn>=0.13.4
 urllib3>=1.26.5
 httpx>=0.27.0