Add CI container logs

.github/workflows/CI.yaml

@@ -59,7 +59,7 @@ jobs:
     name: Plugin and Unit Tests
     needs: prep-plugin-and-unit-tests
     runs-on: ubuntu-latest
-    timeout-minutes: 60
+    timeout-minutes: 30
     strategy:
       matrix:
         python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]

skywalking/plugins/__init__.py

@@ -59,7 +59,11 @@ def install():
             plugin.install()
             logger.debug('Successfully installed plugin %s', modname)
         except Exception:
-            logger.warning('failed to install plugin %s', modname)
+            logger.warning(
+                'plugin %s failed to install, please disregard this warning '
+                'if the corresponding package was not used in your project',
+                modname
+            )
             traceback.print_exc() if logger.isEnabledFor(logging.DEBUG) else None
 
 

tests/plugin/conftest.py

@@ -40,35 +40,34 @@ def prepare():
 
 
 @pytest.fixture
-def docker_compose(request, prepare, version):
-    # type: (FixtureRequest, Callable, str) -> None
-
+def docker_compose(request: FixtureRequest, prepare: Callable, version: str) -> None:
     module = request.module
     cwd = dirname(inspect.getfile(module))
 
     if version:
         with open(os.path.join(cwd, 'requirements.txt'), mode='w') as req:
             req.write(version)
 
-    compose = DockerCompose(filepath=cwd)
-
-    compose.start()
+    with DockerCompose(filepath=cwd) as compose:
+        exception = None
+        exception_delay = 0
+        stdout, stderr = None, None
+        for _ in range(10):
+            try:
+                time.sleep(10)
+                prepare()
+                exception = None
+                break
+            except Exception as e:
+                exception_delay += 10
+                exception = e
+                stdout, stderr = compose.get_logs()
 
-    exception = None
-    exception_delay = 100
-    for _ in range(0, 10):
-        try:
-            prepare()
-            exception = None
-            break
-        except Exception as e:
-            time.sleep(10)
-            exception = e
-    if exception:
-        time.sleep(exception_delay)
-        compose.stop()
-        raise Exception(f"""Wait time exceeded {exception_delay} secs. Exception {exception}""")
+        if exception:
+            print(f'STDOUT:\n{stdout.decode("utf-8")}')
+            print('==================================')
+            print(f'STDERR:\n{stderr.decode("utf-8")}')
 
-    yield compose
+            raise Exception(f"""Wait time exceeded {exception_delay} secs. Exception {exception}""")
 
-    compose.stop()
+        yield compose

tests/plugin/data/sw_elasticsearch/test_elasticsearch.py

@@ -27,7 +27,7 @@
 @pytest.fixture
 def prepare():
     # type: () -> Callable
-    return lambda *_: requests.get('http://0.0.0.0:9090/users')
+    return lambda *_: requests.get('http://0.0.0.0:9090/users', timeout=5)
 
 
 class TestPlugin(TestPluginBase):

tests/plugin/data/sw_kafka/test_kafka.py

@@ -27,7 +27,7 @@
 @pytest.fixture
 def prepare():
     # type: () -> Callable
-    return lambda *_: requests.get('http://0.0.0.0:9090/users')
+    return lambda *_: requests.get('http://0.0.0.0:9090/users', timeout=5)
 
 
 class TestPlugin(TestPluginBase):

tests/plugin/data/sw_mysqlclient/services/consumer.py

@@ -25,7 +25,7 @@
 
     @app.route('/users', methods=['POST', 'GET'])
     def application():
-        res = requests.post('http://provider:9091/users')
+        res = requests.post('http://provider:9091/users', timeout=5)
         return jsonify(res.json())
 
     PORT = 9090

tests/plugin/data/sw_mysqlclient/test_mysqlclient.py

@@ -27,7 +27,7 @@
 @pytest.fixture
 def prepare():
     # type: () -> Callable
-    return lambda *_: requests.get('http://0.0.0.0:9090/users')
+    return lambda *_: requests.get('http://0.0.0.0:9090/users', timeout=5)
 
 
 class TestPlugin(TestPluginBase):

