[skywalking] branch master updated (db9f8e6 -> 925c0d7)

[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 db9f8e6  Support Jetty server advanced configuration. (#5147)
     add 925c0d7  Provide server-side meter (#4972)

No new revisions were added by this update.

Summary of changes:
 .github/workflows/e2e.yaml                         |  22 ++
 apm-dist-es7/src/main/assembly/binary-es7.xml      |   1 +
 apm-dist/src/main/assembly/binary.xml              |   1 +
 dist-material/release-docs/LICENSE                 |   1 +
 docs/en/setup/backend/backend-meter.md             | 126 +++++++++++
 docs/en/setup/backend/backend-receivers.md         |  14 ++
 docs/en/setup/backend/backend-setup.md             |   1 +
 docs/en/setup/backend/spring-sleuth-setup.md       |  63 ++++++
 .../java-agent/Application-toolkit-meter.md        |   2 +
 oap-server/pom.xml                                 |   6 +
 oap-server/server-bootstrap/pom.xml                |   6 +
 .../src/main/resources/application.yml             |   4 +
 .../meter-receive-config/spring-sleuth.yaml        | 154 ++++++++++++++
 .../main/resources/ui-initialized-templates.yml    | 164 +++++++++++++++
 oap-server/server-receiver-plugin/pom.xml          |   1 +
 .../{ => skywalking-meter-receiver-plugin}/pom.xml |  38 +---
 .../receiver/meter/module/MeterReceiverModule.java |  24 ++-
 .../meter/provider/MeterReceiverConfig.java        |  19 +-
 .../meter/provider/MeterReceiverProvider.java      |  89 ++++++++
 .../meter/provider/config/MeterConfig.java         |  19 +-
 .../meter/provider/config/MeterConfigs.java        |  72 +++++++
 .../meter/provider/config/MeterDataConfig.java     |  40 ++--
 .../receiver/meter/provider/config/Scope.java      |  27 +--
 .../provider/handler/MeterServiceHandler.java      |  66 ++++++
 .../receiver/meter/provider/process/EvalData.java  |  80 +++++++
 .../meter/provider/process/EvalHistogramData.java  |  80 +++++++
 .../meter/provider/process/EvalMultipleData.java   | 152 ++++++++++++++
 .../meter/provider/process/EvalSingleData.java     | 127 +++++++++++
 .../meter/provider/process/MeterBuilder.java       | 157 ++++++++++++++
 .../meter/provider/process/MeterEvalOperation.java | 110 ++++++++++
 .../provider/process/MeterProcessContext.java      |  62 ++++++
 .../meter/provider/process/MeterProcessor.java     | 233 +++++++++++++++++++++
 .../receiver/meter/provider/process/Window.java    | 109 ++++++++++
 ...ywalking.oap.server.library.module.ModuleDefine |  23 +-
 ...alking.oap.server.library.module.ModuleProvider |  23 +-
 .../meter/module/MeterReceiverModuleTest.java      |  21 +-
 .../meter/provider/config/MeterConfigsTest.java    |  62 ++++++
 .../meter/provider/process/EvalDataBaseTest.java   |  73 +++++++
 .../meter/provider/process/EvalDataTest.java       | 106 ++++++++++
 .../provider/process/EvalHistogramDataTest.java    | 129 ++++++++++++
 .../provider/process/EvalMultipleDataTest.java     | 131 ++++++++++++
 .../meter/provider/process/EvalSingleDataTest.java |  97 +++++++++
 .../meter/provider/process/MeterBaseTest.java      | 108 ++++++++++
 .../meter/provider/process/MeterBuilderTest.java   |  97 +++++++++
 .../provider/process/MeterEvalOperationTest.java   |  64 ++++++
 .../provider/process/MeterProcessContextTest.java  |  60 ++++++
 .../meter/provider/process/MeterProcessorTest.java | 104 +++++++++
 .../resources/meter-receive-config/config.yaml     |  43 ++--
 .../skywalking/e2e/metrics/MetricsQuery.java       |   9 +
 test/e2e/e2e-service-provider/pom.xml              |  16 ++
 .../apache/skywalking/e2e/Service0Application.java |   8 +
 .../src/main/resources/application.yml             |   9 +
 .../docker/meter/docker-compose.yml}               |  45 ++--
 .../org/apache/skywalking/e2e/meter/MeterE2E.java  | 115 ++++++++++
 .../expected/{storage => meter}/instances.yml      |   0
 .../expected/{storage => meter}/services.yml       |   0
 .../known-oap-backend-dependencies-es7.txt         |   1 +
 .../known-oap-backend-dependencies.txt             |   1 +
 58 files changed, 3238 insertions(+), 177 deletions(-)
 create mode 100644 docs/en/setup/backend/backend-meter.md
 create mode 100644 docs/en/setup/backend/spring-sleuth-setup.md
 create mode 100644 oap-server/server-bootstrap/src/main/resources/meter-receive-config/spring-sleuth.yaml
 copy oap-server/server-receiver-plugin/{ => skywalking-meter-receiver-plugin}/pom.xml (51%)
 copy test/e2e/e2e-service-provider/src/main/java/org/apache/skywalking/e2e/Service0Application.java => oap-server/server-receiver-plugin/skywalking-meter-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/meter/module/MeterReceiverModule.java (59%)
 copy test/e2e/e2e-service-provider/src/main/java/org/apache/skywalking/e2e/Service0Application.java => oap-server/server-receiver-plugin/skywalking-meter-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/meter/provider/MeterReceiverConfig.java (59%)
 create mode 100644 oap-server/server-receiver-plugin/skywalking-meter-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/meter/provider/MeterReceiverProvider.java
 copy test/e2e/e2e-service-provider/src/main/java/org/apache/skywalking/e2e/Service0Application.java => oap-server/server-receiver-plugin/skywalking-meter-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/meter/provider/config/MeterConfig.java (59%)
 create mode 100644 oap-server/server-receiver-plugin/skywalking-meter-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/meter/provider/config/MeterConfigs.java
 copy test/e2e/e2e-service-provider/src/main/java/org/apache/skywalking/e2e/Service0Application.java => oap-server/server-receiver-plugin/skywalking-meter-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/meter/provider/config/MeterDataConfig.java (59%)
 copy test/e2e/e2e-service-provider/src/main/java/org/apache/skywalking/e2e/Service0Application.java => oap-server/server-receiver-plugin/skywalking-meter-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/meter/provider/config/Scope.java (59%)
 create mode 100644 oap-server/server-receiver-plugin/skywalking-meter-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/meter/provider/handler/MeterServiceHandler.java
 create mode 100644 oap-server/server-receiver-plugin/skywalking-meter-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/meter/provider/process/EvalData.java
 create mode 100644 oap-server/server-receiver-plugin/skywalking-meter-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/meter/provider/process/EvalHistogramData.java
 create mode 100644 oap-server/server-receiver-plugin/skywalking-meter-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/meter/provider/process/EvalMultipleData.java
 create mode 100644 oap-server/server-receiver-plugin/skywalking-meter-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/meter/provider/process/EvalSingleData.java
 create mode 100644 oap-server/server-receiver-plugin/skywalking-meter-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/meter/provider/process/MeterBuilder.java
 create mode 100644 oap-server/server-receiver-plugin/skywalking-meter-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/meter/provider/process/MeterEvalOperation.java
 create mode 100644 oap-server/server-receiver-plugin/skywalking-meter-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/meter/provider/process/MeterProcessContext.java
 create mode 100644 oap-server/server-receiver-plugin/skywalking-meter-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/meter/provider/process/MeterProcessor.java
 create mode 100644 oap-server/server-receiver-plugin/skywalking-meter-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/meter/provider/process/Window.java
 copy test/e2e/e2e-service-provider/src/main/resources/application.yml => oap-server/server-receiver-plugin/skywalking-meter-receiver-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleDefine (68%)
 copy test/e2e/e2e-service-provider/src/main/resources/application.yml => oap-server/server-receiver-plugin/skywalking-meter-receiver-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider (68%)
 copy test/e2e/e2e-service-provider/src/main/java/org/apache/skywalking/e2e/Service0Application.java => oap-server/server-receiver-plugin/skywalking-meter-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/meter/module/MeterReceiverModuleTest.java (59%)
 create mode 100644 oap-server/server-receiver-plugin/skywalking-meter-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/meter/provider/config/MeterConfigsTest.java
 create mode 100644 oap-server/server-receiver-plugin/skywalking-meter-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/meter/provider/process/EvalDataBaseTest.java
 create mode 100644 oap-server/server-receiver-plugin/skywalking-meter-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/meter/provider/process/EvalDataTest.java
 create mode 100644 oap-server/server-receiver-plugin/skywalking-meter-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/meter/provider/process/EvalHistogramDataTest.java
 create mode 100644 oap-server/server-receiver-plugin/skywalking-meter-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/meter/provider/process/EvalMultipleDataTest.java
 create mode 100644 oap-server/server-receiver-plugin/skywalking-meter-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/meter/provider/process/EvalSingleDataTest.java
 create mode 100644 oap-server/server-receiver-plugin/skywalking-meter-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/meter/provider/process/MeterBaseTest.java
 create mode 100644 oap-server/server-receiver-plugin/skywalking-meter-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/meter/provider/process/MeterBuilderTest.java
 create mode 100644 oap-server/server-receiver-plugin/skywalking-meter-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/meter/provider/process/MeterEvalOperationTest.java
 create mode 100644 oap-server/server-receiver-plugin/skywalking-meter-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/meter/provider/process/MeterProcessContextTest.java
 create mode 100644 oap-server/server-receiver-plugin/skywalking-meter-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/meter/provider/process/MeterProcessorTest.java
 copy test/e2e/e2e-service-provider/src/main/resources/application.yml => oap-server/server-receiver-plugin/skywalking-meter-receiver-plugin/src/test/resources/meter-receive-config/config.yaml (59%)
 copy test/e2e/{e2e-service-provider/src/main/resources/application.yml => e2e-test/docker/meter/docker-compose.yml} (64%)
 create mode 100644 test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/meter/MeterE2E.java
 copy test/e2e/e2e-test/src/test/resources/expected/{storage => meter}/instances.yml (100%)
 copy test/e2e/e2e-test/src/test/resources/expected/{storage => meter}/services.yml (100%)