You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2021/06/11 14:21:49 UTC
[skywalking] branch als/status updated (d3b46c2 -> 5289dec)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch als/status
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from d3b46c2 Only count 5xx as error in Envoy ALS receiver
add 7a3355f Use MAL to calculate JVM metrics, remove OAL dependency. (#7091)
add 5289dec Merge branch 'master' into als/status
No new revisions were added by this update.
Summary of changes:
CHANGES.md | 1 +
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 ----
.../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/jvm-metrics-rules/jvm.yaml | 33 ++-
.../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 +--
.../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 +-
23 files changed, 211 insertions(+), 656 deletions(-)
copy test/e2e/e2e-test/docker/log/log-mal.yaml => oap-server/server-bootstrap/src/main/resources/jvm-metrics-rules/jvm.yaml (53%)
delete mode 100644 oap-server/server-bootstrap/src/main/resources/oal/java-agent.oal
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceJVMCPU.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceJVMGC.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceJVMMemory.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceJVMMemoryPool.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceJVMThread.java
delete mode 100644 oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/jvm/provider/JVMOALDefine.java