Pr#83 branch4 deepseek distill llama 70b by Konuralpkilinc · Pull Request #4 · Deeployed-Peer/skywalking-java · GitHub

PR Description

General Description

Added support for returnedObj expression in apm-customize-enhance-plugin
Updated apm-customize-enhance-plugin to use V2 plugin API
Added documentation and test cases for the new returnedObj feature

File Changes

CHANGES.md

Added new feature: Add support returnedObj expression for apm-customize-enhance-plugin

apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/util/CustomizeExpressionTest.java

Updated package declaration from org.apache.skywalking.apm.plugin.customize.util to org.apache.skywalking.apm.agent.core.util

apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/define/CustomizeInstanceInstrumentation.java

Updated class to extend ClassInstanceMethodsEnhancePluginDefineV2 instead of ClassInstanceMethodsEnhancePluginDefine
Updated method signatures to use V2 API:
- getInstanceMethodsInterceptPoints() changed to getInstanceMethodsInterceptV2Points()
- InstanceMethodsInterceptPoint changed to InstanceMethodsInterceptV2Point
- Updated interceptor method signatures

apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/define/CustomizeStaticInstrumentation.java

Updated class to extend ClassStaticMethodsEnhancePluginDefineV2 instead of ClassStaticMethodsEnhancePluginDefine
Updated method signatures to use V2 API:
- getStaticMethodsInterceptPoints() changed to getStaticMethodsInterceptV2Points()
- StaticMethodsInterceptPoint changed to StaticMethodsInterceptV2Point
- Updated interceptor method signatures

apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/interceptor/BaseInterceptorMethods.java

Added support for returnedObj expression evaluation
Added new methods:
- afterMethod()
- handleMethodException()
- Helper methods for expression evaluation and tagging
Updated method signatures to include MethodInvocationContext

apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/interceptor/CustomizeInstanceInterceptor.java

Updated class to implement InstanceMethodsAroundInterceptorV2 instead of InstanceMethodsAroundInterceptor
Updated method signatures to use V2 API

apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/interceptor/CustomizeStaticInterceptor.java

Updated class to implement StaticMethodsAroundInterceptorV2 instead of StaticMethodsAroundInterceptor
Updated method signatures to use V2 API

docs/en/setup/service-agent/java-agent/Customize-enhance-trace.md

Added documentation for returnedObj expression usage in tags and logs
Added examples of using returnedObj in method configurations

test/plugin/scenarios/customize-scenario/config/customize_enhance.xml

Added new test cases for returnedObj expression
Updated method configurations to include return value tagging and logging

test/plugin/scenarios/customize-scenario/config/expectedData.yaml

Added expected data for new test cases using returnedObj

test/apache/skywalking/apm/testcase/customize/controller/CustomizeController.java

Added method calls to test the new returnedObj functionality

test/apache/skywalking/apm/testcase/customize/service/TestService1.java

Added new methods with return values to test returnedObj expressions

…nce-plugin

@deeployed-peer-dev review

Okay, so I need to summarize the changes in this pull request. Let me take a look at what was provided. The user gave a summary that mentions adding support for 'returnedObj' in the apm-customize-enhance-plugin and updating it to use the V2 plugin API. They also modified public interfaces, changed classes to extend V2 plugin defines and interceptors, updated method signatures, and added methods in TestService1.java. There are some dependent files updated too, like documentation, test configs, and expected data, along with new test cases and examples.

Alright, first, I need to create a high-level walkthrough. It should be concise, under 50 words. So, I'll mention adding support for 'returnedObj' and updating to V2 API, along with modifying interfaces and adding tests.

Next, the changes section. I need to group similar files. The main files are apm-customize-enhance-plugin, which has multiple changes. Then, TestService1.java has added methods. Dependent files like documentation, test configs, etc., are also updated. So, I can group these under a single row each.

Now, the sequence diagram. I need to visualize the changes. The actor is the developer. They update the plugin to V2, add 'returnedObj' support, modify interfaces, add test methods, and update dependent files. So, each step is a numbered action in the mermaid diagram.

I have to make sure each section is wrapped in

Details tags with the appropriate titles. The walkthrough, changes, and sequence diagram each get their own section. The changes are a markdown table, so I'll format that correctly with headers and rows.

I should avoid any extra commentary and keep it straightforward. Let me structure each part step by step, ensuring clarity and brevity. I'll make sure the mermaid code is correct so that it renders properly.

Double-checking everything: the walkthrough is concise, the changes are grouped properly, and the sequence diagram accurately reflects the process. Looks good. I think that's all.

Walkthrough Added support for `returnedObj` expression in apm-customize-enhance-plugin and updated to V2 plugin API. Modified public interfaces, updated classes, and method signatures. Added test methods in TestService1.java and updated dependent files. Changes | File | Summary | |------|---------| | apm-customize-enhance-plugin | Added support for `returnedObj` expression and updated to V2 plugin API. Modified public interfaces, updated classes to extend V2 plugin defines/interceptors, and changed method signatures. | | TestService1.java | Added two new methods for testing. | | Dependent files | Updated documentation, test configurations, and expected data. Added new test cases and documentation examples. | Sequence Diagram ```mermaid sequenceDiagram actor Developer as "Developer" Developer->>Plugin: Update plugin to V2 API Developer->>Plugin: Add support for returnedObj expression Developer->>Interfaces: Modify public interfaces Developer->>Classes: Update classes to extend V2 defines/interceptors Developer->>Methods: Update method signatures Developer->>TestService1.java: Add test methods Developer->>Documentation: Update documentation/examples Developer->>TestConfigs: Update test configurations Developer->>ExpectedData: Update expected data ```

Uplevel your code reviews with Deeployed Peer!

Commits Files that changed from the base of the PR and between Base and 86ff5ed commits: 13 Files Selected For Review: 10

apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/util/CustomizeExpressionTest.java with diff length 263.
apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/define/CustomizeInstanceInstrumentation.java with diff length 2438.
apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/define/CustomizeStaticInstrumentation.java with diff length 2327.
apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/interceptor/BaseInterceptorMethods.java with diff length 9156.
apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/interceptor/CustomizeInstanceInterceptor.java with diff length 2007.
apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/interceptor/CustomizeStaticInterceptor.java with diff length 1683.
test/plugin/scenarios/customize-scenario/bin/startup.sh with diff length 256.
test/plugin/scenarios/customize-scenario/config/expectedData.yaml with diff length 852.
test/plugin/scenarios/customize-scenario/src/main/java/test/apache/skywalking/apm/testcase/customize/controller/CustomizeController.java with diff length 237.
test/plugin/scenarios/customize-scenario/src/main/java/test/apache/skywalking/apm/testcase/customize/service/TestService1.java with diff length 282.

Files excluded from review due to unsupported file extensions: 3

CHANGES.md
docs/en/setup/service-agent/java-agent/Customize-enhance-trace.md
test/plugin/scenarios/customize-scenario/config/customize_enhance.xml

Review comments generated: (18)

Review: 5
LGTM: 13
Identified issue already discussed: 0

Tips

Chat with Deeployed Bot (@@deeployed-peer-dev)

Reply on review comments left by this bot to ask follow-up questions. A review comment is a comment on a diff or a file.
Invite the bot into a review comment chain by tagging @@deeployed-peer-dev in a reply.

Code suggestions

The bot may make code suggestions, but please review them carefully before committing since the line number ranges may be misaligned.
You can edit the comment made by the bot and manually tweak the suggestion if it is slightly off.

Pausing incremental reviews

Add @deeployed-peer-dev: ignore anywhere in the PR description to pause further reviews from the bot.

The import of CustomizeExpression was removed but is likely still needed since it's used in the test class.

Suggested change

      
            package org.apache.skywalking.apm.agent.core.util;
          
            import org.apache.skywalking.apm.agent.core.util.CustomizeExpression;
          
            import org.junit.Assert;
          
            import org.junit.Test;
          
            import org.apache.skywalking.apm.agent.core.util.CustomizeExpression;

FP_Hallucination

The beforeMethod signature has been updated to include MethodInvocationContext and passes it to the super method. This aligns with the V2 API requirements.

FP_Hallucination

The afterMethod signature has been updated to include MethodInvocationContext and passes it to the super method. The return value is still properly handled.

FP_hallucination

The handleMethodException signature has been updated to include MethodInvocationContext and passes it to the super method. This aligns with the V2 API requirements.

All changes are consistent with the V2 API upgrade and maintain the existing functionality while adding the new context parameter.

<!-- This is an auto-generated comment by Deeployed - Reviewed -->

There's a syntax error in the add function.

Suggested change

      
              -Dskywalking.plugin.customize.enhance_file=${home}/../config/customize_enhance.xml \
          
                return z

FP_Hallucination

3FN

Deepseek distill llama 70b:
4 FP_Hallucination
3 FN

chanjarster added 2 commits December 14, 2021 16:08

issue #8292 add returnedObj expression support for apm-customize-enha…

a65f6bd

…nce-plugin

update apm-customize-enhance-plugin use plugin V2 API

86ff5ed

This comment was marked as outdated.

Sign in to view

