[skywalking] branch master updated (273bc5b -> d63f3ff)

[wu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


    from 273bc5b  Sync UI (#7187)
     add d63f3ff  revert #7091 (#7189)

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  |  61 -----
 .../src/main/resources/oal/java-agent.oal          |  31 +++
 ...tanceCLRCPU.java => ServiceInstanceJVMCPU.java} |  13 +-
 ...stanceCLRCPU.java => ServiceInstanceJVMGC.java} |  21 +-
 ...nceCLRGC.java => ServiceInstanceJVMMemory.java} |  24 +-
 ...read.java => ServiceInstanceJVMMemoryPool.java} |  24 +-
 ...ceCLRCPU.java => ServiceInstanceJVMThread.java} |  21 +-
 .../agent/kafka/provider/KafkaFetcherProvider.java |  12 +-
 .../kafka/provider/handler/JVMMetricsHandler.java  |  13 +-
 .../provider/handler/JVMMetricsHandlerTest.java    |  31 ++-
 .../receiver/jvm/provider/JVMModuleProvider.java   |  16 +-
 .../receiver/jvm/provider/JVMOALDefine.java}       |  14 +-
 .../handler/JVMMetricReportServiceHandler.java     |  13 +-
 21 files changed, 353 insertions(+), 296 deletions(-)
 delete mode 100644 oap-server/server-bootstrap/src/main/resources/jvm-metrics-rules/jvm.yaml
 create mode 100644 oap-server/server-bootstrap/src/main/resources/oal/java-agent.oal
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/{ServiceInstanceCLRCPU.java => ServiceInstanceJVMCPU.java} (86%)
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/{ServiceInstanceCLRCPU.java => ServiceInstanceJVMGC.java} (82%)
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/{ServiceInstanceCLRGC.java => ServiceInstanceJVMMemory.java} (81%)
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/{ServiceInstanceCLRThread.java => ServiceInstanceJVMMemoryPool.java} (80%)
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/{ServiceInstanceCLRCPU.java => ServiceInstanceJVMThread.java} (81%)
 copy oap-server/server-receiver-plugin/{skywalking-clr-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/clr/provider/CLROALDefine.java => skywalking-jvm-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/jvm/provider/JVMOALDefine.java} (75%)