tests/plugin/data/sw_psycopg/services/consumer.py

@@ -25,7 +25,7 @@
 
     @app.route('/users', methods=['POST', 'GET'])
     def application():
-        res = requests.post('http://provider:9091/users')
+        res = requests.post('http://provider:9091/users', timeout=5)
         return jsonify(res.json())
 
     PORT = 9090

tests/plugin/data/sw_psycopg/test_psycopg.py

@@ -27,7 +27,7 @@
 @pytest.fixture
 def prepare():
     # type: () -> Callable
-    return lambda *_: requests.get('http://0.0.0.0:9090/users')
+    return lambda *_: requests.get('http://0.0.0.0:9090/users', timeout=5)
 
 
 class TestPlugin(TestPluginBase):

tests/plugin/data/sw_psycopg2/services/consumer.py

@@ -25,7 +25,7 @@
 
     @app.route('/users', methods=['POST', 'GET'])
     def application():
-        res = requests.post('http://provider:9091/users')
+        res = requests.post('http://provider:9091/users', timeout=5)
         return jsonify(res.json())
 
     PORT = 9090

tests/plugin/data/sw_psycopg2/test_psycopg2.py

@@ -27,7 +27,7 @@
 @pytest.fixture
 def prepare():
     # type: () -> Callable
-    return lambda *_: requests.get('http://0.0.0.0:9090/users')
+    return lambda *_: requests.get('http://0.0.0.0:9090/users', timeout=5)
 
 
 class TestPlugin(TestPluginBase):

tests/plugin/data/sw_pymongo/services/consumer.py

@@ -25,9 +25,9 @@
 
     @app.route('/users', methods=['POST', 'GET'])
     def application():
-        requests.get('http://provider:9091/insert_many')
-        requests.get('http://provider:9091/find_one')
-        res = requests.get('http://provider:9091/delete_one')
+        requests.get('http://provider:9091/insert_many', timeout=5)
+        requests.get('http://provider:9091/find_one', timeout=5)
+        res = requests.get('http://provider:9091/delete_one', timeout=5)
         return jsonify(res.json())
 
     PORT = 9090

tests/plugin/data/sw_pymongo/test_pymongo.py

@@ -27,7 +27,7 @@
 @pytest.fixture
 def prepare():
     # type: () -> Callable
-    return lambda *_: requests.get('http://0.0.0.0:9090/users')
+    return lambda *_: requests.get('http://0.0.0.0:9090/users', timeout=5)
 
 
 class TestPlugin(TestPluginBase):

tests/plugin/data/sw_pymysql/services/consumer.py

@@ -25,7 +25,7 @@
 
     @app.route('/users', methods=['POST', 'GET'])
     def application():
-        res = requests.post('http://provider:9091/users')
+        res = requests.post('http://provider:9091/users', timeout=5)
         return jsonify(res.json())
 
     PORT = 9090

tests/plugin/data/sw_pymysql/test_pymysql.py

@@ -27,7 +27,7 @@
 @pytest.fixture
 def prepare():
     # type: () -> Callable
-    return lambda *_: requests.get('http://0.0.0.0:9090/users')
+    return lambda *_: requests.get('http://0.0.0.0:9090/users', timeout=5)
 
 
 class TestPlugin(TestPluginBase):

tests/plugin/data/sw_rabbitmq/test_rabbitmq.py

@@ -27,7 +27,7 @@
 @pytest.fixture
 def prepare():
     # type: () -> Callable
-    return lambda *_: requests.get('http://0.0.0.0:9090/users')
+    return lambda *_: requests.get('http://0.0.0.0:9090/users', timeout=5)
 
 
 class TestPlugin(TestPluginBase):

tests/plugin/data/sw_redis/services/consumer.py

@@ -25,7 +25,7 @@
 
     @app.route('/users', methods=['POST', 'GET'])
     def application():
-        res = requests.post('http://provider:9091/users')
+        res = requests.post('http://provider:9091/users', timeout=5)
         return jsonify(res.json())
 
     PORT = 9090

