Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[plugin][pulsar] Handle the SendCallback method sign changed. #715

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/actions/build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/run/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/publish-docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Release Notes.
------------------

* Upgrade nats plugin to support 2.16.5
* 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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
Loading