You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2023/11/28 03:07:56 UTC
(skywalking-java) branch grpc updated (73b227a5b4 -> b40757b091)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a change to branch grpc
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
discard 73b227a5b4 Bump up grpc
add 017bc20908 Fix config length limitation. (#623)
add c15ac3071e Support collect ZGC memory pool metrics (#622)
add 88b4b5c930 Add OAP version requirement (#624)
add 45993545e9 [DOCS] Corrected an issue using misspelled words in Native Tracer (#626)
add c94b409b28 fix CVE-2023-4586 (#632)
add 0b80f3d424 Add a netty-4.1.x plugin to trace http (#625)
add d5cfd35c5d Disable dep bot (#641)
add 2721438820 Fix Impala Jdbc URL (including schema without properties) parsing exception (#644)
add db54c65d09 Optimize bytebuddy type description performance (#637)
add 2bd500b831 Add JDK 21 image container (#646)
add c82287e1dd Add JDK21 Support (#647)
add e71b9e899e Fix PostgreSQL Jdbc URL parsing exception (#649)
new b40757b091 Bump up grpc
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (73b227a5b4)
\
N -- N -- N refs/heads/grpc (b40757b091)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.asf.yaml | 1 +
.github/workflows/ci.yaml | 3 +
.github/workflows/plugins-jdk17-test.0.yaml | 2 +-
.github/workflows/plugins-jdk17-test.1.yaml | 2 +-
...jdk17-test.1.yaml => plugins-jdk21-test.0.yaml} | 11 +-
.github/workflows/plugins-test.1.yaml | 1 +
.github/workflows/publish-docker.yaml | 2 +-
CHANGES.md | 12 +
Makefile | 3 +-
.../skywalking/apm/util/ConfigInitializer.java | 2 +-
.../network/trace/component/ComponentsDefine.java | 2 +
.../skywalking/apm/agent/core/conf/Constants.java | 2 +-
.../core/jvm/memorypool/MemoryPoolProvider.java | 3 +
.../core/jvm/memorypool/ZGCCollectorModule.java | 70 +++++
.../core/context/IgnoredTracerContextTest.java | 6 +-
.../skywalking/apm/agent/SkyWalkingAgent.java | 7 +-
.../connectionurl/parser/ImpalaJdbcURLParser.java | 6 +
.../connectionurl/parser/PostgreSQLURLParser.java | 101 ++++++-
.../jdbc/connectionurl/parser/URLParserTest.java | 95 ++++++
apm-sniffer/bytebuddy-patch/pom.xml | 7 -
.../agent/builder/SWDescriptionStrategy.java | 335 +++++++++++++++++++++
.../apm/agent/bytebuddy/SWClassFileLocator.java | 2 +-
.../skywalking/apm/agent/bytebuddy/biz/BizFoo.java | 2 +-
.../biz/{BizFoo.java => BizInterface.java} | 25 +-
.../bytebuddy/cases/AbstractInterceptTest.java | 48 ++-
.../agent/bytebuddy/cases/ReTransform1Test.java | 22 +-
.../agent/bytebuddy/cases/ReTransform2Test.java | 6 +
...ReTransform2Test.java => ReTransform3Test.java} | 37 +--
apm-sniffer/config/agent.config | 6 +
.../netty-http-4.1.x-plugin}/pom.xml | 47 +--
.../http/AddHttpRequestDecoderInterceptor.java | 64 ++++
.../http/AddHttpRequestEncoderInterceptor.java | 64 ++++
.../http/AddHttpResponseDecoderInterceptor.java | 64 ++++
.../http/AddHttpResponseEncoderInterceptor.java | 64 ++++
.../http/ChannelHandlerContextInterceptor.java | 52 ++++
.../http/ChannelPipelineRemoveLastInterceptor.java | 50 +++
.../netty/http/RemoveHandlerInterceptor.java | 71 +++++
.../plugin/netty/http/common/AttributeKeys.java | 55 ++++
.../plugin/netty/http/common/NettyConstants.java} | 27 +-
.../netty/http/config/NettyHttpPluginConfig.java | 50 +++
.../http/define/AbstractNettyInstrumentation.java} | 29 +-
.../ChannelHandlerContextInstrumentation.java | 64 ++++
.../http/define/ChannelHandlerInstrumentation.java | 63 ++++
.../define/ChannelPipelineInstrumentation.java | 63 ++++
.../define/HttpRequestDecoderInstrumentation.java | 65 ++++
.../define/HttpRequestEncoderInstrumentation.java | 65 ++++
.../define/HttpResponseDecoderInstrumentation.java | 65 ++++
.../define/HttpResponseEncoderInstrumentation.java | 65 ++++
.../NettyHttpRequestDecoderTracingHandler.java | 133 ++++++++
.../NettyHttpRequestEncoderTracingHandler.java | 134 +++++++++
.../NettyHttpResponseDecoderTracingHandler.java | 103 +++++++
.../NettyHttpResponseEncoderTracingHandler.java | 82 +++++
.../netty/http/utils/HttpDataCollectUtils.java | 80 +++++
.../apm/plugin/netty/http/utils/TypeUtils.java | 68 +++++
.../src/main/resources/skywalking-plugin.def | 23 ++
apm-sniffer/optional-plugins/pom.xml | 1 +
dist-material/LICENSE | 4 +-
docs/en/contribution/compiling.md | 2 +-
.../java-agent/Application-toolkit-tracer.md | 2 +-
.../service-agent/java-agent/Optional-plugins.md | 3 +-
.../setup/service-agent/java-agent/Plugin-list.md | 1 +
.../setup/service-agent/java-agent/Plugin-test.md | 1 +
docs/en/setup/service-agent/java-agent/README.md | 4 +-
.../service-agent/java-agent/Supported-list.md | 1 +
.../service-agent/java-agent/configurations.md | 6 +-
pom.xml | 6 +-
.../netty-http-4.1.x-scenario/bin/startup.sh | 21 ++
.../config/expectedData.yaml | 81 +++++
.../netty-http-4.1.x-scenario/configuration.yml | 22 ++
.../scenarios/netty-http-4.1.x-scenario/pom.xml | 101 +++++++
.../src/main/assembly/assembly.xml | 41 +++
.../apm/testcase/netty/http/Application.java | 28 +-
.../netty/http/controller/CaseController.java | 49 +++
.../testcase/netty/http/core/ClientService.java | 87 ++++++
.../testcase/netty/http/core/ServerService.java | 62 ++++
.../netty/http/handler/UserClientHandler.java | 45 +++
.../netty/http/handler/UserServerHandler.java | 57 ++++
.../src/main/resources/application.yaml | 30 +-
.../netty-http-4.1.x-scenario/support-version.list | 27 ++
79 files changed, 2991 insertions(+), 222 deletions(-)
copy .github/workflows/{plugins-jdk17-test.1.yaml => plugins-jdk21-test.0.yaml} (87%)
create mode 100644 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/ZGCCollectorModule.java
create mode 100644 apm-sniffer/bytebuddy-patch/src/main/java/net/bytebuddy/agent/builder/SWDescriptionStrategy.java
copy apm-sniffer/bytebuddy-patch/src/test/java/org/apache/skywalking/apm/agent/bytebuddy/biz/{BizFoo.java => BizInterface.java} (63%)
copy apm-sniffer/bytebuddy-patch/src/test/java/org/apache/skywalking/apm/agent/bytebuddy/cases/{ReTransform2Test.java => ReTransform3Test.java} (67%)
copy apm-sniffer/{bytebuddy-patch => optional-plugins/netty-http-4.1.x-plugin}/pom.xml (54%)
create mode 100644 apm-sniffer/optional-plugins/netty-http-4.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/http/AddHttpRequestDecoderInterceptor.java
create mode 100644 apm-sniffer/optional-plugins/netty-http-4.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/http/AddHttpRequestEncoderInterceptor.java
create mode 100644 apm-sniffer/optional-plugins/netty-http-4.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/http/AddHttpResponseDecoderInterceptor.java
create mode 100644 apm-sniffer/optional-plugins/netty-http-4.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/http/AddHttpResponseEncoderInterceptor.java
create mode 100644 apm-sniffer/optional-plugins/netty-http-4.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/http/ChannelHandlerContextInterceptor.java
create mode 100644 apm-sniffer/optional-plugins/netty-http-4.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/http/ChannelPipelineRemoveLastInterceptor.java
create mode 100644 apm-sniffer/optional-plugins/netty-http-4.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/http/RemoveHandlerInterceptor.java
create mode 100644 apm-sniffer/optional-plugins/netty-http-4.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/http/common/AttributeKeys.java
copy apm-sniffer/{bytebuddy-patch/src/test/java/org/apache/skywalking/apm/agent/bytebuddy/biz/BizFoo.java => optional-plugins/netty-http-4.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/http/common/NettyConstants.java} (64%)
create mode 100644 apm-sniffer/optional-plugins/netty-http-4.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/http/config/NettyHttpPluginConfig.java
copy apm-sniffer/{bytebuddy-patch/src/test/java/org/apache/skywalking/apm/agent/bytebuddy/biz/BizFoo.java => optional-plugins/netty-http-4.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/http/define/AbstractNettyInstrumentation.java} (57%)
create mode 100644 apm-sniffer/optional-plugins/netty-http-4.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/http/define/ChannelHandlerContextInstrumentation.java
create mode 100644 apm-sniffer/optional-plugins/netty-http-4.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/http/define/ChannelHandlerInstrumentation.java
create mode 100644 apm-sniffer/optional-plugins/netty-http-4.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/http/define/ChannelPipelineInstrumentation.java
create mode 100644 apm-sniffer/optional-plugins/netty-http-4.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/http/define/HttpRequestDecoderInstrumentation.java
create mode 100644 apm-sniffer/optional-plugins/netty-http-4.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/http/define/HttpRequestEncoderInstrumentation.java
create mode 100644 apm-sniffer/optional-plugins/netty-http-4.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/http/define/HttpResponseDecoderInstrumentation.java
create mode 100644 apm-sniffer/optional-plugins/netty-http-4.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/http/define/HttpResponseEncoderInstrumentation.java
create mode 100644 apm-sniffer/optional-plugins/netty-http-4.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/http/handler/NettyHttpRequestDecoderTracingHandler.java
create mode 100644 apm-sniffer/optional-plugins/netty-http-4.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/http/handler/NettyHttpRequestEncoderTracingHandler.java
create mode 100644 apm-sniffer/optional-plugins/netty-http-4.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/http/handler/NettyHttpResponseDecoderTracingHandler.java
create mode 100644 apm-sniffer/optional-plugins/netty-http-4.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/http/handler/NettyHttpResponseEncoderTracingHandler.java
create mode 100644 apm-sniffer/optional-plugins/netty-http-4.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/http/utils/HttpDataCollectUtils.java
create mode 100644 apm-sniffer/optional-plugins/netty-http-4.1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/http/utils/TypeUtils.java
create mode 100644 apm-sniffer/optional-plugins/netty-http-4.1.x-plugin/src/main/resources/skywalking-plugin.def
create mode 100644 test/plugin/scenarios/netty-http-4.1.x-scenario/bin/startup.sh
create mode 100644 test/plugin/scenarios/netty-http-4.1.x-scenario/config/expectedData.yaml
create mode 100644 test/plugin/scenarios/netty-http-4.1.x-scenario/configuration.yml
create mode 100644 test/plugin/scenarios/netty-http-4.1.x-scenario/pom.xml
create mode 100644 test/plugin/scenarios/netty-http-4.1.x-scenario/src/main/assembly/assembly.xml
copy apm-sniffer/bytebuddy-patch/src/test/java/org/apache/skywalking/apm/agent/bytebuddy/biz/BizFoo.java => test/plugin/scenarios/netty-http-4.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/netty/http/Application.java (63%)
create mode 100644 test/plugin/scenarios/netty-http-4.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/netty/http/controller/CaseController.java
create mode 100644 test/plugin/scenarios/netty-http-4.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/netty/http/core/ClientService.java
create mode 100644 test/plugin/scenarios/netty-http-4.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/netty/http/core/ServerService.java
create mode 100644 test/plugin/scenarios/netty-http-4.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/netty/http/handler/UserClientHandler.java
create mode 100644 test/plugin/scenarios/netty-http-4.1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/netty/http/handler/UserServerHandler.java
copy .asf.yaml => test/plugin/scenarios/netty-http-4.1.x-scenario/src/main/resources/application.yaml (59%)
create mode 100644 test/plugin/scenarios/netty-http-4.1.x-scenario/support-version.list
(skywalking-java) 01/01: Bump up grpc
Posted by ke...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch grpc
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
commit b40757b0918639076dd718765721ff8b5ca1cb26
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Tue Nov 28 11:05:00 2023 +0800
Bump up grpc
---
CHANGES.md | 2 +-
apm-protocol/apm-network/src/main/proto | 2 +-
dist-material/LICENSE | 2 +-
pom.xml | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 7dcf73cb16..a98f8a6448 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -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.
@@ -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.
diff --git a/apm-protocol/apm-network/src/main/proto b/apm-protocol/apm-network/src/main/proto
index d4da569991..f9066463de 160000
--- a/apm-protocol/apm-network/src/main/proto
+++ b/apm-protocol/apm-network/src/main/proto
@@ -1 +1 @@
-Subproject commit d4da5699915ee52288f8ff1c954decf6363485bc
+Subproject commit f9066463deb7f9d1fbe8110eab3524694b0db298
diff --git a/dist-material/LICENSE b/dist-material/LICENSE
index 982dfe0ae9..a5c6f781cf 100755
--- a/dist-material/LICENSE
+++ b/dist-material/LICENSE
@@ -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
diff --git a/pom.xml b/pom.xml
index e521e38152..e40545b238 100755
--- a/pom.xml
+++ b/pom.xml
@@ -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>