update latest dev@726b (#697)

* use python:3.13 * update mysql-connector-python (#695) * [py] python version > https://devguide.python.org/versions/ - remove python3.8 * [#693] update mysql-connector-python > #693 # Conflicts: # setup.py # setup_pypi_test.py * add CIBW_SKIP * fix build failed * update upload-artifact * fix action script * Update setup-php-sdk action (#696)
pinpoint-apm · Nov 6, 2024 · c770778 · c770778
1 parent bbfa106
commit c770778
Show file tree

Hide file tree

Showing 16 changed files with 129 additions and 42 deletions.
diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml
@@ -45,41 +45,48 @@ jobs:
           python -m build -s --outdir wheelhouse
 
       - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel
+        run: python -m pip install cibuildwheel==2.21.3
 
       - name: Build wheels
         run: python -m cibuildwheel --output-dir wheelhouse
         env:
           CIBW_ARCHS_LINUX: auto aarch64
           CIBW_ARCHS_WINDOWS: ARM64 AMD64 x86
           CIBW_ARCHS_MACOS: auto x86_64 arm64
+          CIBW_SKIP: cp37-* cp38-* cp36-* pp*
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: pypi_test
+          name: pypi_test-${{ matrix.os }}
           path: ./wheelhouse/*
+          retention-days: 1
+          if-no-files-found: error
 
   publish-pypitest:
     needs: build_wheels_pypitest
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/download-artifact@v4.1.7
+      - uses: actions/download-artifact@v4
         with:
-          name: pypi_test
+          pattern: pypi_test-*
+          merge-multiple: true
           path: ./wheelhouse/
 
       - name: show all artifact
         run: |
-          ls -R ./wheelhouse/
+          ls -alR ./wheelhouse/
 
       - name: Publish package to pypitest
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           user: __token__
           password: ${{ secrets.EELIUTEST }}
-          packages_dir: ./wheelhouse/
-          repository_url: https://test.pypi.org/legacy/
-
+          packages-dir: ./wheelhouse/
+          repository-url: https://test.pypi.org/legacy/
+          skip_existing: true
+          verbose: true
+          print_hash: true
+          attestations: true
   build_wheels:
     name: Build wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
@@ -114,24 +121,28 @@ jobs:
           CIBW_ARCHS_LINUX: auto aarch64
           CIBW_ARCHS_WINDOWS: ARM64 AMD64 x86
           CIBW_ARCHS_MACOS: auto x86_64 arm64
+          CIBW_SKIP: cp37-* cp38-* cp36-* pp*
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: pypi
+          name: pypi-${{ matrix.os }}
           path: ./wheelhouse/*
+          retention-days: 1
+          if-no-files-found: error
 
   publish:
     needs: build_wheels
     runs-on: ubuntu-latest
     steps:
       - uses: actions/download-artifact@v4.1.7
         with:
-          name: pypi
+          pattern: pypi-*
+          merge-multiple: true
           path: ./wheelhouse/
 
       - name: show all artifact
         run: |
-          ls -R ./wheelhouse/
+          ls -alR ./wheelhouse/
 
       - name: Publish package to pypitest
         uses: pypa/gh-action-pypi-publish@release/v1

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -248,7 +248,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-13]
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11","3.12","3.13"]
     runs-on: ${{ matrix.os }}
     needs: [cpp, cpp-windows]
     steps:
@@ -277,10 +277,13 @@ jobs:
         # run: docker-compose  -f "testapps/compose.yaml" build python-plugins
       # - name: build python-plugins
       - name: start test environment
-        run: ./docker-compose-linux-x86_64 -f "testapps/compose.yaml" up python-plugins --exit-code-from python-plugins
+        run: |
+          ./docker-compose-linux-x86_64 -f "testapps/compose.yaml" up py3.9-plugins --exit-code-from py3.9-plugins
+          ./docker-compose-linux-x86_64 -f "testapps/compose.yaml" up py-plugins --exit-code-from py-plugins
+          ./docker-compose-linux-x86_64 -f "testapps/compose.yaml" up py3.11-plugins --exit-code-from py3.11-plugins
       - name: Stop containers
         # if: always()
-        run: ./docker-compose-linux-x86_64 -f "testapps/compose.yaml" down python-plugins
+        run: ./docker-compose-linux-x86_64 -f "testapps/compose.yaml" down py3.11-plugins py-plugins py3.9-plugins 
 
   Collector-agent:
     strategy:

diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ Our advantage:
 
 ## Python Agent
 
-> py 3.8+
+> py 3.9+
 
 `pip install pinpointPy`
 

diff --git a/Readme-CN.md b/Readme-CN.md
@@ -32,7 +32,7 @@ Pinpoint-c-agent 帮助您接入 [pinpoint-apm](https://github.com/pinpoint-apm/
 
 ## Python Agent
 
-> py 3.8+
+> py 3.9+
 
 `pip install pinpointPy`
 

diff --git a/Readme-KR.md b/Readme-KR.md
@@ -31,7 +31,7 @@ Pinpoint-c-agent는 [pinpoint-apm](https://github.com/pinpoint-apm/pinpoint) 모
 
 ## Python Agent
 
-> py 3.8+
+> py 3.9+
 
 `pip install pinpointPy`
 

diff --git a/plugins/PY/pinpointPy/libs/_MysqlConnector/CMysqlPlugin.py b/plugins/PY/pinpointPy/libs/_MysqlConnector/CMysqlPlugin.py
@@ -15,11 +15,17 @@
 # ------------------------------------------------------------------------------
 
 from pinpointPy import Common, Defines, pinpoint
+import mysql
+import warnings
+
+#
 
 
 class CMysqlPlugin(Common.PinTrace):
 
     def __init__(self, name):
+        warnings.warn(
+            "CMysqlPlugin is deprecated, please use MysqlPlugin instead", DeprecationWarning)
         super().__init__(name)
 
     # -> tuple[Any, tuple[Any, ...], dict[str, Any]]:
@@ -48,4 +54,5 @@ def onException(self, traceId, e):
         pinpoint.add_exception(f'{e}', traceId)
 
     def get_cursor_host(self, cursor):
-        return f'{cursor._cnx.server_host}:{cursor._cnx.server_port}'
+        # https://github.com/mysql/mysql-connector-python/blob/4fbf521f1c6c71621f882f89c0c4946c10ee13ac/mysql-connector-python/lib/mysql/connector/abstracts.py#L692
+        return f'{cursor._connection._host}:{cursor._connection._host}'
diff --git a/plugins/PY/pinpointPy/libs/_MysqlConnector/__init__.py b/plugins/PY/pinpointPy/libs/_MysqlConnector/__init__.py
@@ -55,5 +55,9 @@ def monkey_patch():
 
 
 __all__ = ['monkey_patch']
-__version__ = '0.0.5'
+__version__ = '0.0.6'
 __author__ = 'liu.mingyi@navercorp.com'
+
+# Changes
+# ## 0.0.6
+# - remove `CMySQLCursor` and `CMySQLCursorPrepared`
diff --git a/plugins/PY/requirements.txt b/plugins/PY/requirements.txt
@@ -1,16 +1,16 @@
-bottle==0.12.25
-fastapi==0.111.0
-flask==3.0.0
-httpx==0.25.1
-mysql-connector-python==8.0.31
-pymongo==4.6.3
-PyMySQL==1.1.1
-redis==5.0.1
-requests==2.31.0
-SQLAlchemy==2.0.23
-starlette-context==0.3.6
-mysqlclient==2.2.0
+bottle
+fastapi
+flask
+httpx
+mysql-connector-python
+pymongo
+PyMySQL
+redis
+requests
+SQLAlchemy
+starlette-context
+mysqlclient
 grpcio
-grpc-interceptor==0.15.4
+grpc-interceptor
 psycopg2
 pinpointPy
diff --git a/testapps/compose.yaml b/testapps/compose.yaml
@@ -224,9 +224,41 @@ services:
     ports:
       - 27017:27017
 
-  python-plugins:
+  py3.9-plugins:
     build:
-      dockerfile: testapps/python-plugins.dockerfile
+      dockerfile: testapps/python-plugins/py3.9-plugins.dockerfile
+      context: ../
+    profiles:
+      - testing
+    depends_on:
+      redis:
+        condition: service_healthy
+      httpbin:
+        condition: service_healthy
+      mongodb:
+        condition: service_healthy
+      postgres:
+        condition: service_healthy
+
+  py3.11-plugins:
+    build:
+      dockerfile: testapps/python-plugins/py3.11-plugins.dockerfile
+      context: ../
+    profiles:
+      - testing
+    depends_on:
+      redis:
+        condition: service_healthy
+      httpbin:
+        condition: service_healthy
+      mongodb:
+        condition: service_healthy
+      postgres:
+        condition: service_healthy
+
+  py-plugins:
+    build:
+      dockerfile: testapps/python-plugins/py-plugins.dockerfile
       context: ../
     profiles:
       - testing

diff --git a/testapps/django.dockerfile b/testapps/django.dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.8
+FROM python:3.12
 WORKDIR /app/
 
 COPY testapps/django/mysite/ /app/

diff --git a/testapps/fastapi.dockerfile b/testapps/fastapi.dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.8
+FROM python:3.12
 WORKDIR /app/
 
 COPY testapps/fastapi/ /app/

diff --git a/testapps/grpc_py.dockerfile b/testapps/grpc_py.dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.8
+FROM python:3.12
 WORKDIR /app/
 
 COPY testapps/grpc-py/ /app/

diff --git a/testapps/grpc_py_client.dockerfile b/testapps/grpc_py_client.dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.8
+FROM python:3.12
 WORKDIR /app/
 
 COPY testapps/grpc-py/ /app/

diff --git a/testapps/python-plugins/py-plugins.dockerfile b/testapps/python-plugins/py-plugins.dockerfile
@@ -0,0 +1,15 @@
+FROM python:latest
+
+COPY setup.py /pinpoint-c-agent/setup.py
+COPY common/ /pinpoint-c-agent/common
+COPY README /pinpoint-c-agent/README
+COPY plugins/PY /pinpoint-c-agent/plugins/PY
+COPY src/PY /pinpoint-c-agent/src/PY
+
+
+RUN pip install -r /pinpoint-c-agent/plugins/PY/requirements.txt
+RUN cd /pinpoint-c-agent && pip install -e .
+CMD ["python","-m","unittest","discover","-s","/pinpoint-c-agent/plugins/PY/pinpointPy/"]
+# CMD [ "python","-m","unittest","pinpointPy.libs._MysqlConnector.test_case.Test_Case" ]
+# CMD [ "sleep","infinity" ]
+# python -m unittest discover -s /pinpoint-c-agent/plugins/PY/pinpointPy/
diff --git a/testapps/python-plugins/py3.11-plugins.dockerfile b/testapps/python-plugins/py3.11-plugins.dockerfile
@@ -0,0 +1,15 @@
+FROM python:latest
+
+COPY setup.py /pinpoint-c-agent/setup.py
+COPY common/ /pinpoint-c-agent/common
+COPY README /pinpoint-c-agent/README
+COPY plugins/PY /pinpoint-c-agent/plugins/PY
+COPY src/PY /pinpoint-c-agent/src/PY
+
+
+RUN pip install -r /pinpoint-c-agent/plugins/PY/requirements.txt
+RUN cd /pinpoint-c-agent && pip install -e .
+CMD ["python","-m","unittest","discover","-s","/pinpoint-c-agent/plugins/PY/pinpointPy/"]
+# CMD [ "python","-m","unittest","pinpointPy.libs._MysqlConnector.test_case.Test_Case" ]
+# CMD [ "sleep","infinity" ]
+# python -m unittest discover -s /pinpoint-c-agent/plugins/PY/pinpointPy/
diff --git a/testapps/python-plugins.dockerfile → ...s/python-plugins/py3.9-plugins.dockerfile b/testapps/python-plugins.dockerfile → ...s/python-plugins/py3.9-plugins.dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.8
+FROM python:3.9
 
 COPY setup.py /pinpoint-c-agent/setup.py
 COPY common/ /pinpoint-c-agent/common
@@ -11,5 +11,5 @@ RUN pip install -r /pinpoint-c-agent/plugins/PY/requirements.txt
 RUN cd /pinpoint-c-agent && pip install -e .
 CMD ["python","-m","unittest","discover","-s","/pinpoint-c-agent/plugins/PY/pinpointPy/"]
 # CMD [ "python","-m","unittest","pinpointPy.libs._MysqlConnector.test_case.Test_Case" ]
-# CMD [ "bash" ]
+# CMD [ "sleep","infinity" ]
 # python -m unittest discover -s /pinpoint-c-agent/plugins/PY/pinpointPy/