You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ha...@apache.org on 2020/10/09 02:54:35 UTC
[skywalking] branch meter-mal updated (7395da6 -> fcc20d2)
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a change to branch meter-mal
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 7395da6 Add more features
add 3696e5f Add PHP RabbitMQ (#5560)
add ea69ae6 Update als_setting.md (#5562)
add 1a27452 Fix IDManager.java note. (#5563)
add c56099f Update KafkaFetcherHandlerRegister.java (#5564)
add a68be42 Provide metrics APIs for agent plugin (#5523)
add b560bae Polish comments of the meter at the agent side. (#5565)
add 806666b add webflux webclient plugin (#5493)
add 59e8764 Optimizing grafana self monitoring dashboard. (#5574)
add 5c17143 Feat:add go-micro component id (#5580)
add 103cf00 Support JDK 11 compiling and upgrade dependencies (#5579)
add bc64c6a Make the extension header really extendable (#5590)
add 3bc94cb fix Calling getClass() on an enum may return a subclass of the enum type (#5594)
add 7d5d8b4 fix MissingCasesInEnumSwitch (#5595)
add 8a8df35 fix Classcanbestatic (#5597)
add 7c69ea8 Fix JdkObsolete issue (#5599)
add 772f1d2 Replace Class.newInstance() with getDeclaredConstructor().newInstance() (#5600)
add 736dc3d Remove some unused variables (#5598)
add 6f99a24 add @SuppressWarnings(HidingField) annotation (#5603)
add 1cddb60 add @SuppressWarnings(NonAtomicVolatileUpdate) (#5606)
add 2b737e2 Embrace the maven cache in the GitHub action. (#5619)
add a45f615 Use explicit charset instead of default charset (#5601)
add f39c0dd fix to release incorrectly lock when it is failed to obtain lock (#5610)
add 6eda834 remove dead code (#5611)
add d30ca1a fix TypeParameterUnusedInFormals (#5613)
add a36f22f add comment (#5620)
add 1f79367 sync ui: Set current service for topology (#5622)
add d02ee0a Replace != with equals (#5617)
add d0b020e fix timebucket converter issue (#5585)
add 235fbe7 Fix 3 format issue of CI control file. (#5625)
add 0171ff6 Promote Integer to Long before multiplying to avoid numeric overflow (#5602)
add 47d5a76 chore: fix UnnecessaryParentheses (#5624)
add 2c729b5 Support group concept in the alarm core (#5615)
add 5ed9762 new components id for envoy proxy (#5629)
add c9b6a78 Limit Sql body size (#5626)
add ec6f9d3 Merge remote-tracking branch 'origin/master' into meter-mal
add fcc20d2 Add histogram relevant functions
No new revisions were added by this update.
Summary of changes:
.github/workflows/ci-it.yaml | 34 ++++
.github/workflows/docker-ci.yaml | 7 +
.github/workflows/e2e.cluster.yaml | 7 +
.github/workflows/e2e.go.yaml | 7 +
.github/workflows/e2e.jdk-versions.yaml | 7 +
.github/workflows/e2e.js.yaml | 9 +
.github/workflows/e2e.kafka.yaml | 21 ++
.github/workflows/e2e.php.yaml | 7 +
.github/workflows/e2e.profiling.yaml | 7 +
.github/workflows/e2e.python.yaml | 7 +
.github/workflows/e2e.storages.yaml | 7 +
.github/workflows/e2e.ttl.yaml | 7 +
.github/workflows/e2e.yaml | 28 +++
.github/workflows/istio-mixer-ci.yaml | 7 +
.github/workflows/plugins-jdk14-test.0.yaml | 7 +
.github/workflows/plugins-test.0.yaml | 7 +
.github/workflows/plugins-test.1.yaml | 7 +
.github/workflows/plugins-test.2.yaml | 7 +
.github/workflows/plugins-test.3.yaml | 7 +
.../skywalking/apm/toolkit/meter/BaseBuilder.java | 53 ++++-
.../skywalking/apm/toolkit/meter/BaseMeter.java | 16 +-
.../skywalking/apm/toolkit/meter/Counter.java | 52 ++++-
.../apache/skywalking/apm/toolkit/meter/Gauge.java | 39 +++-
.../skywalking/apm/toolkit/meter/Histogram.java | 87 ++++++---
.../skywalking/apm/toolkit/meter/MeterCenter.java | 16 +-
.../skywalking/apm/toolkit/meter/MeterFactory.java | 16 +-
.../skywalking/apm/toolkit/meter/MeterId.java | 2 +-
.../apm/toolkit/meter/impl/AbstractBuilder.java | 98 ----------
.../apm/toolkit/meter/impl/AbstractMeter.java | 72 -------
.../apm/toolkit/meter/impl/GaugeImpl.java | 79 --------
.../apm/toolkit/meter/impl/MeterCenter.java | 65 -------
.../apm/toolkit/meter/AbstractMeterTest.java | 194 -------------------
.../skywalking/apm/toolkit/meter/CounterTest.java | 89 +--------
.../skywalking/apm/toolkit/meter/GaugeTest.java | 44 +----
.../apm/toolkit/meter/HistogramTest.java | 99 +---------
.../apm/toolkit/meter/MeterCenterTest.java | 76 --------
.../apm/meter/micrometer/SkywalkingCounter.java | 3 +-
.../meter/micrometer/SkywalkingCustomCounter.java | 15 +-
.../micrometer/SkywalkingDistributionSummary.java | 1 +
.../meter/micrometer/SkywalkingMeterRegistry.java | 4 +-
.../apm/meter/micrometer/SkywalkingTimer.java | 1 +
.../apm/meter/micrometer/MeterBuilderTest.java | 13 +-
.../meter/micrometer/SkywalkingCounterTest.java | 26 +--
.../micrometer/SkywalkingCustomCounterTest.java | 7 +-
.../SkywalkingDistributionSummaryTest.java | 25 +--
.../micrometer/SkywalkingLongTaskTimerTest.java | 26 +--
.../meter/micrometer/SkywalkingMeterBaseTest.java | 91 ---------
.../micrometer/SkywalkingMeterRegistryTest.java | 129 +------------
.../apm/meter/micrometer/SkywalkingTimerTest.java | 25 +--
.../toolkit/opentracing/SkywalkingSpanBuilder.java | 10 +-
apm-application-toolkit/pom.xml | 4 -
.../apm/commons/datacarrier/DataCarrier.java | 8 +-
.../apm/commons/datacarrier/buffer/Channels.java | 9 +-
.../datacarrier/consumer/ConsumeDriver.java | 11 +-
.../consumer/MultipleChannelsConsumer.java | 5 +-
.../partition/ProducerThreadPartitioner.java | 6 -
.../partition/SimpleRollingPartitioner.java | 1 +
.../apm/commons/datacarrier/DataCarrierTest.java | 53 +++--
apm-commons/pom.xml | 1 -
apm-protocol/apm-network/pom.xml | 6 +
.../network/trace/component/ComponentsDefine.java | 4 +-
apm-sniffer/apm-agent-core/pom.xml | 6 +-
.../apm/agent/core/context/ExtensionContext.java | 24 ++-
.../apm/agent/core/meter/AbstractBuilder.java | 77 ++++++++
.../MeterTransformer.java => BaseMeter.java} | 71 +++----
.../skywalking/apm/agent/core/meter/Counter.java | 80 ++++----
.../HistogramAdapter.java => CounterMode.java} | 17 +-
.../GaugeTransformer.java => Gauge.java} | 59 ++++--
.../skywalking/apm/agent/core/meter/Histogram.java | 123 +++++-------
.../apm/agent/core}/meter/MeterFactory.java | 49 ++---
.../skywalking/apm/agent/core/meter/MeterId.java | 2 +-
.../apm/agent/core/meter/MeterSender.java | 11 +-
.../apm/agent/core/meter/MeterService.java | 21 +-
.../skywalking/apm/agent/core/meter/MeterTag.java | 7 +-
.../skywalking/apm/agent/core/meter/MeterType.java | 12 ++
.../agent/core/meter/adapter/CounterAdapter.java | 23 ---
.../apm/agent/core/meter/adapter/GaugeAdapter.java | 23 ---
.../core/meter/transform/CounterTransformer.java | 49 -----
.../core/meter/transform/HistogramTransformer.java | 92 ---------
.../agent/core/logging/core/WriterFactoryTest.java | 2 -
...ounterTransformerTest.java => CounterTest.java} | 77 ++++----
.../GaugeTransformerTest.java => GaugeTest.java} | 68 +++----
...gramTransformerTest.java => HistogramTest.java} | 95 ++++-----
.../apm/agent/core/meter/MeterDataBaseTest.java | 81 ++++++++
.../apm/agent/core/meter/MeterFactoryTest.java | 79 ++++++++
.../apm/agent/core/meter/MeterIdTest.java | 9 +-
.../apm/agent/core/meter/MeterServiceTest.java | 69 +------
.../apm-sdk-plugin/armeria-0.85.x-plugin/pom.xml | 3 -
.../apm/plugin/avro/SWClientRPCPlugin.java | 3 +-
.../apm/plugin/avro/SWServerRPCPlugin.java | 3 +-
.../asf/dubbo/patch/MakeWrapperInterceptor.java | 4 +-
.../plugin/dubbo/patch/MakeWrapperInterceptor.java | 4 +-
...terActionFutureActionGetMethodsInterceptor.java | 2 -
...ClusterClientGetSettingsMethodsInterceptor.java | 6 +-
.../ClusterClientHealthMethodsInterceptor.java | 2 +-
...ClusterClientPutSettingsMethodsInterceptor.java | 8 +-
.../IndicesClientCreateMethodsInterceptor.java | 2 +-
.../IndicesClientDeleteMethodsInterceptor.java | 8 +-
...stHighLevelClientClusterMethodsInterceptor.java | 3 +-
.../RestHighLevelClientConInterceptor.java | 7 +-
.../RestHighLevelClientGetMethodsInterceptor.java | 2 +-
...RestHighLevelClientIndexMethodsInterceptor.java | 2 +-
...stHighLevelClientIndicesMethodsInterceptor.java | 3 +-
...estHighLevelClientSearchMethodsInterceptor.java | 2 +-
...estHighLevelClientUpdateMethodsInterceptor.java | 2 +-
.../http/v9/DefaultHttpClientInterceptor.java | 29 ++-
.../apm/plugin/graphql/v12/GraphqlInterceptor.java | 6 +-
.../apm/plugin/graphql/v8/GraphqlInterceptor.java | 4 +-
.../apm/plugin/graphql/v9/GraphqlInterceptor.java | 6 +-
.../apm/plugin/hbase/HTableInterceptor.java | 5 +-
.../apm/plugin/jdbc/JDBCPluginConfig.java | 36 +---
.../PSSetterDefinitionOfJDBCInstrumentation.java | 2 +-
.../jdbc/PreparedStatementParameterBuilder.java | 12 +-
.../skywalking/apm/plugin/jdbc/SqlBodyUtil.java | 22 ++-
.../PreparedStatementParameterBuilderTest.java | 7 +-
.../apm/plugin/jdbc/SWCallableStatementTest.java | 8 +-
.../apm/plugin/jdbc/SqlBodyUtilTest.java | 53 +++++
.../apm/plugin/jdbc/SwPreparedStatementTest.java | 4 +-
.../apm/plugin/kafka/KafkaConsumerInterceptor.java | 3 +-
.../apm/plugin/kafka/KafkaProducerInterceptor.java | 3 +-
.../apm-sdk-plugin/lettuce-5.x-plugin/pom.xml | 1 -
...PreparedStatementExecuteMethodsInterceptor.java | 6 +-
.../v2/StatementExecuteMethodsInterceptor.java | 2 +
...aredStatementExecuteMethodsInterceptorTest.java | 39 +++-
.../v2/StatementExecuteMethodsInterceptorTest.java | 24 +++
.../v2/MongoDBCollectionMethodInterceptor.java | 5 +-
...PreparedStatementExecuteMethodsInterceptor.java | 6 +-
.../mysql/StatementExecuteMethodsInterceptor.java | 3 +-
.../StatementExecuteMethodsInterceptorTest.java | 30 ++-
.../play/v2x/define/Play2xInstrumentation.java | 5 +-
apm-sniffer/apm-sdk-plugin/pom.xml | 6 +
...PreparedStatementExecuteMethodsInterceptor.java | 6 +-
.../StatementExecuteMethodsInterceptor.java | 5 +-
.../apm-sdk-plugin/redisson-3.x-plugin/pom.xml | 1 -
.../v3/RedisConnectionMethodInterceptorTest.java | 12 +-
.../TransportClientHandlerInterceptorTest.java | 2 +-
.../v1/TransportClientHandlerInterceptorTest.java | 2 +-
.../apm/plugin/sjdbc/ExecuteEventListener.java | 1 +
.../plugin/sofarpc/SofaRpcConsumerInterceptor.java | 21 +-
.../plugin/sofarpc/SofaRpcProviderInterceptor.java | 8 +-
.../spring/mvc/v3/GetBeanInterceptorTest.java | 64 ------
.../interceptor/AbstractMethodInterceptor.java | 4 +-
apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml | 1 +
.../spring-webflux-5.x-webclient-plugin}/pom.xml | 10 +-
.../webclient/BodyInserterRequestInterceptor.java} | 29 +--
.../v5/webclient/WebFluxWebClientInterceptor.java | 116 +++++++++++
.../BodyInserterRequestInstrumentation.java} | 42 ++--
.../define/WebFluxWebClientInstrumentation.java | 72 +++++++
.../src/main/resources/skywalking-plugin.def | 6 +-
.../apm-sdk-plugin/struts2-2.x-plugin/pom.xml | 14 ++
.../v2x/define/RoutingHandlerInstrumentation.java | 11 +-
.../skywalking/apm/plugin/vertx3/VertxContext.java | 14 +-
.../agent/core/context/MockContextSnapshot.java | 14 +-
.../apm/agent/test/helper/FieldGetter.java | 3 +
.../apm/agent/test/tools/AgentServiceRule.java | 8 +-
.../apm/agent/test/tools/SegmentStorage.java | 12 +-
.../activation/meter/CounterActivation.java | 40 +++-
...eptor.java => CounterConstructInterceptor.java} | 20 +-
.../activation/meter/CounterGetInterceptor.java} | 24 +--
.../meter/CounterIncrementInterceptor.java} | 22 +--
.../toolkit/activation/meter/GaugeActivation.java | 24 ++-
...rceptor.java => GaugeConstructInterceptor.java} | 18 +-
.../activation/meter/GaugeGetInterceptor.java} | 23 +--
.../activation/meter/HistogramActivation.java | 24 ++-
.../meter/HistogramAddValueInterceptor.java} | 22 +--
...tor.java => HistogramConstructInterceptor.java} | 19 +-
.../meter/adapter/ToolkitCounterAdapter.java | 46 -----
.../meter/adapter/ToolkitGaugeAdapter.java | 46 -----
.../meter/adapter/ToolkitHistogramAdapter.java | 61 ------
...t.java => CounterConstructInterceptorTest.java} | 50 ++---
...est.java => GaugeConstructInterceptorTest.java} | 50 ++---
...java => HistogramConstructInterceptorTest.java} | 42 ++--
.../toolkit/meter/ToolkitCounterAdapterTest.java | 71 -------
.../apm/toolkit/meter/ToolkitGaugeAdapterTest.java | 49 -----
.../toolkit/meter/ToolkitHistogramAdapterTest.java | 64 ------
.../trace/CallableOrRunnableActivation.java | 6 +-
.../gateway-2.0.x-plugin/pom.xml | 1 -
.../gateway-2.1.x-plugin/pom.xml | 1 -
.../spring-webflux-5.x-plugin/pom.xml | 4 -
.../apm/agent/core/kafka/KafkaMeterSender.java | 5 +-
apm-webapp/pom.xml | 15 +-
dist-material/release-docs/LICENSE | 14 +-
docs/en/guides/Component-library-settings.md | 1 +
docs/en/guides/How-to-build.md | 4 +-
docs/en/guides/Java-Plugin-Development-Guide.md | 55 +++++-
docs/en/setup/backend/backend-alarm.md | 23 +++
docs/en/setup/backend/grafana.json | 8 +-
docs/en/setup/envoy/als_setting.md | 14 +-
.../java-agent/Application-toolkit-meter.md | 2 +-
.../setup/service-agent/java-agent/Plugin-list.md | 1 +
docs/en/setup/service-agent/java-agent/README.md | 9 +-
.../provider/meter/process/MeterBaseTest.java | 37 ++--
.../provider/meter/process/MeterBuilderTest.java | 12 +-
.../meter/process/MeterProcessContextTest.java | 4 +-
.../provider/meter/process/MeterProcessorTest.java | 29 +--
.../oap/meter/analyzer/dsl/SampleFamily.java | 67 ++++++-
.../oap/meter/analyzer/dsl/FunctionTest.java | 34 ++++
oap-server/pom.xml | 22 ++-
oap-server/server-alarm-plugin/pom.xml | 4 +
.../oap/server/core/alarm/provider/AlarmCore.java | 13 +-
.../oap/server/core/alarm/provider/AlarmRule.java | 1 +
.../core/alarm/provider/AlarmRulesWatcher.java | 11 +-
.../core/alarm/provider/CompositeAlarmRule.java | 34 ++--
.../alarm/provider/CompositeRuleEvaluator.java | 130 +++++++++++++
.../oap/server/core/alarm/provider/Rules.java | 2 +
.../server/core/alarm/provider/RulesReader.java | 215 ++++++++++++++-------
.../server/core/alarm/provider/RunningRule.java | 17 +-
.../core/alarm/provider/expression/Expression.java | 80 ++++++++
.../provider/expression/ExpressionContext.java | 58 ++++++
.../core/alarm/provider/AlarmRuleInitTest.java | 5 +-
.../core/alarm/provider/AlarmRulesWatcherTest.java | 2 +-
.../alarm/provider/CompositeRuleEvaluatorTest.java | 166 ++++++++++++++++
.../core/alarm/provider/NotifyHandlerTest.java | 2 +-
.../provider/expression/ExpressionContextTest.java | 55 ++++++
.../alarm/provider/expression/ExpressionTest.java | 88 +++++++++
.../src/test/resources/alarm-settings.yml | 23 +++
.../src/main/resources/component-libraries.yml | 20 +-
.../consul/ClusterModuleConsulProviderTest.java | 2 +-
.../plugin/etcd/ClusterModuleEtcdProviderTest.java | 119 ------------
.../cluster/plugin/etcd/EtcdCoordinatorTest.java | 192 ------------------
.../ClusterModuleKubernetesProviderTest.java | 2 +-
.../kubernetes/KubernetesCoordinatorTest.java | 2 +-
.../nacos/ClusterModuleNacosProviderTest.java | 109 -----------
.../ClusterModuleStandaloneProvider.java | 5 -
.../ConsulConfigurationWatcherRegisterTest.java | 17 +-
.../configuration-etcd/pom.xml | 13 ++
.../etcd/EtcdConfigWatcherRegisterTest.java | 134 -------------
.../ConfigmapConfigWatcherRegisterTest.java | 2 +-
.../ConfigmapConfigurationProviderTest.java | 2 +-
.../oap/server/core/alarm/AlarmMessage.java | 8 +-
.../oap/server/core/analysis/IDManager.java | 4 +-
.../oap/server/core/analysis/TimeBucket.java | 5 +
.../oap/server/core/analysis/TimeBucketTest.java | 65 +++----
.../core/storage/model/StorageModelsTest.java | 2 +
.../agent/kafka/KafkaFetcherHandlerRegister.java | 3 +-
oap-server/server-library/library-util/pom.xml | 5 +-
.../envoy-metrics-receiver-plugin/pom.xml | 10 +-
.../rest/BrowserReportServletHandlerTest.java | 4 +-
.../rest/TraceSegmentReportServletHandlerTest.java | 6 +-
.../exporter/test/ProfileSnapshotExporterTest.java | 2 +-
pom.xml | 50 +++--
skywalking-ui | 2 +-
test/e2e/e2e-protocol/src/main/proto | 2 +-
test/e2e/e2e-service-provider/pom.xml | 10 +-
test/plugin/scenarios/gson-scenario/pom.xml | 1 -
test/plugin/scenarios/hystrix-scenario/pom.xml | 2 -
.../bin/startup.sh | 2 +-
.../webflux-scenario/config/expectedData.yaml | 38 ++++
.../webflux-scenario/support-version.list | 5 +-
.../webflux-projectA-scenario/pom.xml | 10 +
.../projectA/controller/TestController.java | 19 +-
.../controller/TestAnnotationController.java | 5 +
.../known-oap-backend-dependencies-es7.txt | 31 ++-
.../known-oap-backend-dependencies.txt | 29 ++-
254 files changed, 3238 insertions(+), 3565 deletions(-)
rename apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/meter/adapter/MeterAdapter.java => apm-application-toolkit/apm-toolkit-meter/src/main/java/org/apache/skywalking/apm/toolkit/meter/MeterCenter.java (70%)
delete mode 100644 apm-application-toolkit/apm-toolkit-meter/src/main/java/org/apache/skywalking/apm/toolkit/meter/impl/AbstractBuilder.java
delete mode 100644 apm-application-toolkit/apm-toolkit-meter/src/main/java/org/apache/skywalking/apm/toolkit/meter/impl/AbstractMeter.java
delete mode 100644 apm-application-toolkit/apm-toolkit-meter/src/main/java/org/apache/skywalking/apm/toolkit/meter/impl/GaugeImpl.java
delete mode 100644 apm-application-toolkit/apm-toolkit-meter/src/main/java/org/apache/skywalking/apm/toolkit/meter/impl/MeterCenter.java
delete mode 100644 apm-application-toolkit/apm-toolkit-meter/src/test/java/org/apache/skywalking/apm/toolkit/meter/AbstractMeterTest.java
delete mode 100644 apm-application-toolkit/apm-toolkit-meter/src/test/java/org/apache/skywalking/apm/toolkit/meter/MeterCenterTest.java
delete mode 100644 apm-application-toolkit/apm-toolkit-micrometer-registry/src/test/java/org/apache/skywalking/apm/meter/micrometer/SkywalkingMeterBaseTest.java
create mode 100644 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/meter/AbstractBuilder.java
rename apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/meter/{transform/MeterTransformer.java => BaseMeter.java} (60%)
rename apm-application-toolkit/apm-toolkit-meter/src/main/java/org/apache/skywalking/apm/toolkit/meter/impl/CounterImpl.java => apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/meter/Counter.java (58%)
rename apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/meter/{adapter/HistogramAdapter.java => CounterMode.java} (74%)
rename apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/meter/{transform/GaugeTransformer.java => Gauge.java} (55%)
rename apm-application-toolkit/apm-toolkit-meter/src/main/java/org/apache/skywalking/apm/toolkit/meter/impl/HistogramImpl.java => apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/meter/Histogram.java (57%)
copy {apm-application-toolkit/apm-toolkit-meter/src/main/java/org/apache/skywalking/apm/toolkit => apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core}/meter/MeterFactory.java (50%)
delete mode 100644 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/meter/adapter/CounterAdapter.java
delete mode 100644 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/meter/adapter/GaugeAdapter.java
delete mode 100644 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/meter/transform/CounterTransformer.java
delete mode 100644 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/meter/transform/HistogramTransformer.java
rename apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/meter/{transform/CounterTransformerTest.java => CounterTest.java} (53%)
rename apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/meter/{transform/GaugeTransformerTest.java => GaugeTest.java} (55%)
rename apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/meter/{transform/HistogramTransformerTest.java => HistogramTest.java} (53%)
create mode 100644 apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/meter/MeterDataBaseTest.java
create mode 100644 apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/meter/MeterFactoryTest.java
copy apm-application-toolkit/apm-toolkit-meter/src/main/java/org/apache/skywalking/apm/toolkit/meter/Gauge.java => apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/SqlBodyUtil.java (56%)
create mode 100644 apm-sniffer/apm-sdk-plugin/jdbc-commons/src/test/java/org/apache/skywalking/apm/plugin/jdbc/SqlBodyUtilTest.java
delete mode 100644 apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/spring/mvc/v3/GetBeanInterceptorTest.java
copy apm-sniffer/{optional-plugins/optional-spring-plugins/spring-webflux-5.x-plugin => apm-sdk-plugin/spring-plugins/spring-webflux-5.x-webclient-plugin}/pom.xml (87%)
copy apm-sniffer/apm-sdk-plugin/{elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientIndicesMethodsInterceptor.java => spring-plugins/spring-webflux-5.x-webclient-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/webclient/BodyInserterRequestInterceptor.java} (62%)
create mode 100644 apm-sniffer/apm-sdk-plugin/spring-plugins/spring-webflux-5.x-webclient-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/webclient/WebFluxWebClientInterceptor.java
copy apm-sniffer/{apm-toolkit-activation/apm-toolkit-meter-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/meter/HistogramActivation.java => apm-sdk-plugin/spring-plugins/spring-webflux-5.x-webclient-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/webclient/define/BodyInserterRequestInstrumentation.java} (56%)
create mode 100644 apm-sniffer/apm-sdk-plugin/spring-plugins/spring-webflux-5.x-webclient-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/webclient/define/WebFluxWebClientInstrumentation.java
copy test/plugin/scenarios/postgresql-above9.4.1207-scenario/bin/startup.sh => apm-sniffer/apm-sdk-plugin/spring-plugins/spring-webflux-5.x-webclient-plugin/src/main/resources/skywalking-plugin.def (75%)
rename apm-sniffer/apm-toolkit-activation/apm-toolkit-meter-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/meter/{HistogramInterceptor.java => CounterConstructInterceptor.java} (64%)
copy apm-sniffer/{apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientClusterMethodsInterceptor.java => apm-toolkit-activation/apm-toolkit-meter-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/meter/CounterGetInterceptor.java} (64%)
copy apm-sniffer/{apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientClusterMethodsInterceptor.java => apm-toolkit-activation/apm-toolkit-meter-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/meter/CounterIncrementInterceptor.java} (65%)
rename apm-sniffer/apm-toolkit-activation/apm-toolkit-meter-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/meter/{GaugeInterceptor.java => GaugeConstructInterceptor.java} (70%)
copy apm-sniffer/{apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientIndicesMethodsInterceptor.java => apm-toolkit-activation/apm-toolkit-meter-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/meter/GaugeGetInterceptor.java} (64%)
copy apm-sniffer/{apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientClusterMethodsInterceptor.java => apm-toolkit-activation/apm-toolkit-meter-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/meter/HistogramAddValueInterceptor.java} (65%)
rename apm-sniffer/apm-toolkit-activation/apm-toolkit-meter-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/meter/{CounterInterceptor.java => HistogramConstructInterceptor.java} (69%)
delete mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-meter-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/meter/adapter/ToolkitCounterAdapter.java
delete mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-meter-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/meter/adapter/ToolkitGaugeAdapter.java
delete mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-meter-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/meter/adapter/ToolkitHistogramAdapter.java
rename apm-sniffer/apm-toolkit-activation/apm-toolkit-meter-activation/src/test/java/org/apache/skywalking/apm/toolkit/activation/meter/{CounterInterceptorTest.java => CounterConstructInterceptorTest.java} (58%)
rename apm-sniffer/apm-toolkit-activation/apm-toolkit-meter-activation/src/test/java/org/apache/skywalking/apm/toolkit/activation/meter/{GaugeInterceptorTest.java => GaugeConstructInterceptorTest.java} (62%)
rename apm-sniffer/apm-toolkit-activation/apm-toolkit-meter-activation/src/test/java/org/apache/skywalking/apm/toolkit/activation/meter/{HistogramInterceptorTest.java => HistogramConstructInterceptorTest.java} (67%)
delete mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-meter-activation/src/test/java/org/apache/skywalking/apm/toolkit/meter/ToolkitCounterAdapterTest.java
delete mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-meter-activation/src/test/java/org/apache/skywalking/apm/toolkit/meter/ToolkitGaugeAdapterTest.java
delete mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-meter-activation/src/test/java/org/apache/skywalking/apm/toolkit/meter/ToolkitHistogramAdapterTest.java
copy apm-application-toolkit/apm-toolkit-meter/src/main/java/org/apache/skywalking/apm/toolkit/meter/BaseMeter.java => oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/CompositeAlarmRule.java (65%)
create mode 100644 oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/CompositeRuleEvaluator.java
create mode 100644 oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/expression/Expression.java
create mode 100644 oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/expression/ExpressionContext.java
create mode 100644 oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/CompositeRuleEvaluatorTest.java
create mode 100644 oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/expression/ExpressionContextTest.java
create mode 100644 oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/expression/ExpressionTest.java
delete mode 100644 oap-server/server-cluster-plugin/cluster-etcd-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/ClusterModuleEtcdProviderTest.java
delete mode 100644 oap-server/server-cluster-plugin/cluster-etcd-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/EtcdCoordinatorTest.java
delete mode 100644 oap-server/server-cluster-plugin/cluster-nacos-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/nacos/ClusterModuleNacosProviderTest.java
delete mode 100644 oap-server/server-configuration/configuration-etcd/src/test/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdConfigWatcherRegisterTest.java