From 938b797de1cfedc48dda043e6bfe8490ce5ca735 Mon Sep 17 00:00:00 2001 From: CharlieSeastar <49227833+CharlieSeastar@users.noreply.github.com> Date: Thu, 31 Oct 2024 20:45:34 +0800 Subject: [PATCH 1/4] fix(plugin): fastapi testclient casue None type error in sw_fastapi plugin --- skywalking/plugins/sw_fastapi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skywalking/plugins/sw_fastapi.py b/skywalking/plugins/sw_fastapi.py index 45ce504f..9acba507 100644 --- a/skywalking/plugins/sw_fastapi.py +++ b/skywalking/plugins/sw_fastapi.py @@ -56,7 +56,7 @@ async def create_span(self, method, scope, req, send, receive): with span: span.layer = Layer.Http span.component = Component.FastAPI - span.peer = f'{req.client.host}:{req.client.port}' + span.peer = f'{req.client.host}:{req.client.port}' if req.client else 'unknown' span.tag(TagHttpMethod(method)) span.tag(TagHttpURL(str(req.url).split('?')[0])) if config.plugin_fastapi_collect_http_params and req.query_params: From 44e544febea8a00b6ad1f12ed4bb52f9a2f86567 Mon Sep 17 00:00:00 2001 From: kezhenxu94 Date: Thu, 31 Oct 2024 21:09:02 +0800 Subject: [PATCH 2/4] Update CI.yaml --- .github/workflows/CI.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml index 1fd1268d..70a17be7 100644 --- a/.github/workflows/CI.yaml +++ b/.github/workflows/CI.yaml @@ -264,7 +264,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@2f20482135ba3a933bc0bb48c41f538ad1aa3048 + uses: apache/skywalking-infra-e2e@cf589b4a0b9f8e6f436f78e9cfd94a1ee5494180 with: log-dir: /tmp/e2e-logs e2e-file: ${{ matrix.case.path }} From 00fdd8f8e6a9162c160f50db13c909aaf5ccbcf7 Mon Sep 17 00:00:00 2001 From: kezhenxu94 Date: Thu, 31 Oct 2024 21:25:02 +0800 Subject: [PATCH 3/4] Update CI.yaml --- .github/workflows/CI.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml index 70a17be7..2d34b842 100644 --- a/.github/workflows/CI.yaml +++ b/.github/workflows/CI.yaml @@ -167,6 +167,15 @@ jobs: uses: actions/checkout@v3 with: submodules: true + - name: Install docker-compose + shell: bash + if: runner.os != 'Windows' + run: | + if ! command docker-compose 2>&1 > /dev/null; then + echo "Installing docker-compose" + sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose + sudo chmod +x /usr/local/bin/docker-compose + fi - name: Pull SkyWalking Python agent base image uses: actions/download-artifact@v3 with: From eb426cdf812d8296a1e9096d6a53bbc6d94f52b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Tue, 5 Nov 2024 23:26:44 +0800 Subject: [PATCH 4/4] Update CHANGELOG.md --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8aaedf01..381dc5d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ ## Change Logs +### 1.2.0 + +- Feature: + - Drop support for 3.7 (#356) + +- Fixes: + - Fix: user/password replacement is not allowed for relative URLs (#349) + - Fix pulsar client does not support init arguments other than service_url (#351) + - Fix outdated make dev-fix rule in CodeStyle.md (#350) + - Fix TestClient for fastapi cause the req.client None error (#355) + ### 1.1.0 - Feature: