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 776d508 Vertx plugin test re-implementation (#4624)
add b635e25 Provide Meter(metrics) system (#4694)
No new revisions were added by this update.
Summary of changes:
README.md | 13 +-
docs/en/concepts-and-designs/meter.md | 20 ++
docs/en/concepts-and-designs/overview.md | 21 +-
docs/en/setup/backend/backend-fetcher.md | 13 +
docs/en/setup/backend/backend-receivers.md | 9 +-
docs/en/setup/backend/backend-setup.md | 4 +-
oap-server/oal-rt/pom.xml | 4 -
.../skywalking/oal/rt/parser/MetricsHolder.java | 9 +-
oap-server/pom.xml | 1 +
oap-server/server-bootstrap/pom.xml | 11 +-
.../src/main/resources/application.yml | 5 +
oap-server/server-core/pom.xml | 4 +
.../skywalking/oap/server/core/CoreModule.java | 3 +
.../oap/server/core/CoreModuleProvider.java | 5 +
.../Model.java => analysis/StreamDefinition.java} | 25 +-
.../analysis/manual/segment/SegmentRecord.java | 14 +-
.../server/core/analysis/meter/MeterEntity.java | 82 ++++++
.../server/core/analysis/meter/MeterSystem.java | 292 +++++++++++++++++++++
.../Source.java => analysis/meter/ScopeType.java} | 24 +-
.../analysis/meter/function/AcceptableValue.java | 27 +-
.../server/core/analysis/meter/function/Avg.java | 137 ++++++++++
.../function/MeterFunction.java} | 7 +-
.../core/analysis/metrics/LongAvgMetrics.java | 4 +-
.../analysis/worker/MetricsStreamProcessor.java | 27 +-
.../skywalking/oap/server/core/CoreModuleTest.java | 2 +-
.../server-fetcher-plugin}/pom.xml | 14 +-
.../prometheus-fetcher-plugin}/pom.xml | 9 +-
.../module/PrometheusFetcherModule.java} | 9 +-
.../provider/PrometheusFetcherConfig.java} | 11 +-
.../provider/PrometheusFetcherProvider.java | 94 +++++++
...ywalking.oap.server.library.module.ModuleDefine | 2 +-
...alking.oap.server.library.module.ModuleProvider | 2 +-
.../elasticsearch/query/AggregationQueryEsDAO.java | 20 +-
.../query/AggregationQueryEs7DAO.java | 21 +-
.../tool/profile/core/MockCoreModuleProvider.java | 6 +
35 files changed, 831 insertions(+), 120 deletions(-)
create mode 100644 docs/en/concepts-and-designs/meter.md
create mode 100644 docs/en/setup/backend/backend-fetcher.md
copy
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{storage/model/Model.java
=> analysis/StreamDefinition.java} (67%)
create mode 100644
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/MeterEntity.java
create mode 100644
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/MeterSystem.java
copy
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{source/Source.java
=> analysis/meter/ScopeType.java} (67%)
copy
apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/QueueBuffer.java
=>
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/AcceptableValue.java
(59%)
create mode 100644
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/Avg.java
copy
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{metrics/annotation/MetricsFunction.java
=> meter/function/MeterFunction.java} (77%)
copy {test/e2e/e2e-data => oap-server/server-fetcher-plugin}/pom.xml (82%)
copy oap-server/{server-cluster-plugin/cluster-standalone-plugin =>
server-fetcher-plugin/prometheus-fetcher-plugin}/pom.xml (77%)
copy
oap-server/{server-configuration/configuration-etcd/src/test/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdConfigurationTestModule.java
=>
server-fetcher-plugin/prometheus-fetcher-plugin/src/main/java/org/apache/skywalking/oap/server/fetcher/prometheus/module/PrometheusFetcherModule.java}
(81%)
copy
oap-server/{server-receiver-plugin/skywalking-so11y-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/so11y/So11yReceiverConfig.java
=>
server-fetcher-plugin/prometheus-fetcher-plugin/src/main/java/org/apache/skywalking/oap/server/fetcher/prometheus/provider/PrometheusFetcherConfig.java}
(82%)
create mode 100644
oap-server/server-fetcher-plugin/prometheus-fetcher-plugin/src/main/java/org/apache/skywalking/oap/server/fetcher/prometheus/provider/PrometheusFetcherProvider.java
copy oap-server/{server-configuration/configuration-api =>
server-fetcher-plugin/prometheus-fetcher-plugin}/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleDefine
(90%)
copy oap-server/{exporter =>
server-fetcher-plugin/prometheus-fetcher-plugin}/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
(90%)
