This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch enhance/release-script
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 1703a20 Enhance release script to support non-MacOS system
add 8213224 Make meter receiver support MAL (#5915)
add a167a9a Merge branch 'master' into enhance/release-script
No new revisions were added by this update.
Summary of changes:
CHANGES.md | 3 +
docs/en/setup/backend/backend-meter.md | 111 ++-----------
docs/en/setup/backend/spring-sleuth-setup.md | 2 +-
oap-server/analyzer/agent-analyzer/pom.xml | 5 +-
.../provider/meter/config/MeterConfig.java | 20 ++-
.../provider/meter/config/MeterConfigs.java | 8 +-
.../analyzer/provider/meter/config/Scope.java | 36 -----
.../analyzer/provider/meter/process/EvalData.java | 80 ----------
.../provider/meter/process/EvalHistogramData.java | 80 ----------
.../provider/meter/process/EvalMultipleData.java | 171 --------------------
.../provider/meter/process/EvalSingleData.java | 127 ---------------
.../meter/process/IMeterProcessService.java | 5 -
.../provider/meter/process/MeterBuilder.java | 177 ---------------------
.../provider/meter/process/MeterEvalOperation.java | 110 -------------
.../meter/process/MeterProcessService.java | 33 ++--
.../provider/meter/process/MeterProcessor.java | 167 +++++--------------
.../SampleBuilder.java} | 56 ++++---
.../analyzer/provider/meter/process/Window.java | 109 -------------
.../provider/meter/process/EvalDataBaseTest.java | 73 ---------
.../provider/meter/process/EvalDataTest.java | 106 ------------
.../meter/process/EvalHistogramDataTest.java | 129 ---------------
.../meter/process/EvalMultipleDataTest.java | 156 ------------------
.../provider/meter/process/EvalSingleDataTest.java | 97 -----------
.../provider/meter/process/MeterBaseTest.java | 2 +
.../provider/meter/process/MeterBuilderTest.java | 10 +-
.../meter/process/MeterEvalOperationTest.java | 63 --------
.../meter/process/MeterProcessContextTest.java | 62 --------
.../provider/meter/process/MeterProcessorTest.java | 109 -------------
.../resources/meter-analyzer-config/config.yaml | 27 +---
.../skywalking/oap/meter/analyzer/Analyzer.java | 9 +-
.../oap/meter/analyzer/MetricConvert.java | 12 +-
.../oap/meter/analyzer/MetricRuleConfig.java | 34 ++--
.../{DownsamplingType.java => HistogramType.java} | 15 +-
.../oap/meter/analyzer/dsl/SampleFamily.java | 42 ++---
.../meter/analyzer/dsl/SampleFamilyBuilder.java | 56 +++++++
.../prometheus/PrometheusMetricConverter.java | 28 ++--
.../analyzer/prometheus/rule/MetricsRule.java | 7 +-
.../oap/meter/analyzer/prometheus/rule/Rule.java | 6 +-
.../oap/meter/analyzer/dsl/AggregationTest.java | 19 +--
.../oap/meter/analyzer/dsl/ArithmeticTest.java | 145 ++++++++---------
.../oap/meter/analyzer/dsl/BasicTest.java | 9 +-
.../meter/analyzer/dsl/ExpressionParsingTest.java | 28 ++--
.../oap/meter/analyzer/dsl/FunctionTest.java | 41 ++---
.../oap/meter/analyzer/dsl/IncreaseTest.java | 101 ++++++------
.../oap/meter/analyzer/dsl/TagFilterTest.java | 9 +-
.../src/main/resources/application.yml | 2 +-
.../meter-analyzer-config/spring-sleuth.yaml | 142 +++--------------
.../skywalking/oap/server/core/source/Service.java | 3 +-
.../oap/server/core/source/ServiceInstance.java | 3 +-
.../agent/kafka/provider/KafkaFetcherProvider.java | 3 -
.../meter/provider/MeterReceiverProvider.java | 1 -
.../meter/provider/config/MeterConfigsTest.java | 64 --------
52 files changed, 481 insertions(+), 2432 deletions(-)
delete mode 100644
oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/meter/config/Scope.java
delete mode 100644
oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/meter/process/EvalData.java
delete mode 100644
oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/meter/process/EvalHistogramData.java
delete mode 100644
oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/meter/process/EvalMultipleData.java
delete mode 100644
oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/meter/process/EvalSingleData.java
delete mode 100644
oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/meter/process/MeterBuilder.java
delete mode 100644
oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/meter/process/MeterEvalOperation.java
rename
oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/meter/{config/MeterDataConfig.java
=> process/SampleBuilder.java} (51%)
delete mode 100644
oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/meter/process/Window.java
delete mode 100644
oap-server/analyzer/agent-analyzer/src/test/java/org/apache/skywalking/oap/server/analyzer/provider/meter/process/EvalDataBaseTest.java
delete mode 100644
oap-server/analyzer/agent-analyzer/src/test/java/org/apache/skywalking/oap/server/analyzer/provider/meter/process/EvalDataTest.java
delete mode 100644
oap-server/analyzer/agent-analyzer/src/test/java/org/apache/skywalking/oap/server/analyzer/provider/meter/process/EvalHistogramDataTest.java
delete mode 100644
oap-server/analyzer/agent-analyzer/src/test/java/org/apache/skywalking/oap/server/analyzer/provider/meter/process/EvalMultipleDataTest.java
delete mode 100644
oap-server/analyzer/agent-analyzer/src/test/java/org/apache/skywalking/oap/server/analyzer/provider/meter/process/EvalSingleDataTest.java
delete mode 100644
oap-server/analyzer/agent-analyzer/src/test/java/org/apache/skywalking/oap/server/analyzer/provider/meter/process/MeterEvalOperationTest.java
delete mode 100644
oap-server/analyzer/agent-analyzer/src/test/java/org/apache/skywalking/oap/server/analyzer/provider/meter/process/MeterProcessContextTest.java
delete mode 100644
oap-server/analyzer/agent-analyzer/src/test/java/org/apache/skywalking/oap/server/analyzer/provider/meter/process/MeterProcessorTest.java
copy
apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/buffer/QueueBuffer.java
=>
oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/MetricRuleConfig.java
(63%)
copy
oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/{DownsamplingType.java
=> HistogramType.java} (79%)
create mode 100644
oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/SampleFamilyBuilder.java
delete 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
