feat: Add GEvent instrumentation support with OTel

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

Author: GSVarsha

src/instana/__init__.py

@@ -182,6 +182,7 @@ def boot_agent() -> None:
             sqlalchemy,  # noqa: F401
             starlette,  # noqa: F401
             urllib3,  # noqa: F401
+            gevent,  # noqa: F401
         )
         from instana.instrumentation.aiohttp import (
             client as aiohttp_client,  # noqa: F401
@@ -209,8 +210,6 @@ def boot_agent() -> None:
             server as tornado_server,  # noqa: F401
         )
 
-        # from instana.instrumentation import gevent_inst # noqa: F401
-
     # Hooks
     from instana.hooks import (
         hook_gunicorn,  # noqa: F401

src/instana/instrumentation/gevent.py

@@ -6,8 +6,11 @@
 """
 
 import sys
-from ..log import logger
-from ..singletons import tracer
+
+from opentelemetry import context
+import contextvars
+
+from instana.log import logger
 
 
 def instrument_gevent():
@@ -16,38 +19,21 @@ def instrument_gevent():
         logger.debug("Instrumenting gevent")
 
         import gevent
-        from opentracing.scope_managers.gevent import GeventScopeManager
-        from opentracing.scope_managers.gevent import _GeventScope
 
         def spawn_callback(new_greenlet):
             """Handles context propagation for newly spawning greenlets"""
-            parent_scope = tracer.scope_manager.active
-            if parent_scope is not None:
-                # New greenlet, new clean slate.  Clone and make active in this new greenlet
-                # the currently active scope (but don't finish() the span on close - it's a
-                # clone/not the original and we don't want to close it prematurely)
-                # TODO: Change to our own ScopeManagers
-                parent_scope_clone = _GeventScope(
-                    parent_scope.manager, parent_scope.span, finish_on_close=False
-                )
-                tracer._scope_manager._set_greenlet_scope(
-                    parent_scope_clone, new_greenlet
-                )
-
-        logger.debug(" -> Updating tracer to use gevent based context management")
-        tracer._scope_manager = GeventScopeManager()
+            parent_context = context.get_current()
+            new_context = contextvars.Context()
+
+            new_context.run(lambda: context.attach(parent_context))
+            new_greenlet.gr_context = new_context
+
         gevent.Greenlet.add_spawn_callback(spawn_callback)
     except Exception:
         logger.debug("instrument_gevent: ", exc_info=True)
 
 
 if "gevent" not in sys.modules:
     logger.debug("Instrumenting gevent: gevent not detected or loaded.  Nothing done.")
-elif not hasattr(sys.modules["gevent"], "version_info"):
-    logger.debug("gevent module has no 'version_info'. Skipping instrumentation.")
-elif sys.modules["gevent"].version_info < (1, 4):
-    logger.debug(
-        "gevent < 1.4 detected.  The Instana package supports gevent versions 1.4 and greater."
-    )
 else:
     instrument_gevent()