ci: Run gevent tests after support

Signed-off-by: Varsha GS <[email protected]>

Author: GSVarsha

.circleci/config.yml

@@ -219,10 +219,8 @@ jobs:
       - pip-install-tests-deps:
           requirements: "tests/requirements-gevent-starlette.txt"
       - run-tests-with-coverage-report:
-          # TODO: uncomment once gevent instrumentation is done
-          # gevent: "true"
-          # tests: "tests/frameworks/test_gevent.py tests/frameworks/test_starlette.py"
-          tests: "tests/frameworks/test_starlette.py"
+          gevent: "true"
+          tests: "tests/frameworks/test_gevent.py tests/frameworks/test_starlette.py"
       - store-pytest-results
       - store-coverage-report
 

tests/conftest.py

@@ -26,7 +26,6 @@
 from instana.util.runtime import is_ppc64, is_s390x
 
 collect_ignore_glob = [
-    "*test_gevent*",
     "*collector/test_gcr*",
     "*agent/test_google*",
 ]

tests/frameworks/test_sanic.py

@@ -7,7 +7,7 @@
 
 from instana.singletons import tracer, agent
 from instana.util.ids import hex_id
-from tests.helpers import get_first_span_by_filter, get_first_span_by_name, is_test_span
+from tests.helpers import get_first_span_by_filter, get_first_span_by_name, filter_test_span
 from tests.test_utils import _TraceContextMixin
 from tests.apps.sanic_app.server import app
 
@@ -57,7 +57,7 @@ def test_basic_get(self) -> None:
         spans = self.recorder.queued_spans()
         assert len(spans) == 3
 
-        test_span = get_first_span_by_filter(spans, is_test_span)
+        test_span = get_first_span_by_filter(spans, filter_test_span)
         assert test_span
 
         httpx_span = get_first_span_by_name(spans, "http")
@@ -108,7 +108,7 @@ def test_404(self) -> None:
         spans = self.recorder.queued_spans()
         assert len(spans) == 3
 
-        test_span = get_first_span_by_filter(spans, is_test_span)
+        test_span = get_first_span_by_filter(spans, filter_test_span)
         assert test_span
 
         httpx_span = get_first_span_by_name(spans, "http")
@@ -159,7 +159,7 @@ def test_sanic_exception(self) -> None:
         spans = self.recorder.queued_spans()
         assert len(spans) == 4
 
-        test_span = get_first_span_by_filter(spans, is_test_span)
+        test_span = get_first_span_by_filter(spans, filter_test_span)
         assert test_span
 
         httpx_span = get_first_span_by_name(spans, "http")
@@ -210,7 +210,7 @@ def test_500_instana_exception(self) -> None:
         spans = self.recorder.queued_spans()
         assert len(spans) == 4
 
-        test_span = get_first_span_by_filter(spans, is_test_span)
+        test_span = get_first_span_by_filter(spans, filter_test_span)
         assert test_span
 
         httpx_span = get_first_span_by_name(spans, "http")
@@ -261,7 +261,7 @@ def test_500(self) -> None:
         spans = self.recorder.queued_spans()
         assert len(spans) == 4
 
-        test_span = get_first_span_by_filter(spans, is_test_span)
+        test_span = get_first_span_by_filter(spans, filter_test_span)
         assert test_span
 
         httpx_span = get_first_span_by_name(spans, "http")
@@ -312,7 +312,7 @@ def test_path_templates(self) -> None:
         spans = self.recorder.queued_spans()
         assert len(spans) == 3
 
-        test_span = get_first_span_by_filter(spans, is_test_span)
+        test_span = get_first_span_by_filter(spans, filter_test_span)
         assert test_span
 
         httpx_span = get_first_span_by_name(spans, "http")
@@ -363,7 +363,7 @@ def test_secret_scrubbing(self) -> None:
         spans = self.recorder.queued_spans()
         assert len(spans) == 3
 
-        test_span = get_first_span_by_filter(spans, is_test_span)
+        test_span = get_first_span_by_filter(spans, filter_test_span)
         assert test_span
 
         httpx_span = get_first_span_by_name(spans, "http")
@@ -417,7 +417,7 @@ def test_synthetic_request(self) -> None:
         spans = self.recorder.queued_spans()
         assert len(spans) == 3
 
-        test_span = get_first_span_by_filter(spans, is_test_span)
+        test_span = get_first_span_by_filter(spans, filter_test_span)
         assert test_span
 
         httpx_span = get_first_span_by_name(spans, "http")
@@ -476,7 +476,7 @@ def test_request_header_capture(self) -> None:
         spans = self.recorder.queued_spans()
         assert len(spans) == 3
 
-        test_span = get_first_span_by_filter(spans, is_test_span)
+        test_span = get_first_span_by_filter(spans, filter_test_span)
         assert test_span
 
         httpx_span = get_first_span_by_name(spans, "http")
@@ -523,7 +523,7 @@ def test_response_header_capture(self) -> None:
         spans = self.recorder.queued_spans()
         assert len(spans) == 3
 
-        test_span = get_first_span_by_filter(spans, is_test_span)
+        test_span = get_first_span_by_filter(spans, filter_test_span)
         assert test_span
 
         httpx_span = get_first_span_by_name(spans, "http")

tests/requirements-gevent-starlette.txt

@@ -1,6 +1,6 @@
 -r requirements-minimal.txt
 flask>=0.12.2
-gevent>=1.4.0
+gevent>=23.9.0.post1
 mock>=2.0.0
 pyramid>=2.0.1
 starlette>=0.12.13

tests/requirements-pre314.txt

@@ -12,7 +12,7 @@ Django>=4.2.16
 # fastapi>=0.115.0; python_version >= "3.13"
 flask>=2.3.2
 # gevent is taking more than 20min to build on 3.14
-# gevent>=1.4.0
+# gevent>=23.9.0.post1
 grpcio>=1.14.1
 google-cloud-pubsub>=2.0.0
 google-cloud-storage>=1.24.0

tests/requirements.txt

@@ -10,7 +10,7 @@ Django>=4.2.16
 fastapi>=0.92.0; python_version < "3.13"
 fastapi>=0.115.0; python_version >= "3.13"
 flask>=2.3.2
-gevent>=1.4.0
+gevent>=23.9.0.post1
 grpcio>=1.14.1
 google-cloud-pubsub>=2.0.0
 google-cloud-storage>=1.24.0