tests/plugin/data/sw_redis/test_redis.py

@@ -27,7 +27,7 @@
 @pytest.fixture
 def prepare():
     # type: () -> Callable
-    return lambda *_: requests.get('http://0.0.0.0:9090/users')
+    return lambda *_: requests.get('http://0.0.0.0:9090/users', timeout=5)
 
 
 class TestPlugin(TestPluginBase):

tests/plugin/docker-compose.base.yml

@@ -19,7 +19,7 @@ version: '2.1'
 
 services:
   collector:
-    image: ghcr.io/apache/skywalking-agent-test-tool/mock-collector:5acb890f225ca37ee60675ce3e330545e23e3cbc
+    image: ghcr.io/apache/skywalking-agent-test-tool/mock-collector:092c6a3c753684b5a301baf5bcb1965f2dfaf79d
     ports:
       - 19876:19876
       - 12800:12800
@@ -40,6 +40,8 @@ services:
     environment:
       SW_AGENT_COLLECTOR_BACKEND_SERVICES: collector:19876
       SW_AGENT_LOGGING_LEVEL: DEBUG
+      # Agent test tool does not support profiling, TODO: address in e2e ref: #155
+      SW_AGENT_PROFILE_ACTIVE: 'False'
     networks:
       - beyond
     command: ['python3', '/entrypoint.py']

tests/plugin/http/sw_aiohttp/test_aiohttp.py

@@ -27,7 +27,7 @@
 @pytest.fixture  # pyre-ignore
 def prepare():
     # type: () -> Callable
-    return lambda *_: requests.get('http://0.0.0.0:9090/skywalking')
+    return lambda *_: requests.get('http://0.0.0.0:9090/skywalking', timeout=5)
 
 
 class TestPlugin(TestPluginBase):

tests/plugin/http/sw_http/test_http.py

@@ -25,7 +25,7 @@
 @pytest.fixture
 def prepare():
     # type: () -> Callable
-    return lambda *_: requests.post('http://0.0.0.0:9090')
+    return lambda *_: requests.post('http://0.0.0.0:9090', timeout=5)
 
 
 class TestPlugin(TestPluginBase):

tests/plugin/http/sw_http_wsgi/test_http_wsgi.py

@@ -27,7 +27,7 @@
 @pytest.fixture
 def prepare():
     # type: () -> Callable
-    return lambda *_: requests.post('http://0.0.0.0:9090')
+    return lambda *_: requests.post('http://0.0.0.0:9090', timeout=5)
 
 
 class TestPlugin(TestPluginBase):

tests/plugin/http/sw_requests/services/consumer.py

@@ -28,7 +28,7 @@ def do_POST(self):  # noqa
             self.send_header('Content-Type', 'application/json; charset=utf-8')
             self.end_headers()
 
-            res = requests.post('http://provider:9091/users')
+            res = requests.post('http://provider:9091/users', timeout=5)
             self.wfile.write(str(res.json()).encode('utf8'))
 
     PORT = 9090

tests/plugin/http/sw_requests/test_request.py

@@ -27,7 +27,7 @@
 @pytest.fixture
 def prepare():
     # type: () -> Callable
-    return lambda *_: requests.post('http://0.0.0.0:9090')
+    return lambda *_: requests.post('http://0.0.0.0:9090', timeout=5)
 
 
 class TestPlugin(TestPluginBase):

tests/plugin/http/sw_urllib3/test_urllib3.py

@@ -27,7 +27,7 @@
 @pytest.fixture
 def prepare():
     # type: () -> Callable
-    return lambda *_: requests.get('http://0.0.0.0:9090/users')
+    return lambda *_: requests.get('http://0.0.0.0:9090/users', timeout=5)
 
 
 class TestPlugin(TestPluginBase):

tests/plugin/web/sw_django/services/consumer.py

@@ -30,7 +30,7 @@
 
 
 def index(request):
-    res = requests.post('http://provider:9091/users')
+    res = requests.post('http://provider:9091/users', timeout=5)
     return JsonResponse(res.json())
 
 

tests/plugin/web/sw_django/test_django.py

