You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ha...@apache.org on 2021/06/15 04:29:35 UTC
[skywalking] 01/02: Merge remote-tracking branch 'origin/master'
into upgrade-deps
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch upgrade-deps
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 19ba4df0844f0c0450b2be242ddab17be290bcd0
Merge: 47addd6 efcb396
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Tue Jun 15 10:48:07 2021 +0800
Merge remote-tracking branch 'origin/master' into upgrade-deps
CHANGES.md | 4 +-
apm-dist-es7/src/main/assembly/binary-es7.xml | 1 +
apm-dist/src/main/assembly/binary.xml | 1 +
docs/en/concepts-and-designs/scope-definitions.md | 56 ----
docs/en/setup/backend/backend-meter.md | 4 +
docs/en/setup/backend/backend-receivers.md | 12 +
docs/en/setup/backend/spring-sleuth-setup.md | 8 +
.../analyzer/provider/jvm/JVMSourceDispatcher.java | 289 ++++++++++-----------
.../apache/skywalking/oal/rt/grammar/OALLexer.g4 | 5 -
.../apache/skywalking/oal/rt/grammar/OALParser.g4 | 1 -
oap-server/server-bootstrap/pom.xml | 1 +
.../src/main/resources/application.yml | 2 +-
.../src/main/resources/jvm-metrics-rules/jvm.yaml | 61 +++++
.../src/main/resources/oal/java-agent.oal | 31 ---
.../server/core/source/ServiceInstanceJVMCPU.java | 58 -----
.../server/core/source/ServiceInstanceJVMGC.java | 64 -----
.../core/source/ServiceInstanceJVMMemory.java | 70 -----
.../core/source/ServiceInstanceJVMMemoryPool.java | 70 -----
.../core/source/ServiceInstanceJVMThread.java | 64 -----
.../agent/kafka/provider/KafkaFetcherProvider.java | 10 +-
.../kafka/provider/handler/JVMMetricsHandler.java | 7 +-
.../provider/handler/JVMMetricsHandlerTest.java | 29 +--
.../envoy/als/LogEntry2MetricsAdapter.java | 2 +-
.../receiver/jvm/provider/JVMModuleProvider.java | 14 +-
.../server/receiver/jvm/provider/JVMOALDefine.java | 35 ---
.../handler/JVMMetricReportServiceHandler.java | 11 +-
.../skywalking/e2e/metrics/MetricsQuery.java | 10 +-
.../apache/skywalking/e2e/simple/SimpleE2E.java | 6 +-
28 files changed, 271 insertions(+), 655 deletions(-)