Skip to content

Commit 1a1454e

Browse files
wankai123wankai123
authored
storage e2e: make topn result more predictable (#12921)
1 parent 3f0d68a commit 1a1454e

File tree

8 files changed

+45
-29
lines changed

8 files changed

+45
-29
lines changed

‎oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmRecord.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
package org.apache.skywalking.oap.server.core.alarm;
2020

21-
import com.google.gson.Gson;
2221
import lombok.Getter;
2322
import lombok.Setter;
2423
import org.apache.skywalking.oap.server.core.analysis.Stream;
@@ -46,7 +45,6 @@
4645
@SQLDatabase.ExtraColumn4AdditionalEntity(additionalTable = AlarmRecord.ADDITIONAL_TAG_TABLE, parentColumn = TIME_BUCKET)
4746
@BanyanDB.TimestampColumn(AlarmRecord.START_TIME)
4847
public class AlarmRecord extends Record {
49-
private static final Gson GSON = new Gson();
5048
public static final String INDEX_NAME = "alarm_record";
5149
public static final String ADDITIONAL_TAG_TABLE = "alarm_record_tag";
5250
public static final String SCOPE = "scope";

‎test/e2e-v2/cases/storage/banyandb/e2e.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,5 @@ verify:
4848
cases:
4949
- includes:
5050
- ../storage-cases.yaml
51-
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql metrics exec --expression="top_n(service_sla,3,des,attr0='GENERAL',attr1!='Not_exist')/100"
51+
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql metrics exec --expression="top_n(service_resp_time,3,des,attr0='GENERAL',attr1!='Not_exist')/100"
5252
expected: ../expected/topN-OP-service.yml

‎test/e2e-v2/cases/storage/es/e2e.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,5 @@ verify:
4848
cases:
4949
- includes:
5050
- ../storage-cases.yaml
51-
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql metrics exec --expression="top_n(service_sla,3,des,attr0='GENERAL',attr1!='Not_exist')/100"
51+
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql metrics exec --expression="top_n(service_resp_time,3,des,attr0='GENERAL',attr1!='Not_exist')/100"
5252
expected: ../expected/topN-OP-service.yml

‎test/e2e-v2/cases/storage/es/es-sharding/e2e.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,5 @@ verify:
4848
cases:
4949
- includes:
5050
- ../../storage-cases.yaml
51+
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql metrics exec --expression="top_n(service_resp_time,3,des,attr0='GENERAL',attr1!='Not_exist')/100"
52+
expected: ../../expected/topN-OP-service.yml

‎test/e2e-v2/cases/storage/expected/topN-OP-endpoint.yml‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,31 @@
1616
debuggingtrace: null
1717
type: SORTED_LIST
1818
results:
19-
{{- contains .results }}
2019
- metric:
2120
labels: []
2221
values:
23-
{{- contains .values }}
24-
- id: {{ notEmpty .id }}
25-
value: "100"
22+
- id: "e2e-service-consumer - POST:/users"
23+
value: "{{ (index (index .results 0).values 0).value }}"
2624
traceid: null
2725
owner:
2826
scope: Endpoint
29-
serviceid: {{ notEmpty .owner.serviceid }}
30-
servicename: {{ notEmpty .owner.servicename }}
27+
serviceid: {{ b64enc "e2e-service-consumer"}}.1
28+
servicename: e2e-service-consumer
3129
normal: true
3230
serviceinstanceid: null
3331
serviceinstancename: null
34-
endpointid: {{ notEmpty .owner.endpointid }}
35-
endpointname: {{ notEmpty .owner.endpointname }}
36-
{{- end }}
37-
{{- end }}
32+
endpointid: {{ b64enc "e2e-service-consumer" }}.1_{{ b64enc "POST:/users" }}
33+
endpointname: POST:/users
34+
- id: "e2e-service-provider - POST:/users"
35+
value: "{{ (index (index .results 0).values 1).value }}"
36+
traceid: null
37+
owner:
38+
scope: Endpoint
39+
serviceid: {{ b64enc "e2e-service-provider" }}.1
40+
servicename: e2e-service-provider
41+
normal: true
42+
serviceinstanceid: null
43+
serviceinstancename: null
44+
endpointid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "POST:/users" }}
45+
endpointname: POST:/users
3846
error: null

‎test/e2e-v2/cases/storage/expected/topN-OP-service.yml‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,31 @@
1616
debuggingtrace: null
1717
type: SORTED_LIST
1818
results:
19-
{{- contains .results }}
2019
- metric:
2120
labels: []
2221
values:
23-
{{- contains .values }}
24-
- id: {{ notEmpty .id }}
25-
value: "100"
22+
- id: e2e-service-consumer
23+
value: "{{ (index (index .results 0).values 0).value }}"
2624
traceid: null
2725
owner:
2826
scope: Service
29-
serviceid: {{ notEmpty .owner.serviceid }}
30-
servicename: {{ notEmpty .owner.servicename }}
27+
serviceid: {{ b64enc "e2e-service-consumer"}}.1
28+
servicename: e2e-service-consumer
29+
normal: true
30+
serviceinstanceid: null
31+
serviceinstancename: null
32+
endpointid: null
33+
endpointname: null
34+
- id: e2e-service-provider
35+
value: "{{ (index (index .results 0).values 1).value }}"
36+
traceid: null
37+
owner:
38+
scope: Service
39+
serviceid: {{ b64enc "e2e-service-provider"}}.1
40+
servicename: e2e-service-provider
3141
normal: true
3242
serviceinstanceid: null
3343
serviceinstancename: null
3444
endpointid: null
3545
endpointname: null
36-
{{- end }}
37-
{{- end }}
3846
error: null

‎test/e2e-v2/cases/storage/opensearch/e2e.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,5 @@ verify:
4848
cases:
4949
- includes:
5050
- ../storage-cases.yaml
51-
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql metrics exec --expression="top_n(service_sla,3,des,attr0='GENERAL',attr1!='Not_exist')/100"
51+
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql metrics exec --expression="top_n(service_resp_time,3,des,attr0='GENERAL',attr1!='Not_exist')/100"
5252
expected: ../expected/topN-OP-service.yml

‎test/e2e-v2/cases/storage/storage-cases.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -161,18 +161,18 @@ cases:
161161
)
162162
expected: expected/trace-users-detail.yml
163163
# topN-OP-service Global
164-
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql metrics exec --expression="top_n(service_sla,3,des)/100"
164+
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql metrics exec --expression="top_n(service_resp_time,3,des)"
165165
expected: expected/topN-OP-service.yml
166166
# topN-OP-service Global with attrs
167-
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql metrics exec --expression="top_n(service_sla,3,des,attr0='GENERAL')/100"
167+
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql metrics exec --expression="top_n(service_resp_time,3,des,attr0='GENERAL')"
168168
expected: expected/topN-OP-service.yml
169-
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql metrics exec --expression="top_n(service_sla,3,des,attr0!='Not_GENERAL')/100"
169+
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql metrics exec --expression="top_n(service_resp_time,3,des,attr0!='Not_GENERAL')"
170170
expected: expected/topN-OP-service.yml
171171
# topN-OP-endpoint Global
172-
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql metrics exec --expression="top_n(endpoint_sla,3,des)/100"
172+
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql metrics exec --expression="top_n(endpoint_resp_time,3,des)"
173173
expected: expected/topN-OP-endpoint.yml
174174
# topN-OP-endpoint Global with attrs
175-
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql metrics exec --expression="top_n(endpoint_sla,3,des,attr0='GENERAL')/100"
175+
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql metrics exec --expression="top_n(endpoint_resp_time,3,des,attr0='GENERAL')"
176176
expected: expected/topN-OP-endpoint.yml
177-
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql metrics exec --expression="top_n(endpoint_sla,3,des,attr0!='Not_GENERAL')/100"
177+
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql metrics exec --expression="top_n(endpoint_resp_time,3,des,attr0!='Not_GENERAL')"
178178
expected: expected/topN-OP-endpoint.yml

0 commit comments

Comments
 (0)