This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new d1f5b58 [Breaking Change] Deprecate `All` from OAL source. (#8656)
d1f5b58 is described below
commit d1f5b58f5c6603a2126c3766dffc029ce93b23d3
Author: 吴晟 Wu Sheng <[email protected]>
AuthorDate: Thu Mar 10 22:36:22 2022 +0800
[Breaking Change] Deprecate `All` from OAL source. (#8656)
* Add source `event` generated metrics to SERVICE_CATALOG_NAME catalog.
* [Breaking Change] Deprecate `All` from OAL source.
* [Breaking Change] Remove `SRC_ALL: 'All'` from OAL grammar tree.
* Remove `all_heatmap` and `all_percentile` metrics.
---
CHANGES.md | 5 ++
docs/en/concepts-and-designs/oal.md | 8 +--
docs/en/concepts-and-designs/scope-definitions.md | 18 +----
.../listener/MultiScopesAnalysisListener.java | 1 -
.../trace/parser/listener/SourceBuilder.java | 21 ------
.../exporter/provider/grpc/GRPCExporterTest.java | 4 +-
.../apache/skywalking/oal/rt/grammar/OALLexer.g4 | 1 -
.../apache/skywalking/oal/rt/grammar/OALParser.g4 | 2 +-
.../core/alarm/provider/NotifyHandlerTest.java | 2 +-
.../core/alarm/provider/WebhookCallbackTest.java | 2 +-
.../dingtalk/DingtalkHookCallbackTest.java | 4 +-
.../provider/feishu/FeishuHookCallbackTest.java | 6 +-
.../provider/wechat/WechatHookCallbackTest.java | 2 +-
.../provider/welink/WeLinkHookCallbackTest.java | 2 +-
.../oap/server/core/query/enumeration/Scope.java | 4 ++
.../skywalking/oap/server/core/source/All.java | 77 ----------------------
.../oap/server/core/source/DefaultScopeDefine.java | 4 ++
.../skywalking/oap/server/core/source/Event.java | 3 +-
.../receiver/mesh/TelemetryDataDispatcher.java | 24 ++-----
.../listener/MultiScopesAnalysisListenerTest.java | 47 ++++++-------
.../server-starter/src/main/resources/oal/core.oal | 4 --
skywalking-ui | 2 +-
22 files changed, 58 insertions(+), 185 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 374ca20..582eb1a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -88,6 +88,10 @@ Release Notes.
* Implement v9 UI template management protocol.
* Implement process metadata query protocol.
* Expose more ElasticSearch health check related logs to help to diagnose
`Health check fails. reason: No healthy endpoint`.
+* Add source `event` generated metrics to SERVICE_CATALOG_NAME catalog.
+* [Breaking Change] Deprecate `All` from OAL source.
+* [Breaking Change] Remove `SRC_ALL: 'All'` from OAL grammar tree.
+* Remove `all_heatmap` and `all_percentile` metrics.
#### UI
@@ -102,6 +106,7 @@ Release Notes.
* Update backend-meter.md doc .
* Add <STAM: Enhancing Topology Auto Detection For A Highly Distributed and
Large-Scale Application System> paper.
* Add Academy menu for recommending articles.
+* Remove `All` source relative document and examples.
All issues and pull requests are
[here](https://github.com/apache/skywalking/milestone/112?closed=1)
diff --git a/docs/en/concepts-and-designs/oal.md
b/docs/en/concepts-and-designs/oal.md
index 579778d..b07c2d2 100644
--- a/docs/en/concepts-and-designs/oal.md
+++ b/docs/en/concepts-and-designs/oal.md
@@ -26,7 +26,7 @@ disable(METRICS_NAME);
## From
The **from** statement defines the data source of this OAL expression.
-Primary **SCOPE**s are `All`, `Service`, `ServiceInstance`, `Endpoint`,
`ServiceRelation`, `ServiceInstanceRelation`, and `EndpointRelation`.
+Primary **SCOPE**s are `Service`, `ServiceInstance`, `Endpoint`,
`ServiceRelation`, `ServiceInstanceRelation`, and `EndpointRelation`.
There are also some secondary scopes which belong to a primary scope.
See [Scope Definitions](scope-definitions.md), where you can find all existing
Scopes and Fields.
@@ -66,7 +66,7 @@ Parameter (2) is the `denominator` condition.
In this case, the number of calls of each service.
- `histogram`. See [Heatmap in WIKI](https://en.wikipedia.org/wiki/Heat_map).
-> all_heatmap = from(All.latency).histogram(100, 20);
+> service_heatmap = from(Service.latency).histogram(100, 20);
In this case, the thermodynamic heatmap of all incoming requests.
Parameter (1) is the precision of latency calculation, such as in the above
case, where 113ms and 193ms are considered the same in the 101-200ms group.
@@ -80,12 +80,12 @@ Parameter (1) is the service name, which reflects the Apdex
threshold value load
Parameter (2) is the status of this request. The status(success/failure)
reflects the Apdex calculation.
- `p99`, `p95`, `p90`, `p75`, `p50`. See [percentile in
WIKI](https://en.wikipedia.org/wiki/Percentile).
-> all_percentile = from(All.latency).percentile(10);
+> service_percentile = from(Service.latency).percentile(10);
**percentile** is the first multiple-value metric, which has been introduced
since 7.0.0. As a metric with multiple values, it could be queried through the
`getMultipleLinearIntValues` GraphQL query.
In this case, see `p99`, `p95`, `p90`, `p75`, and `p50` of all incoming
requests. The parameter is precise to a latency at p99, such as in the above
case, and 120ms and 124ms are considered to produce the same response time.
Before 7.0.0, `p99`, `p95`, `p90`, `p75`, `p50` func(s) are used to calculate
metrics separately. They are still supported in 7.x, but they are no longer
recommended and are not included in the current official OAL script.
-> all_p99 = from(All.latency).p99(10);
+> service_p99 = from(Service.latency).p99(10);
In this case, the p99 value of all incoming requests. The parameter is precise
to a latency at p99, such as in the above case, and 120ms and 124ms are
considered to produce the same response time.
diff --git a/docs/en/concepts-and-designs/scope-definitions.md
b/docs/en/concepts-and-designs/scope-definitions.md
index 7102860..38d8798 100644
--- a/docs/en/concepts-and-designs/scope-definitions.md
+++ b/docs/en/concepts-and-designs/scope-definitions.md
@@ -1,22 +1,6 @@
# Scopes and Fields
Using the Aggregation Function, the requests will be grouped by time and
**Group Key(s)** in each scope.
-### SCOPE `All`
-
-| Name | Remarks | Group Key | Type |
-|---|---|---|---|
-| name | The service name of each request. | | string |
-| serviceInstanceName | The name of the service instance ID. | | string |
-| endpoint | The endpoint path of each request. | | string |
-| latency | The time taken by each request. | | int(in ms) |
-| status | The success or failure of the request. | | bool(true for
success) |
-| ~~responseCode~~ | Deprecated.The response code of the HTTP response, and if
this request is the HTTP call. E.g. 200, 404, 302| | int |
-| httpResponseStatusCode | The response code of the HTTP response, and if this
request is the HTTP call. E.g. 200, 404, 302| | int |
-| rpcStatusCode | The string value of the rpc response code. | | string |
-| type | The type of each request, such as Database, HTTP, RPC, or gRPC. | |
enum |
-| tags | The labels of each request. Each value is made up by
`TagKey:TagValue` in the segment. | | `List<String>` |
-| tag | The key-value pair of span tags in the segment. | | `Map<String,
String>` |
-
### SCOPE `Service`
This calculates the metrics data from each request of the service.
@@ -302,4 +286,4 @@ This calculates the metrics data from [events](event.md).
| endpoint | The service endpoint to which the event belongs to, if any. | |
string|
| type | The type of the event, `Normal` or `Error`. | | string|
| message | The message of the event. | | string |
-| parameters | The parameters in the `message`, see
[parameters](event.md#parameters). | | string |
+| parameters | The parameters in the `message`, see
[parameters](event.md#parameters). | | string |
\ No newline at end of file
diff --git
a/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/listener/MultiScopesAnalysisListener.java
b/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/listener/MultiScopesAnalysisListener.java
index 1ed76bd..f34c125 100644
---
a/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/listener/MultiScopesAnalysisListener.java
+++
b/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/listener/MultiScopesAnalysisListener.java
@@ -286,7 +286,6 @@ public class MultiScopesAnalysisListener implements
EntryAnalysisListener, ExitA
public void build() {
entrySourceBuilders.forEach(entrySourceBuilder -> {
entrySourceBuilder.prepare();
- sourceReceiver.receive(entrySourceBuilder.toAll());
sourceReceiver.receive(entrySourceBuilder.toService());
sourceReceiver.receive(entrySourceBuilder.toServiceInstance());
sourceReceiver.receive(entrySourceBuilder.toEndpoint());
diff --git
a/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/listener/SourceBuilder.java
b/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/listener/SourceBuilder.java
index 6a5869d..b45745b 100644
---
a/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/listener/SourceBuilder.java
+++
b/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/listener/SourceBuilder.java
@@ -29,7 +29,6 @@ import
org.apache.skywalking.apm.network.common.v3.KeyStringValuePair;
import org.apache.skywalking.oap.server.core.analysis.Layer;
import org.apache.skywalking.oap.server.library.util.StringUtil;
import org.apache.skywalking.oap.server.core.config.NamingControl;
-import org.apache.skywalking.oap.server.core.source.All;
import org.apache.skywalking.oap.server.core.source.DatabaseAccess;
import org.apache.skywalking.oap.server.core.source.DetectPoint;
import org.apache.skywalking.oap.server.core.source.Endpoint;
@@ -126,26 +125,6 @@ class SourceBuilder {
}
/**
- * The global level metrics source
- */
- All toAll() {
- All all = new All();
- all.setName(destServiceName);
- all.setServiceInstanceName(destServiceInstanceName);
- all.setEndpointName(destEndpointName);
- all.setLatency(latency);
- all.setStatus(status);
- all.setResponseCode(responseCode);
- all.setHttpResponseStatusCode(httpResponseStatusCode);
- all.setRpcStatusCode(rpcStatusCode);
- all.setType(type);
- all.setTimeBucket(timeBucket);
- all.setTags(tags);
- all.setOriginalTags(originalTags);
- return all;
- }
-
- /**
* Service meta and metrics related source of {@link #destServiceName}.
The metrics base on the OAL scripts.
*/
Service toService() {
diff --git
a/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporterTest.java
b/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporterTest.java
index 480632f..f483840 100644
---
a/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporterTest.java
+++
b/oap-server/exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporterTest.java
@@ -43,7 +43,7 @@ public class GRPCExporterTest {
public final GrpcServerRule grpcServerRule = new
GrpcServerRule().directExecutor();
private MetricExportServiceGrpc.MetricExportServiceImplBase service = new
MockMetricExportServiceImpl();
- private MetricsMetaInfo metaInfo = new MetricsMetaInfo("mock-metrics",
DefaultScopeDefine.ALL);
+ private MetricsMetaInfo metaInfo = new MetricsMetaInfo("mock-metrics",
DefaultScopeDefine.SERVICE);
private MetricExportServiceGrpc.MetricExportServiceBlockingStub stub;
@@ -67,7 +67,7 @@ public class GRPCExporterTest {
public static class MockExporterMetrics extends MockMetrics implements
WithMetadata {
@Override
public MetricsMetaInfo getMeta() {
- return new MetricsMetaInfo("mock-metrics", DefaultScopeDefine.ALL);
+ return new MetricsMetaInfo("mock-metrics",
DefaultScopeDefine.SERVICE);
}
}
diff --git
a/oap-server/oal-grammar/src/main/antlr4/org/apache/skywalking/oal/rt/grammar/OALLexer.g4
b/oap-server/oal-grammar/src/main/antlr4/org/apache/skywalking/oal/rt/grammar/OALLexer.g4
index af0289c..f8cd022 100644
---
a/oap-server/oal-grammar/src/main/antlr4/org/apache/skywalking/oal/rt/grammar/OALLexer.g4
+++
b/oap-server/oal-grammar/src/main/antlr4/org/apache/skywalking/oal/rt/grammar/OALLexer.g4
@@ -27,7 +27,6 @@ lexer grammar OALLexer;
FROM: 'from';
FILTER: 'filter';
DISABLE: 'disable';
-SRC_ALL: 'All';
SRC_SERVICE: 'Service';
SRC_SERVICE_INSTANCE: 'ServiceInstance';
SRC_ENDPOINT: 'Endpoint';
diff --git
a/oap-server/oal-grammar/src/main/antlr4/org/apache/skywalking/oal/rt/grammar/OALParser.g4
b/oap-server/oal-grammar/src/main/antlr4/org/apache/skywalking/oal/rt/grammar/OALParser.g4
index 09b0844..43f2c0e 100644
---
a/oap-server/oal-grammar/src/main/antlr4/org/apache/skywalking/oal/rt/grammar/OALParser.g4
+++
b/oap-server/oal-grammar/src/main/antlr4/org/apache/skywalking/oal/rt/grammar/OALParser.g4
@@ -50,7 +50,7 @@ filterExpression
;
source
- : SRC_ALL | SRC_SERVICE | SRC_DATABASE_ACCESS | SRC_SERVICE_INSTANCE |
SRC_ENDPOINT |
+ : SRC_SERVICE | SRC_DATABASE_ACCESS | SRC_SERVICE_INSTANCE | SRC_ENDPOINT |
SRC_SERVICE_RELATION | SRC_SERVICE_INSTANCE_RELATION |
SRC_ENDPOINT_RELATION |
SRC_SERVICE_INSTANCE_CLR_CPU | SRC_SERVICE_INSTANCE_CLR_GC |
SRC_SERVICE_INSTANCE_CLR_THREAD |
SRC_SERVICE_INSTANCE_JVM_CPU | SRC_SERVICE_INSTANCE_JVM_MEMORY |
SRC_SERVICE_INSTANCE_JVM_MEMORY_POOL | SRC_SERVICE_INSTANCE_JVM_GC |
SRC_SERVICE_INSTANCE_JVM_THREAD | SRC_SERVICE_INSTANCE_JVM_CLASS |// JVM source
of service instance
diff --git
a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/NotifyHandlerTest.java
b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/NotifyHandlerTest.java
index e28fc21..ca0c6d3 100644
---
a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/NotifyHandlerTest.java
+++
b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/NotifyHandlerTest.java
@@ -302,7 +302,7 @@ public class NotifyHandlerTest {
public void dontNotify() {
MetricsMetaInfo metadata = mock(MetricsMetaInfo.class);
- when(metadata.getScope()).thenReturn(DefaultScopeDefine.ALL);
+ when(metadata.getScope()).thenReturn(DefaultScopeDefine.SERVICE);
MockMetrics mockMetrics = mock(MockMetrics.class);
when(mockMetrics.getMeta()).thenReturn(metadata);
diff --git
a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/WebhookCallbackTest.java
b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/WebhookCallbackTest.java
index 1514855..e6dc7cc 100644
---
a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/WebhookCallbackTest.java
+++
b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/WebhookCallbackTest.java
@@ -85,7 +85,7 @@ public class WebhookCallbackTest implements Servlet {
WebhookCallback webhookCallback = new
WebhookCallback(alarmRulesWatcher);
List<AlarmMessage> alarmMessages = new ArrayList<>(2);
AlarmMessage alarmMessage = new AlarmMessage();
- alarmMessage.setScopeId(DefaultScopeDefine.ALL);
+ alarmMessage.setScopeId(DefaultScopeDefine.SERVICE);
alarmMessage.setRuleName("service_resp_time_rule");
alarmMessage.setAlarmMessage("alarmMessage with
[DefaultScopeDefine.All]");
alarmMessages.add(alarmMessage);
diff --git
a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/dingtalk/DingtalkHookCallbackTest.java
b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/dingtalk/DingtalkHookCallbackTest.java
index 1ec5bed..772be8f 100644
---
a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/dingtalk/DingtalkHookCallbackTest.java
+++
b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/dingtalk/DingtalkHookCallbackTest.java
@@ -84,7 +84,7 @@ public class DingtalkHookCallbackTest implements Servlet {
DingtalkHookCallback dingtalkCallBack = new
DingtalkHookCallback(alarmRulesWatcher);
List<AlarmMessage> alarmMessages = new ArrayList<>(2);
AlarmMessage alarmMessage = new AlarmMessage();
- alarmMessage.setScopeId(DefaultScopeDefine.ALL);
+ alarmMessage.setScopeId(DefaultScopeDefine.SERVICE);
alarmMessage.setRuleName("service_resp_time_rule");
alarmMessage.setAlarmMessage("alarmMessage with
[DefaultScopeDefine.All]");
alarmMessages.add(alarmMessage);
@@ -110,7 +110,7 @@ public class DingtalkHookCallbackTest implements Servlet {
DingtalkHookCallback dingtalkCallBack = new
DingtalkHookCallback(alarmRulesWatcher);
List<AlarmMessage> alarmMessages = new ArrayList<>(2);
AlarmMessage alarmMessage = new AlarmMessage();
- alarmMessage.setScopeId(DefaultScopeDefine.ALL);
+ alarmMessage.setScopeId(DefaultScopeDefine.SERVICE);
alarmMessage.setRuleName("service_resp_time_rule");
alarmMessage.setAlarmMessage("alarmMessage with
[DefaultScopeDefine.All]");
alarmMessages.add(alarmMessage);
diff --git
a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/feishu/FeishuHookCallbackTest.java
b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/feishu/FeishuHookCallbackTest.java
index 1914843..4cfa0ff 100644
---
a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/feishu/FeishuHookCallbackTest.java
+++
b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/feishu/FeishuHookCallbackTest.java
@@ -84,7 +84,7 @@ public class FeishuHookCallbackTest implements Servlet {
FeishuHookCallback feishuHookCallback = new
FeishuHookCallback(alarmRulesWatcher);
List<AlarmMessage> alarmMessages = new ArrayList<>(2);
AlarmMessage alarmMessage = new AlarmMessage();
- alarmMessage.setScopeId(DefaultScopeDefine.ALL);
+ alarmMessage.setScopeId(DefaultScopeDefine.SERVICE);
alarmMessage.setRuleName("service_resp_time_rule");
alarmMessage.setAlarmMessage("alarmMessage with
[DefaultScopeDefine.All]");
alarmMessages.add(alarmMessage);
@@ -110,7 +110,7 @@ public class FeishuHookCallbackTest implements Servlet {
FeishuHookCallback feishuHookCallback = new
FeishuHookCallback(alarmRulesWatcher);
List<AlarmMessage> alarmMessages = new ArrayList<>(2);
AlarmMessage alarmMessage = new AlarmMessage();
- alarmMessage.setScopeId(DefaultScopeDefine.ALL);
+ alarmMessage.setScopeId(DefaultScopeDefine.SERVICE);
alarmMessage.setRuleName("service_resp_time_rule");
alarmMessage.setAlarmMessage("alarmMessage with
[DefaultScopeDefine.All]");
alarmMessages.add(alarmMessage);
@@ -136,7 +136,7 @@ public class FeishuHookCallbackTest implements Servlet {
FeishuHookCallback feishuHookCallback = new
FeishuHookCallback(alarmRulesWatcher);
List<AlarmMessage> alarmMessages = new ArrayList<>(2);
AlarmMessage alarmMessage = new AlarmMessage();
- alarmMessage.setScopeId(DefaultScopeDefine.ALL);
+ alarmMessage.setScopeId(DefaultScopeDefine.SERVICE);
alarmMessage.setRuleName("service_resp_time_rule");
alarmMessage.setAlarmMessage("alarmMessage with
[DefaultScopeDefine.All]");
alarmMessages.add(alarmMessage);
diff --git
a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/wechat/WechatHookCallbackTest.java
b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/wechat/WechatHookCallbackTest.java
index 23683ec..55a6b27 100644
---
a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/wechat/WechatHookCallbackTest.java
+++
b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/wechat/WechatHookCallbackTest.java
@@ -79,7 +79,7 @@ public class WechatHookCallbackTest implements Servlet {
WechatHookCallback wechatHookCallback = new
WechatHookCallback(alarmRulesWatcher);
List<AlarmMessage> alarmMessages = new ArrayList<>(2);
AlarmMessage alarmMessage = new AlarmMessage();
- alarmMessage.setScopeId(DefaultScopeDefine.ALL);
+ alarmMessage.setScopeId(DefaultScopeDefine.SERVICE);
alarmMessage.setRuleName("service_resp_time_rule");
alarmMessage.setAlarmMessage("alarmMessage with
[DefaultScopeDefine.All]");
alarmMessages.add(alarmMessage);
diff --git
a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/welink/WeLinkHookCallbackTest.java
b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/welink/WeLinkHookCallbackTest.java
index 1be8f11..2428b16 100644
---
a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/welink/WeLinkHookCallbackTest.java
+++
b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/welink/WeLinkHookCallbackTest.java
@@ -84,7 +84,7 @@ public class WeLinkHookCallbackTest implements Servlet {
WeLinkHookCallback welinkHookCallback = new
WeLinkHookCallback(alarmRulesWatcher);
List<AlarmMessage> alarmMessages = new ArrayList<>(2);
AlarmMessage alarmMessage = new AlarmMessage();
- alarmMessage.setScopeId(DefaultScopeDefine.ALL);
+ alarmMessage.setScopeId(DefaultScopeDefine.SERVICE);
alarmMessage.setRuleName("service_resp_time_rule");
alarmMessage.setAlarmMessage("alarmMessage with
[DefaultScopeDefine.All]");
alarmMessages.add(alarmMessage);
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/enumeration/Scope.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/enumeration/Scope.java
index 97cf41a..df4b313 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/enumeration/Scope.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/enumeration/Scope.java
@@ -24,6 +24,10 @@ import
org.apache.skywalking.oap.server.core.UnexpectedException;
import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine;
public enum Scope {
+ /**
+ * @since Deprecated from 9.0.0
+ */
+ @Deprecated
All(DefaultScopeDefine.ALL),
Service(DefaultScopeDefine.SERVICE),
ServiceInstance(DefaultScopeDefine.SERVICE_INSTANCE),
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/All.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/All.java
deleted file mode 100644
index a6d681f..0000000
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/All.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.skywalking.oap.server.core.source;
-
-import java.util.List;
-import java.util.Map;
-import lombok.Getter;
-import lombok.Setter;
-
-import static
org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.ALL;
-
-@ScopeDeclaration(id = ALL, name = "All")
-public class All extends Source {
- @Override
- public int scope() {
- return DefaultScopeDefine.ALL;
- }
-
- @Override
- public String getEntityId() {
- return "";
- }
-
- @Getter
- @Setter
- private String name;
- @Getter
- @Setter
- private String serviceInstanceName;
- @Getter
- @Setter
- private String endpointName;
- @Getter
- @Setter
- private int latency;
- @Getter
- @Setter
- private boolean status;
- @Getter
- @Setter
- @Deprecated
- private int responseCode;
- @Getter
- @Setter
- private int httpResponseStatusCode;
- @Getter
- @Setter
- private String rpcStatusCode;
- @Getter
- @Setter
- private RequestType type;
- @Getter
- @Setter
- private List<String> tags;
- @Setter
- private Map<String, String> originalTags;
-
- public String getTag(String key) {
- return originalTags.get(key);
- }
-}
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DefaultScopeDefine.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DefaultScopeDefine.java
index 59a0729..fa295cb 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DefaultScopeDefine.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DefaultScopeDefine.java
@@ -43,6 +43,10 @@ public class DefaultScopeDefine {
* @since 9.0.0
*/
public static final int UNKNOWN = 0;
+ /**
+ * @since Deprecated from 9.0.0
+ */
+ @Deprecated
public static final int ALL = 0;
public static final int SERVICE = 1;
public static final int SERVICE_INSTANCE = 2;
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Event.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Event.java
index 3646643..3a351de 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Event.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Event.java
@@ -40,11 +40,12 @@ import
org.apache.skywalking.oap.server.core.storage.StorageHashMapBuilder;
import org.apache.skywalking.oap.server.core.storage.annotation.Column;
import static
org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.EVENT;
+import static
org.apache.skywalking.oap.server.core.source.DefaultScopeDefine.SERVICE_CATALOG_NAME;
import static
org.apache.skywalking.oap.server.library.util.StringUtil.isNotBlank;
@Getter
@Setter
-@ScopeDeclaration(id = EVENT, name = "Event")
+@ScopeDeclaration(id = EVENT, name = "Event", catalog = SERVICE_CATALOG_NAME)
@Stream(name = Event.INDEX_NAME, scopeId = EVENT, builder =
Event.Builder.class, processor = MetricsStreamProcessor.class)
@EqualsAndHashCode(
callSuper = false,
diff --git
a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/TelemetryDataDispatcher.java
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/TelemetryDataDispatcher.java
index 8126586..60a5c38 100644
---
a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/TelemetryDataDispatcher.java
+++
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/TelemetryDataDispatcher.java
@@ -26,7 +26,6 @@ import org.apache.skywalking.oap.server.core.CoreModule;
import org.apache.skywalking.oap.server.core.analysis.Layer;
import org.apache.skywalking.oap.server.core.analysis.TimeBucket;
import org.apache.skywalking.oap.server.core.config.NamingControl;
-import org.apache.skywalking.oap.server.core.source.All;
import org.apache.skywalking.oap.server.core.source.DetectPoint;
import org.apache.skywalking.oap.server.core.source.Endpoint;
import org.apache.skywalking.oap.server.core.source.RequestType;
@@ -69,9 +68,10 @@ public class TelemetryDataDispatcher {
"mesh_analysis_latency", "The process latency of service mesh
telemetry", MetricsTag.EMPTY_KEY,
MetricsTag.EMPTY_VALUE
);
- MESH_ERROR_METRICS =
metricsCreator.createCounter("mesh_analysis_error_count", "The error number of
mesh analysis",
- MetricsTag.EMPTY_KEY,
- MetricsTag.EMPTY_VALUE
+ MESH_ERROR_METRICS =
metricsCreator.createCounter("mesh_analysis_error_count",
+ "The error number of
mesh analysis",
+ MetricsTag.EMPTY_KEY,
+
MetricsTag.EMPTY_VALUE
);
}
@@ -108,7 +108,6 @@ public class TelemetryDataDispatcher {
long minuteTimeBucket =
TimeBucket.getMinuteTimeBucket(metrics.getStartTime());
if
(org.apache.skywalking.apm.network.common.v3.DetectPoint.server.equals(metrics.getDetectPoint()))
{
- toAll(metrics, minuteTimeBucket);
toService(metrics, minuteTimeBucket);
toServiceInstance(metrics, minuteTimeBucket);
toEndpoint(metrics, minuteTimeBucket);
@@ -122,21 +121,6 @@ public class TelemetryDataDispatcher {
}
}
- private static void toAll(ServiceMeshMetric.Builder metrics, long
minuteTimeBucket) {
- All all = new All();
- all.setTimeBucket(minuteTimeBucket);
- all.setName(metrics.getDestServiceName());
- all.setServiceInstanceName(metrics.getDestServiceInstance());
- all.setEndpointName(metrics.getEndpoint());
- all.setLatency(metrics.getLatency());
- all.setStatus(metrics.getStatus());
- all.setResponseCode(metrics.getResponseCode());
- all.setHttpResponseStatusCode(metrics.getResponseCode());
- all.setType(protocol2Type(metrics.getProtocol()));
-
- SOURCE_RECEIVER.receive(all);
- }
-
private static void toService(ServiceMeshMetric.Builder metrics, long
minuteTimeBucket) {
Service service = new Service();
service.setTimeBucket(minuteTimeBucket);
diff --git
a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/MultiScopesAnalysisListenerTest.java
b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/MultiScopesAnalysisListenerTest.java
index 6c5600c..7d6e6eb 100644
---
a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/MultiScopesAnalysisListenerTest.java
+++
b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/MultiScopesAnalysisListenerTest.java
@@ -39,7 +39,6 @@ import
org.apache.skywalking.oap.server.core.analysis.manual.networkalias.Networ
import org.apache.skywalking.oap.server.core.cache.NetworkAddressAliasCache;
import org.apache.skywalking.oap.server.core.config.NamingControl;
import org.apache.skywalking.oap.server.core.config.group.EndpointNameGrouping;
-import org.apache.skywalking.oap.server.core.source.All;
import org.apache.skywalking.oap.server.core.source.DatabaseAccess;
import org.apache.skywalking.oap.server.core.source.Endpoint;
import org.apache.skywalking.oap.server.core.source.EndpointRelation;
@@ -153,14 +152,13 @@ public class MultiScopesAnalysisListenerTest {
listener.build();
final List<ISource> receivedSources =
mockReceiver.getReceivedSources();
- Assert.assertEquals(7, receivedSources.size());
- final All all = (All) receivedSources.get(0);
- final Service service = (Service) receivedSources.get(1);
- final ServiceInstance serviceInstance = (ServiceInstance)
receivedSources.get(2);
- final Endpoint endpoint = (Endpoint) receivedSources.get(3);
- final ServiceRelation serviceRelation = (ServiceRelation)
receivedSources.get(4);
- final ServiceInstanceRelation serviceInstanceRelation =
(ServiceInstanceRelation) receivedSources.get(5);
- final EndpointRelation endpointRelation = (EndpointRelation)
receivedSources.get(6);
+ Assert.assertEquals(6, receivedSources.size());
+ final Service service = (Service) receivedSources.get(0);
+ final ServiceInstance serviceInstance = (ServiceInstance)
receivedSources.get(1);
+ final Endpoint endpoint = (Endpoint) receivedSources.get(2);
+ final ServiceRelation serviceRelation = (ServiceRelation)
receivedSources.get(3);
+ final ServiceInstanceRelation serviceInstanceRelation =
(ServiceInstanceRelation) receivedSources.get(4);
+ final EndpointRelation endpointRelation = (EndpointRelation)
receivedSources.get(5);
Assert.assertEquals("mock-service", service.getName());
Assert.assertEquals(500, service.getResponseCode());
Assert.assertEquals(500, service.getHttpResponseStatusCode());
@@ -220,14 +218,13 @@ public class MultiScopesAnalysisListenerTest {
listener.build();
final List<ISource> receivedSources =
mockReceiver.getReceivedSources();
- Assert.assertEquals(7, receivedSources.size());
- final All all = (All) receivedSources.get(0);
- final Service service = (Service) receivedSources.get(1);
- final ServiceInstance serviceInstance = (ServiceInstance)
receivedSources.get(2);
- final Endpoint endpoint = (Endpoint) receivedSources.get(3);
- final ServiceRelation serviceRelation = (ServiceRelation)
receivedSources.get(4);
- final ServiceInstanceRelation serviceInstanceRelation =
(ServiceInstanceRelation) receivedSources.get(5);
- final EndpointRelation endpointRelation = (EndpointRelation)
receivedSources.get(6);
+ Assert.assertEquals(6, receivedSources.size());
+ final Service service = (Service) receivedSources.get(0);
+ final ServiceInstance serviceInstance = (ServiceInstance)
receivedSources.get(1);
+ final Endpoint endpoint = (Endpoint) receivedSources.get(2);
+ final ServiceRelation serviceRelation = (ServiceRelation)
receivedSources.get(3);
+ final ServiceInstanceRelation serviceInstanceRelation =
(ServiceInstanceRelation) receivedSources.get(4);
+ final EndpointRelation endpointRelation = (EndpointRelation)
receivedSources.get(5);
Assert.assertEquals("mock-service", service.getName());
Assert.assertEquals("mock-instance", serviceInstance.getName());
Assert.assertEquals("/springMVC", endpoint.getName());
@@ -238,7 +235,6 @@ public class MultiScopesAnalysisListenerTest {
Assert.assertEquals("downstream-endpoint",
endpointRelation.getEndpoint());
Assert.assertEquals(endpoint.getName(),
endpointRelation.getChildEndpoint());
// tags test
- Assert.assertEquals("http.method:GET", all.getTags().get(0));
Assert.assertEquals("http.method:GET", service.getTags().get(0));
Assert.assertEquals("http.method:GET",
serviceInstance.getTags().get(0));
Assert.assertEquals("http.method:GET", endpoint.getTags().get(0));
@@ -284,14 +280,13 @@ public class MultiScopesAnalysisListenerTest {
listener.build();
final List<ISource> receivedSources =
mockReceiver.getReceivedSources();
- Assert.assertEquals(7, receivedSources.size());
- final All all = (All) receivedSources.get(0);
- final Service service = (Service) receivedSources.get(1);
- final ServiceInstance serviceInstance = (ServiceInstance)
receivedSources.get(2);
- final Endpoint endpoint = (Endpoint) receivedSources.get(3);
- final ServiceRelation serviceRelation = (ServiceRelation)
receivedSources.get(4);
- final ServiceInstanceRelation serviceInstanceRelation =
(ServiceInstanceRelation) receivedSources.get(5);
- final EndpointRelation endpointRelation = (EndpointRelation)
receivedSources.get(6);
+ Assert.assertEquals(6, receivedSources.size());
+ final Service service = (Service) receivedSources.get(0);
+ final ServiceInstance serviceInstance = (ServiceInstance)
receivedSources.get(1);
+ final Endpoint endpoint = (Endpoint) receivedSources.get(2);
+ final ServiceRelation serviceRelation = (ServiceRelation)
receivedSources.get(3);
+ final ServiceInstanceRelation serviceInstanceRelation =
(ServiceInstanceRelation) receivedSources.get(4);
+ final EndpointRelation endpointRelation = (EndpointRelation)
receivedSources.get(5);
Assert.assertEquals("mock-service", service.getName());
Assert.assertEquals("mock-instance", serviceInstance.getName());
Assert.assertEquals("/springMVC", endpoint.getName());
diff --git a/oap-server/server-starter/src/main/resources/oal/core.oal
b/oap-server/server-starter/src/main/resources/oal/core.oal
index 59ee34b..9d11a0b 100755
--- a/oap-server/server-starter/src/main/resources/oal/core.oal
+++ b/oap-server/server-starter/src/main/resources/oal/core.oal
@@ -19,10 +19,6 @@
// For services using protocols HTTP 1/2, gRPC, RPC, etc., the cpm metrics
means "calls per minute",
// for services that are built on top of TCP, the cpm means "packages per
minute".
-// All scope metrics
-all_percentile = from(All.latency).percentile(10); // Multiple values
including p50, p75, p90, p95, p99
-all_heatmap = from(All.latency).histogram(100, 20);
-
// Service scope metrics
service_resp_time = from(Service.latency).longAvg();
service_sla = from(Service.*).percent(status == true);
diff --git a/skywalking-ui b/skywalking-ui
index 2a40545..24f07cf 160000
--- a/skywalking-ui
+++ b/skywalking-ui
@@ -1 +1 @@
-Subproject commit 2a40545f9310de897330d7845c3e778cd1a8f604
+Subproject commit 24f07cfdb1ef9c5970cdbb978d4d46bf1f7ce18c
