You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by yi...@apache.org on 2023/02/16 02:22:33 UTC
[skywalking-python] branch master updated: Add support for python 3.11 (#285)
This is an automated email from the ASF dual-hosted git repository.
yihaochen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-python.git
The following commit(s) were added to refs/heads/master by this push:
new 3f2926b Add support for python 3.11 (#285)
3f2926b is described below
commit 3f2926b387a55a41cde27c04201d015dc048fae6
Author: Superskyyy (AWAY, busy graduating | Debug 人) <Su...@outlook.com>
AuthorDate: Wed Feb 15 21:22:28 2023 -0500
Add support for python 3.11 (#285)
* Add support for python 311
* Fix for plugins
---
.github/workflows/CI.yaml | 13 ++--
CHANGELOG.md | 3 +-
docker/Makefile | 4 +-
docs/en/setup/Container.md | 2 +-
docs/en/setup/Plugins.md | 9 ++-
poetry.lock | 155 +++++++++++++++++++++------------------
pyproject.toml | 5 +-
skywalking/plugins/sw_bottle.py | 2 +-
skywalking/plugins/sw_falcon.py | 5 +-
skywalking/plugins/sw_psycopg.py | 3 +-
10 files changed, 110 insertions(+), 91 deletions(-)
diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
index 70996d0..9f974b8 100644
--- a/.github/workflows/CI.yaml
+++ b/.github/workflows/CI.yaml
@@ -67,7 +67,6 @@ jobs:
# set outputs for other jobs to access for if conditions
name: Check Changes
runs-on: ubuntu-latest
- needs: [ license-and-lint, plugin-doc-check ]
# To prevent error when there's no base branch
if: github.event_name != 'schedule'
timeout-minutes: 10
@@ -127,7 +126,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix: # may support pypy in the future
- python-version: [ "3.7-slim", "3.8-slim", "3.9-slim", "3.10-slim" ]
+ python-version: [ "3.7-slim", "3.8-slim", "3.9-slim", "3.10-slim", "3.11-slim" ]
fail-fast: false
env:
BASE_PYTHON_IMAGE: ${{ matrix.python-version }}
@@ -159,7 +158,7 @@ jobs:
timeout-minutes: 30
strategy:
matrix:
- python-version: [ "3.7", "3.8", "3.9", "3.10" ]
+ python-version: [ "3.7", "3.8", "3.9", "3.10", "3.11" ]
test-path: ${{fromJson(needs.prep-plugin-and-unit-tests.outputs.matrix)}}
fail-fast: false
env:
@@ -197,7 +196,7 @@ jobs:
timeout-minutes: 10
strategy:
matrix:
- python-image-variant: [ "3.7", "3.7-slim" ]
+ python-image-variant: [ "3.7-slim", "3.8-slim", "3.9-slim", "3.10-slim", "3.11-slim" ]
fail-fast: false
env:
BASE_PYTHON_IMAGE: ${{ matrix.python-image-variant }}
@@ -228,7 +227,7 @@ jobs:
timeout-minutes: 20
strategy:
matrix:
- python-image-variant: [ "3.7", "3.7-slim" ]
+ python-image-variant: [ "3.7-slim", "3.8-slim", "3.9-slim", "3.10-slim", "3.11-slim" ]
case:
- name: gRPC
path: tests/e2e/case/grpc/e2e.yaml
@@ -254,7 +253,7 @@ jobs:
- name: Load docker images
run: find docker-images -name "*.tar" -exec docker load -i {} \;
- name: Run E2E Tests
- uses: apache/skywalking-infra-e2e@964ede199fe199e166920169dc5f8c9b214cfac5
+ uses: apache/skywalking-infra-e2e@2f20482135ba3a933bc0bb48c41f538ad1aa3048
with:
log-dir: /tmp/e2e-logs
e2e-file: ${{ matrix.case.path }}
@@ -271,7 +270,7 @@ jobs:
timeout-minutes: 60
# wait upon them regardless of success or skipped or failure
if: ${{ always() }}
- needs: [ license-and-lint, changes, plugin-and-unit-tests, e2e-tests, plugin-doc-check ]
+ needs: [ license-and-lint, changes, plugin-and-unit-tests, plugin-doc-check, e2e-tests ]
steps:
- name: Merge Requirement
# check license, lint, plugin and e2e tests, then naturally exits 0
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d2c325..fa128b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
### 1.0.0
- **Important Note and Breaking Changes:**
- - Python 3.6 is no longer supported and may not function properly.
+ - Python 3.6 is no longer supported and may not function properly, Python 3.11 support is added and tested.
- A number of common configuration options (environment variables) are renamed to follow the convention of Java agent,
please check with the latest official documentation before upgrading. (#273, #282)
@@ -12,6 +12,7 @@
- Feature:
+ - Add support for Python 3.11 (#285)
- Add MeterReportService (gRPC, Kafka reporter) (default:enabled) (#231, #236, #241, #243)
- Add reporter for PVM runtime metrics (default:enabled) (#238, #247)
- Add Greenlet profiler (#246)
diff --git a/docker/Makefile b/docker/Makefile
index 72a1895..f44cbee 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -18,16 +18,18 @@ D := docker
P := grpc http kafka
-TARGETS := py3.7 py3.8 py3.9 py3.10 py3.7-slim py3.8-slim py3.9-slim py3.10-slim
+TARGETS := py3.7 py3.8 py3.9 py3.10 python3.11 py3.7-slim py3.8-slim py3.9-slim py3.10-slim python3.11-slim
py3.7: BASE_PYTHON_IMAGE = python:3.7
py3.8: BASE_PYTHON_IMAGE = python:3.8
py3.9: BASE_PYTHON_IMAGE = python:3.9
py3.10: BASE_PYTHON_IMAGE = python:3.10
+py3.11: BASE_PYTHON_IMAGE = python:3.11
py3.7-slim: BASE_PYTHON_IMAGE = python:3.7-slim
py3.8-slim: BASE_PYTHON_IMAGE = python:3.8-slim
py3.9-slim: BASE_PYTHON_IMAGE = python:3.9-slim
py3.10-slim: BASE_PYTHON_IMAGE = python:3.10-slim
+py3.11-slim: BASE_PYTHON_IMAGE = python:3.11-slim
PUSH_TARGETS := $(TARGETS:%=push-%)
diff --git a/docs/en/setup/Container.md b/docs/en/setup/Container.md
index 474c2da..7a52496 100644
--- a/docs/en/setup/Container.md
+++ b/docs/en/setup/Container.md
@@ -4,7 +4,7 @@
source**
This image hosts the SkyWalking Python agent package on top of official Python base images (full & slim) providing support from
-Python 3.7 - 3.10.
+Python 3.7 - 3.11.
## How to use this image
diff --git a/docs/en/setup/Plugins.md b/docs/en/setup/Plugins.md
index 4afa888..1947608 100644
--- a/docs/en/setup/Plugins.md
+++ b/docs/en/setup/Plugins.md
@@ -18,12 +18,12 @@ or a limitation of SkyWalking auto-instrumentation (welcome to contribute!)
| [aiormq](https://pypi.org/project/aiormq/) | Python >=3.7 - ['6.3', '6.4']; | `sw_aiormq` |
| [amqp](https://pypi.org/project/amqp/) | Python >=3.7 - ['2.6.1']; | `sw_amqp` |
| [asyncpg](https://github.com/MagicStack/asyncpg) | Python >=3.7 - ['0.25.0']; | `sw_asyncpg` |
-| [bottle](http://bottlepy.org/docs/dev/) | Python >=3.7 - ['0.12.21']; | `sw_bottle` |
+| [bottle](http://bottlepy.org/docs/dev/) | Python >=3.7 - ['0.12.23']; | `sw_bottle` |
| [celery](https://docs.celeryq.dev) | Python >=3.7 - ['5.1']; | `sw_celery` |
| [confluent_kafka](https://www.confluent.io/) | Python >=3.7 - ['1.5.0', '1.7.0', '1.8.2']; | `sw_confluent_kafka` |
| [django](https://www.djangoproject.com/) | Python >=3.7 - ['3.2']; | `sw_django` |
| [elasticsearch](https://github.com/elastic/elasticsearch-py) | Python >=3.7 - ['7.13', '7.14', '7.15']; | `sw_elasticsearch` |
-| [hug](https://falcon.readthedocs.io/en/stable/) | Python >=3.10 - ['2.5', '2.6']; Python >=3.7 - ['2.4.1', '2.5', '2.6']; | `sw_falcon` |
+| [hug](https://falcon.readthedocs.io/en/stable/) | Python >=3.11 - NOT SUPPORTED YET; Python >=3.10 - ['2.5', '2.6']; Python >=3.7 - ['2.4.1', '2.5', '2.6']; | `sw_falcon` |
| [fastapi](https://fastapi.tiangolo.com) | Python >=3.7 - ['0.89.*', '0.88.*']; | `sw_fastapi` |
| [flask](https://flask.palletsprojects.com) | Python >=3.7 - ['2.0']; | `sw_flask` |
| [happybase](https://happybase.readthedocs.io) | Python >=3.7 - ['1.2.0']; | `sw_happybase` |
@@ -33,7 +33,7 @@ or a limitation of SkyWalking auto-instrumentation (welcome to contribute!)
| [kafka-python](https://kafka-python.readthedocs.io) | Python >=3.7 - ['2.0']; | `sw_kafka` |
| [loguru](https://pypi.org/project/loguru/) | Python >=3.7 - ['0.6.0']; | `sw_loguru` |
| [mysqlclient](https://mysqlclient.readthedocs.io/) | Python >=3.7 - ['2.1.*']; | `sw_mysqlclient` |
-| [psycopg[binary]](https://www.psycopg.org/) | Python >=3.7 - ['3.0']; | `sw_psycopg` |
+| [psycopg[binary]](https://www.psycopg.org/) | Python >=3.11 - ['3.1.*']; Python >=3.7 - ['3.0.18', '3.1.*']; | `sw_psycopg` |
| [psycopg2-binary](https://www.psycopg.org/) | Python >=3.10 - NOT SUPPORTED YET; Python >=3.7 - ['2.9']; | `sw_psycopg2` |
| [pymongo](https://pymongo.readthedocs.io) | Python >=3.7 - ['3.11.*']; | `sw_pymongo` |
| [pymysql](https://pymysql.readthedocs.io/en/latest/) | Python >=3.7 - ['1.0']; | `sw_pymysql` |
@@ -50,6 +50,9 @@ or a limitation of SkyWalking auto-instrumentation (welcome to contribute!)
- The celery server running with "celery -A ..." should be run with the HTTP protocol
as it uses multiprocessing by default which is not compatible with the gRPC protocol implementation
in SkyWalking currently. Celery clients can use whatever protocol they want.
+- While Falcon is instrumented, only Hug is tested.
+Hug is believed to be abandoned project, use this plugin with a bit more caution.
+Instead of Hug, plugin test should move to test actual Falcon.
- The websocket instrumentation only traces client side connection handshake,
the actual message exchange (send/recv) is not traced since injecting headers to socket message
body is the only way to propagate the trace context, which requires customization of message structure
diff --git a/poetry.lock b/poetry.lock
index dbe6e3f..635cd00 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1040,43 +1040,52 @@ tomli = ">=1.1.0"
[[package]]
name = "gevent"
-version = "21.8.0"
+version = "22.8.0"
description = "Coroutine-based network library"
category = "dev"
optional = false
python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5"
files = [
- {file = "gevent-21.8.0-cp27-cp27m-macosx_10_14_x86_64.whl", hash = "sha256:e91632fdcf1c9a33e97e35f96edcbdf0b10e36cf53b58caa946dca4836bb688c"},
- {file = "gevent-21.8.0-cp27-cp27m-win32.whl", hash = "sha256:84e1af2dfb4ea9495cb914b00b6303ca0d54bf0a92e688a17e60f6b033873df2"},
- {file = "gevent-21.8.0-cp27-cp27m-win_amd64.whl", hash = "sha256:3b600145dc0c5b39c6f89c2e91ec6c55eb0dd52dc8148228479ca42cded358e4"},
- {file = "gevent-21.8.0-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:90131877d3ce1a05da1b718631860815b89ff44e93c42d168c9c9e8893b26318"},
- {file = "gevent-21.8.0-cp310-cp310-win_amd64.whl", hash = "sha256:3f5ba654bdd3c774079b553fef535ede5b52c7abd224cb235a15da90ae36251b"},
- {file = "gevent-21.8.0-cp36-cp36m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:02d1e8ca227d0ab0b7917fd7e411f9a534475e0a41fb6f434e9264b20155201a"},
- {file = "gevent-21.8.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:55ede95f41b74e7506fab293ad04cc7fc2b6f662b42281e9f2d668ad3817b574"},
- {file = "gevent-21.8.0-cp36-cp36m-win32.whl", hash = "sha256:72d4c2a8e65bbc702db76456841c7ddd6de2d9ab544a24aa74ad9c2b6411a269"},
- {file = "gevent-21.8.0-cp36-cp36m-win_amd64.whl", hash = "sha256:ceec7c5f15fb2f9b767b194daa55246830db6c7c3c2f0b1c7e9e90cb4d01f3f9"},
- {file = "gevent-21.8.0-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:6cad37a55e904879beef2a7e7c57c57d62fde2331fef1bec7f2b2a7ef14da6a2"},
- {file = "gevent-21.8.0-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:aaf1451cd0d9c32f65a50e461084a0540be52b8ea05c18669c95b42e1f71592a"},
- {file = "gevent-21.8.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0c7b4763514fec74c9fe6ad10c3de62d8fe7b926d520b1e35eb6887181b954ff"},
- {file = "gevent-21.8.0-cp37-cp37m-win32.whl", hash = "sha256:1c9c87b15f792af80edc950a83ab8ef4f3ba3889712211c2c42740ddb57b5492"},
- {file = "gevent-21.8.0-cp37-cp37m-win_amd64.whl", hash = "sha256:23077d87d1589ac141c22923fd76853d2cc5b7e3c5e1f1f9cdf6ff23bc9790fc"},
- {file = "gevent-21.8.0-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:4c94d27be9f0439b28eb8bd0f879e6142918c62092fda7fb96b6d06f01886b94"},
- {file = "gevent-21.8.0-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:8d8655ce581368b7e1ab42c8a3a166c0b43ea04e59970efbade9448864585e99"},
- {file = "gevent-21.8.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:473f918bdf7d2096e391f66bd8ce1e969639aa235e710aaf750a37774bb585bd"},
- {file = "gevent-21.8.0-cp38-cp38-win32.whl", hash = "sha256:f39d5defda9443b5fb99a185050e94782fe7ac38f34f751b491142216ad23bc7"},
- {file = "gevent-21.8.0-cp38-cp38-win_amd64.whl", hash = "sha256:afc877ff4f277d0e51a1206d748fdab8c1e0256f7a05e1b1067abbed71c64da9"},
- {file = "gevent-21.8.0-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:a8656d6e02bf47d7fa47728cf7a7cbf408f77ef1fad12afd9e0e3246c5de1707"},
- {file = "gevent-21.8.0-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:9d46bea8644048ceac5737950c08fc89c37a66c34a56a6c9e3648726e60cb767"},
- {file = "gevent-21.8.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:75c29ed5148c916021d39d2fac90ccc0e19adf854626a34eaee012aa6b1fcb67"},
- {file = "gevent-21.8.0-cp39-cp39-win32.whl", hash = "sha256:e00dc0450f79253b7a3a7f2a28e6ca959c8d0d47c0f9fa2c57894c7974d5965f"},
- {file = "gevent-21.8.0-cp39-cp39-win_amd64.whl", hash = "sha256:37a469a99e6000b42dd0b9bbd9d716dbd66cdc6e5738f136f6a266c29b90ee99"},
- {file = "gevent-21.8.0-pp27-pypy_73-win32.whl", hash = "sha256:b10c3326edb76ec3049646dc5131608d6d3733b5adfc75d34852028ecc67c52c"},
- {file = "gevent-21.8.0.tar.gz", hash = "sha256:43e93e1a4738c922a2416baf33f0afb0a20b22d3dba886720bc037cd02a98575"},
+ {file = "gevent-22.8.0-cp27-cp27m-macosx_10_14_x86_64.whl", hash = "sha256:117d947d3a6d93e27ba0ce3c8de6c49e33e106ce8841ff34777bdb2c884605f7"},
+ {file = "gevent-22.8.0-cp27-cp27m-win32.whl", hash = "sha256:94174ff3e4d16f37a295437cc17d1ce22e5bd30059eecaff10a28bb5724da1e3"},
+ {file = "gevent-22.8.0-cp27-cp27m-win_amd64.whl", hash = "sha256:c78d64845186b7d2f940a27c466bd5a36c20acf9972eb9b3e3566052942c4af3"},
+ {file = "gevent-22.8.0-cp310-cp310-macosx_10_15_x86_64.whl", hash = "sha256:f0b7017c58a7d61649d74049b46851e5024c95b73c18144092be0e348a198e39"},
+ {file = "gevent-22.8.0-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:5d71144d79c08dc1e0554e8b142500d72e40feedc596657b25d87940bedca0d7"},
+ {file = "gevent-22.8.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9e0d6fa493d9e48d1d36c2bbca4231852e8aa70d4c22d76c11a438a61cdd730a"},
+ {file = "gevent-22.8.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:646777ee668f745cad7671fa20ca5384b2baa2709562399caf433f4a52967081"},
+ {file = "gevent-22.8.0-cp310-cp310-win_amd64.whl", hash = "sha256:27ea8edae95b530e86476df59c785d96a2eb45d0dd85335dccd474045278b1d6"},
+ {file = "gevent-22.8.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:594565ab5b7ad95e76ef66d53b434ca22848b5154da817d6f4e43603b548f71c"},
+ {file = "gevent-22.8.0-cp36-cp36m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:e38f76f00eb489b2e87fd67896e48a3127b2d613c78a4930b25820c42e884ef4"},
+ {file = "gevent-22.8.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e2e82f09ab81551623650a1b0315ed790f82162d6ef2e0ed9c7cce50398c2b09"},
+ {file = "gevent-22.8.0-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:df50d390785db12a0825796654a7d8ae2263c46419de72daaac92a1aa21895c8"},
+ {file = "gevent-22.8.0-cp36-cp36m-win32.whl", hash = "sha256:aced6fe003aceb0d816ec27eced385adbf838f190b73136567eaaad2c3777c8a"},
+ {file = "gevent-22.8.0-cp36-cp36m-win_amd64.whl", hash = "sha256:6301302095f5e30237eb135198e97a2cdbb822edaac05fcf9d4223b19ee65dd5"},
+ {file = "gevent-22.8.0-cp37-cp37m-macosx_10_15_x86_64.whl", hash = "sha256:79050166a526f73352f8bbbdc246ae7fd233d24e4eea9be8793cc67021f1a967"},
+ {file = "gevent-22.8.0-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:9c909b54f803585e602102ec71f23c6ad2ee69fca3ee0bfdb99d694ff76527f5"},
+ {file = "gevent-22.8.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f895f56c9cf132fa4f62950ef960b68d852762344f16475724bdd978e4d856eb"},
+ {file = "gevent-22.8.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:c606f7839d45dafd90ae87359e1f7f2b795b2e4fcecd4632f1edd0cd01f6b439"},
+ {file = "gevent-22.8.0-cp37-cp37m-win32.whl", hash = "sha256:c92129d3e29608e95796863f7c88dfe61a341386a8a882c70ff5684370fd2bd2"},
+ {file = "gevent-22.8.0-cp37-cp37m-win_amd64.whl", hash = "sha256:bd2536a45d3204fa2b13885ef4342bb5e3f0199916be5b4c728d53da9da57364"},
+ {file = "gevent-22.8.0-cp38-cp38-macosx_10_15_x86_64.whl", hash = "sha256:7f2256efb270f02855006254d3a10774f57c5b78c59e79fce9bbd6027a800598"},
+ {file = "gevent-22.8.0-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:004e1b58dd2d1f1622ec566864bcd9a807461d28115916ac76eb54fde42460a1"},
+ {file = "gevent-22.8.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0bfdb33b31cdd7f867bd7da48faf4724f59f8ee563dd5cc23475e9859b72bd99"},
+ {file = "gevent-22.8.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:3d26f37817e3c720f0d3f0631ae776f2fbac6291232743197e93f4821772e0b7"},
+ {file = "gevent-22.8.0-cp38-cp38-win32.whl", hash = "sha256:a549a5f7e89ea87914005e693cef32022a026a8c6835b4452cb8f9715ea7a876"},
+ {file = "gevent-22.8.0-cp38-cp38-win_amd64.whl", hash = "sha256:318448e50cf8ff5434be56aa1ac6d0d1016841ecbcf7fe00c5d95c07ccb7cccf"},
+ {file = "gevent-22.8.0-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:64f3917096a1853d5a12c425dcd1b6be00c14767472c24f60d720ceb0bdd91f1"},
+ {file = "gevent-22.8.0-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:0ae2cb16aea63a35794e6dff3cfd9b5c0cf0ce8fb7c9e4c9e770f03e1b7a4fc0"},
+ {file = "gevent-22.8.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3ee0a88dcf15f697ffa94ee0f4be63fc1e90584e304232ec6597976afd34891a"},
+ {file = "gevent-22.8.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:e8236298bf21c2503dad6933b8d809a2e950ef837b852838a4edb096a5f64769"},
+ {file = "gevent-22.8.0-cp39-cp39-win32.whl", hash = "sha256:c55efafb738df758742367cca717b9b74702a6f6909c07eb8b8b9a9fb3026921"},
+ {file = "gevent-22.8.0-cp39-cp39-win_amd64.whl", hash = "sha256:d3609365f4ecaf9ead75cd9ca5b52be32da57c09cde02d3ff9b9d9ba240b450a"},
+ {file = "gevent-22.8.0-pp27-pypy_73-win_amd64.whl", hash = "sha256:99efe04bc9de603a70ddd2815b934d06440723d5e4cac6ba91fe27d705c7cd12"},
+ {file = "gevent-22.8.0-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:79c2b6980e9380ba3915d1f5619acbf7a78e592e47e6e3bdb18f7874f4c959d6"},
+ {file = "gevent-22.8.0.tar.gz", hash = "sha256:868d500fe2b7f9750eadc07ada8ab32360c0e71976be2bf5919482f14a6477c7"},
]
[package.dependencies]
cffi = {version = ">=1.12.2", markers = "platform_python_implementation == \"CPython\" and sys_platform == \"win32\""}
-greenlet = {version = ">=1.1.0,<2.0", markers = "platform_python_implementation == \"CPython\""}
+greenlet = {version = ">=1.1.3,<2.0", markers = "platform_python_implementation == \"CPython\""}
setuptools = "*"
"zope.event" = "*"
"zope.interface" = "*"
@@ -2250,48 +2259,48 @@ files = [
[[package]]
name = "pydantic"
-version = "1.10.4"
+version = "1.10.5"
description = "Data validation and settings management using python type hints"
category = "dev"
optional = false
python-versions = ">=3.7"
files = [
- {file = "pydantic-1.10.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:b5635de53e6686fe7a44b5cf25fcc419a0d5e5c1a1efe73d49d48fe7586db854"},
- {file = "pydantic-1.10.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:6dc1cc241440ed7ca9ab59d9929075445da6b7c94ced281b3dd4cfe6c8cff817"},
- {file = "pydantic-1.10.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:51bdeb10d2db0f288e71d49c9cefa609bca271720ecd0c58009bd7504a0c464c"},
- {file = "pydantic-1.10.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:78cec42b95dbb500a1f7120bdf95c401f6abb616bbe8785ef09887306792e66e"},
- {file = "pydantic-1.10.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:8775d4ef5e7299a2f4699501077a0defdaac5b6c4321173bcb0f3c496fbadf85"},
- {file = "pydantic-1.10.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:572066051eeac73d23f95ba9a71349c42a3e05999d0ee1572b7860235b850cc6"},
- {file = "pydantic-1.10.4-cp310-cp310-win_amd64.whl", hash = "sha256:7feb6a2d401f4d6863050f58325b8d99c1e56f4512d98b11ac64ad1751dc647d"},
- {file = "pydantic-1.10.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:39f4a73e5342b25c2959529f07f026ef58147249f9b7431e1ba8414a36761f53"},
- {file = "pydantic-1.10.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:983e720704431a6573d626b00662eb78a07148c9115129f9b4351091ec95ecc3"},
- {file = "pydantic-1.10.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:75d52162fe6b2b55964fbb0af2ee58e99791a3138588c482572bb6087953113a"},
- {file = "pydantic-1.10.4-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fdf8d759ef326962b4678d89e275ffc55b7ce59d917d9f72233762061fd04a2d"},
- {file = "pydantic-1.10.4-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:05a81b006be15655b2a1bae5faa4280cf7c81d0e09fcb49b342ebf826abe5a72"},
- {file = "pydantic-1.10.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:d88c4c0e5c5dfd05092a4b271282ef0588e5f4aaf345778056fc5259ba098857"},
- {file = "pydantic-1.10.4-cp311-cp311-win_amd64.whl", hash = "sha256:6a05a9db1ef5be0fe63e988f9617ca2551013f55000289c671f71ec16f4985e3"},
- {file = "pydantic-1.10.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:887ca463c3bc47103c123bc06919c86720e80e1214aab79e9b779cda0ff92a00"},
- {file = "pydantic-1.10.4-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fdf88ab63c3ee282c76d652fc86518aacb737ff35796023fae56a65ced1a5978"},
- {file = "pydantic-1.10.4-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a48f1953c4a1d9bd0b5167ac50da9a79f6072c63c4cef4cf2a3736994903583e"},
- {file = "pydantic-1.10.4-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:a9f2de23bec87ff306aef658384b02aa7c32389766af3c5dee9ce33e80222dfa"},
- {file = "pydantic-1.10.4-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:cd8702c5142afda03dc2b1ee6bc358b62b3735b2cce53fc77b31ca9f728e4bc8"},
- {file = "pydantic-1.10.4-cp37-cp37m-win_amd64.whl", hash = "sha256:6e7124d6855b2780611d9f5e1e145e86667eaa3bd9459192c8dc1a097f5e9903"},
- {file = "pydantic-1.10.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0b53e1d41e97063d51a02821b80538053ee4608b9a181c1005441f1673c55423"},
- {file = "pydantic-1.10.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:55b1625899acd33229c4352ce0ae54038529b412bd51c4915349b49ca575258f"},
- {file = "pydantic-1.10.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:301d626a59edbe5dfb48fcae245896379a450d04baeed50ef40d8199f2733b06"},
- {file = "pydantic-1.10.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b6f9d649892a6f54a39ed56b8dfd5e08b5f3be5f893da430bed76975f3735d15"},
- {file = "pydantic-1.10.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:d7b5a3821225f5c43496c324b0d6875fde910a1c2933d726a743ce328fbb2a8c"},
- {file = "pydantic-1.10.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:f2f7eb6273dd12472d7f218e1fef6f7c7c2f00ac2e1ecde4db8824c457300416"},
- {file = "pydantic-1.10.4-cp38-cp38-win_amd64.whl", hash = "sha256:4b05697738e7d2040696b0a66d9f0a10bec0efa1883ca75ee9e55baf511909d6"},
- {file = "pydantic-1.10.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:a9a6747cac06c2beb466064dda999a13176b23535e4c496c9d48e6406f92d42d"},
- {file = "pydantic-1.10.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:eb992a1ef739cc7b543576337bebfc62c0e6567434e522e97291b251a41dad7f"},
- {file = "pydantic-1.10.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:990406d226dea0e8f25f643b370224771878142155b879784ce89f633541a024"},
- {file = "pydantic-1.10.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2e82a6d37a95e0b1b42b82ab340ada3963aea1317fd7f888bb6b9dfbf4fff57c"},
- {file = "pydantic-1.10.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9193d4f4ee8feca58bc56c8306bcb820f5c7905fd919e0750acdeeeef0615b28"},
- {file = "pydantic-1.10.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:2b3ce5f16deb45c472dde1a0ee05619298c864a20cded09c4edd820e1454129f"},
- {file = "pydantic-1.10.4-cp39-cp39-win_amd64.whl", hash = "sha256:9cbdc268a62d9a98c56e2452d6c41c0263d64a2009aac69246486f01b4f594c4"},
- {file = "pydantic-1.10.4-py3-none-any.whl", hash = "sha256:4948f264678c703f3877d1c8877c4e3b2e12e549c57795107f08cf70c6ec7774"},
- {file = "pydantic-1.10.4.tar.gz", hash = "sha256:b9a3859f24eb4e097502a3be1fb4b2abb79b6103dd9e2e0edb70613a4459a648"},
+ {file = "pydantic-1.10.5-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:5920824fe1e21cbb3e38cf0f3dd24857c8959801d1031ce1fac1d50857a03bfb"},
+ {file = "pydantic-1.10.5-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:3bb99cf9655b377db1a9e47fa4479e3330ea96f4123c6c8200e482704bf1eda2"},
+ {file = "pydantic-1.10.5-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2185a3b3d98ab4506a3f6707569802d2d92c3a7ba3a9a35683a7709ea6c2aaa2"},
+ {file = "pydantic-1.10.5-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f582cac9d11c227c652d3ce8ee223d94eb06f4228b52a8adaafa9fa62e73d5c9"},
+ {file = "pydantic-1.10.5-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:c9e5b778b6842f135902e2d82624008c6a79710207e28e86966cd136c621bfee"},
+ {file = "pydantic-1.10.5-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:72ef3783be8cbdef6bca034606a5de3862be6b72415dc5cb1fb8ddbac110049a"},
+ {file = "pydantic-1.10.5-cp310-cp310-win_amd64.whl", hash = "sha256:45edea10b75d3da43cfda12f3792833a3fa70b6eee4db1ed6aed528cef17c74e"},
+ {file = "pydantic-1.10.5-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:63200cd8af1af2c07964546b7bc8f217e8bda9d0a2ef0ee0c797b36353914984"},
+ {file = "pydantic-1.10.5-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:305d0376c516b0dfa1dbefeae8c21042b57b496892d721905a6ec6b79494a66d"},
+ {file = "pydantic-1.10.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1fd326aff5d6c36f05735c7c9b3d5b0e933b4ca52ad0b6e4b38038d82703d35b"},
+ {file = "pydantic-1.10.5-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6bb0452d7b8516178c969d305d9630a3c9b8cf16fcf4713261c9ebd465af0d73"},
+ {file = "pydantic-1.10.5-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:9a9d9155e2a9f38b2eb9374c88f02fd4d6851ae17b65ee786a87d032f87008f8"},
+ {file = "pydantic-1.10.5-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:f836444b4c5ece128b23ec36a446c9ab7f9b0f7981d0d27e13a7c366ee163f8a"},
+ {file = "pydantic-1.10.5-cp311-cp311-win_amd64.whl", hash = "sha256:8481dca324e1c7b715ce091a698b181054d22072e848b6fc7895cd86f79b4449"},
+ {file = "pydantic-1.10.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:87f831e81ea0589cd18257f84386bf30154c5f4bed373b7b75e5cb0b5d53ea87"},
+ {file = "pydantic-1.10.5-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7ce1612e98c6326f10888df951a26ec1a577d8df49ddcaea87773bfbe23ba5cc"},
+ {file = "pydantic-1.10.5-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:58e41dd1e977531ac6073b11baac8c013f3cd8706a01d3dc74e86955be8b2c0c"},
+ {file = "pydantic-1.10.5-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:6a4b0aab29061262065bbdede617ef99cc5914d1bf0ddc8bcd8e3d7928d85bd6"},
+ {file = "pydantic-1.10.5-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:36e44a4de37b8aecffa81c081dbfe42c4d2bf9f6dff34d03dce157ec65eb0f15"},
+ {file = "pydantic-1.10.5-cp37-cp37m-win_amd64.whl", hash = "sha256:261f357f0aecda005934e413dfd7aa4077004a174dafe414a8325e6098a8e419"},
+ {file = "pydantic-1.10.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:b429f7c457aebb7fbe7cd69c418d1cd7c6fdc4d3c8697f45af78b8d5a7955760"},
+ {file = "pydantic-1.10.5-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:663d2dd78596c5fa3eb996bc3f34b8c2a592648ad10008f98d1348be7ae212fb"},
+ {file = "pydantic-1.10.5-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:51782fd81f09edcf265823c3bf43ff36d00db246eca39ee765ef58dc8421a642"},
+ {file = "pydantic-1.10.5-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c428c0f64a86661fb4873495c4fac430ec7a7cef2b8c1c28f3d1a7277f9ea5ab"},
+ {file = "pydantic-1.10.5-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:76c930ad0746c70f0368c4596020b736ab65b473c1f9b3872310a835d852eb19"},
+ {file = "pydantic-1.10.5-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:3257bd714de9db2102b742570a56bf7978e90441193acac109b1f500290f5718"},
+ {file = "pydantic-1.10.5-cp38-cp38-win_amd64.whl", hash = "sha256:f5bee6c523d13944a1fdc6f0525bc86dbbd94372f17b83fa6331aabacc8fd08e"},
+ {file = "pydantic-1.10.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:532e97c35719f137ee5405bd3eeddc5c06eb91a032bc755a44e34a712420daf3"},
+ {file = "pydantic-1.10.5-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ca9075ab3de9e48b75fa8ccb897c34ccc1519177ad8841d99f7fd74cf43be5bf"},
+ {file = "pydantic-1.10.5-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bd46a0e6296346c477e59a954da57beaf9c538da37b9df482e50f836e4a7d4bb"},
+ {file = "pydantic-1.10.5-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3353072625ea2a9a6c81ad01b91e5c07fa70deb06368c71307529abf70d23325"},
+ {file = "pydantic-1.10.5-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:3f9d9b2be177c3cb6027cd67fbf323586417868c06c3c85d0d101703136e6b31"},
+ {file = "pydantic-1.10.5-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:b473d00ccd5c2061fd896ac127b7755baad233f8d996ea288af14ae09f8e0d1e"},
+ {file = "pydantic-1.10.5-cp39-cp39-win_amd64.whl", hash = "sha256:5f3bc8f103b56a8c88021d481410874b1f13edf6e838da607dcb57ecff9b4594"},
+ {file = "pydantic-1.10.5-py3-none-any.whl", hash = "sha256:7c5b94d598c90f2f46b3a983ffb46ab806a67099d118ae0da7ef21a2a4033b28"},
+ {file = "pydantic-1.10.5.tar.gz", hash = "sha256:9e337ac83686645a46db0e825acceea8e02fca4062483f40e9ae178e8bd1103a"},
]
[package.dependencies]
@@ -2724,14 +2733,14 @@ files = [
[[package]]
name = "setuptools"
-version = "67.2.0"
+version = "67.3.2"
description = "Easily download, build, install, upgrade, and uninstall Python packages"
category = "main"
optional = false
python-versions = ">=3.7"
files = [
- {file = "setuptools-67.2.0-py3-none-any.whl", hash = "sha256:16ccf598aab3b506593c17378473978908a2734d7336755a8769b480906bec1c"},
- {file = "setuptools-67.2.0.tar.gz", hash = "sha256:b440ee5f7e607bb8c9de15259dba2583dd41a38879a7abc1d43a71c59524da48"},
+ {file = "setuptools-67.3.2-py3-none-any.whl", hash = "sha256:bb6d8e508de562768f2027902929f8523932fcd1fb784e6d573d2cafac995a48"},
+ {file = "setuptools-67.3.2.tar.gz", hash = "sha256:95f00380ef2ffa41d9bba85d95b27689d923c93dfbafed4aecd7cf988a25e012"},
]
[package.extras]
@@ -2973,14 +2982,14 @@ files = [
[[package]]
name = "typing-extensions"
-version = "4.4.0"
+version = "4.5.0"
description = "Backported and Experimental Type Hints for Python 3.7+"
category = "main"
optional = false
python-versions = ">=3.7"
files = [
- {file = "typing_extensions-4.4.0-py3-none-any.whl", hash = "sha256:16fa4864408f655d35ec496218b85f79b3437c829e93320c7c9215ccfd92489e"},
- {file = "typing_extensions-4.4.0.tar.gz", hash = "sha256:1511434bb92bf8dd198c12b1cc812e800d4181cfcb867674e0f8279cc93087aa"},
+ {file = "typing_extensions-4.5.0-py3-none-any.whl", hash = "sha256:fb33085c39dd998ac16d1431ebc293a8b3eedd00fd4a32de0ff79002c19511b4"},
+ {file = "typing_extensions-4.5.0.tar.gz", hash = "sha256:5cb5f4a79139d699607b3ef622a1dedafa84e115ab0024e0d9c044a9479ca7cb"},
]
[[package]]
@@ -3638,5 +3647,5 @@ kafka = ["kafka-python"]
[metadata]
lock-version = "2.0"
-python-versions = ">=3.7, <3.11"
-content-hash = "1d42154067478257d0ac1a7c065cd03e81219992808471f6b04cd45d53cc6f3f"
+python-versions = ">=3.7, <3.12"
+content-hash = "426b17b1c2a7b4a46f09762ab0f1679e04bcab0e8bfc7dc44854627aabea433d"
diff --git a/pyproject.toml b/pyproject.toml
index 80365c6..c1a99ef 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -41,6 +41,7 @@ classifiers=[
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
+ 'Programming Language :: Python :: 3.11',
'Topic :: System :: Monitoring',
'Topic :: Software Development',
@@ -66,7 +67,7 @@ sw-python = 'skywalking.bootstrap.cli.sw_python:start'
[tool.poetry.dependencies]
-python = ">=3.7, <3.11"
+python = ">=3.7, <3.12"
grpcio = '*'
grpcio-tools = '*'
contextvars = "2.4"
@@ -105,7 +106,7 @@ celery = "5.1.2"
django = "3.2.8"
elasticsearch = "7.15.1"
flask = "2.0.2"
-gevent = "21.8.0"
+gevent = "22.8.0"
hug = "2.6.1"
pika = "1.2.0"
psycopg = {extras = ["binary"], version = "^3.1.7"}
diff --git a/skywalking/plugins/sw_bottle.py b/skywalking/plugins/sw_bottle.py
index 0fe27a9..b445827 100644
--- a/skywalking/plugins/sw_bottle.py
+++ b/skywalking/plugins/sw_bottle.py
@@ -24,7 +24,7 @@ from skywalking.trace.tags import TagHttpMethod, TagHttpParams, TagHttpStatusCod
link_vector = ['http://bottlepy.org/docs/dev/']
support_matrix = {
'bottle': {
- '>=3.7': ['0.12.21']
+ '>=3.7': ['0.12.23']
}
}
note = """"""
diff --git a/skywalking/plugins/sw_falcon.py b/skywalking/plugins/sw_falcon.py
index 25f4e75..21aeecd 100644
--- a/skywalking/plugins/sw_falcon.py
+++ b/skywalking/plugins/sw_falcon.py
@@ -24,11 +24,14 @@ from skywalking.trace.tags import TagHttpMethod, TagHttpURL, TagHttpParams, TagH
link_vector = ['https://falcon.readthedocs.io/en/stable/']
support_matrix = {
'hug': {
+ '>=3.11': [],
'>=3.10': ['2.5', '2.6'], # api deprecated for 3.10
'>=3.7': ['2.4.1', '2.5', '2.6'], # support begins 2.4.1
}
}
-note = """"""
+note = """While Falcon is instrumented, only Hug is tested.
+Hug is believed to be abandoned project, use this plugin with a bit more caution.
+Instead of Hug, plugin test should move to test actual Falcon."""
def install():
diff --git a/skywalking/plugins/sw_psycopg.py b/skywalking/plugins/sw_psycopg.py
index e524c2c..87b4239 100644
--- a/skywalking/plugins/sw_psycopg.py
+++ b/skywalking/plugins/sw_psycopg.py
@@ -22,7 +22,8 @@ from skywalking.trace.tags import TagDbType, TagDbInstance, TagDbStatement, TagD
link_vector = ['https://www.psycopg.org/']
support_matrix = {
'psycopg[binary]': {
- '>=3.7': ['3.0'] # psycopg is psycopg3
+ '>=3.11': ['3.1.*'], # 3.11 support begins 3.1
+ '>=3.7': ['3.0.18', '3.1.*'] # psycopg is psycopg3
}
}
note = """"""