This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch GA-release
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from 544e8d8 Merge branch 'master' into GA-release
new 9c08c3e Revert "GA tagged, move to 6.1 (#2180)"
new 8b50343 Improve buffer reader speed. (#2188)
The 4552 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:
.../apm-toolkit-log4j-1.x/pom.xml | 2 +-
.../apm-toolkit-log4j-2.x/pom.xml | 2 +-
.../apm-toolkit-logback-1.x/pom.xml | 2 +-
.../apm-toolkit-opentracing/pom.xml | 2 +-
apm-application-toolkit/apm-toolkit-trace/pom.xml | 2 +-
apm-application-toolkit/pom.xml | 2 +-
apm-commons/apm-datacarrier/pom.xml | 2 +-
apm-commons/apm-util/pom.xml | 2 +-
apm-commons/pom.xml | 2 +-
apm-dist/pom.xml | 2 +-
apm-protocol/apm-network/pom.xml | 2 +-
apm-protocol/pom.xml | 2 +-
apm-sniffer/apm-agent-core/pom.xml | 5 +-
apm-sniffer/apm-agent/pom.xml | 2 +-
.../apm-sdk-plugin/activemq-5.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/canal-1.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/dubbo-conflict-patch/pom.xml | 6 +-
apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml | 2 +-
.../elasticsearch-5.x-plugin/pom.xml | 2 +-
.../feign-default-http-9.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/httpClient-4.x-plugin/pom.xml | 2 +-
.../httpasyncclient-4.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/hystrix-1.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml | 2 +-
.../apm-sdk-plugin/jedis-2.x-plugin/pom.xml | 2 +-
.../jetty-plugin/jetty-client-9.0-plugin/pom.xml | 2 +-
.../jetty-plugin/jetty-client-9.x-plugin/pom.xml | 2 +-
.../jetty-plugin/jetty-server-9.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/mongodb-2.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/mongodb-3.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/mysql-5.x-plugin/pom.xml | 2 +-
.../nutz-plugins/http-1.x-plugin/pom.xml | 2 +-
.../nutz-plugins/mvc-annotation-1.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml | 2 +-
.../apm-sdk-plugin/okhttp-3.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/postgresql-8.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/rabbitmq-5.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/redisson-3.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/servicecomb-plugin/pom.xml | 2 +-
.../servicecomb-java-chassis-0.x-plugin/pom.xml | 2 +-
.../servicecomb-java-chassis-1.x-plugin/pom.xml | 2 +-
.../sharding-jdbc-1.5.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml | 2 +-
.../concurrent-util-4.x-plugin/pom.xml | 2 +-
.../spring-plugins/core-patch/pom.xml | 2 +-
.../mvc-annotation-3.x-plugin/pom.xml | 2 +-
.../mvc-annotation-4.x-plugin/pom.xml | 2 +-
.../mvc-annotation-5.x-plugin/pom.xml | 2 +-
.../spring-plugins/mvc-annotation-commons/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml | 2 +-
.../spring-plugins/resttemplate-4.x-plugin/pom.xml | 2 +-
.../spring-cloud/netflix-plugins/pom.xml | 2 +-
.../spring-cloud-feign-1.x-plugin/pom.xml | 2 +-
.../spring-plugins/spring-cloud/pom.xml | 2 +-
.../spring-plugins/spring-commons/pom.xml | 6 +-
.../spring-plugins/webflux-5.x-plugin/pom.xml | 5 +-
.../apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/struts2-2.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/undertow-plugins/pom.xml | 2 +-
.../undertow-plugins/undertow-2.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-test-tools/pom.xml | 5 +-
.../apm-toolkit-log4j-1.x-activation/pom.xml | 2 +-
.../apm-toolkit-log4j-2.x-activation/pom.xml | 2 +-
.../apm-toolkit-logback-1.x-activation/pom.xml | 2 +-
.../apm-toolkit-opentracing-activation/pom.xml | 2 +-
.../apm-toolkit-trace-activation/pom.xml | 2 +-
apm-sniffer/apm-toolkit-activation/pom.xml | 2 +-
.../optional-plugins/gson-2.8.x-plugin/pom.xml | 2 +-
.../optional-spring-plugins/pom.xml | 2 +-
.../spring-annotation-plugin/pom.xml | 2 +-
apm-sniffer/optional-plugins/pom.xml | 2 +-
.../optional-plugins/trace-ignore-plugin/pom.xml | 5 +-
apm-sniffer/pom.xml | 2 +-
apm-webapp/pom.xml | 2 +-
oap-server/generate-tool/pom.xml | 6 +-
oap-server/generated-analysis/pom.xml | 6 +-
oap-server/pom.xml | 5 +-
oap-server/server-alarm-plugin/pom.xml | 2 +-
.../cluster-consul-plugin/pom.xml | 6 +-
.../cluster-kubernetes-plugin/pom.xml | 5 +-
.../cluster-standalone-plugin/pom.xml | 2 +-
.../cluster-zookeeper-plugin/pom.xml | 2 +-
oap-server/server-cluster-plugin/pom.xml | 2 +-
oap-server/server-core/pom.xml | 5 +-
.../register/worker/RegisterPersistentWorker.java | 41 ++++++++-----
oap-server/server-library/library-buffer/pom.xml | 2 +-
.../oap/server/library/buffer/BufferData.java} | 18 +++---
.../library/buffer/BufferDataCollection.java | 57 ++++++++++++++++++
.../oap/server/library/buffer/BufferStream.java | 3 +-
.../server/library/buffer/DataStreamReader.java | 68 ++++++++++++++++------
.../library/buffer/BufferStreamTestCase.java | 14 ++---
oap-server/server-library/library-client/pom.xml | 2 +-
oap-server/server-library/library-module/pom.xml | 2 +-
oap-server/server-library/library-server/pom.xml | 2 +-
oap-server/server-library/library-util/pom.xml | 5 +-
oap-server/server-library/pom.xml | 2 +-
oap-server/server-query-plugin/pom.xml | 2 +-
.../query-graphql-plugin/pom.xml | 2 +-
oap-server/server-receiver-plugin/pom.xml | 2 +-
.../pom.xml | 2 +-
.../skywalking-jvm-receiver-plugin/pom.xml | 2 +-
.../skywalking-mesh-receiver-plugin/pom.xml | 2 +-
.../receiver/mesh/MeshDataBufferFileCache.java | 9 ++-
.../skywalking-register-receiver-plugin/pom.xml | 2 +-
.../skywalking-trace-receiver-plugin/pom.xml | 2 +-
.../trace/provider/parser/SegmentParse.java | 61 ++++++++++---------
.../trace/provider/parser/SegmentParseV2.java | 62 +++++++++++---------
.../standardization/ReferenceIdExchanger.java | 13 +++--
.../parser/standardization/SpanIdExchanger.java | 13 +++--
.../zipkin-receiver-plugin/pom.xml | 5 +-
oap-server/server-starter/pom.xml | 5 +-
oap-server/server-storage-plugin/pom.xml | 2 +-
.../storage-elasticsearch-plugin/pom.xml | 2 +-
.../elasticsearch/lock/RegisterLockInstaller.java | 12 ++++
.../storage-jdbc-hikaricp-plugin/pom.xml | 2 +-
oap-server/server-telemetry/pom.xml | 6 +-
oap-server/server-telemetry/telemetry-api/pom.xml | 6 +-
.../server-telemetry/telemetry-prometheus/pom.xml | 6 +-
oap-server/server-testing/pom.xml | 6 +-
pom.xml | 2 +-
131 files changed, 421 insertions(+), 254 deletions(-)
copy
oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Alarms.java
=>
server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/BufferData.java}
(61%)
create mode 100644
oap-server/server-library/library-buffer/src/main/java/org/apache/skywalking/oap/server/library/buffer/BufferDataCollection.java
