diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index e59ab6c02f..d6373eaaff 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -47,6 +47,7 @@ * Support `priority` definition in the `component-libraries.yml`. * Enhance service topology query. When there are multiple components detected from the server side, the component type of the node would be determined by the priority, which was random in the previous release. +* Remove `component_id` from `service_instance_relation_client_side` and `service_instance_relation_server_side`. #### UI diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/instance/ServiceInstanceCallRelationDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/instance/ServiceInstanceCallRelationDispatcher.java index 19fd61a40f..d3279dea6e 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/instance/ServiceInstanceCallRelationDispatcher.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/instance/ServiceInstanceCallRelationDispatcher.java @@ -43,7 +43,6 @@ public class ServiceInstanceCallRelationDispatcher implements SourceDispatcher serviceInstanceRelationClientCalls, @@ -71,10 +64,6 @@ public class ServiceInstanceTopologyBuilder { if (!nodes.containsKey(clientCall.getTarget())) { final ServiceInstanceNode node = buildNode(destService, destServiceInstance); nodes.put(clientCall.getTarget(), node); - if (!node.isReal() && StringUtil.isEmpty(node.getType())) { - node.setType( - componentLibraryCatalogService.getServerNameBasedOnComponent(clientCall.getComponentId())); - } } if (!callMap.containsKey(clientCall.getId())) { @@ -85,7 +74,6 @@ public class ServiceInstanceTopologyBuilder { call.setTarget(clientCall.getTarget()); call.setId(clientCall.getId()); call.addDetectPoint(DetectPoint.CLIENT); - call.addSourceComponent(componentLibraryCatalogService.getComponentName(clientCall.getComponentId())); calls.add(call); } } @@ -111,12 +99,6 @@ public class ServiceInstanceTopologyBuilder { final ServiceInstanceNode node = buildNode(destService, destServiceInstance); nodes.put(serverCall.getTarget(), node); } - /* - * Service side component id has higher priority - */ - final ServiceInstanceNode serverSideNode = nodes.get(serverCall.getTarget()); - serverSideNode.setType( - componentLibraryCatalogService.getServerNameBasedOnComponent(serverCall.getComponentId())); if (!callMap.containsKey(serverCall.getId())) { Call call = new Call(); @@ -126,12 +108,10 @@ public class ServiceInstanceTopologyBuilder { call.setTarget(serverCall.getTarget()); call.setId(serverCall.getId()); call.addDetectPoint(DetectPoint.SERVER); - call.addTargetComponent(componentLibraryCatalogService.getComponentName(serverCall.getComponentId())); calls.add(call); } else { Call call = callMap.get(serverCall.getId()); call.addDetectPoint(DetectPoint.SERVER); - call.addTargetComponent(componentLibraryCatalogService.getComponentName(serverCall.getComponentId())); } } @@ -151,6 +131,7 @@ public class ServiceInstanceTopologyBuilder { instanceNode.setServiceId(instanceIDDefinition.getServiceId()); instanceNode.setServiceName(serviceIDDefinition.getName()); instanceNode.setReal(serviceIDDefinition.isReal()); + instanceNode.setType(Const.EMPTY_STRING); //Since 9.4.0, don't provide type for instance topology node. return instanceNode; } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/Call.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/Call.java index 4676649590..35075460bc 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/Call.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/Call.java @@ -31,7 +31,19 @@ import org.apache.skywalking.oap.server.core.source.DetectPoint; public class Call { private String source; private String target; + /** + * Components are detected at the client-side in Service and Process topologies, and no value in instance topology + * and endpoint dependency. + * + * @since 9.4.0 + */ private List sourceComponents; + /** + * Components are detected at the server-side in Service and Process topologies, and no value in instance topology + * and endpoint dependency. + * + * @since 9.4.0 + */ private List targetComponents; private String id; private List detectPoints; @@ -88,14 +100,13 @@ public class Call { this.setDetectPoint(detectPoint); } - public void buildFromInstanceRelation(String entityId, int componentId, DetectPoint detectPoint) { + public void buildFromInstanceRelation(String entityId, DetectPoint detectPoint) { final IDManager.ServiceInstanceID.ServiceInstanceRelationDefine serviceRelationDefine = IDManager.ServiceInstanceID.analysisRelationId(entityId); this.setId(entityId); this.setSource(serviceRelationDefine.getSourceId()); this.setTarget(serviceRelationDefine.getDestId()); - this.setComponentId(componentId); this.setDetectPoint(detectPoint); } @@ -122,7 +133,8 @@ public class Call { public void buildProcessRelation(String entityId, int componentId, DetectPoint detectPoint) { this.setId(entityId); - final IDManager.ProcessID.ProcessRelationDefine processRelationDefine = IDManager.ProcessID.analysisRelationId(entityId); + final IDManager.ProcessID.ProcessRelationDefine processRelationDefine = IDManager.ProcessID.analysisRelationId( + entityId); this.setDetectPoint(detectPoint); this.setSource(processRelationDefine.getSourceId()); this.setTarget(processRelationDefine.getDestId()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/ServiceInstanceNode.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/ServiceInstanceNode.java index 891af86563..64cdbe2d1f 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/ServiceInstanceNode.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/ServiceInstanceNode.java @@ -29,6 +29,10 @@ public class ServiceInstanceNode { private String name; private String serviceId; private String serviceName; + /** + * @since 9.4.0 No type for service instance topology. + */ + @Deprecated private String type = ""; private boolean isReal; } diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBTopologyQueryDAO.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBTopologyQueryDAO.java index bfd4de75e7..cc6f313b7a 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBTopologyQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBTopologyQueryDAO.java @@ -129,8 +129,6 @@ public class BanyanDBTopologyQueryDAO extends AbstractBanyanDBDAO implements ITo MeasureQueryResponse resp = query(modelName, ImmutableSet.of( ServiceRelationClientSideMetrics.COMPONENT_IDS, - ServiceRelationClientSideMetrics.SOURCE_SERVICE_ID, - ServiceRelationClientSideMetrics.DEST_SERVICE_ID, Metrics.ENTITY_ID ), Collections.emptySet(), timestampRange, q @@ -208,9 +206,6 @@ public class BanyanDBTopologyQueryDAO extends AbstractBanyanDBDAO implements ITo for (final QueryBuilder q : queryBuilderList) { MeasureQueryResponse resp = query(modelName, ImmutableSet.of( - ServiceInstanceRelationServerSideMetrics.COMPONENT_ID, - ServiceInstanceRelationServerSideMetrics.SOURCE_SERVICE_ID, - ServiceInstanceRelationServerSideMetrics.DEST_SERVICE_ID, Metrics.ENTITY_ID ), Collections.emptySet(), timestampRange, q @@ -220,11 +215,7 @@ public class BanyanDBTopologyQueryDAO extends AbstractBanyanDBDAO implements ITo } final Call.CallDetail call = new Call.CallDetail(); final String entityId = resp.getDataPoints().get(0).getTagValue(Metrics.ENTITY_ID); - final int componentId = ((Number) resp.getDataPoints() - .get(0) - .getTagValue( - ServiceInstanceRelationServerSideMetrics.COMPONENT_ID)).intValue(); - call.buildFromInstanceRelation(entityId, componentId, detectPoint); + call.buildFromInstanceRelation(entityId, detectPoint); callMap.putIfAbsent(entityId, call); } return new ArrayList<>(callMap.values()); @@ -283,8 +274,6 @@ public class BanyanDBTopologyQueryDAO extends AbstractBanyanDBDAO implements ITo for (final QueryBuilder q : queryBuilderList) { MeasureQueryResponse resp = query(EndpointRelationServerSideMetrics.INDEX_NAME, ImmutableSet.of( - EndpointRelationServerSideMetrics.DEST_ENDPOINT, - EndpointRelationServerSideMetrics.SOURCE_ENDPOINT, Metrics.ENTITY_ID ), Collections.emptySet(), timestampRange, q diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TopologyQueryEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TopologyQueryEsDAO.java index d5c8cea21b..2417779f2c 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TopologyQueryEsDAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TopologyQueryEsDAO.java @@ -89,7 +89,9 @@ public class TopologyQueryEsDAO extends EsDAO implements ITopologyQueryDAO { .gte(duration.getStartTimeBucket()) .lte(duration.getEndTimeBucket())); if (IndexController.LogicIndicesRegister.isMergedTable(ServiceRelationServerSideMetrics.INDEX_NAME)) { - query.must(Query.term(IndexController.LogicIndicesRegister.METRIC_TABLE_NAME, ServiceRelationServerSideMetrics.INDEX_NAME)); + query.must(Query.term(IndexController.LogicIndicesRegister.METRIC_TABLE_NAME, + ServiceRelationServerSideMetrics.INDEX_NAME + )); } sourceBuilder.query(query).size(0); @@ -105,7 +107,9 @@ public class TopologyQueryEsDAO extends EsDAO implements ITopologyQueryDAO { .gte(duration.getStartTimeBucket()) .lte(duration.getEndTimeBucket())); if (IndexController.LogicIndicesRegister.isMergedTable(ServiceRelationClientSideMetrics.INDEX_NAME)) { - query.must(Query.term(IndexController.LogicIndicesRegister.METRIC_TABLE_NAME, ServiceRelationClientSideMetrics.INDEX_NAME)); + query.must(Query.term(IndexController.LogicIndicesRegister.METRIC_TABLE_NAME, + ServiceRelationClientSideMetrics.INDEX_NAME + )); } sourceBuilder.query(query).size(0); @@ -118,7 +122,8 @@ public class TopologyQueryEsDAO extends EsDAO implements ITopologyQueryDAO { String serverServiceId, Duration duration) { final SearchBuilder search = Search.builder().size(0); - setInstanceQueryCondition(search, duration, clientServiceId, serverServiceId, ServiceInstanceRelationServerSideMetrics.INDEX_NAME); + setInstanceQueryCondition( + search, duration, clientServiceId, serverServiceId, ServiceInstanceRelationServerSideMetrics.INDEX_NAME); return buildInstanceRelation( search, ServiceInstanceRelationServerSideMetrics.INDEX_NAME, DetectPoint.SERVER); @@ -129,7 +134,8 @@ public class TopologyQueryEsDAO extends EsDAO implements ITopologyQueryDAO { String serverServiceId, Duration duration) { final SearchBuilder search = Search.builder().size(0); - setInstanceQueryCondition(search, duration, clientServiceId, serverServiceId, ServiceInstanceRelationClientSideMetrics.INDEX_NAME); + setInstanceQueryCondition( + search, duration, clientServiceId, serverServiceId, ServiceInstanceRelationClientSideMetrics.INDEX_NAME); return buildInstanceRelation( search, ServiceInstanceRelationClientSideMetrics.INDEX_NAME, DetectPoint.CLIENT); @@ -201,7 +207,9 @@ public class TopologyQueryEsDAO extends EsDAO implements ITopologyQueryDAO { EndpointRelationServerSideMetrics.DEST_ENDPOINT, destEndpointId )); if (IndexController.LogicIndicesRegister.isMergedTable(EndpointRelationServerSideMetrics.INDEX_NAME)) { - boolQuery.must(Query.term(IndexController.LogicIndicesRegister.METRIC_TABLE_NAME, EndpointRelationServerSideMetrics.INDEX_NAME)); + boolQuery.must(Query.term(IndexController.LogicIndicesRegister.METRIC_TABLE_NAME, + EndpointRelationServerSideMetrics.INDEX_NAME + )); } sourceBuilder.query(boolQuery); @@ -210,19 +218,25 @@ public class TopologyQueryEsDAO extends EsDAO implements ITopologyQueryDAO { } @Override - public List loadProcessRelationDetectedAtClientSide(String serviceInstanceId, Duration duration) throws IOException { + public List loadProcessRelationDetectedAtClientSide(String serviceInstanceId, + Duration duration) throws IOException { return buildProcessRelation(serviceInstanceId, duration, DetectPoint.CLIENT); } @Override - public List loadProcessRelationDetectedAtServerSide(String serviceInstanceId, Duration duration) throws IOException { + public List loadProcessRelationDetectedAtServerSide(String serviceInstanceId, + Duration duration) throws IOException { return buildProcessRelation(serviceInstanceId, duration, DetectPoint.SERVER); } - private List buildProcessRelation(String serviceInstanceId, Duration duration, DetectPoint detectPoint) throws IOException { + private List buildProcessRelation(String serviceInstanceId, + Duration duration, + DetectPoint detectPoint) throws IOException { final SearchBuilder sourceBuilder = Search.builder().size(0); final BoolQueryBuilder query = Query.bool() - .must(Query.term(ProcessRelationServerSideMetrics.SERVICE_INSTANCE_ID, serviceInstanceId)) + .must(Query.term(ProcessRelationServerSideMetrics.SERVICE_INSTANCE_ID, + serviceInstanceId + )) .must(Query.range(EndpointRelationServerSideMetrics.TIME_BUCKET) .gte(duration.getStartTimeBucket()) .lte(duration.getEndTimeBucket())); @@ -232,9 +246,9 @@ public class TopologyQueryEsDAO extends EsDAO implements ITopologyQueryDAO { .terms(Metrics.ENTITY_ID).field(Metrics.ENTITY_ID) .subAggregation( Aggregation.terms(ProcessRelationServerSideMetrics.COMPONENT_ID) - .field(ProcessRelationServerSideMetrics.COMPONENT_ID) - .executionHint(TermsAggregationBuilder.ExecutionHint.MAP) - .collectMode(TermsAggregationBuilder.CollectMode.BREADTH_FIRST)) + .field(ProcessRelationServerSideMetrics.COMPONENT_ID) + .executionHint(TermsAggregationBuilder.ExecutionHint.MAP) + .collectMode(TermsAggregationBuilder.CollectMode.BREADTH_FIRST)) .executionHint(TermsAggregationBuilder.ExecutionHint.MAP) .collectMode(TermsAggregationBuilder.CollectMode.BREADTH_FIRST) .size(1000)); @@ -317,11 +331,6 @@ public class TopologyQueryEsDAO extends EsDAO implements ITopologyQueryDAO { sourceBuilder.aggregation( Aggregation .terms(Metrics.ENTITY_ID).field(Metrics.ENTITY_ID) - .subAggregation( - Aggregation.terms(ServiceInstanceRelationServerSideMetrics.COMPONENT_ID) - .field(ServiceInstanceRelationServerSideMetrics.COMPONENT_ID) - .executionHint(TermsAggregationBuilder.ExecutionHint.MAP) - .collectMode(TermsAggregationBuilder.CollectMode.BREADTH_FIRST)) .executionHint(TermsAggregationBuilder.ExecutionHint.MAP) .collectMode(TermsAggregationBuilder.CollectMode.BREADTH_FIRST) .size(1000)); @@ -333,18 +342,14 @@ public class TopologyQueryEsDAO extends EsDAO implements ITopologyQueryDAO { List calls = new ArrayList<>(); final Map entityTerms = (Map) response.getAggregations().get(Metrics.ENTITY_ID); + final List> buckets = (List>) entityTerms.get("buckets"); - for (Map entityBucket : buckets) { - final String entityId = (String) entityBucket.get("key"); - final Map componentTerms = (Map) entityBucket.get( - ServiceInstanceRelationServerSideMetrics.COMPONENT_ID); - final List> subAgg = - (List>) componentTerms.get("buckets"); - final int componentId = ((Number) subAgg.iterator().next().get("key")).intValue(); + for (final Map entityBucket : buckets) { + String entityId = (String) entityBucket.get("key"); Call.CallDetail call = new Call.CallDetail(); - call.buildFromInstanceRelation(entityId, componentId, detectPoint); + call.buildFromInstanceRelation(entityId, detectPoint); calls.add(call); } return calls; diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCTopologyQueryDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCTopologyQueryDAO.java index 9d6bf5f24f..a4b7ce8b3c 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCTopologyQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCTopologyQueryDAO.java @@ -201,9 +201,9 @@ public class JDBCTopologyQueryDAO implements ITopologyQueryDAO { try (Connection connection = jdbcClient.getConnection()) { try (ResultSet resultSet = jdbcClient.executeQuery( connection, - "select " + Metrics.ENTITY_ID + ", " + ServiceInstanceRelationServerSideMetrics.COMPONENT_ID + "select " + Metrics.ENTITY_ID + " from " + tableName + " where " + Metrics.TIME_BUCKET + ">= ? and " + Metrics.TIME_BUCKET + "<=? " + serviceIdMatchSql - .toString() + " group by " + Metrics.ENTITY_ID + ", " + ServiceInstanceRelationServerSideMetrics.COMPONENT_ID, + .toString() + " group by " + Metrics.ENTITY_ID, conditions )) { buildInstanceCalls(resultSet, calls, detectPoint); @@ -287,8 +287,7 @@ public class JDBCTopologyQueryDAO implements ITopologyQueryDAO { while (resultSet.next()) { Call.CallDetail call = new Call.CallDetail(); String entityId = resultSet.getString(Metrics.ENTITY_ID); - final int componentId = resultSet.getInt(ServiceInstanceRelationServerSideMetrics.COMPONENT_ID); - call.buildFromInstanceRelation(entityId, componentId, detectPoint); + call.buildFromInstanceRelation(entityId, detectPoint); calls.add(call); } } diff --git a/test/e2e-v2/cases/gateway/expected/dependency-instance.yml b/test/e2e-v2/cases/gateway/expected/dependency-instance.yml index ec55a867c0..5457d1ccc0 100644 --- a/test/e2e-v2/cases/gateway/expected/dependency-instance.yml +++ b/test/e2e-v2/cases/gateway/expected/dependency-instance.yml @@ -25,13 +25,13 @@ nodes: name: provider1 serviceid: {{ b64enc "e2e-service-provider" }}.1 servicename: e2e-service-provider - type: "Tomcat" + type: "" isreal: true - id: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider2" }} name: provider2 serviceid: {{ b64enc "e2e-service-provider" }}.1 servicename: e2e-service-provider - type: "Tomcat" + type: "" isreal: true {{- end }} calls: diff --git a/test/e2e-v2/cases/go/expected/dependency-instance-go.yml b/test/e2e-v2/cases/go/expected/dependency-instance-go.yml index b115dbabe7..823d5f100a 100644 --- a/test/e2e-v2/cases/go/expected/dependency-instance-go.yml +++ b/test/e2e-v2/cases/go/expected/dependency-instance-go.yml @@ -25,7 +25,7 @@ nodes: name: provider1 serviceid: {{ b64enc "e2e-service-provider" }}.1 servicename: e2e-service-provider - type: Tomcat + type: "" isreal: true {{- end }} calls: diff --git a/test/e2e-v2/cases/istio/als/expected/dependency-services-instance-productpage.yml b/test/e2e-v2/cases/istio/als/expected/dependency-services-instance-productpage.yml index 1494adfd62..959380f389 100644 --- a/test/e2e-v2/cases/istio/als/expected/dependency-services-instance-productpage.yml +++ b/test/e2e-v2/cases/istio/als/expected/dependency-services-instance-productpage.yml @@ -19,7 +19,7 @@ nodes: name: {{ notEmpty .name }} serviceid: {{ b64enc "e2e::reviews" }}.1 servicename: e2e::reviews - type: http + type: "" isreal: true - id: {{ notEmpty .id }} name: {{ notEmpty .name }} diff --git a/test/e2e-v2/cases/lua/expected/dependency-instance.yml b/test/e2e-v2/cases/lua/expected/dependency-instance.yml index 2a3ffecb78..24799e5798 100644 --- a/test/e2e-v2/cases/lua/expected/dependency-instance.yml +++ b/test/e2e-v2/cases/lua/expected/dependency-instance.yml @@ -19,7 +19,7 @@ nodes: name: User_Service_Instance_Name serviceid: {{ b64enc "User_Service_Name" }}.1 servicename: User_Service_Name - type: Nginx + type: "" isreal: true - id: {{ b64enc "e2e-service-entry-provider" }}.1_{{ b64enc "provider1" }} name: provider1 diff --git a/test/e2e-v2/cases/nodejs/expected/dependency-instance.yml b/test/e2e-v2/cases/nodejs/expected/dependency-instance.yml index 900f7e1036..70f9421daf 100644 --- a/test/e2e-v2/cases/nodejs/expected/dependency-instance.yml +++ b/test/e2e-v2/cases/nodejs/expected/dependency-instance.yml @@ -19,7 +19,7 @@ nodes: name: consumer1 serviceid: {{ b64enc "e2e-service-consumer" }}.1 servicename: e2e-service-consumer - type: Tomcat + type: "" isreal: true - id: {{ b64enc "consumer" }}.1_{{ b64enc "consumer-instance" }} name: consumer-instance diff --git a/test/e2e-v2/cases/php/expected/dependency-instance.yml b/test/e2e-v2/cases/php/expected/dependency-instance.yml index 320103bf1e..2523c0712c 100644 --- a/test/e2e-v2/cases/php/expected/dependency-instance.yml +++ b/test/e2e-v2/cases/php/expected/dependency-instance.yml @@ -25,7 +25,7 @@ nodes: name: provider1 serviceid: {{ b64enc "e2e-service-provider" }}.1 servicename: e2e-service-provider - type: Tomcat + type: "" isreal: true {{- end }} calls: diff --git a/test/e2e-v2/cases/python/expected/dependency-instance-consumer-py.yml b/test/e2e-v2/cases/python/expected/dependency-instance-consumer-py.yml index 3116872d40..38c5e1c716 100644 --- a/test/e2e-v2/cases/python/expected/dependency-instance-consumer-py.yml +++ b/test/e2e-v2/cases/python/expected/dependency-instance-consumer-py.yml @@ -19,7 +19,7 @@ nodes: name: consumer1 serviceid: {{ b64enc "e2e-service-consumer" }}.1 servicename: e2e-service-consumer - type: Tomcat + type: "" isreal: true - id: {{ b64enc "consumer-py" }}.1_{{ b64enc "consumer-py-instance" }} name: consumer-py-instance diff --git a/test/e2e-v2/cases/python/expected/dependency-instance-provider-py-kafka.yml b/test/e2e-v2/cases/python/expected/dependency-instance-provider-py-kafka.yml index 4f2ae32d58..fd77748bee 100644 --- a/test/e2e-v2/cases/python/expected/dependency-instance-provider-py-kafka.yml +++ b/test/e2e-v2/cases/python/expected/dependency-instance-provider-py-kafka.yml @@ -19,7 +19,7 @@ nodes: name: provider-py-kafka-instance serviceid: {{ b64enc "provider-py-kafka" }}.1 servicename: provider-py-kafka - type: Python + type: "" isreal: true - id: {{ b64enc "consumer-py" }}.1_{{ b64enc "consumer-py-instance" }} name: consumer-py-instance diff --git a/test/e2e-v2/cases/python/expected/dependency-instance-provider-py.yml b/test/e2e-v2/cases/python/expected/dependency-instance-provider-py.yml index 34eb6ec619..8bc410fb66 100644 --- a/test/e2e-v2/cases/python/expected/dependency-instance-provider-py.yml +++ b/test/e2e-v2/cases/python/expected/dependency-instance-provider-py.yml @@ -25,7 +25,7 @@ nodes: name: provider-py-instance serviceid: {{ b64enc "provider-py" }}.1 servicename: provider-py - type: Python + type: "" isreal: true {{- end }} calls: diff --git a/test/e2e-v2/cases/simple/expected/dependency-instance.yml b/test/e2e-v2/cases/simple/expected/dependency-instance.yml index d3b9547c60..61cc1cad9a 100644 --- a/test/e2e-v2/cases/simple/expected/dependency-instance.yml +++ b/test/e2e-v2/cases/simple/expected/dependency-instance.yml @@ -25,7 +25,7 @@ nodes: name: provider1 serviceid: {{ b64enc "e2e-service-provider" }}.1 servicename: e2e-service-provider - type: "Tomcat" + type: "" isreal: true {{- end }} calls: diff --git a/test/e2e-v2/cases/storage/expected/dependency-instance.yml b/test/e2e-v2/cases/storage/expected/dependency-instance.yml index d3b9547c60..61cc1cad9a 100644 --- a/test/e2e-v2/cases/storage/expected/dependency-instance.yml +++ b/test/e2e-v2/cases/storage/expected/dependency-instance.yml @@ -25,7 +25,7 @@ nodes: name: provider1 serviceid: {{ b64enc "e2e-service-provider" }}.1 servicename: e2e-service-provider - type: "Tomcat" + type: "" isreal: true {{- end }} calls: