This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a change to branch meter/prometheus
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 15f83a0 Add endpoint entity
add 42d79bf Fix too many mang ipv4 records reported by the agent when
deployed in container. (#4817)
add ec175f5 Miss the node type condition in the es searchServices query.
(#4821)
add 6ed40b3 Keep ID as ref ID in the readSampledRecords (#4822)
add 594fb15 Increased support for Vertx (#4827)
add 37940be Correct the service node type. (#4833)
add 605d244 ApdexMetrics Change type of `totalNum`、`sSum`，`tNum` from
int to long (#4839)
add e8e9153 fix ClassCastException in KafkaProducerInterceptor (#4826)
add deccc26 Bulk executed with failures，then log detail message (#4845)
add 51be4b9 Merge branch 'master' into meter/prometheus
No new revisions were added by this update.
Summary of changes:
.github/workflows/plugins-test.3.yaml | 3 +-
.../skywalking/apm/agent/core/conf/Config.java | 8 +++
.../skywalking/apm/agent/core/os/OSUtil.java | 9 ++-
.../agent/core/remote/ServiceManagementClient.java | 3 +-
.../plugin/kafka/CallbackAdapterInterceptor.java | 65 ++++++++++++++++++++++
.../apm/plugin/kafka/KafkaProducerInterceptor.java | 39 +++++++++----
.../kafka/define/KafkaProducerInstrumentation.java | 2 +-
.../plugin/kafka/KafkaProducerInterceptorTest.java | 39 +++++++++++--
...ClientRequestImplHandleResponseInterceptor.java | 22 +++++---
.../HttpServerResponseImplEndInterceptor.java | 8 ++-
.../skywalking/apm/plugin/vertx3/VertxContext.java | 17 +++++-
.../define/RouterImplAcceptInstrumentation.java | 6 +-
...n.java => RouterImplHandleInstrumentation.java} | 12 ++--
.../src/main/resources/skywalking-plugin.def | 2 +
docs/en/setup/service-agent/java-agent/README.md | 1 +
.../server/core/analysis/metrics/ApdexMetrics.java | 8 +--
.../client/elasticsearch/ElasticSearchClient.java | 2 +-
.../src/main/resources/query-protocol | 2 +-
.../parser/listener/SegmentAnalysisListener.java | 2 +-
.../elasticsearch/query/MetadataQueryEsDAO.java | 1 +
.../elasticsearch/query/TopNRecordsQueryEsDAO.java | 9 ++-
.../plugin/influxdb/query/TopNRecordsQuery.java | 1 +
.../plugin/jdbc/h2/dao/H2TopNRecordsQueryDAO.java | 1 +
.../kafka-scenario/config/expectedData.yaml | 35 ++++++++++++
.../testcase/kafka/controller/CaseController.java | 21 ++++---
.../bin/startup.sh | 2 +-
.../config/expectedData.yaml | 28 +++++-----
.../configuration.yml | 4 +-
.../pom.xml | 8 +--
.../src/main/assembly/assembly.xml | 2 +-
.../apm/testcase/vertxweb/Application.java | 0
.../vertxweb/controller/VertxWebController.java | 8 +--
.../src/main/resources/log4j2.xml | 0
.../support-version.list | 13 -----
.../bin/startup.sh | 3 +-
.../config/expectedData.yaml | 28 +++++-----
.../configuration.yml | 4 +-
.../pom.xml | 11 +++-
.../src/main/assembly/assembly.xml | 2 +-
.../apm/testcase/vertxweb/Application.java | 0
.../vertxweb/controller/VertxWebController.java | 15 ++---
.../src/main/resources/log4j2.xml | 0
.../support-version.list | 14 ++++-
.../vertx-web-3.x-scenario/bin/startup.sh | 21 -------
.../vertx-web-3.x-scenario/configuration.yml | 20 -------
.../src/main/assembly/assembly.xml | 41 --------------
46 files changed, 331 insertions(+), 211 deletions(-)
create mode 100644
apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/CallbackAdapterInterceptor.java
copy
apm-sniffer/apm-sdk-plugin/vertx-plugins/vertx-core-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/vertx3/define/{RouterImplAcceptInstrumentation.java
=> RouterImplHandleInstrumentation.java} (88%)
copy test/plugin/scenarios/{apm-toolkit-trace-scenario =>
vertx-web-3.54minus-scenario}/bin/startup.sh (91%)
copy test/plugin/scenarios/{vertx-web-3.x-scenario =>
vertx-web-3.54minus-scenario}/config/expectedData.yaml (76%)
copy test/plugin/scenarios/{dubbo-2.5.x-scenario =>
vertx-web-3.54minus-scenario}/configuration.yml (83%)
copy test/plugin/scenarios/{vertx-web-3.x-scenario =>
vertx-web-3.54minus-scenario}/pom.xml (93%)
copy test/plugin/scenarios/{canal-scenario =>
vertx-web-3.54minus-scenario}/src/main/assembly/assembly.xml (94%)
copy test/plugin/scenarios/{vertx-web-3.x-scenario =>
vertx-web-3.54minus-scenario}/src/main/java/org/apache/skywalking/apm/testcase/vertxweb/Application.java
(100%)
copy test/plugin/scenarios/{vertx-web-3.x-scenario =>
vertx-web-3.54minus-scenario}/src/main/java/org/apache/skywalking/apm/testcase/vertxweb/controller/VertxWebController.java
(82%)
copy test/plugin/scenarios/{vertx-web-3.x-scenario =>
vertx-web-3.54minus-scenario}/src/main/resources/log4j2.xml (100%)
rename test/plugin/scenarios/{vertx-web-3.x-scenario =>
vertx-web-3.54minus-scenario}/support-version.list (91%)
copy test/plugin/scenarios/{elasticsearch-5.x-scenario =>
vertx-web-3.6plus-scenario}/bin/startup.sh (92%)
rename test/plugin/scenarios/{vertx-web-3.x-scenario =>
vertx-web-3.6plus-scenario}/config/expectedData.yaml (77%)
copy test/plugin/scenarios/{dubbo-2.5.x-scenario =>
vertx-web-3.6plus-scenario}/configuration.yml (84%)
rename test/plugin/scenarios/{vertx-web-3.x-scenario =>
vertx-web-3.6plus-scenario}/pom.xml (90%)
copy test/plugin/scenarios/{elasticsearch-6.x-scenario =>
vertx-web-3.6plus-scenario}/src/main/assembly/assembly.xml (96%)
rename test/plugin/scenarios/{vertx-web-3.x-scenario =>
vertx-web-3.6plus-scenario}/src/main/java/org/apache/skywalking/apm/testcase/vertxweb/Application.java
(100%)
rename test/plugin/scenarios/{vertx-web-3.x-scenario =>
vertx-web-3.6plus-scenario}/src/main/java/org/apache/skywalking/apm/testcase/vertxweb/controller/VertxWebController.java
(68%)
rename test/plugin/scenarios/{vertx-web-3.x-scenario =>
vertx-web-3.6plus-scenario}/src/main/resources/log4j2.xml (100%)
copy test/plugin/scenarios/{cassandra-java-driver-3.x-scenario =>
vertx-web-3.6plus-scenario}/support-version.list (92%)
delete mode 100644 test/plugin/scenarios/vertx-web-3.x-scenario/bin/startup.sh
delete mode 100644
test/plugin/scenarios/vertx-web-3.x-scenario/configuration.yml
delete mode 100644
test/plugin/scenarios/vertx-web-3.x-scenario/src/main/assembly/assembly.xml
