loose restrict of greenlet (#3) (#326)

Author: jaychoww

poetry.lock

@@ -72,7 +72,7 @@ grpcio = '*'
 grpcio-tools = '*'
 packaging = '*'
 wrapt = '*'
-psutil = '*'
+psutil = '<=5.9.5'
 requests = { version = ">=2.26.0", optional = true }
 kafka-python = { version = "*", optional = true }
 uvloop = { version = "^0.17.0", optional = true }
@@ -129,7 +129,7 @@ celery = "5.1.2"
 django = "3.2.8"
 elasticsearch = "7.15.1"
 flask = "2.0.2"
-gevent = "22.8.0"
+gevent = "22.10.2"
 hug = "2.6.1"
 pika = "1.2.0"
 psycopg = {extras = ["binary"], version = "^3.1.7"}

pyproject.toml

@@ -19,7 +19,6 @@
 import time
 import traceback
 
-from packaging import version
 from threading import Thread, Event, current_thread
 from typing import Optional
 
@@ -43,15 +42,12 @@
     from gevent.exceptions import BlockingSwitchOutError
 
     if monkey.is_module_patched('threading'):
-        if version.parse(greenlet.__version__) <= version.parse('1.1.3.post0'):
-            # todo: greenlet will raise a segment fault with signal 11 when it upgrade to 2.0.0
-            # this issue may be caused by gevent's compatibility with greenlet
-            # we should do some tests when gevent release a new version to verify if this issue would be fixed
-            THREAD_MODEL = 'greenlet'
-        else:
-            logger.warn('greenlet profiler can not work with version >= 2.0.0')
+        THREAD_MODEL = 'greenlet'
+        logger.debug('Using greenlet model')
+    else:
+        logger.debug('Gevent monkey exists but does not patch threading, using threading model')
 except ImportError:
-    pass
+    logger.debug("Gevent does\'t exist, using threading model")
 
 
 class ProfileTaskExecutionContext:
@@ -326,6 +322,7 @@ def build_snapshot(self) -> Optional[TracingThreadSnapshot]:
 
 
     def start_profiling(self, context: ProfileTaskExecutionContext):
+        logger.debug('GreenletProfiler::start_profiling')
         self._task_execution_context = context
         try:
             curr = self._profiling_thread

skywalking/profile/profile_context.py

@@ -31,7 +31,7 @@ RUN cd /skywalking-python && apt-get update && apt-get install -y make && make i
 RUN apt-get update \
     && apt-get install -y --no-install-recommends gcc build-essential\
     && rm -rf /var/lib/apt/lists/* \
-    && pip install uwsgi fastapi uvicorn aiohttp flask gunicorn\
+    && pip install uwsgi fastapi uvicorn aiohttp flask "Werkzeug<3" gunicorn \
     && apt-get purge -y --auto-remove gcc build-essential
 
 # Entrypoint with agent attached

tests/e2e/base/Dockerfile.e2e

@@ -18,5 +18,5 @@
 #
 
 set -ex
-pip install gunicorn gevent "greenlet<2.0.0"
-gunicorn -k gevent -b :9090 --chdir /services entrypoint:app
+pip install gunicorn gevent "greenlet>=3"
+gunicorn -k gevent -b :9090 --chdir /services entrypoint:app

tests/e2e/case/profiling/greenlet/start_gevent.sh

@@ -31,7 +31,7 @@ services:
       - 9091:9091
     volumes:
       - .:/app
-    command: ['bash', '-c', 'pip install flask itsdangerous==2.0.1 && pip install -r /app/requirements.txt && sw-python run python3 /app/services/provider.py']
+    command: ['bash', '-c', 'pip install flask itsdangerous==2.0.1 "Werkzeug<3" && pip install -r /app/requirements.txt && sw-python run python3 /app/services/provider.py']
     depends_on:
       collector:
         condition: service_healthy
@@ -52,7 +52,7 @@ services:
       - 9090:9090
     volumes:
       - .:/app
-    command: ['bash', '-c', 'pip install flask itsdangerous==2.0.1 && pip install -r /app/requirements.txt && sw-python run python3 /app/services/consumer.py']
+    command: ['bash', '-c', 'pip install flask itsdangerous==2.0.1 "Werkzeug<3" && pip install -r /app/requirements.txt && sw-python run python3 /app/services/consumer.py']
     depends_on:
       collector:
         condition: service_healthy