From b09f51235fc019432cfbd0aed941b9e051c1e97c Mon Sep 17 00:00:00 2001 From: dao-jun Date: Tue, 20 Aug 2024 07:26:07 +0800 Subject: [PATCH 1/5] Address PIP363 --- .../apm/plugin/pulsar/common/SendCallbackInterceptor.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apm-sniffer/apm-sdk-plugin/pulsar-common/src/main/java/org/apache/skywalking/apm/plugin/pulsar/common/SendCallbackInterceptor.java b/apm-sniffer/apm-sdk-plugin/pulsar-common/src/main/java/org/apache/skywalking/apm/plugin/pulsar/common/SendCallbackInterceptor.java index af2719911a..bc9c3d2bac 100644 --- a/apm-sniffer/apm-sdk-plugin/pulsar-common/src/main/java/org/apache/skywalking/apm/plugin/pulsar/common/SendCallbackInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/pulsar-common/src/main/java/org/apache/skywalking/apm/plugin/pulsar/common/SendCallbackInterceptor.java @@ -62,9 +62,9 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA Object ret) throws Throwable { SendCallbackEnhanceRequiredInfo requiredInfo = (SendCallbackEnhanceRequiredInfo) objInst.getSkyWalkingDynamicField(); if (null != requiredInfo.getContextSnapshot()) { - Exception exceptions = (Exception) allArguments[0]; - if (exceptions != null) { - ContextManager.activeSpan().log(exceptions); + Throwable t = (Throwable) allArguments[0]; + if (t != null) { + ContextManager.activeSpan().log(t); } ContextManager.stopSpan(); } From a358ceee95eb5f24ff7fc45cbe5bb561e0545bd8 Mon Sep 17 00:00:00 2001 From: dao-jun Date: Tue, 20 Aug 2024 07:33:44 +0800 Subject: [PATCH 2/5] Address PIP363 --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 8a31625dc9..d3587aac7f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,7 @@ Release Notes. ------------------ * Upgrade nats plugin to support 2.16.5 +* [pulsar] Handle the SendCallback class method signature change. All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/222?closed=1) From 5c3da173dc51c38fdc9bf65303bb5f46cefe5e9a Mon Sep 17 00:00:00 2001 From: dao-jun Date: Wed, 21 Aug 2024 11:41:10 +0800 Subject: [PATCH 3/5] fix ci --- .github/workflows/codeql.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml index 0932d63cee..8c336507dd 100644 --- a/.github/workflows/codeql.yaml +++ b/.github/workflows/codeql.yaml @@ -54,11 +54,11 @@ jobs: java-version: 17 - name: Initialize CodeQL - uses: github/codeql-action/init@v1 + uses: github/codeql-action/init@v2 with: languages: ${{ matrix.language }} - run: ./mvnw -q -Dmaven.test.skip=true clean install || ./mvnw -q -Dmaven.test.skip=true clean install - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + uses: github/codeql-action/analyze@v2 From 63b5e05140e2b9825679afa77b11f488d00020a7 Mon Sep 17 00:00:00 2001 From: dao-jun Date: Wed, 21 Aug 2024 11:41:43 +0800 Subject: [PATCH 4/5] update CHANGES.md --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index d3587aac7f..1289d6c0ed 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,7 +6,7 @@ Release Notes. ------------------ * Upgrade nats plugin to support 2.16.5 -* [pulsar] Handle the SendCallback class method signature change. +* Support newer Pulsar versions to adopt SendCallback class method signature change. All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/222?closed=1) From 59d916ee27fd4969ec32a8fd028ac05ebe99f8d3 Mon Sep 17 00:00:00 2001 From: dao-jun Date: Thu, 22 Aug 2024 02:11:20 +0800 Subject: [PATCH 5/5] fix CI --- .github/actions/build/action.yml | 4 ++-- .github/actions/run/action.yml | 2 +- .github/workflows/publish-docker.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index 2b63165d0d..74f11fe549 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -56,7 +56,7 @@ runs: ./mvnw -q --batch-mode clean package -Dmaven.test.skip || \ ./mvnw -q --batch-mode clean package -Dmaven.test.skip echo "::endgroup::" - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 name: Upload Agent with: name: skywalking-agent @@ -89,7 +89,7 @@ runs: docker save -o test-containers/skywalking-agent-test-jvm-1.0.0.tgz skywalking/agent-test-jvm:1.0.0 docker save -o test-containers/skywalking-agent-test-tomcat-1.0.0.tgz skywalking/agent-test-tomcat:1.0.0 echo "::endgroup::" - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 name: Upload Test Containers with: name: test-tools diff --git a/.github/actions/run/action.yml b/.github/actions/run/action.yml index 02fdb8503c..dd269eaf04 100644 --- a/.github/actions/run/action.yml +++ b/.github/actions/run/action.yml @@ -53,7 +53,7 @@ runs: echo "::group::Run Plugin Test ${{ inputs.test_case }}" bash test/plugin/run.sh ${{ inputs.test_case }} echo "::endgroup::" - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 name: Upload Agent if: always() with: diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml index be696af980..0d63a3efc0 100644 --- a/.github/workflows/publish-docker.yaml +++ b/.github/workflows/publish-docker.yaml @@ -47,7 +47,7 @@ jobs: java-version: 17 - name: Build Agent run: make build - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 name: Upload Agent with: name: skywalking-agent