Adjust e2e case for V9 core (#8429)
* Adjust e2e case for V9 core * fix swctl install scrip * fix cases of browser, iotdb * fix instance serialize
This commit is contained in:
wankai123
GitHub
parent
810d840027
commit
17e8fa8ae5
|
|
@ -29,6 +29,7 @@ Release Notes.
|
|||
* Follow protocol grammar fix `GCPhrase -> GCPhase`.
|
||||
* Set layer to mesh relation.
|
||||
* Add `FAAS` to SpanLayer.
|
||||
* Adjust e2e case for V9 core.
|
||||
* Support ZGC GC time and count metric collecting.
|
||||
* Sync proto buffers files from upstream Envoy (Related to https://github.com/envoyproxy/envoy/pull/18955).
|
||||
|
||||
|
|
|
|||
|
|
@ -106,6 +106,7 @@ public class InstanceTraffic extends Metrics {
|
|||
public void deserialize(final RemoteData remoteData) {
|
||||
setServiceId(remoteData.getDataStrings(0));
|
||||
setName(remoteData.getDataStrings(1));
|
||||
setLayer(Layer.valueOf(remoteData.getDataIntegers(0)));
|
||||
final String propString = remoteData.getDataStrings(2);
|
||||
if (StringUtil.isNotEmpty(propString)) {
|
||||
setProperties(GSON.fromJson(propString, JsonObject.class));
|
||||
|
|
@ -119,6 +120,7 @@ public class InstanceTraffic extends Metrics {
|
|||
final RemoteData.Builder builder = RemoteData.newBuilder();
|
||||
builder.addDataStrings(serviceId);
|
||||
builder.addDataStrings(name);
|
||||
builder.addDataIntegers(layer.value());
|
||||
if (properties == null) {
|
||||
builder.addDataStrings(Const.EMPTY_STRING);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@ public class BrowserAppSingleVersionTrafficDispatcher extends BrowserAppTrafficS
|
|||
traffic.setName(source.getName());
|
||||
traffic.setServiceId(source.getServiceId());
|
||||
traffic.setLastPingTimestamp(source.getTimeBucket());
|
||||
traffic.setLayer(source.getLayer());
|
||||
MetricsStreamProcessor.getInstance().in(traffic);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ import java.util.List;
|
|||
import java.util.Map;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
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.analysis.manual.endpoint.EndpointTraffic;
|
||||
import org.apache.skywalking.oap.server.core.analysis.manual.instance.InstanceTraffic;
|
||||
|
|
@ -59,7 +60,7 @@ public class IoTDBMetadataQueryDAO implements IMetadataQueryDAO {
|
|||
query = client.addModelPath(query, ServiceTraffic.INDEX_NAME);
|
||||
Map<String, String> indexAndValueMap = new HashMap<>();
|
||||
if (StringUtil.isNotEmpty(layer)) {
|
||||
indexAndValueMap.put(IoTDBIndexes.LAYER_IDX, layer);
|
||||
indexAndValueMap.put(IoTDBIndexes.LAYER_IDX, String.valueOf(Layer.valueOf(layer).value()));
|
||||
}
|
||||
if (StringUtil.isNotEmpty(group)) {
|
||||
indexAndValueMap.put(IoTDBIndexes.GROUP_IDX, group);
|
||||
|
|
@ -168,7 +169,7 @@ public class IoTDBMetadataQueryDAO implements IMetadataQueryDAO {
|
|||
serviceInstance.setId(instanceTraffic.id());
|
||||
serviceInstance.setName(instanceTraffic.getName());
|
||||
serviceInstance.setInstanceUUID(serviceInstance.getId());
|
||||
serviceInstance.setLayer(serviceInstance.getLayer());
|
||||
serviceInstance.setLayer(instanceTraffic.getLayer().name());
|
||||
|
||||
JsonObject properties = instanceTraffic.getProperties();
|
||||
if (properties != null) {
|
||||
|
|
|
|||
|
|
@ -17,4 +17,7 @@
|
|||
- id: {{ b64enc "e2e-service-provider" }}.1
|
||||
name: e2e-service-provider
|
||||
group: ""
|
||||
shortname: e2e-service-provider
|
||||
layers:
|
||||
- GENERAL
|
||||
{{- end }}
|
||||
|
|
|
|||
|
|
@ -16,3 +16,6 @@
|
|||
- id: {{ b64enc "test-ui" }}.1
|
||||
name: test-ui
|
||||
group: ""
|
||||
shortname: test-ui
|
||||
layers:
|
||||
- BROWSER
|
||||
|
|
|
|||
|
|
@ -18,3 +18,4 @@
|
|||
attributes: []
|
||||
language: UNKNOWN
|
||||
instanceuuid: {{ b64enc "test-ui" }}.1_{{ b64enc "v1.0.0" }}
|
||||
layer: BROWSER
|
||||
|
|
|
|||
|
|
@ -37,4 +37,5 @@
|
|||
{{- end}}
|
||||
language: JAVA
|
||||
instanceuuid: {{ b64enc "e2e-service-consumer" }}.1_{{ b64enc "consumer1" }}
|
||||
layer: GENERAL
|
||||
{{- end}}
|
||||
|
|
|
|||
|
|
@ -37,4 +37,5 @@
|
|||
{{- end}}
|
||||
language: JAVA
|
||||
instanceuuid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider1" }}
|
||||
layer: GENERAL
|
||||
{{- end}}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,13 @@
|
|||
- id: {{ b64enc "e2e-service-provider" }}.1
|
||||
name: e2e-service-provider
|
||||
group: ""
|
||||
shortname: e2e-service-provider
|
||||
layers:
|
||||
- GENERAL
|
||||
- id: {{ b64enc "e2e-service-consumer" }}.1
|
||||
name: e2e-service-consumer
|
||||
group: ""
|
||||
shortname: e2e-service-consumer
|
||||
layers:
|
||||
- GENERAL
|
||||
{{- end }}
|
||||
|
|
|
|||
|
|
@ -37,4 +37,5 @@
|
|||
{{- end}}
|
||||
language: JAVA
|
||||
instanceuuid: {{ b64enc "e2e-service-consumer" }}.1_{{ b64enc "consumer1" }}
|
||||
layer: GENERAL
|
||||
{{- end}}
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@
|
|||
{{- end}}
|
||||
language: JAVA
|
||||
instanceuuid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider1" }}
|
||||
layer: GENERAL
|
||||
- id: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider2" }}
|
||||
name: provider2
|
||||
attributes:
|
||||
|
|
@ -58,4 +59,5 @@
|
|||
{{- end}}
|
||||
language: JAVA
|
||||
instanceuuid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider2" }}
|
||||
layer: GENERAL
|
||||
{{- end}}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,13 @@
|
|||
- id: {{ b64enc "e2e-service-provider" }}.1
|
||||
name: e2e-service-provider
|
||||
group: ""
|
||||
shortname: e2e-service-provider
|
||||
layers:
|
||||
- GENERAL
|
||||
- id: {{ b64enc "e2e-service-consumer" }}.1
|
||||
name: e2e-service-consumer
|
||||
group: ""
|
||||
shortname: e2e-service-consumer
|
||||
layers:
|
||||
- GENERAL
|
||||
{{- end }}
|
||||
|
|
|
|||
|
|
@ -31,4 +31,5 @@
|
|||
{{- end}}
|
||||
language: GO
|
||||
instanceuuid: {{ notEmpty .instanceuuid }}
|
||||
layer: GENERAL
|
||||
{{- end}}
|
||||
|
|
|
|||
|
|
@ -37,4 +37,5 @@
|
|||
{{- end}}
|
||||
language: JAVA
|
||||
instanceuuid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider1" }}
|
||||
{{- end}}
|
||||
layer: GENERAL
|
||||
{{- end}}
|
||||
|
|
|
|||
|
|
@ -17,10 +17,19 @@
|
|||
- id: {{ b64enc "e2e-service-provider" }}.1
|
||||
name: e2e-service-provider
|
||||
group: ""
|
||||
shortname: e2e-service-provider
|
||||
layers:
|
||||
- GENERAL
|
||||
- id: {{ b64enc "e2e-service-consumer" }}.1
|
||||
name: e2e-service-consumer
|
||||
group: ""
|
||||
shortname: e2e-service-consumer
|
||||
layers:
|
||||
- GENERAL
|
||||
- id: {{ b64enc "go2sky" }}.1
|
||||
name: go2sky
|
||||
group: ""
|
||||
shortname: go2sky
|
||||
layers:
|
||||
- GENERAL
|
||||
{{- end }}
|
||||
|
|
|
|||
|
|
@ -19,4 +19,5 @@
|
|||
attributes: []
|
||||
language: UNKNOWN
|
||||
instanceuuid: {{ notEmpty .instanceuuid }}
|
||||
layer: GENERAL
|
||||
{{- end }}
|
||||
|
|
|
|||
|
|
@ -16,20 +16,38 @@
|
|||
{{- contains . }}
|
||||
- id: {{ b64enc "istio-dp::e2e::istio-egressgateway" }}.1
|
||||
name: istio-dp::e2e::istio-egressgateway
|
||||
group: ""
|
||||
group: "istio-dp"
|
||||
shortname: e2e::istio-egressgateway
|
||||
layers:
|
||||
- GENERAL
|
||||
- id: {{ b64enc "istio-dp::e2e::istio-ingressgateway" }}.1
|
||||
name: istio-dp::e2e::istio-ingressgateway
|
||||
group: ""
|
||||
group: "istio-dp"
|
||||
shortname: e2e::istio-ingressgateway
|
||||
layers:
|
||||
- GENERAL
|
||||
- id: {{ b64enc "istio-dp::e2e::reviews" }}.1
|
||||
name: istio-dp::e2e::reviews
|
||||
group: ""
|
||||
group: "istio-dp"
|
||||
shortname: e2e::reviews
|
||||
layers:
|
||||
- GENERAL
|
||||
- id: {{ b64enc "istio-dp::e2e::productpage" }}.1
|
||||
name: istio-dp::e2e::productpage
|
||||
group: ""
|
||||
group: "istio-dp"
|
||||
shortname: e2e::productpage
|
||||
layers:
|
||||
- GENERAL
|
||||
- id: {{ b64enc "istio-dp::e2e::details" }}.1
|
||||
name: istio-dp::e2e::details
|
||||
group: ""
|
||||
group: "istio-dp"
|
||||
shortname: e2e::details
|
||||
layers:
|
||||
- GENERAL
|
||||
- id: {{ b64enc "istio-dp::e2e::ratings" }}.1
|
||||
name: istio-dp::e2e::ratings
|
||||
group: ""
|
||||
group: "istio-dp"
|
||||
shortname: e2e::ratings
|
||||
layers:
|
||||
- GENERAL
|
||||
{{- end }}
|
||||
|
|
|
|||
|
|
@ -37,4 +37,5 @@
|
|||
{{- end}}
|
||||
language: JAVA
|
||||
instanceuuid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider1" }}
|
||||
layer: GENERAL
|
||||
{{- end}}
|
||||
|
|
|
|||
|
|
@ -17,4 +17,7 @@
|
|||
- id: {{ b64enc "e2e-service-provider" }}.1
|
||||
name: e2e-service-provider
|
||||
group: ""
|
||||
shortname: e2e-service-provider
|
||||
layers:
|
||||
- GENERAL
|
||||
{{- end }}
|
||||
|
|
|
|||
|
|
@ -37,4 +37,5 @@
|
|||
{{- end}}
|
||||
language: JAVA
|
||||
instanceuuid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider1" }}
|
||||
{{- end}}
|
||||
layer: GENERAL
|
||||
{{- end}}
|
||||
|
|
|
|||
|
|
@ -17,4 +17,7 @@
|
|||
- id: {{ b64enc "e2e-service-provider" }}.1
|
||||
name: e2e-service-provider
|
||||
group: ""
|
||||
{{- end }}
|
||||
shortname: e2e-service-provider
|
||||
layers:
|
||||
- GENERAL
|
||||
{{- end }}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
cases:
|
||||
# service list
|
||||
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql service ls
|
||||
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql service layer GENERAL
|
||||
expected: expected/service.yml
|
||||
# service endpoint
|
||||
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql endpoint list --keyword=users --service-name=e2e-service-provider
|
||||
|
|
|
|||
|
|
@ -37,4 +37,5 @@
|
|||
{{- end}}
|
||||
language: LUA
|
||||
instanceuuid: {{ b64enc "User_Service_Name" }}.1_{{ b64enc "User_Service_Instance_Name" }}
|
||||
{{- end}}
|
||||
layer: GENERAL
|
||||
{{- end}}
|
||||
|
|
|
|||
|
|
@ -37,4 +37,5 @@
|
|||
{{- end}}
|
||||
language: JAVA
|
||||
instanceuuid: {{ b64enc "e2e-service-entry-provider" }}.1_{{ b64enc "provider1" }}
|
||||
{{- end}}
|
||||
layer: GENERAL
|
||||
{{- end}}
|
||||
|
|
|
|||
|
|
@ -17,10 +17,19 @@
|
|||
- id: {{ b64enc "e2e-service-entry-provider" }}.1
|
||||
name: e2e-service-entry-provider
|
||||
group: ""
|
||||
shortname: e2e-service-entry-provider
|
||||
layers:
|
||||
- GENERAL
|
||||
- id: {{ b64enc "User_Service_Name" }}.1
|
||||
name: User_Service_Name
|
||||
group: ""
|
||||
shortname: User_Service_Name
|
||||
layers:
|
||||
- GENERAL
|
||||
- id: {{ b64enc "e2e-service-end-provider" }}.1
|
||||
name: e2e-service-end-provider
|
||||
group: ""
|
||||
{{- end }}
|
||||
shortname: e2e-service-end-provider
|
||||
layers:
|
||||
- GENERAL
|
||||
{{- end }}
|
||||
|
|
|
|||
|
|
@ -37,4 +37,5 @@
|
|||
{{- end}}
|
||||
language: JAVA
|
||||
instanceuuid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider1" }}
|
||||
layer: GENERAL
|
||||
{{- end}}
|
||||
|
|
|
|||
|
|
@ -17,4 +17,7 @@
|
|||
- id: {{ b64enc "e2e-service-provider" }}.1
|
||||
name: e2e-service-provider
|
||||
group: ""
|
||||
shortname: e2e-service-provider
|
||||
layers:
|
||||
- GENERAL
|
||||
{{- end }}
|
||||
|
|
|
|||
|
|
@ -29,4 +29,5 @@
|
|||
{{- end}}
|
||||
language: UNKNOWN
|
||||
instanceuuid: {{ b64enc "consumer" }}.1_{{ b64enc "consumer-instance" }}
|
||||
layer: GENERAL
|
||||
{{- end}}
|
||||
|
|
|
|||
|
|
@ -29,4 +29,5 @@
|
|||
{{- end}}
|
||||
language: UNKNOWN
|
||||
instanceuuid: {{ b64enc "provider" }}.1_{{ b64enc "provider-instance" }}
|
||||
layer: GENERAL
|
||||
{{- end}}
|
||||
|
|
|
|||
|
|
@ -17,10 +17,19 @@
|
|||
- id: {{ b64enc "consumer" }}.1
|
||||
name: consumer
|
||||
group: ""
|
||||
shortname: consumer
|
||||
layers:
|
||||
- GENERAL
|
||||
- id: {{ b64enc "provider" }}.1
|
||||
name: provider
|
||||
group: ""
|
||||
shortname: provider
|
||||
layers:
|
||||
- GENERAL
|
||||
- id: {{ b64enc "e2e-service-consumer" }}.1
|
||||
name: e2e-service-consumer
|
||||
group: ""
|
||||
shortname: e2e-service-consumer
|
||||
layers:
|
||||
- GENERAL
|
||||
{{- end }}
|
||||
|
|
|
|||
|
|
@ -41,8 +41,11 @@ verify:
|
|||
# the interval between two retries, in millisecond.
|
||||
interval: 3s
|
||||
cases:
|
||||
# layer list
|
||||
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql layer ls
|
||||
expected: expected/layer.yml
|
||||
# service list
|
||||
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql service ls
|
||||
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql service layer GENERAL
|
||||
expected: expected/service.yml
|
||||
# service instance list
|
||||
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql instance list --service-name=php
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
# 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.
|
||||
|
||||
{{- contains . }}
|
||||
- GENERAL
|
||||
- VIRTUAL_DATABASE
|
||||
{{- end }}
|
||||
|
|
@ -31,4 +31,5 @@
|
|||
{{- end}}
|
||||
language: PHP
|
||||
instanceuuid: {{ b64enc "php" }}.1_{{ b64enc "php-instance" }}
|
||||
layer: GENERAL
|
||||
{{- end}}
|
||||
|
|
|
|||
|
|
@ -37,4 +37,5 @@
|
|||
{{- end}}
|
||||
language: JAVA
|
||||
instanceuuid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider1" }}
|
||||
{{- end}}
|
||||
layer: GENERAL
|
||||
{{- end}}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,13 @@
|
|||
- id: {{ b64enc "e2e-service-provider" }}.1
|
||||
name: e2e-service-provider
|
||||
group: ""
|
||||
shortname: e2e-service-provider
|
||||
layers:
|
||||
- GENERAL
|
||||
- id: {{ b64enc "php" }}.1
|
||||
name: php
|
||||
group: ""
|
||||
shortname: php
|
||||
layers:
|
||||
- GENERAL
|
||||
{{- end }}
|
||||
|
|
|
|||
|
|
@ -37,4 +37,5 @@
|
|||
{{- end}}
|
||||
language: JAVA
|
||||
instanceuuid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider1" }}
|
||||
layer: GENERAL
|
||||
{{- end}}
|
||||
|
|
|
|||
|
|
@ -17,4 +17,7 @@
|
|||
- id: {{ b64enc "e2e-service-provider" }}.1
|
||||
name: e2e-service-provider
|
||||
group: ""
|
||||
shortname: e2e-service-provider
|
||||
layers:
|
||||
- GENERAL
|
||||
{{- end }}
|
||||
|
|
|
|||
|
|
@ -37,4 +37,5 @@
|
|||
{{- end}}
|
||||
language: JAVA
|
||||
instanceuuid: {{ b64enc "e2e-service-consumer" }}.1_{{ b64enc "consumer1" }}
|
||||
layer: GENERAL
|
||||
{{- end}}
|
||||
|
|
|
|||
|
|
@ -25,4 +25,5 @@
|
|||
{{- end}}
|
||||
language: UNKNOWN
|
||||
instanceuuid: {{ b64enc "consumer-py" }}.1_{{ b64enc "consumer-py-instance" }}
|
||||
layer: GENERAL
|
||||
{{- end}}
|
||||
|
|
|
|||
|
|
@ -25,4 +25,5 @@
|
|||
{{- end}}
|
||||
language: UNKNOWN
|
||||
instanceuuid: {{ b64enc "provider-py-kafka" }}.1_{{ b64enc "provider-py-kafka-instance" }}
|
||||
layer: GENERAL
|
||||
{{- end}}
|
||||
|
|
|
|||
|
|
@ -25,4 +25,5 @@
|
|||
{{- end}}
|
||||
language: UNKNOWN
|
||||
instanceuuid: {{ b64enc "provider-py" }}.1_{{ b64enc "provider-py-instance" }}
|
||||
layer: GENERAL
|
||||
{{- end}}
|
||||
|
|
|
|||
|
|
@ -17,13 +17,25 @@
|
|||
- id: {{ b64enc "provider-py" }}.1
|
||||
name: provider-py
|
||||
group: ""
|
||||
shortname: provider-py
|
||||
layers:
|
||||
- GENERAL
|
||||
- id: {{ b64enc "e2e-service-consumer" }}.1
|
||||
name: e2e-service-consumer
|
||||
group: ""
|
||||
shortname: e2e-service-consumer
|
||||
layers:
|
||||
- GENERAL
|
||||
- id: {{ b64enc "consumer-py" }}.1
|
||||
name: consumer-py
|
||||
group: ""
|
||||
shortname: consumer-py
|
||||
layers:
|
||||
- GENERAL
|
||||
- id: {{ b64enc "provider-py-kafka" }}.1
|
||||
name: provider-py-kafka
|
||||
group: ""
|
||||
shortname: provider-py-kafka
|
||||
layers:
|
||||
- GENERAL
|
||||
{{- end }}
|
||||
|
|
|
|||
|
|
@ -37,4 +37,5 @@
|
|||
{{- end}}
|
||||
language: JAVA
|
||||
instanceuuid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider1" }}
|
||||
layer: GENERAL
|
||||
{{- end}}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,13 @@
|
|||
- id: {{ b64enc "e2e-service-provider" }}.1
|
||||
name: e2e-service-provider
|
||||
group: ""
|
||||
shortname: e2e-service-provider
|
||||
layers:
|
||||
- GENERAL
|
||||
- id: {{ b64enc "e2e-service-consumer" }}.1
|
||||
name: e2e-service-consumer
|
||||
group: ""
|
||||
shortname: e2e-service-consumer
|
||||
layers:
|
||||
- GENERAL
|
||||
{{- end }}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
# 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.
|
||||
|
||||
{{- contains . }}
|
||||
- GENERAL
|
||||
- VIRTUAL_DATABASE
|
||||
{{- end }}
|
||||
|
|
@ -37,4 +37,5 @@
|
|||
{{- end}}
|
||||
language: JAVA
|
||||
instanceuuid: {{ b64enc "e2e-service-consumer" }}.1_{{ b64enc "consumer1" }}
|
||||
layer: GENERAL
|
||||
{{- end}}
|
||||
|
|
|
|||
|
|
@ -37,4 +37,5 @@
|
|||
{{- end}}
|
||||
language: JAVA
|
||||
instanceuuid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider1" }}
|
||||
{{- end}}
|
||||
layer: GENERAL
|
||||
{{- end}}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,19 @@
|
|||
- id: {{ b64enc "e2e-service-provider" }}.1
|
||||
name: e2e-service-provider
|
||||
group: ""
|
||||
shortname: e2e-service-provider
|
||||
layers:
|
||||
- GENERAL
|
||||
- id: {{ b64enc "e2e-service-consumer" }}.1
|
||||
name: e2e-service-consumer
|
||||
group: ""
|
||||
shortname: e2e-service-consumer
|
||||
layers:
|
||||
- GENERAL
|
||||
- id: {{ b64enc "localhost:-1" }}.0
|
||||
name: localhost:-1
|
||||
group: ""
|
||||
shortname: localhost:-1
|
||||
layers:
|
||||
- VIRTUAL_DATABASE
|
||||
{{- end }}
|
||||
|
|
|
|||
|
|
@ -14,6 +14,9 @@
|
|||
# limitations under the License.
|
||||
|
||||
cases:
|
||||
# layer list
|
||||
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql layer ls
|
||||
expected: expected/layer.yml
|
||||
# service list
|
||||
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql service ls
|
||||
expected: expected/service.yml
|
||||
|
|
|
|||
|
|
@ -0,0 +1,20 @@
|
|||
# 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.
|
||||
|
||||
{{- contains . }}
|
||||
- GENERAL
|
||||
- VIRTUAL_DATABASE
|
||||
- SO11Y_OAP
|
||||
{{- end }}
|
||||
|
|
@ -16,5 +16,8 @@
|
|||
{{- contains . }}
|
||||
- id: {{ b64enc "satellite::satellite-service" }}.1
|
||||
name: satellite::satellite-service
|
||||
group: ""
|
||||
{{- end }}
|
||||
group: satellite
|
||||
shortname: satellite-service
|
||||
layers:
|
||||
- SO11Y_SATELLITE
|
||||
{{- end }}
|
||||
|
|
|
|||
|
|
@ -21,4 +21,5 @@
|
|||
attributes: []
|
||||
language: UNKNOWN
|
||||
instanceuuid: {{ b64enc "oap::oap-server" }}.1_{{ b64enc "http://localhost:1234" }}
|
||||
{{- end}}
|
||||
layer: SO11Y_OAP
|
||||
{{- end}}
|
||||
|
|
|
|||
|
|
@ -17,10 +17,25 @@
|
|||
- id: {{ b64enc "e2e-service-provider" }}.1
|
||||
name: e2e-service-provider
|
||||
group: ""
|
||||
shortname: e2e-service-provider
|
||||
layers:
|
||||
- GENERAL
|
||||
- id: {{ b64enc "e2e-service-consumer" }}.1
|
||||
name: e2e-service-consumer
|
||||
group: ""
|
||||
shortname: e2e-service-consumer
|
||||
layers:
|
||||
- GENERAL
|
||||
- id: {{ b64enc "localhost:-1" }}.0
|
||||
name: localhost:-1
|
||||
group: ""
|
||||
shortname: localhost:-1
|
||||
layers:
|
||||
- VIRTUAL_DATABASE
|
||||
- id: {{ b64enc "oap::oap-server" }}.1
|
||||
name: oap::oap-server
|
||||
group: ""
|
||||
{{- end }}
|
||||
group: oap
|
||||
shortname: oap-server
|
||||
layers:
|
||||
- SO11Y_OAP
|
||||
{{- end }}
|
||||
|
|
|
|||
|
|
@ -15,10 +15,10 @@
|
|||
|
||||
cases:
|
||||
# service list
|
||||
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql service ls
|
||||
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql service layer SO11Y_SATELLITE
|
||||
expected: expected/satellite-service.yml
|
||||
# service metrics
|
||||
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql metrics linear --name=satellite_service_server_cpu_utilization --service-name=satellite::satellite-service |yq e 'to_entries' -
|
||||
expected: expected/metrics-has-value.yml
|
||||
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql metrics linear --name=satellite_service_grpc_connect_count --service-name=satellite::satellite-service |yq e 'to_entries' -
|
||||
expected: expected/metrics-has-value.yml
|
||||
expected: expected/metrics-has-value.yml
|
||||
|
|
|
|||
|
|
@ -14,6 +14,9 @@
|
|||
# limitations under the License.
|
||||
|
||||
cases:
|
||||
# layer list
|
||||
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql layer ls
|
||||
expected: expected/layer.yml
|
||||
# service list
|
||||
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql service ls
|
||||
expected: expected/service.yml
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
# 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.
|
||||
|
||||
{{- contains . }}
|
||||
- GENERAL
|
||||
- VIRTUAL_DATABASE
|
||||
{{- end }}
|
||||
|
|
@ -37,4 +37,5 @@
|
|||
{{- end}}
|
||||
language: JAVA
|
||||
instanceuuid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider1" }}
|
||||
layer: GENERAL
|
||||
{{- end}}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,13 @@
|
|||
- id: {{ b64enc "e2e-service-provider" }}.1
|
||||
name: e2e-service-provider
|
||||
group: ""
|
||||
shortname: e2e-service-provider
|
||||
layers:
|
||||
- GENERAL
|
||||
- id: {{ b64enc "e2e-service-consumer" }}.1
|
||||
name: e2e-service-consumer
|
||||
group: ""
|
||||
shortname: e2e-service-consumer
|
||||
layers:
|
||||
- GENERAL
|
||||
{{- end }}
|
||||
|
|
|
|||
|
|
@ -14,8 +14,11 @@
|
|||
# limitations under the License.
|
||||
|
||||
cases:
|
||||
# layer list
|
||||
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql layer ls
|
||||
expected: expected/layer.yml
|
||||
# service list
|
||||
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql service ls
|
||||
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql service layer GENERAL
|
||||
expected: expected/service.yml
|
||||
# service metrics
|
||||
- query: swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql metrics linear --name service_sla --service-name=e2e-service-provider | yq e 'to_entries' -
|
||||
|
|
|
|||
|
|
@ -16,5 +16,8 @@
|
|||
{{- contains . }}
|
||||
- id: {{ b64enc "vm::vm-service" }}.1
|
||||
name: vm::vm-service
|
||||
group: ""
|
||||
shortname: vm-service
|
||||
group: vm
|
||||
layers:
|
||||
- OS_LINUX
|
||||
{{- end }}
|
||||
|
|
|
|||
|
|
@ -23,4 +23,4 @@ SW_AGENT_CLIENT_JS_COMMIT=af0565a67d382b683c1dbd94c379b7080db61449
|
|||
SW_AGENT_CLIENT_JS_TEST_COMMIT=4f1eb1dcdbde3ec4a38534bf01dded4ab5d2f016
|
||||
SW_KUBERNETES_COMMIT_SHA=0f3ec68e5a7e1608cec8688716b848ed15e971e5
|
||||
|
||||
SW_CTL_COMMIT=45a5f9807126dc6ea9fe06e17e7aafbe212436d2
|
||||
SW_CTL_COMMIT=3278a47ab49e672f4ef7eb2ab5c806faf3c48dd5
|
||||
|
|
|
|||
|
|
@ -27,5 +27,5 @@ if ! command -v swctl &> /dev/null; then
|
|||
curl -kLo skywalking-cli.tar.gz https://github.com/apache/skywalking-cli/archive/${SW_CTL_COMMIT}.tar.gz
|
||||
tar -zxf skywalking-cli.tar.gz --strip=1
|
||||
utype=$(uname | awk '{print tolower($0)}')
|
||||
make $utype && mv bin/swctl-*-$utype-amd64 $BIN_DIR/swctl
|
||||
fi
|
||||
make $utype-amd64 && mv bin/swctl-*-$utype-amd64 $BIN_DIR/swctl
|
||||
fi
|
||||
|
|
|
|||
Loading…
Reference in New Issue