You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ta...@apache.org on 2019/05/10 07:39:10 UTC
[skywalking] branch ui updated (1a84193 -> ae3a3c0)
This is an automated email from the ASF dual-hosted git repository.
tanjian pushed a change to branch ui
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 1a84193 update
add 37c9252 add test cases for Base64 (#2630)
add c46554a fix spring data redis usercase NPE (#2621)
add ed78dab Rename metric and indicator to metrics. (#2643)
add dd9d178 Support span#error in toolkit (#2605)
add 3a31812 Recover the module name of envoy-metric. (#2645)
add 118485f Make the elasticsearch json object build to be a public method. (#2648)
add ae3a3c0 Merge branch 'master' into ui
No new revisions were added by this update.
Summary of changes:
CHANGES.md | 12 +-
README.md | 4 +-
.../skywalking/apm/toolkit/trace/ActiveSpan.java | 16 +-
.../skywalking/apm/agent/core/jvm/JVMService.java | 2 +-
...MetricAccessor.java => CPUMetricsAccessor.java} | 7 +-
.../apm/agent/core/jvm/cpu/CPUProvider.java | 13 +-
.../agent/core/jvm/cpu/NoSupportedCPUAccessor.java | 2 +-
.../apm/agent/core/jvm/cpu/SunCpuAccessor.java | 2 +-
...ccessor.java => MemoryPoolMetricsAccessor.java} | 7 +-
.../core/jvm/memorypool/MemoryPoolModule.java | 11 +-
.../core/jvm/memorypool/MemoryPoolProvider.java | 15 +-
.../core/jvm/memorypool/UnknownMemoryPool.java | 4 +-
.../apm/agent/core/base64/Base64Test.java} | 21 ++-
.../activation/trace/ActiveSpanActivation.java | 154 +++++++++++++++++
.../trace/ActiveSpanDebugInterceptor.java | 58 +++++++
.../trace/ActiveSpanErrorInterceptor.java | 53 ++++++
.../trace/ActiveSpanErrorMsgInterceptor.java | 59 +++++++
.../trace/ActiveSpanErrorThrowableInteceptor.java | 53 ++++++
.../trace/ActiveSpanInfoInterceptor.java | 58 +++++++
.../src/main/resources/skywalking-plugin.def | 2 +-
.../toolkit/activation/trace/ActiveSpanTest.java | 187 +++++++++++++++++++++
.../lettuce/v5/AbstractRedisClientInterceptor.java | 57 +++++++
.../AbstractRedisClientInstrumentation.java} | 41 ++---
.../src/main/resources/skywalking-plugin.def | 1 +
docker/config/alarm-settings.yml | 14 +-
docs/en/concepts-and-designs/README.md | 2 +-
docs/en/concepts-and-designs/backend-overview.md | 14 +-
docs/en/concepts-and-designs/oal.md | 18 +-
docs/en/concepts-and-designs/probe-introduction.md | 6 +-
docs/en/concepts-and-designs/project-goals.md | 4 +-
docs/en/concepts-and-designs/scope-definitions.md | 16 +-
docs/en/concepts-and-designs/service-mesh-probe.md | 6 +-
docs/en/guides/README.md | 4 +-
docs/en/guides/backend-oal-scripts.md | 4 +-
docs/en/guides/inventory-extension.md | 2 +-
docs/en/guides/source-extension.md | 6 +-
docs/en/guides/storage-extention.md | 2 +-
docs/en/protocols/README.md | 30 ++--
docs/en/protocols/Trace-Data-Protocol-v2.md | 6 +-
docs/en/setup/backend/backend-alarm.md | 26 +--
docs/en/setup/backend/backend-receivers.md | 4 +-
docs/en/setup/backend/backend-setup.md | 16 +-
docs/en/setup/backend/backend-telemetry.md | 2 +-
.../{metric-exporter.md => metrics-exporter.md} | 12 +-
.../setup/backend/telemetry/mesh-mode-grafana.json | 2 +-
.../backend/telemetry/trace-mode-grafana.json | 2 +-
docs/en/setup/backend/trace-sampling.md | 2 +-
docs/en/setup/backend/ttl.md | 4 +-
docs/en/setup/istio/README.md | 4 +-
.../java-agent/Application-toolkit-trace.md | 14 ++
.../server/exporter/provider/MetricFormatter.java | 4 +-
.../exporter/provider/grpc/GRPCExporter.java | 40 ++---
.../exporter/provider/grpc/GRPCExporterTest.java | 14 +-
...eIndicator.java => MockDoubleValueMetrics.java} | 4 +-
...alueIndicator.java => MockIntValueMetrics.java} | 4 +-
...lueIndicator.java => MockLongValueMetrics.java} | 4 +-
.../grpc/{MockIndicator.java => MockMetrics.java} | 14 +-
.../java/org/apache/skywalking/oal/tool/Main.java | 2 +-
.../oal/tool/output/DispatcherContext.java | 2 +-
.../skywalking/oal/tool/output/FileGenerator.java | 12 +-
.../skywalking/oal/tool/parser/AnalysisResult.java | 4 +-
.../skywalking/oal/tool/parser/DeepAnalysis.java | 21 ++-
.../parser/{Indicators.java => MetricsHolder.java} | 25 ++-
.../skywalking/oal/tool/parser/OALListener.java | 8 +-
.../skywalking/oal/tool/parser/OALScripts.java | 4 +-
.../code-templates/DispatcherTemplate.ftl | 34 ++--
...catorImplementor.ftl => MetricsImplementor.ftl} | 98 +++++------
.../oal/tool/output/FileGeneratorTest.java | 20 +--
.../oal/tool/parser/DeepAnalysisTest.java | 8 +-
.../oal/tool/parser/ScriptParserTest.java | 20 +--
...pected.java => MetricsImplementorExpected.java} | 98 +++++------
.../expectedFiles/ServiceDispatcherExpected.java | 14 +-
.../generate-tool/src/test/resources/oal_test.oal | 14 +-
.../src/main/resources/official_analysis.oal | 18 +-
.../oap/server/core/alarm/provider/AlarmCore.java | 30 ++--
.../core/alarm/provider/AlarmModuleProvider.java | 2 +-
.../oap/server/core/alarm/provider/AlarmRule.java | 2 +-
...dicatorValueType.java => MetricsValueType.java} | 2 +-
.../server/core/alarm/provider/NotifyHandler.java | 20 +--
.../server/core/alarm/provider/RulesReader.java | 8 +-
.../server/core/alarm/provider/RunningRule.java | 66 ++++----
.../oap/server/core/alarm/provider/Threshold.java | 4 +-
.../alarm/provider/AlarmMessageFormatterTest.java | 4 +-
.../core/alarm/provider/NotifyHandlerTest.java | 72 ++++----
.../core/alarm/provider/RunningRuleTest.java | 60 +++----
.../server/core/alarm/provider/ThresholdTest.java | 8 +-
.../src/test/resources/alarm-settings.yml | 12 +-
.../dependencies/NamespacedPodListWatchTest.java | 166 ------------------
.../oap/server/core/CoreModuleProvider.java | 4 +-
.../oap/server/core/alarm/AlarmEntrance.java | 12 +-
.../oap/server/core/alarm/AlarmModule.java | 2 +-
.../oap/server/core/alarm/EndpointMetaInAlarm.java | 2 +-
.../oap/server/core/alarm/MetaInAlarm.java | 2 +-
.../{IndicatorNotify.java => MetricsNotify.java} | 8 +-
.../core/alarm/ServiceInstanceMetaInAlarm.java | 6 +-
.../oap/server/core/alarm/ServiceMetaInAlarm.java | 6 +-
.../server/core/analysis/data/MergeDataCache.java | 14 +-
.../annotation/IndicatorAnnotationUtils.java | 29 ----
.../EndpointCallRelationDispatcher.java | 16 +-
...java => EndpointRelationServerSideMetrics.java} | 90 +++++-----
.../ServiceCallRelationDispatcher.java | 30 ++--
....java => ServiceRelationClientSideMetrics.java} | 90 +++++-----
....java => ServiceRelationServerSideMetrics.java} | 90 +++++-----
.../CPMIndicator.java => metrics/CPMMetrics.java} | 14 +-
.../CountMetrics.java} | 14 +-
.../DoubleAvgMetrics.java} | 14 +-
.../{indicator => metrics}/DoubleValueHolder.java | 2 +-
.../{indicator => metrics}/IntKeyLongValue.java | 2 +-
.../IntKeyLongValueArray.java | 2 +-
.../{indicator => metrics}/IntValueHolder.java | 2 +-
.../LongAvgMetrics.java} | 14 +-
.../{indicator => metrics}/LongValueHolder.java | 2 +-
.../MaxDoubleMetrics.java} | 14 +-
.../MaxLongMetrics.java} | 14 +-
.../Indicator.java => metrics/Metrics.java} | 12 +-
.../MetricsMetaInfo.java} | 18 +-
.../P50Indicator.java => metrics/P50Metrics.java} | 10 +-
.../P75Indicator.java => metrics/P75Metrics.java} | 10 +-
.../P90Indicator.java => metrics/P90Metrics.java} | 10 +-
.../P95Indicator.java => metrics/P95Metrics.java} | 10 +-
.../P99Indicator.java => metrics/P99Metrics.java} | 10 +-
.../PercentMetrics.java} | 16 +-
.../PxxIndicator.java => metrics/PxxMetrics.java} | 18 +-
.../SumIndicator.java => metrics/SumMetrics.java} | 14 +-
.../ThermodynamicMetrics.java} | 28 ++-
.../{indicator => metrics}/WithMetadata.java | 6 +-
.../{indicator => metrics}/annotation/Arg.java | 2 +-
.../annotation/ConstOne.java | 2 +-
.../annotation/Entrance.java | 2 +-
.../annotation/Expression.java | 2 +-
.../annotation/ExpressionArg0.java | 2 +-
.../annotation/ExpressionArg1.java | 2 +-
.../annotation/MetricsAnnotationUtils.java} | 12 +-
.../annotation/MetricsFunction.java} | 6 +-
.../annotation/MetricsType.java} | 4 +-
.../annotation/MetricsTypeListener.java} | 12 +-
.../annotation/SourceFrom.java | 2 +-
.../expression/BinaryMatchExpression.java | 2 +-
.../expression/EqualMatch.java | 2 +-
.../expression/GreaterEqualMatch.java | 2 +-
.../expression/GreaterMatch.java | 2 +-
.../expression/LessEqualMatch.java | 2 +-
.../expression/LessMatch.java | 2 +-
.../core/analysis/worker/AlarmNotifyWorker.java | 10 +-
.../server/core/analysis/worker/ExportWorker.java | 10 +-
.../core/analysis/worker/IndicatorProcess.java | 95 -----------
.../core/analysis/worker/IndicatorTransWorker.java | 91 ----------
...gateWorker.java => MetricsAggregateWorker.java} | 66 ++++----
...entWorker.java => MetricsPersistentWorker.java} | 80 ++++-----
.../core/analysis/worker/MetricsProcess.java | 95 +++++++++++
...rRemoteWorker.java => MetricsRemoteWorker.java} | 14 +-
.../core/analysis/worker/MetricsTransWorker.java | 91 ++++++++++
.../core/exporter/MetricValuesExportService.java | 6 +-
.../oap/server/core/query/MetricQueryService.java | 12 +-
.../register/worker/RegisterPersistentWorker.java | 8 +-
.../core/register/worker/RegisterRemoteWorker.java | 4 +-
.../server/core/remote/RemoteServiceHandler.java | 20 +--
.../core/remote/client/GRPCRemoteClient.java | 12 +-
.../core/remote/client/RemoteClientManager.java | 6 +-
.../core/remote/client/SelfRemoteClient.java | 6 +-
.../oap/server/core/source/DefaultScopeDefine.java | 4 +-
.../server/core/source/EnvoyInstanceMetric.java | 4 +-
.../{IIndicatorDAO.java => IMetricsDAO.java} | 10 +-
.../oap/server/core/storage/PersistenceTimer.java | 26 +--
.../oap/server/core/storage/StorageDAO.java | 4 +-
.../oap/server/core/storage/StorageModule.java | 2 +-
.../annotation/StorageAnnotationListener.java | 6 +-
.../oap/server/core/storage/model/Model.java | 8 +-
.../server/core/storage/model/ModelInstaller.java | 2 +-
...{IMetricQueryDAO.java => IMetricsQueryDAO.java} | 2 +-
.../core/storage/ttl/DataTTLKeeperTimer.java | 12 +-
.../core/analysis/indicator/PxxIndicatorTest.java | 130 --------------
.../indicator/ThermodynamicIndicatorTest.java | 123 --------------
.../CountMetricsTest.java} | 18 +-
.../LongAvgMetricsTest.java} | 18 +-
.../MaxLongMetricsTest.java} | 18 +-
.../MetricsTest.java} | 24 +--
.../PercentMetricsTest.java} | 22 +--
.../core/analysis/metrics/PxxMetricsTest.java | 129 ++++++++++++++
.../analysis/metrics/ThermodynamicMetricsTest.java | 123 ++++++++++++++
.../core/remote/RemoteServiceHandlerTestCase.java | 10 +-
.../remote/client/GRPCRemoteClientRealClient.java | 6 +-
.../remote/client/GRPCRemoteClientTestCase.java | 6 +-
.../remote/client/RemoteClientManagerTestCase.java | 6 +-
.../src/test/resources/application.yml | 2 +-
.../oap/query/graphql/resolver/MetricQuery.java | 14 +-
.../receiver/envoy/EnvoyMetricReceiverModule.java | 2 +-
.../receiver/envoy/MetricServiceGRPCHandler.java | 26 +--
.../src/test/resources/envoy-metric.msg | 10 +-
.../handler/CLRMetricReportServiceHandler.java | 8 +-
.../clr/provider/handler/CLRSourceDispatcher.java | 8 +-
.../provider/IstioTelemetryGRPCHandler.java | 22 +--
.../handler/JVMMetricReportServiceHandler.java | 8 +-
.../provider/handler/JVMMetricsServiceHandler.java | 8 +-
.../jvm/provider/handler/JVMSourceDispatcher.java | 10 +-
.../receiver/mesh/MeshDataBufferFileCache.java | 24 +--
.../aop/server/receiver/mesh/MeshGRPCHandler.java | 16 +-
.../receiver/mesh/TelemetryDataDispatcher.java | 160 +++++++++---------
.../trace/provider/TraceServiceModuleConfig.java | 2 +-
.../v6/grpc/TraceSegmentReportServiceHandler.java | 10 +-
.../trace/provider/parser/SegmentParse.java | 20 +--
.../trace/provider/parser/SegmentParseV2.java | 20 +--
.../SegmentStandardizationWorker.java | 8 +-
.../src/main/assembly/alarm-settings-sample.yml | 12 +-
.../src/main/assembly/alarm-settings.yml | 20 +--
.../src/main/assembly/application.yml | 2 +-
.../oap/server/starter/OAPServerStartUp.java | 4 +-
.../src/main/resources/alarm-settings.yml | 12 +-
.../src/main/resources/application.yml | 2 +-
.../StorageModuleElasticsearchProvider.java | 6 +-
.../elasticsearch/base/ColumnTypeEsMapping.java | 2 +-
.../storage/plugin/elasticsearch/base/EsDAO.java | 25 ++-
.../elasticsearch/base/HistoryDeleteEsDAO.java | 7 +-
.../plugin/elasticsearch/base/IndicatorEsDAO.java | 87 ----------
.../base/{RecordEsDAO.java => MetricsEsDAO.java} | 43 ++---
.../plugin/elasticsearch/base/RecordEsDAO.java | 19 +--
.../plugin/elasticsearch/base/RegisterEsDAO.java | 24 +--
.../plugin/elasticsearch/base/StorageEsDAO.java | 6 +-
.../elasticsearch/query/AggregationQueryEsDAO.java | 18 +-
...etricQueryEsDAO.java => MetricsQueryEsDAO.java} | 18 +-
.../elasticsearch/query/TopologyQueryEsDAO.java | 42 ++---
.../storage/plugin/jdbc/h2/H2StorageProvider.java | 6 +-
.../plugin/jdbc/h2/dao/H2AggregationQueryDAO.java | 10 +-
.../dao/{H2IndicatorDAO.java => H2MetricsDAO.java} | 22 +--
...2MetricQueryDAO.java => H2MetricsQueryDAO.java} | 24 ++-
.../storage/plugin/jdbc/h2/dao/H2SQLExecutor.java | 12 +-
.../storage/plugin/jdbc/h2/dao/H2StorageDAO.java | 8 +-
.../plugin/jdbc/h2/dao/H2TableInstaller.java | 2 +-
.../plugin/jdbc/h2/dao/H2TopologyQueryDAO.java | 44 ++---
.../jdbc/mysql/MySQLAggregationQueryDAO.java | 10 +-
.../plugin/jdbc/mysql/MySQLStorageProvider.java | 6 +-
.../plugin/jdbc/mysql/MySQLTableInstaller.java | 6 +-
.../oap/server/telemetry/TelemetryModule.java | 4 +-
.../{CounterMetric.java => CounterMetrics.java} | 4 +-
.../api/{GaugeMetric.java => GaugeMetrics.java} | 4 +-
...{HistogramMetric.java => HistogramMetrics.java} | 10 +-
.../{MetricCreator.java => MetricsCreator.java} | 16 +-
.../api/{MetricTag.java => MetricsTag.java} | 4 +-
.../telemetry/api/TelemetryRelatedContext.java | 2 +-
...ricCreatorNoop.java => MetricsCreatorNoop.java} | 18 +-
.../telemetry/none/NoneTelemetryProvider.java | 4 +-
.../{BaseMetric.java => BaseMetrics.java} | 24 +--
...erMetric.java => PrometheusCounterMetrics.java} | 20 +--
...augeMetric.java => PrometheusGaugeMetrics.java} | 40 ++---
...Metric.java => PrometheusHistogramMetrics.java} | 20 +--
...cCreator.java => PrometheusMetricsCreator.java} | 18 +-
.../prometheus/PrometheusTelemetryProvider.java | 4 +-
247 files changed, 2753 insertions(+), 2375 deletions(-)
rename apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/{CPUMetricAccessor.java => CPUMetricsAccessor.java} (89%)
rename apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/{MemoryPoolMetricAccessor.java => MemoryPoolMetricsAccessor.java} (85%)
copy apm-sniffer/apm-agent-core/src/{main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/NoSupportedCPUAccessor.java => test/java/org/apache/skywalking/apm/agent/core/base64/Base64Test.java} (66%)
create mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanActivation.java
create mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanDebugInterceptor.java
create mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanErrorInterceptor.java
create mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanErrorMsgInterceptor.java
create mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanErrorThrowableInteceptor.java
create mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanInfoInterceptor.java
create mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/test/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanTest.java
create mode 100644 apm-sniffer/optional-plugins/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/AbstractRedisClientInterceptor.java
rename apm-sniffer/{apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanTagActivation.java => optional-plugins/lettuce-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/lettuce/v5/define/AbstractRedisClientInstrumentation.java} (54%)
rename docs/en/setup/backend/{metric-exporter.md => metrics-exporter.md} (75%)
rename oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/{MockDoubleValueIndicator.java => MockDoubleValueMetrics.java} (85%)
rename oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/{MockIntValueIndicator.java => MockIntValueMetrics.java} (85%)
rename oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/{MockLongValueIndicator.java => MockLongValueMetrics.java} (85%)
rename oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/{MockIndicator.java => MockMetrics.java} (83%)
rename oap-server/generate-tool/src/main/java/org/apache/skywalking/oal/tool/parser/{Indicators.java => MetricsHolder.java} (56%)
rename oap-server/generate-tool/src/main/resources/code-templates/{IndicatorImplementor.ftl => MetricsImplementor.ftl} (72%)
rename oap-server/generate-tool/src/test/resources/expectedFiles/{IndicatorImplementorExpected.java => MetricsImplementorExpected.java} (59%)
rename oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/{IndicatorValueType.java => MetricsValueType.java} (96%)
delete mode 100644 oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/kubernetes/dependencies/NamespacedPodListWatchTest.java
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/{IndicatorNotify.java => MetricsNotify.java} (81%)
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/annotation/IndicatorAnnotationUtils.java
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/endpointrelation/{EndpointRelationServerSideIndicator.java => EndpointRelationServerSideMetrics.java} (62%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/servicerelation/{ServiceRelationClientSideIndicator.java => ServiceRelationClientSideMetrics.java} (62%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/servicerelation/{ServiceRelationServerSideIndicator.java => ServiceRelationServerSideMetrics.java} (63%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator/CPMIndicator.java => metrics/CPMMetrics.java} (77%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator/CountIndicator.java => metrics/CountMetrics.java} (74%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator/DoubleAvgIndicator.java => metrics/DoubleAvgMetrics.java} (78%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator => metrics}/DoubleValueHolder.java (93%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator => metrics}/IntKeyLongValue.java (97%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator => metrics}/IntKeyLongValueArray.java (97%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator => metrics}/IntValueHolder.java (93%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator/LongAvgIndicator.java => metrics/LongAvgMetrics.java} (78%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator => metrics}/LongValueHolder.java (93%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator/MaxDoubleIndicator.java => metrics/MaxDoubleMetrics.java} (73%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator/MaxLongIndicator.java => metrics/MaxLongMetrics.java} (74%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator/Indicator.java => metrics/Metrics.java} (91%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator/IndicatorMetaInfo.java => metrics/MetricsMetaInfo.java} (72%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator/P50Indicator.java => metrics/P50Metrics.java} (75%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator/P75Indicator.java => metrics/P75Metrics.java} (75%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator/P90Indicator.java => metrics/P90Metrics.java} (75%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator/P95Indicator.java => metrics/P95Metrics.java} (75%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator/P99Indicator.java => metrics/P99Metrics.java} (75%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator/PercentIndicator.java => metrics/PercentMetrics.java} (78%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator/PxxIndicator.java => metrics/PxxMetrics.java} (86%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator/SumIndicator.java => metrics/SumMetrics.java} (75%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator/ThermodynamicIndicator.java => metrics/ThermodynamicMetrics.java} (81%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator => metrics}/WithMetadata.java (82%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator => metrics}/annotation/Arg.java (93%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator => metrics}/annotation/ConstOne.java (92%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator => metrics}/annotation/Entrance.java (92%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator => metrics}/annotation/Expression.java (93%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator => metrics}/annotation/ExpressionArg0.java (93%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator => metrics}/annotation/ExpressionArg1.java (93%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator/annotation/IndicatorType.java => metrics/annotation/MetricsAnnotationUtils.java} (78%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator/annotation/IndicatorFunction.java => metrics/annotation/MetricsFunction.java} (83%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator/annotation/IndicatorType.java => metrics/annotation/MetricsType.java} (89%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator/annotation/IndicatorTypeListener.java => metrics/annotation/MetricsTypeListener.java} (76%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator => metrics}/annotation/SourceFrom.java (92%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator => metrics}/expression/BinaryMatchExpression.java (94%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator => metrics}/expression/EqualMatch.java (92%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator => metrics}/expression/GreaterEqualMatch.java (94%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator => metrics}/expression/GreaterMatch.java (94%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator => metrics}/expression/LessEqualMatch.java (94%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{indicator => metrics}/expression/LessMatch.java (94%)
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/IndicatorProcess.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/IndicatorTransWorker.java
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/{IndicatorAggregateWorker.java => MetricsAggregateWorker.java} (63%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/{IndicatorPersistentWorker.java => MetricsPersistentWorker.java} (62%)
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsProcess.java
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/{IndicatorRemoteWorker.java => MetricsRemoteWorker.java} (78%)
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsTransWorker.java
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/{IIndicatorDAO.java => IMetricsDAO.java} (70%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/{IMetricQueryDAO.java => IMetricsQueryDAO.java} (96%)
delete mode 100644 oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/indicator/PxxIndicatorTest.java
delete mode 100644 oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/indicator/ThermodynamicIndicatorTest.java
rename oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/{indicator/CountIndicatorTest.java => metrics/CountMetricsTest.java} (80%)
rename oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/{indicator/LongAvgIndicatorTest.java => metrics/LongAvgMetricsTest.java} (79%)
rename oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/{indicator/MaxLongIndicatorTest.java => metrics/MaxLongMetricsTest.java} (78%)
rename oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/{indicator/IndicatorTest.java => metrics/MetricsTest.java} (83%)
rename oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/{indicator/PercentIndicatorTest.java => metrics/PercentMetricsTest.java} (79%)
create mode 100644 oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/PxxMetricsTest.java
create mode 100644 oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/ThermodynamicMetricsTest.java
delete mode 100644 oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/IndicatorEsDAO.java
copy oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/{RecordEsDAO.java => MetricsEsDAO.java} (50%)
rename oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/{MetricQueryEsDAO.java => MetricsQueryEsDAO.java} (91%)
rename oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/{H2IndicatorDAO.java => H2MetricsDAO.java} (63%)
rename oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/{H2MetricQueryDAO.java => H2MetricsQueryDAO.java} (90%)
rename oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/{CounterMetric.java => CounterMetrics.java} (89%)
rename oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/{GaugeMetric.java => GaugeMetrics.java} (91%)
rename oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/{HistogramMetric.java => HistogramMetrics.java} (89%)
rename oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/{MetricCreator.java => MetricsCreator.java} (66%)
rename oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/{MetricTag.java => MetricsTag.java} (96%)
rename oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/none/{MetricCreatorNoop.java => MetricsCreatorNoop.java} (71%)
rename oap-server/server-telemetry/telemetry-prometheus/src/main/java/org/apache/skywalking/oap/server/telemetry/prometheus/{BaseMetric.java => BaseMetrics.java} (82%)
rename oap-server/server-telemetry/telemetry-prometheus/src/main/java/org/apache/skywalking/oap/server/telemetry/prometheus/{PrometheusCounterMetric.java => PrometheusCounterMetrics.java} (72%)
rename oap-server/server-telemetry/telemetry-prometheus/src/main/java/org/apache/skywalking/oap/server/telemetry/prometheus/{PrometheusGaugeMetric.java => PrometheusGaugeMetrics.java} (64%)
rename oap-server/server-telemetry/telemetry-prometheus/src/main/java/org/apache/skywalking/oap/server/telemetry/prometheus/{PrometheusHistogramMetric.java => PrometheusHistogramMetrics.java} (76%)
rename oap-server/server-telemetry/telemetry-prometheus/src/main/java/org/apache/skywalking/oap/server/telemetry/prometheus/{PrometheusMetricCreator.java => PrometheusMetricsCreator.java} (57%)