Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
c54f287
Add support gRPC 1.60.x and 1.70.x server interceptor trace
huicunjun Jul 25, 2025
fe5cd51
Add support gRPC 1.60.x and 1.70.x server interceptor trace
huicunjun Jul 25, 2025
0c88fa9
Add case
huicunjun Jul 26, 2025
7288e2e
keep grpc old version
huicunjun Jul 26, 2025
89206ee
Update Docs
huicunjun Jul 26, 2025
956c9a5
Fix
huicunjun Jul 26, 2025
4551e27
Fix
huicunjun Jul 26, 2025
cd4bf58
Add case
huicunjun Jul 26, 2025
5a0b960
Update plugins-test.0.yaml
huicunjun Jul 26, 2025
fa3ff02
Update expectedData.yaml
huicunjun Jul 26, 2025
0f3dc3c
Update test case
huicunjun Jul 26, 2025
0653a43
Update test case
huicunjun Jul 26, 2025
9677d03
Update grpc test case 1.50.0 -> 1.73.0
huicunjun Jul 27, 2025
29a1f0a
Remove grpc-1.60.x-1.70.x-scenario
huicunjun Jul 27, 2025
303ffd4
Note enhancement points
huicunjun Jul 27, 2025
611071a
Fix Repeat Add trace interceptor
huicunjun Jul 28, 2025
3b5f02f
Add Field Cache
huicunjun Jul 28, 2025
bd35702
only support grpc 1.59-1.70.x
huicunjun Jul 28, 2025
22b38a6
only support grpc 1.59-1.70.x
huicunjun Jul 28, 2025
3e9fd79
Add grpc 1.26.0->1.58.0 test case
huicunjun Jul 28, 2025
797d850
fix code style
huicunjun Jul 28, 2025
d0ed0a7
fix code style 2
huicunjun Jul 28, 2025
5dd664e
reset old grpc case
huicunjun Jul 28, 2025
a6b609f
Add grpc 1.30.0 -> 1.58.0
huicunjun Jul 28, 2025
13fa3d4
Add grpc 1.30.0 -> 1.58.0
huicunjun Jul 28, 2025
0b3f5a0
Add grpc 1.30.0 -> 1.39.0
huicunjun Jul 28, 2025
1975779
Add grpc 1.30.0 -> 1.39.0
huicunjun Jul 28, 2025
fafe941
Update CHANGES.md
huicunjun Jul 28, 2025
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
3 changes: 2 additions & 1 deletion apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,11 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<grpc-all.version>1.6.0</grpc-all.version>
<grpc-all.version>1.73.0</grpc-all.version>
Comment thread
huicunjun marked this conversation as resolved.
Outdated
</properties>

<dependencies>
<!-- https://mvnrepository.com/artifact/io.grpc/grpc-all -->
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-all</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,13 @@
import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint;
import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;
import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch;
import org.apache.skywalking.apm.agent.core.plugin.match.MultiClassNameMatch;

import static net.bytebuddy.matcher.ElementMatchers.named;
import static net.bytebuddy.matcher.ElementMatchers.takesNoArguments;
import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName;

public class AbstractServerImplBuilderInstrumentation extends ClassInstanceMethodsEnhancePluginDefine {

public static final String ENHANCE_CLASS = "io.grpc.internal.AbstractServerImplBuilder";
public static final String ENHANCE_METHOD = "build";
public static final String INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.grpc.v1.server.AbstractServerImplBuilderInterceptor";

@Override
public ConstructorInterceptPoint[] getConstructorsInterceptPoints() {
return new ConstructorInterceptPoint[0];
Expand All @@ -46,12 +42,12 @@ public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() {
new InstanceMethodsInterceptPoint() {
@Override
public ElementMatcher<MethodDescription> getMethodsMatcher() {
return named(ENHANCE_METHOD).and(takesNoArguments());
return named("build").and(takesNoArguments());
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you change this?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just keep this class using local variables

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't see the point of changing this. Please follow original style.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

}

@Override
public String getMethodsInterceptor() {
return INTERCEPT_CLASS;
return "org.apache.skywalking.apm.plugin.grpc.v1.server.AbstractServerImplBuilderInterceptor";
}

@Override
Expand All @@ -64,6 +60,9 @@ public boolean isOverrideArgs() {

@Override
protected ClassMatch enhanceClass() {
return byName(ENHANCE_CLASS);
return MultiClassNameMatch.byMultiClassMatch(
"io.grpc.internal.AbstractServerImplBuilder",
"io.grpc.internal.ServerImplBuilder",
"io.grpc.internal.ForwardingServerBuilder");
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these for different versions? If so, please add comments to the codes.

}
}
Loading