Konuralpkilinc changed the title Pr#83 branch4 Pr#83 branch4 deepseek distill llama3.1 Oct 28, 2025

Konuralpkilinc changed the title Pr#83 branch4 deepseek distill llama3.1 Pr#83 branch4 deepseek distill llama 70b Oct 28, 2025

                   @Override
                   public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class<?>[] parameterTypes,
-                      MethodInterceptResult result) {
-                      super.beforeMethod(method, allArguments);
+                      MethodInvocationContext context) {
+                      super.beforeMethod(method, allArguments, context);
                   }

                   public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class<?>[] parameterTypes,
-                      Object ret) {
-                      super.afterMethod(method);
+                      Object ret, MethodInvocationContext context) {
+                      super.afterMethod(method, ret, context);
                       return ret;
                   }

                   public void handleMethodException(Class clazz, Method method, Object[] allArguments, Class<?>[] parameterTypes,
-                      Throwable t) {
+                      Throwable t, MethodInvocationContext context) {
                       super.handleMethodException(t);
                   }

		@@ -20,4 +20,4 @@ home="$(cd "$(dirname $0)"; pwd)"

		java -jar ${agent_opts} \
		-Dskywalking.plugin.customize.enhance_file=${home}/../config/customize_enhance.xml \

	-Dskywalking.plugin.customize.enhance_file=${home}/../config/customize_enhance.xml \
	return z

Pr#83 branch4 deepseek distill llama 70b by Konuralpkilinc · Pull Request #4 · Deeployed-Peer/skywalking-java · GitHub

Uh oh!

Pr#83 branch4 deepseek distill llama 70b - #4

Pr#83 branch4 deepseek distill llama 70b#4Konuralpkilinc wants to merge 2 commits intotargetDeeployed-Peer/skywalking-java:targetfrom PR#83-branch4Deeployed-Peer/skywalking-java:PR#83-branch4Copy head branch name to clipboard

Conversation

Konuralpkilinc commented Oct 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

PR Description

General Description

File Changes

CHANGES.md

apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/util/CustomizeExpressionTest.java

apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/define/CustomizeInstanceInstrumentation.java

apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/define/CustomizeStaticInstrumentation.java

apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/interceptor/BaseInterceptorMethods.java

apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/interceptor/CustomizeInstanceInterceptor.java

apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/java/org/apache/skywalking/apm/plugin/customize/interceptor/CustomizeStaticInterceptor.java

docs/en/setup/service-agent/java-agent/Customize-enhance-trace.md

test/plugin/scenarios/customize-scenario/config/customize_enhance.xml

test/plugin/scenarios/customize-scenario/config/expectedData.yaml

test/apache/skywalking/apm/testcase/customize/controller/CustomizeController.java

test/apache/skywalking/apm/testcase/customize/service/TestService1.java

Uh oh!

This comment was marked as outdated.

Uh oh!

This comment was marked as outdated.

Uh oh!

Konuralpkilinc commented Oct 29, 2025

Uh oh!

deeployed-peer-dev Bot commented Oct 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

deeployed-peer-dev Bot left a comment

Choose a reason for hiding this comment

Chat with Deeployed Bot (@@deeployed-peer-dev)

Code suggestions

Pausing incremental reviews

Uh oh!

deeployed-peer-dev Bot Oct 29, 2025

Choose a reason for hiding this comment

Uh oh!

Konuralpkilinc Oct 30, 2025

Choose a reason for hiding this comment

Uh oh!

deeployed-peer-dev Bot Oct 29, 2025

Choose a reason for hiding this comment

Uh oh!

Konuralpkilinc Oct 30, 2025

Choose a reason for hiding this comment

Uh oh!

deeployed-peer-dev Bot Oct 29, 2025

Choose a reason for hiding this comment

Uh oh!

Konuralpkilinc Oct 30, 2025

Choose a reason for hiding this comment

Uh oh!

deeployed-peer-dev Bot Oct 29, 2025

Choose a reason for hiding this comment

Uh oh!

deeployed-peer-dev Bot Oct 29, 2025

Choose a reason for hiding this comment

Uh oh!

Konuralpkilinc Oct 30, 2025

Choose a reason for hiding this comment

Uh oh!

Konuralpkilinc commented Oct 30, 2025

Uh oh!

Konuralpkilinc commented Oct 30, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Pr#83 branch4 deepseek distill llama 70b#4
Konuralpkilinc wants to merge 2 commits into
targetfrom
PR#83-branch4

Konuralpkilinc commented Oct 28, 2025 •
edited
Loading

deeployed-peer-dev Bot commented Oct 29, 2025 •
edited
Loading