@@ -27,7 +27,7 @@
 @pytest.fixture
 def prepare():
     # type: () -> Callable
-    return lambda *_: requests.get('http://0.0.0.0:9090/users?test=test1&test=test2&test2=test2')
+    return lambda *_: requests.get('http://0.0.0.0:9090/users?test=test1&test=test2&test2=test2', timeout=5)
 
 
 class TestPlugin(TestPluginBase):

tests/plugin/web/sw_falcon/services/consumer.py

@@ -20,7 +20,7 @@
 
 @hug.get('/users')
 def get():
-    res = requests.get('http://provider:9091/users')
+    res = requests.get('http://provider:9091/users', timeout=5)
     return res.json()
 
 

tests/plugin/web/sw_falcon/test_falcon.py

@@ -28,7 +28,7 @@
 @pytest.fixture
 def prepare():
     # type: () -> Callable
-    return lambda *_: requests.get('http://0.0.0.0:9090/users')
+    return lambda *_: requests.get('http://0.0.0.0:9090/users', timeout=5)
 
 
 class TestPlugin(TestPluginBase):

tests/plugin/web/sw_fastapi/services/consumer.py

@@ -25,7 +25,7 @@
 
     @app.get('/users')
     async def application():
-        res = requests.get('http://provider:9091/users')
+        res = requests.get('http://provider:9091/users', timeout=5)
         return res.json()
 
     uvicorn.run(app, host='0.0.0.0', port=9090)

tests/plugin/web/sw_fastapi/test_fastapi.py

@@ -27,7 +27,7 @@
 @pytest.fixture
 def prepare():
     # type: () -> Callable
-    return lambda *_: requests.get('http://0.0.0.0:9090/users?test=test1&test=test2&test2=test2')
+    return lambda *_: requests.get('http://0.0.0.0:9090/users?test=test1&test=test2&test2=test2', timeout=5)
 
 
 class TestPlugin(TestPluginBase):

tests/plugin/web/sw_flask/services/consumer.py

@@ -31,13 +31,13 @@ def application():
 
         @runnable(op='/test')
         def post():
-            requests.post('http://provider:9091/users')
+            requests.post('http://provider:9091/users', timeout=5)
 
         from threading import Thread
         t = Thread(target=post)
         t.start()
 
-        res = requests.post('http://provider:9091/users')
+        res = requests.post('http://provider:9091/users', timeout=5)
 
         t.join()
 

tests/plugin/web/sw_flask/test_flask.py

@@ -27,14 +27,14 @@
 @pytest.fixture
 def prepare():
     # type: () -> Callable
-    return lambda *_: requests.get('http://0.0.0.0:9090/users?test=test1&test=test2&test2=test2')
+    return lambda *_: requests.get('http://0.0.0.0:9090/users?test=test1&test=test2&test2=test2', timeout=5)
 
 
 class TestPlugin(TestPluginBase):
     @pytest.mark.parametrize('version', get_test_vector(lib_name='flask', support_matrix=support_matrix))
     def test_plugin(self, docker_compose, version):
         self.validate()
 
-        response = requests.get('http://0.0.0.0:9090/users')
+        response = requests.get('http://0.0.0.0:9090/users', timeout=5)
         assert response.status_code == 200
         assert response.json()['correlation'] == 'correlation'

tests/plugin/web/sw_pyramid/test_pyramid.py

@@ -27,7 +27,7 @@
 @pytest.fixture
 def prepare():
     # type: () -> Callable
-    return lambda *_: requests.get('http://0.0.0.0:9090/pyramid')
+    return lambda *_: requests.get('http://0.0.0.0:9090/pyramid', timeout=5)
 
 
 class TestPlugin(TestPluginBase):

tests/plugin/web/sw_sanic/services/consumer.py

@@ -24,7 +24,7 @@
 
     @app.route('/users', methods=['GET'])
     async def application(req):
-        res = requests.get('http://provider:9091/users')
+        res = requests.get('http://provider:9091/users', timeout=5)
         return response.json(res.json())
 
     PORT = 9090