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.

Sign up for GitHub

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

Jump to bottom

Bump up grpc #650

Merged
merged 3 commits into from
Nov 28, 2023
Merged

Bump up grpc #650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e9cf84
Bump up grpc
kezhenxu94 Nov 28, 2023
2ad19a5
Try to exclude transitive grpc in rocketmq
kezhenxu94 Nov 28, 2023
99f80bb
Fix compiliing.
wu-sheng Nov 28, 2023
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
2 changes: 1 addition & 1 deletion CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ Release Notes.
* Optimize spring-cloud-gateway 2.1.x, 3.x witness class.
* Support report MongoDB instance info in Mongodb 4.x plugin.
* To compatible upper and lower case Oracle TNS url parse.
* Fix config length limitation.
* Support collecting ZGC memory pool metrics. Require OAP 9.7.0 to support these new metrics.
* Upgrade netty-codec-http2 to 4.1.100.Final
* Add a netty-http 4.1.x plugin to trace HTTP requests.
Expand All @@ -25,6 +24,7 @@ Release Notes.
* Add JDK21 plugin tests for Spring 6.
* Bump Lombok to 1.18.30 to adopt JDK21 compiling.
* Fix PostgreSQL Jdbc URL parsing exception.
* Bump up grpc version.

#### Documentation
* Fix JDK requirement in the compiling docs.
Expand Down
14 changes: 13 additions & 1 deletion apm-sniffer/apm-sdk-plugin/rocketMQ-5.x-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,18 @@
<version>${rocketmq-client.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>apm-agent-core</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
</exclusion>
</exclusions>
Comment on lines +48 to +53
Copy link
Member

Choose a reason for hiding this comment

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

I think we should exclude grpc from agent-core, rather than from this side?

Copy link
Member Author

Choose a reason for hiding this comment

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

Why? GRPC is needed in agent side, how can we exclude it there?

Copy link
Member

Choose a reason for hiding this comment

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

I think the agent plugin depends on the agent core lib, which has the gRPC dependency overriding the version.
We just need the RocketMQ plugin compiled. So, about exclude, I mean for this plugin, it could depend on agent-core with gRPC excluded. In the runtime, this plugin is using the user's gRPC, our gRPC and netty would have been shaded in another package already. So, we should be good by that.

Comment on lines +43 to +53
Copy link
Member

Choose a reason for hiding this comment

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

These are my new changes.

</dependency>
</dependencies>

<build>
Expand All @@ -50,4 +62,4 @@
</plugins>
</build>

</project>
</project>
2 changes: 1 addition & 1 deletion dist-material/LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ The following components are provided under the Apache License. See project link
The text of each license is the standard Apache 2.0 license.

raphw (byte-buddy) 1.14.9: http://bytebuddy.net/ , Apache 2.0
Google: grpc-java 1.50.0: https://github.com/grpc/grpc-java, Apache 2.0
Google: grpc-java 1.53.0: https://github.com/grpc/grpc-java, Apache 2.0
Google: gson 2.8.9: https://github.com/google/gson , Apache 2.0
Google: proto-google-common-protos 2.0.1: https://github.com/googleapis/googleapis , Apache 2.0
Google: jsr305 3.0.2: http://central.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.0/jsr305-3.0.0.pom , Apache 2.0
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,13 @@

<!-- core lib dependency -->
<bytebuddy.version>1.14.9</bytebuddy.version>
<grpc.version>1.50.0</grpc.version>
<grpc.version>1.53.0</grpc.version>
<netty.version>4.1.100.Final</netty.version>
<gson.version>2.8.9</gson.version>
<os-maven-plugin.version>1.6.2</os-maven-plugin.version>
<protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
<com.google.protobuf.protoc.version>3.21.7</com.google.protobuf.protoc.version>
<protoc-gen-grpc-java.plugin.version>1.50.0</protoc-gen-grpc-java.plugin.version>
<protoc-gen-grpc-java.plugin.version>1.53.0</protoc-gen-grpc-java.plugin.version>
<netty-tcnative-boringssl-static.version>2.0.48.Final</netty-tcnative-boringssl-static.version>
<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
<objenesis.version>3.1</objenesis.version>
Expand Down
Loading