From f00827795efc98e085e1457053bd1a9d5ccbcaf7 Mon Sep 17 00:00:00 2001 From: zhengziyi0117 <91662408+zhengziyi0117@users.noreply.github.com> Date: Mon, 2 Dec 2024 14:13:28 +0800 Subject: [PATCH] feat: Replace timestamps with Duration in async profiler query && Add AsyncProfiling widget (#12816) --- .../core/cache/AsyncProfilerTaskCache.java | 8 ++--- .../AsyncProfilerMutationService.java | 2 +- .../AsyncProfilerQueryService.java | 15 ++++------ .../input/AsyncProfilerTaskListRequest.java | 3 +- .../graphql/resolver/AsyncProfilerQuery.java | 10 +------ .../src/main/resources/query-protocol | 2 +- .../general/general-service.json | 29 +++++++++++++++++++ .../query/AsyncProfilerTaskQueryEsDAO.java | 10 +++++-- ...etrics-has-value-label-destinationname.yml | 2 ++ ...etrics-has-value-label-destinationtype.yml | 2 ++ ...rics-has-value-label-serviceinstanceid.yml | 2 ++ .../activemq/expected/metrics-has-value.yml | 2 ++ .../metrics-has-connection-value-label.yml | 4 +++ .../metrics-has-latency-value-label.yml | 24 +++++++++++++++ .../metrics-has-status-value-label.yml | 2 ++ .../expected/metrics-has-value.yml | 2 ++ .../dynamodb/expected/metrics-has-value.yml | 2 ++ .../aws/eks/expected/metrics-has-value.yml | 2 ++ .../aws/s3/expected/metrics-has-value.yml | 2 ++ .../expected/metrics-has-value-percentile.yml | 8 +++++ .../browser/expected/metrics-has-value.yml | 2 ++ .../cilium/expected/metrics-has-value.yml | 2 ++ .../expected/metrics-has-value-label.yml | 2 ++ .../clickhouse/expected/metrics-has-value.yml | 2 ++ .../cluster/expected/metrics-day-first.yml | 2 ++ .../cluster/expected/metrics-day-second.yml | 2 ++ .../cluster/expected/metrics-hour-first.yml | 5 ++++ .../cluster/expected/metrics-hour-second.yml | 5 ++++ .../cluster/expected/metrics-minute-first.yml | 3 ++ .../expected/metrics-minute-second.yml | 3 ++ .../metrics-has-value-label-breaker.yml | 2 ++ .../metrics-has-value-label-color.yml | 2 ++ .../expected/metrics-has-value-label-gc.yml | 2 ++ .../metrics-has-value-label-mount.yml | 2 ++ .../expected/metrics-has-value-label-node.yml | 2 ++ .../expected/metrics-has-value-label-pool.yml | 2 ++ .../metrics-has-value-label-primary.yml | 2 ++ .../expected/metrics-has-value-label.yml | 2 ++ .../expected/metrics-has-value.yml | 2 ++ .../expected/metrics-has-value-percentile.yml | 2 ++ .../gateway/expected/metrics-has-value.yml | 2 ++ .../cases/go/expected/metrics-has-value.yml | 2 ++ .../istio/als/expected/metrics-has-value.yml | 2 ++ .../expected/metrics-has-value-label.yml | 2 ++ .../metrics/expected/metrics-has-value.yml | 2 ++ .../expected/metrics-has-value-gc-label.yml | 4 +++ .../metrics-has-value-instance-label.yml | 4 +++ .../expected/metrics-has-value-jvm-label.yml | 2 ++ .../metrics-has-value-service-label.yml | 2 ++ .../metrics-has-value-source-label.yml | 6 ++++ .../expected/metrics-has-value.yml | 2 ++ .../meter/expected/metrics-has-value.yml | 2 ++ ...ics-has-value-label-bandwidth-endpoint.yml | 2 ++ ...rics-has-value-label-bandwidth-service.yml | 2 ++ .../metrics-has-value-label-bandwidth.yml | 2 ++ .../metrics-has-value-label-percentile.yml | 2 ++ .../expected/metrics-has-value-label-pid.yml | 2 ++ .../metrics-has-value-label-shared-dict.yml | 2 ++ .../metrics-has-value-label-state.yml | 2 ++ .../metrics-has-value-label-status.yml | 2 ++ .../cases/kong/expected/metrics-has-value.yml | 2 ++ .../expected/metrics-single-value-label.yml | 1 + .../kong/expected/metrics-single-value.yml | 1 + .../cases/log/expected/metrics-has-value.yml | 2 ++ .../cases/lua/expected/metrics-has-value.yml | 2 ++ .../mariadb/expected/metrics-has-value.yml | 2 ++ .../metrics-has-value-label-created_by.yml | 2 ++ .../metrics-has-value-label-percentile.yml | 8 +++++ .../meter/expected/metrics-has-value.yml | 2 ++ .../expected/virtual_cache_has_metrics.yml | 2 ++ .../virtual_cache_has_topN_records.yml | 1 + .../metrics-has-value-label-assert.yml | 2 ++ .../metrics-has-value-label-count.yml | 2 ++ ...as-value-label-csr-service_instance_id.yml | 2 ++ .../expected/metrics-has-value-label-csr.yml | 2 ++ ...lue-label-database-service_instance_id.yml | 2 ++ ...as-value-label-doc-service_instance_id.yml | 2 ++ .../expected/metrics-has-value-label-doc.yml | 2 ++ .../expected/metrics-has-value-label-ins.yml | 2 ++ ...value-label-legacy-service_instance_id.yml | 2 ++ .../metrics-has-value-label-legacy.yml | 2 ++ .../metrics-has-value-label-member.yml | 2 ++ .../expected/metrics-has-value-label-op.yml | 2 ++ .../metrics-has-value-label-version.yml | 2 ++ .../expected/metrics-has-value-label.yml | 2 ++ .../mongodb/expected/metrics-has-value.yml | 2 ++ .../cases/mqe/expected/aggregateLabels-OP.yml | 2 ++ .../cases/mqe/expected/aggregation-OP.yml | 1 + test/e2e-v2/cases/mqe/expected/binary-OP.yml | 2 ++ test/e2e-v2/cases/mqe/expected/compare-OP.yml | 2 ++ test/e2e-v2/cases/mqe/expected/func-OP.yml | 2 ++ .../cases/mqe/expected/isPresent-OP-false.yml | 1 + .../cases/mqe/expected/isPresent-OP-true.yml | 1 + test/e2e-v2/cases/mqe/expected/labels-old.yml | 6 ++++ test/e2e-v2/cases/mqe/expected/no-OP.yml | 2 ++ .../e2e-v2/cases/mqe/expected/relabels-OP.yml | 6 ++++ .../cases/mqe/expected/relabels-binary-OP.yml | 6 ++++ .../mqe/expected/sort-label-value-OP.yml | 6 ++++ .../cases/mqe/expected/sort-value-OP.yml | 2 ++ .../cases/mqe/expected/topN-OP-instance.yml | 1 + .../cases/mqe/expected/topN-OP-service.yml | 2 ++ test/e2e-v2/cases/mqe/expected/trend-OP.yml | 2 ++ .../cases/mqe/expected/viewAsSeq-OP.yml | 2 ++ .../mysql/expected/metrics-has-value.yml | 2 ++ ...-value-label-level-service_instance_id.yml | 2 ++ .../metrics-has-value-label-level.yml | 2 ++ ...e-label-percentile-service_instance_id.yml | 2 ++ .../metrics-has-value-label-percentile.yml | 2 ++ ...cs-has-value-label-service_instance_id.yml | 2 ++ ...-value-label-state-service_instance_id.yml | 2 ++ .../metrics-has-value-label-state.yml | 2 ++ ...value-label-status-service_instance_id.yml | 2 ++ .../metrics-has-value-label-status.yml | 2 ++ ...s-value-label-type-service_instance_id.yml | 2 ++ .../expected/metrics-has-value-label-type.yml | 2 ++ .../nginx/expected/metrics-has-value.yml | 2 ++ .../nodejs/expected/metrics-has-value.yml | 2 ++ .../cases/php/expected/metrics-has-value.yml | 2 ++ .../metrics-has-value-label-datname.yml | 2 ++ .../expected/metrics-has-value-label.yml | 2 ++ .../postgresql/expected/metrics-has-value.yml | 2 ++ .../access_log/expected/metrics-has-value.yml | 2 ++ .../expected/metrics-sorted-has-value.yml | 1 + .../continuous/expected/metrics-has-value.yml | 2 ++ .../metrics-has-client-value-label.yml | 2 ++ .../metrics-has-http1-value-label.yml | 8 +++++ .../metrics-has-server-value-label.yml | 2 ++ .../network/expected/metrics-has-value.yml | 2 ++ ...etrics-has-value-instance-bookie-label.yml | 2 ++ ...etrics-has-value-instance-broker-label.yml | 2 ++ .../pulsar/expected/metrics-has-value.yml | 2 ++ .../python/expected/metrics-has-value.yml | 2 ++ .../metrics-has-value-instance-label.yml | 2 ++ .../metrics-has-value-service-label.yml | 2 ++ .../rabbitmq/expected/metrics-has-value.yml | 2 ++ .../redis/expected/metrics-has-value.yml | 2 ++ .../redis/expected/metrics-single-value.yml | 1 + .../metrics-has-value-empty-label.yml | 2 ++ .../metrics-has-value-group-label.yml | 2 ++ .../metrics-has-value-label-brokerIP.yml | 2 ++ .../expected/metrics-has-value-label.yml | 2 ++ .../rocketmq/expected/metrics-has-value.yml | 2 ++ .../expected/metrics-has-value.yml | 2 ++ .../expected/metrics-has-value-percentile.yml | 2 ++ .../simple/expected/metrics-has-value.yml | 2 ++ .../expected/metrics-has-value-label.yml | 2 ++ .../expected/metrics-has-value-percentile.yml | 4 +++ .../so11y/expected/metrics-has-value.yml | 2 ++ .../expected/metrics-has-value-percentile.yml | 2 ++ .../storage/expected/metrics-has-value.yml | 2 ++ .../storage/expected/topN-OP-endpoint.yml | 2 ++ .../storage/expected/topN-OP-service.yml | 2 ++ .../cases/ttl/expected/metrics-has-value.yml | 2 ++ .../virtual-mq/expected/metrics-has-value.yml | 2 ++ ...metrics-has-average-value-label-zabbix.yml | 4 +++ .../metrics-has-average-value-label.yml | 4 +++ .../metrics-has-mountpoint-value-label.yml | 4 +++ .../cases/vm/expected/metrics-has-value.yml | 2 ++ .../expected/metrics-has-vfs-value-label.yml | 2 ++ test/e2e-v2/cases/vm/expected/topN.yml | 1 + .../cases/win/expected/metrics-has-value.yml | 2 ++ test/e2e-v2/script/env | 2 +- 162 files changed, 429 insertions(+), 30 deletions(-) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cache/AsyncProfilerTaskCache.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cache/AsyncProfilerTaskCache.java index ff4a8741ee48..119cb957623d 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cache/AsyncProfilerTaskCache.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cache/AsyncProfilerTaskCache.java @@ -78,16 +78,16 @@ public void saveTask(String serviceId, AsyncProfilerTask task) { } /** - * use for every db query, -5 start time + * use for every db query, -5min start time */ public long getCacheStartTimeBucket() { - return TimeBucket.getMinuteTimeBucket(System.currentTimeMillis() - TimeUnit.MINUTES.toMillis(5)); + return TimeBucket.getRecordTimeBucket(System.currentTimeMillis() - TimeUnit.MINUTES.toMillis(5)); } /** - * use for every db query, +5 end time(because search through task's start time) + * use for every db query, +5min end time(because search through task's start time) */ public long getCacheEndTimeBucket() { - return TimeBucket.getMinuteTimeBucket(System.currentTimeMillis() + TimeUnit.MINUTES.toMillis(5)); + return TimeBucket.getRecordTimeBucket(System.currentTimeMillis() + TimeUnit.MINUTES.toMillis(5)); } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/asyncprofiler/AsyncProfilerMutationService.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/asyncprofiler/AsyncProfilerMutationService.java index dea03dd60821..1b35c12cd2db 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/asyncprofiler/AsyncProfilerMutationService.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/asyncprofiler/AsyncProfilerMutationService.java @@ -77,7 +77,7 @@ public AsyncProfilerTaskCreationResult createTask(String serviceId, task.setEventsFromList(rowEvents); task.setCreateTime(createTime); task.setExecArgs(execArgs); - task.setTimeBucket(TimeBucket.getMinuteTimeBucket(createTime)); + task.setTimeBucket(TimeBucket.getRecordTimeBucket(createTime)); NoneStreamProcessor.getInstance().in(task); return AsyncProfilerTaskCreationResult.builder() diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/asyncprofiler/AsyncProfilerQueryService.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/asyncprofiler/AsyncProfilerQueryService.java index 0e4e3a70e757..ce86f0fbc616 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/asyncprofiler/AsyncProfilerQueryService.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/asyncprofiler/AsyncProfilerQueryService.java @@ -22,18 +22,18 @@ import com.google.gson.Gson; import lombok.RequiredArgsConstructor; import org.apache.skywalking.oap.server.core.analysis.IDManager; -import org.apache.skywalking.oap.server.core.analysis.TimeBucket; import org.apache.skywalking.oap.server.core.profiling.asyncprofiler.storage.JFRProfilingDataRecord; import org.apache.skywalking.oap.server.core.query.AsyncProfilerTaskLog; +import org.apache.skywalking.oap.server.core.query.input.Duration; import org.apache.skywalking.oap.server.core.query.type.AsyncProfilerStackTree; import org.apache.skywalking.oap.server.core.query.type.AsyncProfilerTask; import org.apache.skywalking.oap.server.core.storage.StorageModule; import org.apache.skywalking.oap.server.core.storage.profiling.asyncprofiler.IAsyncProfilerTaskLogQueryDAO; import org.apache.skywalking.oap.server.core.storage.profiling.asyncprofiler.IAsyncProfilerTaskQueryDAO; import org.apache.skywalking.oap.server.core.storage.profiling.asyncprofiler.IJFRDataQueryDAO; +import org.apache.skywalking.oap.server.library.jfr.parser.JFRMergeBuilder; import org.apache.skywalking.oap.server.library.jfr.type.FrameTree; import org.apache.skywalking.oap.server.library.jfr.type.JFREventType; -import org.apache.skywalking.oap.server.library.jfr.parser.JFRMergeBuilder; import org.apache.skywalking.oap.server.library.module.ModuleManager; import org.apache.skywalking.oap.server.library.module.Service; @@ -79,15 +79,12 @@ private IAsyncProfilerTaskLogQueryDAO getTaskLogQueryDAO() { return logQueryDAO; } - public List queryTask(String serviceId, Long startTime, Long endTime, Integer limit) throws IOException { + public List queryTask(String serviceId, Duration duration, Integer limit) throws IOException { Long startTimeBucket = null; - if (Objects.nonNull(startTime)) { - startTimeBucket = TimeBucket.getMinuteTimeBucket(startTime); - } - Long endTimeBucket = null; - if (Objects.nonNull(endTime)) { - endTimeBucket = TimeBucket.getMinuteTimeBucket(endTime); + if (Objects.nonNull(duration)) { + startTimeBucket = duration.getStartTimeBucketInSec(); + endTimeBucket = duration.getEndTimeBucketInSec(); } return getTaskQueryDAO().getTaskList(serviceId, startTimeBucket, endTimeBucket, limit); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/AsyncProfilerTaskListRequest.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/AsyncProfilerTaskListRequest.java index 4bf8630fb87e..01403e9029da 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/AsyncProfilerTaskListRequest.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/AsyncProfilerTaskListRequest.java @@ -26,7 +26,6 @@ @Setter public class AsyncProfilerTaskListRequest { private String serviceId; - private Long startTime; - private Long endTime; + private Duration queryDuration; private Integer limit; } diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AsyncProfilerQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AsyncProfilerQuery.java index 648db6fc9d2c..f1ab5b96cce1 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AsyncProfilerQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AsyncProfilerQuery.java @@ -32,7 +32,6 @@ import org.apache.skywalking.oap.server.core.query.type.AsyncProfilerTaskListResult; import org.apache.skywalking.oap.server.core.query.type.AsyncProfilerTaskLogOperationType; import org.apache.skywalking.oap.server.core.query.type.AsyncProfilerTaskProgress; -import org.apache.skywalking.oap.server.library.jfr.type.JFREventType; import org.apache.skywalking.oap.server.library.module.ModuleManager; import java.io.IOException; @@ -60,19 +59,12 @@ private AsyncProfilerQueryService getAsyncProfilerQueryService() { public AsyncProfilerTaskListResult queryAsyncProfilerTaskList(AsyncProfilerTaskListRequest request) throws IOException { List tasks = getAsyncProfilerQueryService().queryTask( - request.getServiceId(), request.getStartTime(), request.getEndTime(), request.getLimit() + request.getServiceId(), request.getQueryDuration(), request.getLimit() ); return new AsyncProfilerTaskListResult(null, tasks); } public AsyncProfilerAnalyzation queryAsyncProfilerAnalyze(AsyncProfilerAnalyzatonRequest request) throws IOException { - /** - * Due to the replacement of async-profiler-convert package, after JfrReader reads JFR events, it cannot distinguish lock events. - * Therefore, JAVA_MONITOR_ENTER and THREAD_PARK events are merged into one during query and parsing. - */ - if (JFREventType.isLockSample(request.getEventType())) { - request.setEventType(JFREventType.LOCK); - } AsyncProfilerStackTree eventFrameTrees = getAsyncProfilerQueryService().queryJFRData( request.getTaskId(), request.getInstanceIds(), request.getEventType() ); diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol b/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol index 3b838aea1efa..092856bdfefd 160000 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol @@ -1 +1 @@ -Subproject commit 3b838aea1efa17ce084c6724bd4fa9f9d2133edd +Subproject commit 092856bdfefd2353d134efade62c6421b4ef4854 diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-service.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-service.json index 650ce9a5803c..45f46477d4fb 100644 --- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-service.json +++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-service.json @@ -819,6 +819,35 @@ } ] }, + { + "name": "Async Profiling", + "children": [ + { + "x": 0, + "y": 2, + "w": 24, + "h": 46, + "i": "0", + "type": "AsyncProfiling" + }, + { + "x": 0, + "y": 0, + "w": 24, + "h": 2, + "i": "2", + "type": "Text", + "graph": { + "fontColor": "theme", + "backgroundColor": "theme", + "content": "Async Profiling supported services written in Java with SkyWalking native agents installed.", + "fontSize": 14, + "textAlign": "left", + "url": "" + } + } + ] + }, { "name": "Log", "children": [ diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/AsyncProfilerTaskQueryEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/AsyncProfilerTaskQueryEsDAO.java index d8eeab0239e5..0335990937db 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/AsyncProfilerTaskQueryEsDAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/AsyncProfilerTaskQueryEsDAO.java @@ -36,7 +36,6 @@ import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base.EsDAO; import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base.IndexController; -import java.io.IOException; import java.lang.reflect.Type; import java.util.LinkedList; import java.util.List; @@ -89,14 +88,19 @@ public List getTaskList(String serviceId, Long startTimeBucke } @Override - public AsyncProfilerTask getById(String id) throws IOException { + public AsyncProfilerTask getById(String id) { if (StringUtil.isEmpty(id)) { return null; } + final BoolQueryBuilder query = Query.bool(); final String index = IndexController.LogicIndicesRegister.getPhysicalTableName(AsyncProfilerTaskRecord.INDEX_NAME); + if (IndexController.LogicIndicesRegister.isMergedTable(AsyncProfilerTaskRecord.INDEX_NAME)) { + query.must(Query.term(IndexController.LogicIndicesRegister.RECORD_TABLE_NAME, AsyncProfilerTaskRecord.INDEX_NAME)); + } + query.must(Query.term(AsyncProfilerTaskRecord.TASK_ID, id)); final SearchBuilder search = Search.builder() - .query(Query.bool().must(Query.term(AsyncProfilerTaskRecord.TASK_ID, id))) + .query(query) .size(1); final SearchResponse response = getClient().search(index, search.build()); diff --git a/test/e2e-v2/cases/activemq/expected/metrics-has-value-label-destinationname.yml b/test/e2e-v2/cases/activemq/expected/metrics-has-value-label-destinationname.yml index 39a0cafc74bf..96c3ed0f6913 100644 --- a/test/e2e-v2/cases/activemq/expected/metrics-has-value-label-destinationname.yml +++ b/test/e2e-v2/cases/activemq/expected/metrics-has-value-label-destinationname.yml @@ -27,9 +27,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} {{- end}} diff --git a/test/e2e-v2/cases/activemq/expected/metrics-has-value-label-destinationtype.yml b/test/e2e-v2/cases/activemq/expected/metrics-has-value-label-destinationtype.yml index 77395774219c..6415b764beeb 100644 --- a/test/e2e-v2/cases/activemq/expected/metrics-has-value-label-destinationtype.yml +++ b/test/e2e-v2/cases/activemq/expected/metrics-has-value-label-destinationtype.yml @@ -28,9 +28,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/activemq/expected/metrics-has-value-label-serviceinstanceid.yml b/test/e2e-v2/cases/activemq/expected/metrics-has-value-label-serviceinstanceid.yml index 19b72ff2a984..768b67c420f1 100644 --- a/test/e2e-v2/cases/activemq/expected/metrics-has-value-label-serviceinstanceid.yml +++ b/test/e2e-v2/cases/activemq/expected/metrics-has-value-label-serviceinstanceid.yml @@ -28,9 +28,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/activemq/expected/metrics-has-value.yml b/test/e2e-v2/cases/activemq/expected/metrics-has-value.yml index fb972e235a8c..7b1676057120 100644 --- a/test/e2e-v2/cases/activemq/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/activemq/expected/metrics-has-value.yml @@ -24,9 +24,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null \ No newline at end of file diff --git a/test/e2e-v2/cases/apisix/expected/metrics-has-connection-value-label.yml b/test/e2e-v2/cases/apisix/expected/metrics-has-connection-value-label.yml index 81fb72d1a39b..8352c10e51f2 100644 --- a/test/e2e-v2/cases/apisix/expected/metrics-has-connection-value-label.yml +++ b/test/e2e-v2/cases/apisix/expected/metrics-has-connection-value-label.yml @@ -26,9 +26,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} - metric: labels: @@ -39,9 +41,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/apisix/expected/metrics-has-latency-value-label.yml b/test/e2e-v2/cases/apisix/expected/metrics-has-latency-value-label.yml index 28d3ace1ab5c..ef9c52f6949a 100644 --- a/test/e2e-v2/cases/apisix/expected/metrics-has-latency-value-label.yml +++ b/test/e2e-v2/cases/apisix/expected/metrics-has-latency-value-label.yml @@ -28,9 +28,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} - metric: labels: @@ -43,9 +45,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} - metric: labels: @@ -58,9 +62,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} - metric: labels: @@ -73,9 +79,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} - metric: labels: @@ -88,9 +96,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} - metric: labels: @@ -103,9 +113,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} - metric: labels: @@ -118,9 +130,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} - metric: labels: @@ -133,9 +147,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} - metric: labels: @@ -148,9 +164,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} - metric: labels: @@ -163,9 +181,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} - metric: labels: @@ -178,9 +198,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} - metric: labels: @@ -193,9 +215,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/apisix/expected/metrics-has-status-value-label.yml b/test/e2e-v2/cases/apisix/expected/metrics-has-status-value-label.yml index 0aa2e502a22f..f30c6dfaf3a0 100644 --- a/test/e2e-v2/cases/apisix/expected/metrics-has-status-value-label.yml +++ b/test/e2e-v2/cases/apisix/expected/metrics-has-status-value-label.yml @@ -26,9 +26,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/aws/api-gateway/expected/metrics-has-value.yml b/test/e2e-v2/cases/aws/api-gateway/expected/metrics-has-value.yml index 445dcebcb3b5..458c5980acac 100644 --- a/test/e2e-v2/cases/aws/api-gateway/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/aws/api-gateway/expected/metrics-has-value.yml @@ -24,9 +24,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/aws/dynamodb/expected/metrics-has-value.yml b/test/e2e-v2/cases/aws/dynamodb/expected/metrics-has-value.yml index 445dcebcb3b5..458c5980acac 100644 --- a/test/e2e-v2/cases/aws/dynamodb/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/aws/dynamodb/expected/metrics-has-value.yml @@ -24,9 +24,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/aws/eks/expected/metrics-has-value.yml b/test/e2e-v2/cases/aws/eks/expected/metrics-has-value.yml index 445dcebcb3b5..458c5980acac 100644 --- a/test/e2e-v2/cases/aws/eks/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/aws/eks/expected/metrics-has-value.yml @@ -24,9 +24,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/aws/s3/expected/metrics-has-value.yml b/test/e2e-v2/cases/aws/s3/expected/metrics-has-value.yml index 445dcebcb3b5..458c5980acac 100644 --- a/test/e2e-v2/cases/aws/s3/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/aws/s3/expected/metrics-has-value.yml @@ -24,9 +24,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/browser/expected/metrics-has-value-percentile.yml b/test/e2e-v2/cases/browser/expected/metrics-has-value-percentile.yml index 24eeedf9a6e5..69e12a134e2d 100644 --- a/test/e2e-v2/cases/browser/expected/metrics-has-value-percentile.yml +++ b/test/e2e-v2/cases/browser/expected/metrics-has-value-percentile.yml @@ -25,8 +25,10 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} + owner: null value: null traceid: null {{- end}} @@ -38,8 +40,10 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} + owner: null value: null traceid: null {{- end}} @@ -51,8 +55,10 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} + owner: null value: null traceid: null {{- end}} @@ -64,9 +70,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} {{- end}} diff --git a/test/e2e-v2/cases/browser/expected/metrics-has-value.yml b/test/e2e-v2/cases/browser/expected/metrics-has-value.yml index 445dcebcb3b5..37b19de246b5 100644 --- a/test/e2e-v2/cases/browser/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/browser/expected/metrics-has-value.yml @@ -23,9 +23,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} {{- end}} diff --git a/test/e2e-v2/cases/cilium/expected/metrics-has-value.yml b/test/e2e-v2/cases/cilium/expected/metrics-has-value.yml index 445dcebcb3b5..37b19de246b5 100644 --- a/test/e2e-v2/cases/cilium/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/cilium/expected/metrics-has-value.yml @@ -23,9 +23,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} {{- end}} diff --git a/test/e2e-v2/cases/clickhouse/expected/metrics-has-value-label.yml b/test/e2e-v2/cases/clickhouse/expected/metrics-has-value-label.yml index 19b72ff2a984..768b67c420f1 100644 --- a/test/e2e-v2/cases/clickhouse/expected/metrics-has-value-label.yml +++ b/test/e2e-v2/cases/clickhouse/expected/metrics-has-value-label.yml @@ -28,9 +28,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/clickhouse/expected/metrics-has-value.yml b/test/e2e-v2/cases/clickhouse/expected/metrics-has-value.yml index 445dcebcb3b5..458c5980acac 100644 --- a/test/e2e-v2/cases/clickhouse/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/clickhouse/expected/metrics-has-value.yml @@ -24,9 +24,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/cluster/expected/metrics-day-first.yml b/test/e2e-v2/cases/cluster/expected/metrics-day-first.yml index ad26e581cd29..58b38fbc7581 100644 --- a/test/e2e-v2/cases/cluster/expected/metrics-day-first.yml +++ b/test/e2e-v2/cases/cluster/expected/metrics-day-first.yml @@ -19,9 +19,11 @@ results: labels: [] values: - id: "1643155200000" + owner: null value: "200" traceid: null - id: "1643241600000" + owner: null value: null traceid: null error: null diff --git a/test/e2e-v2/cases/cluster/expected/metrics-day-second.yml b/test/e2e-v2/cases/cluster/expected/metrics-day-second.yml index 7f7fd920f23f..272a4c54664e 100644 --- a/test/e2e-v2/cases/cluster/expected/metrics-day-second.yml +++ b/test/e2e-v2/cases/cluster/expected/metrics-day-second.yml @@ -19,9 +19,11 @@ results: labels: [] values: - id: "1643155200000" + owner: null value: "400" traceid: null - id: "1643241600000" + owner: null value: null traceid: null error: null diff --git a/test/e2e-v2/cases/cluster/expected/metrics-hour-first.yml b/test/e2e-v2/cases/cluster/expected/metrics-hour-first.yml index 30abc0c3e316..df799afa7a42 100644 --- a/test/e2e-v2/cases/cluster/expected/metrics-hour-first.yml +++ b/test/e2e-v2/cases/cluster/expected/metrics-hour-first.yml @@ -19,18 +19,23 @@ results: labels: [] values: - id: "1643158800000" + owner: null value: null traceid: null - id: "1643162400000" + owner: null value: null traceid: null - id: "1643166000000" + owner: null value: "200" traceid: null - id: "1643169600000" + owner: null value: null traceid: null - id: "1643173200000" + owner: null value: null traceid: null error: null diff --git a/test/e2e-v2/cases/cluster/expected/metrics-hour-second.yml b/test/e2e-v2/cases/cluster/expected/metrics-hour-second.yml index 2f780fddadea..e28c04b56a77 100644 --- a/test/e2e-v2/cases/cluster/expected/metrics-hour-second.yml +++ b/test/e2e-v2/cases/cluster/expected/metrics-hour-second.yml @@ -19,18 +19,23 @@ results: labels: [] values: - id: "1643158800000" + owner: null value: null traceid: null - id: "1643162400000" + owner: null value: null traceid: null - id: "1643166000000" + owner: null value: "400" traceid: null - id: "1643169600000" + owner: null value: null traceid: null - id: "1643173200000" + owner: null value: null traceid: null error: null diff --git a/test/e2e-v2/cases/cluster/expected/metrics-minute-first.yml b/test/e2e-v2/cases/cluster/expected/metrics-minute-first.yml index 29fb10413f30..daf2df7526a8 100644 --- a/test/e2e-v2/cases/cluster/expected/metrics-minute-first.yml +++ b/test/e2e-v2/cases/cluster/expected/metrics-minute-first.yml @@ -19,12 +19,15 @@ results: labels: [] values: - id: "1643165940000" + owner: null value: null traceid: null - id: "1643166000000" + owner: null value: "200" traceid: null - id: "1643166060000" + owner: null value: null traceid: null error: null diff --git a/test/e2e-v2/cases/cluster/expected/metrics-minute-second.yml b/test/e2e-v2/cases/cluster/expected/metrics-minute-second.yml index ce8253ef1ce8..060055affcb8 100644 --- a/test/e2e-v2/cases/cluster/expected/metrics-minute-second.yml +++ b/test/e2e-v2/cases/cluster/expected/metrics-minute-second.yml @@ -19,12 +19,15 @@ results: labels: [] values: - id: "1643166540000" + owner: null value: null traceid: null - id: "1643166600000" + owner: null value: "200" traceid: null - id: "1643166660000" + owner: null value: null traceid: null error: null diff --git a/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-breaker.yml b/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-breaker.yml index a4df5d88a969..d39f610612f4 100644 --- a/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-breaker.yml +++ b/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-breaker.yml @@ -28,9 +28,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-color.yml b/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-color.yml index e604d12ec4ac..499557764b62 100644 --- a/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-color.yml +++ b/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-color.yml @@ -28,9 +28,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-gc.yml b/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-gc.yml index a547a6787124..a81b5399f449 100644 --- a/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-gc.yml +++ b/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-gc.yml @@ -28,9 +28,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-mount.yml b/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-mount.yml index 9a8d848e923c..bcdcfec7f67c 100644 --- a/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-mount.yml +++ b/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-mount.yml @@ -28,9 +28,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-node.yml b/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-node.yml index 99c95b21fc2d..c3eedfdc2bd4 100644 --- a/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-node.yml +++ b/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-node.yml @@ -34,9 +34,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-pool.yml b/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-pool.yml index e0ea02073cbe..5f4ec4baefdb 100644 --- a/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-pool.yml +++ b/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-pool.yml @@ -28,9 +28,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-primary.yml b/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-primary.yml index 10437a3ee166..7ffbc5c2bcb0 100644 --- a/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-primary.yml +++ b/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label-primary.yml @@ -28,9 +28,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label.yml b/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label.yml index df463f57e5eb..d6f619e29ab2 100644 --- a/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label.yml +++ b/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value-label.yml @@ -28,9 +28,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value.yml b/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value.yml index 445dcebcb3b5..458c5980acac 100644 --- a/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/elasticsearch/expected/metrics-has-value.yml @@ -24,9 +24,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/gateway/expected/metrics-has-value-percentile.yml b/test/e2e-v2/cases/gateway/expected/metrics-has-value-percentile.yml index 8aad5254ae31..cfce15019f10 100644 --- a/test/e2e-v2/cases/gateway/expected/metrics-has-value-percentile.yml +++ b/test/e2e-v2/cases/gateway/expected/metrics-has-value-percentile.yml @@ -27,9 +27,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} {{- end}} diff --git a/test/e2e-v2/cases/gateway/expected/metrics-has-value.yml b/test/e2e-v2/cases/gateway/expected/metrics-has-value.yml index 445dcebcb3b5..37b19de246b5 100644 --- a/test/e2e-v2/cases/gateway/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/gateway/expected/metrics-has-value.yml @@ -23,9 +23,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} {{- end}} diff --git a/test/e2e-v2/cases/go/expected/metrics-has-value.yml b/test/e2e-v2/cases/go/expected/metrics-has-value.yml index 445dcebcb3b5..7503b1b72662 100644 --- a/test/e2e-v2/cases/go/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/go/expected/metrics-has-value.yml @@ -22,9 +22,11 @@ results: values: {{- contains .values }} - id: {{ notEmpty .id }} + owner: null value: {{ .value }} traceid: null - id: {{ notEmpty .id }} + owner: null value: null traceid: null {{- end}} diff --git a/test/e2e-v2/cases/istio/als/expected/metrics-has-value.yml b/test/e2e-v2/cases/istio/als/expected/metrics-has-value.yml index 445dcebcb3b5..37b19de246b5 100644 --- a/test/e2e-v2/cases/istio/als/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/istio/als/expected/metrics-has-value.yml @@ -23,9 +23,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} {{- end}} diff --git a/test/e2e-v2/cases/istio/metrics/expected/metrics-has-value-label.yml b/test/e2e-v2/cases/istio/metrics/expected/metrics-has-value-label.yml index bb8b7f22b4de..10c8d321f71a 100644 --- a/test/e2e-v2/cases/istio/metrics/expected/metrics-has-value-label.yml +++ b/test/e2e-v2/cases/istio/metrics/expected/metrics-has-value-label.yml @@ -25,9 +25,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} {{- end}} diff --git a/test/e2e-v2/cases/istio/metrics/expected/metrics-has-value.yml b/test/e2e-v2/cases/istio/metrics/expected/metrics-has-value.yml index 445dcebcb3b5..37b19de246b5 100644 --- a/test/e2e-v2/cases/istio/metrics/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/istio/metrics/expected/metrics-has-value.yml @@ -23,9 +23,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} {{- end}} diff --git a/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-gc-label.yml b/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-gc-label.yml index c33cbe5075dc..8348dbd57086 100644 --- a/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-gc-label.yml +++ b/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-gc-label.yml @@ -26,9 +26,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} - metric: labels: @@ -39,9 +41,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-instance-label.yml b/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-instance-label.yml index 959ee2aecaff..fa68feece5e1 100644 --- a/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-instance-label.yml +++ b/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-instance-label.yml @@ -26,9 +26,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} - metric: labels: @@ -39,9 +41,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-jvm-label.yml b/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-jvm-label.yml index 46d2aab4ff70..1ec6e451a33b 100644 --- a/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-jvm-label.yml +++ b/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-jvm-label.yml @@ -26,9 +26,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-service-label.yml b/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-service-label.yml index c435316f6ba4..85612cde3e01 100644 --- a/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-service-label.yml +++ b/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-service-label.yml @@ -26,9 +26,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-source-label.yml b/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-source-label.yml index ec3eab0ff30d..8170f5605257 100644 --- a/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-source-label.yml +++ b/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value-source-label.yml @@ -26,9 +26,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} - metric: labels: @@ -39,9 +41,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} - metric: labels: @@ -52,9 +56,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value.yml b/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value.yml index fb972e235a8c..7b1676057120 100644 --- a/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/kafka/kafka-monitoring/expected/metrics-has-value.yml @@ -24,9 +24,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null \ No newline at end of file diff --git a/test/e2e-v2/cases/kafka/meter/expected/metrics-has-value.yml b/test/e2e-v2/cases/kafka/meter/expected/metrics-has-value.yml index 445dcebcb3b5..37b19de246b5 100644 --- a/test/e2e-v2/cases/kafka/meter/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/kafka/meter/expected/metrics-has-value.yml @@ -23,9 +23,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} {{- end}} diff --git a/test/e2e-v2/cases/kong/expected/metrics-has-value-label-bandwidth-endpoint.yml b/test/e2e-v2/cases/kong/expected/metrics-has-value-label-bandwidth-endpoint.yml index 6fa72979cdd9..9589bcaf4497 100644 --- a/test/e2e-v2/cases/kong/expected/metrics-has-value-label-bandwidth-endpoint.yml +++ b/test/e2e-v2/cases/kong/expected/metrics-has-value-label-bandwidth-endpoint.yml @@ -28,9 +28,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/kong/expected/metrics-has-value-label-bandwidth-service.yml b/test/e2e-v2/cases/kong/expected/metrics-has-value-label-bandwidth-service.yml index 6fa72979cdd9..9589bcaf4497 100644 --- a/test/e2e-v2/cases/kong/expected/metrics-has-value-label-bandwidth-service.yml +++ b/test/e2e-v2/cases/kong/expected/metrics-has-value-label-bandwidth-service.yml @@ -28,9 +28,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/kong/expected/metrics-has-value-label-bandwidth.yml b/test/e2e-v2/cases/kong/expected/metrics-has-value-label-bandwidth.yml index bfec2fdf3ce3..8fe24b36d777 100644 --- a/test/e2e-v2/cases/kong/expected/metrics-has-value-label-bandwidth.yml +++ b/test/e2e-v2/cases/kong/expected/metrics-has-value-label-bandwidth.yml @@ -30,9 +30,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/kong/expected/metrics-has-value-label-percentile.yml b/test/e2e-v2/cases/kong/expected/metrics-has-value-label-percentile.yml index 8aad5254ae31..f3f3bfaee26b 100644 --- a/test/e2e-v2/cases/kong/expected/metrics-has-value-label-percentile.yml +++ b/test/e2e-v2/cases/kong/expected/metrics-has-value-label-percentile.yml @@ -28,9 +28,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/kong/expected/metrics-has-value-label-pid.yml b/test/e2e-v2/cases/kong/expected/metrics-has-value-label-pid.yml index 2c3f89dbbf94..d4de39c5b556 100644 --- a/test/e2e-v2/cases/kong/expected/metrics-has-value-label-pid.yml +++ b/test/e2e-v2/cases/kong/expected/metrics-has-value-label-pid.yml @@ -28,9 +28,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/kong/expected/metrics-has-value-label-shared-dict.yml b/test/e2e-v2/cases/kong/expected/metrics-has-value-label-shared-dict.yml index e5147f53f45d..8010bf033ccf 100644 --- a/test/e2e-v2/cases/kong/expected/metrics-has-value-label-shared-dict.yml +++ b/test/e2e-v2/cases/kong/expected/metrics-has-value-label-shared-dict.yml @@ -28,9 +28,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/kong/expected/metrics-has-value-label-state.yml b/test/e2e-v2/cases/kong/expected/metrics-has-value-label-state.yml index f4657e96742b..c0e8df5e471c 100644 --- a/test/e2e-v2/cases/kong/expected/metrics-has-value-label-state.yml +++ b/test/e2e-v2/cases/kong/expected/metrics-has-value-label-state.yml @@ -27,9 +27,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} {{- end}} diff --git a/test/e2e-v2/cases/kong/expected/metrics-has-value-label-status.yml b/test/e2e-v2/cases/kong/expected/metrics-has-value-label-status.yml index 2942a4ccf51d..46d65cfaae3e 100644 --- a/test/e2e-v2/cases/kong/expected/metrics-has-value-label-status.yml +++ b/test/e2e-v2/cases/kong/expected/metrics-has-value-label-status.yml @@ -28,9 +28,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/kong/expected/metrics-has-value.yml b/test/e2e-v2/cases/kong/expected/metrics-has-value.yml index 445dcebcb3b5..37b19de246b5 100644 --- a/test/e2e-v2/cases/kong/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/kong/expected/metrics-has-value.yml @@ -23,9 +23,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} {{- end}} diff --git a/test/e2e-v2/cases/kong/expected/metrics-single-value-label.yml b/test/e2e-v2/cases/kong/expected/metrics-single-value-label.yml index d9cafc3c52c0..77e1775736fc 100644 --- a/test/e2e-v2/cases/kong/expected/metrics-single-value-label.yml +++ b/test/e2e-v2/cases/kong/expected/metrics-single-value-label.yml @@ -27,6 +27,7 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null {{- end}} {{- end}} diff --git a/test/e2e-v2/cases/kong/expected/metrics-single-value.yml b/test/e2e-v2/cases/kong/expected/metrics-single-value.yml index fee351e688a9..c29e99599183 100644 --- a/test/e2e-v2/cases/kong/expected/metrics-single-value.yml +++ b/test/e2e-v2/cases/kong/expected/metrics-single-value.yml @@ -23,6 +23,7 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null {{- end}} {{- end}} diff --git a/test/e2e-v2/cases/log/expected/metrics-has-value.yml b/test/e2e-v2/cases/log/expected/metrics-has-value.yml index 445dcebcb3b5..37b19de246b5 100644 --- a/test/e2e-v2/cases/log/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/log/expected/metrics-has-value.yml @@ -23,9 +23,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} {{- end}} diff --git a/test/e2e-v2/cases/lua/expected/metrics-has-value.yml b/test/e2e-v2/cases/lua/expected/metrics-has-value.yml index 445dcebcb3b5..37b19de246b5 100644 --- a/test/e2e-v2/cases/lua/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/lua/expected/metrics-has-value.yml @@ -23,9 +23,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} {{- end}} diff --git a/test/e2e-v2/cases/mariadb/expected/metrics-has-value.yml b/test/e2e-v2/cases/mariadb/expected/metrics-has-value.yml index 445dcebcb3b5..37b19de246b5 100644 --- a/test/e2e-v2/cases/mariadb/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/mariadb/expected/metrics-has-value.yml @@ -23,9 +23,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} {{- end}} diff --git a/test/e2e-v2/cases/meter/expected/metrics-has-value-label-created_by.yml b/test/e2e-v2/cases/meter/expected/metrics-has-value-label-created_by.yml index 80af3c4f6ff5..95fa99451527 100644 --- a/test/e2e-v2/cases/meter/expected/metrics-has-value-label-created_by.yml +++ b/test/e2e-v2/cases/meter/expected/metrics-has-value-label-created_by.yml @@ -28,9 +28,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/meter/expected/metrics-has-value-label-percentile.yml b/test/e2e-v2/cases/meter/expected/metrics-has-value-label-percentile.yml index d1e02e916fd4..66d5bda0d8bb 100644 --- a/test/e2e-v2/cases/meter/expected/metrics-has-value-label-percentile.yml +++ b/test/e2e-v2/cases/meter/expected/metrics-has-value-label-percentile.yml @@ -26,9 +26,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} - metric: labels: @@ -39,9 +41,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} - metric: labels: @@ -52,9 +56,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} - metric: labels: @@ -65,9 +71,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/meter/expected/metrics-has-value.yml b/test/e2e-v2/cases/meter/expected/metrics-has-value.yml index 445dcebcb3b5..37b19de246b5 100644 --- a/test/e2e-v2/cases/meter/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/meter/expected/metrics-has-value.yml @@ -23,9 +23,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} {{- end}} diff --git a/test/e2e-v2/cases/meter/expected/virtual_cache_has_metrics.yml b/test/e2e-v2/cases/meter/expected/virtual_cache_has_metrics.yml index 1735612da6cb..3505c4d65dff 100644 --- a/test/e2e-v2/cases/meter/expected/virtual_cache_has_metrics.yml +++ b/test/e2e-v2/cases/meter/expected/virtual_cache_has_metrics.yml @@ -23,9 +23,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/meter/expected/virtual_cache_has_topN_records.yml b/test/e2e-v2/cases/meter/expected/virtual_cache_has_topN_records.yml index 16cdb2bca463..aaaf72615e14 100644 --- a/test/e2e-v2/cases/meter/expected/virtual_cache_has_topN_records.yml +++ b/test/e2e-v2/cases/meter/expected/virtual_cache_has_topN_records.yml @@ -23,6 +23,7 @@ results: - id: {{ notEmpty .id }} value: {{ notEmpty .value }} traceid: {{ notEmpty .traceid }} + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-assert.yml b/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-assert.yml index 8dc097fcfcc1..209715e62748 100644 --- a/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-assert.yml +++ b/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-assert.yml @@ -28,9 +28,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-count.yml b/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-count.yml index 65223f478ae9..58950363702d 100644 --- a/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-count.yml +++ b/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-count.yml @@ -28,9 +28,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-csr-service_instance_id.yml b/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-csr-service_instance_id.yml index caf581e6ac56..2c4f361be467 100644 --- a/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-csr-service_instance_id.yml +++ b/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-csr-service_instance_id.yml @@ -30,9 +30,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-csr.yml b/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-csr.yml index 71518041e5d1..ce397228284c 100644 --- a/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-csr.yml +++ b/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-csr.yml @@ -28,9 +28,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-database-service_instance_id.yml b/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-database-service_instance_id.yml index edb805070aa9..5d46ccb7c649 100644 --- a/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-database-service_instance_id.yml +++ b/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-database-service_instance_id.yml @@ -30,9 +30,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-doc-service_instance_id.yml b/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-doc-service_instance_id.yml index 2fe25ac1fc85..401b1f87bdc5 100644 --- a/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-doc-service_instance_id.yml +++ b/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-doc-service_instance_id.yml @@ -30,9 +30,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-doc.yml b/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-doc.yml index fd958a1a3fe6..78f2c7bdc7dc 100644 --- a/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-doc.yml +++ b/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-doc.yml @@ -28,9 +28,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-ins.yml b/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-ins.yml index 19b72ff2a984..768b67c420f1 100644 --- a/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-ins.yml +++ b/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-ins.yml @@ -28,9 +28,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-legacy-service_instance_id.yml b/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-legacy-service_instance_id.yml index ac95cbd51f5b..115985129e7a 100644 --- a/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-legacy-service_instance_id.yml +++ b/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-legacy-service_instance_id.yml @@ -30,9 +30,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-legacy.yml b/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-legacy.yml index 555e3dcb796e..6700f72c196f 100644 --- a/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-legacy.yml +++ b/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-legacy.yml @@ -28,9 +28,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-member.yml b/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-member.yml index 24e81e679fbe..b4923cdfb651 100644 --- a/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-member.yml +++ b/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-member.yml @@ -28,9 +28,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-op.yml b/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-op.yml index 60143822e6c1..562f3a7e8a2b 100644 --- a/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-op.yml +++ b/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-op.yml @@ -28,9 +28,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-version.yml b/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-version.yml index 47a48327ce4f..684e75114a78 100644 --- a/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-version.yml +++ b/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label-version.yml @@ -30,9 +30,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label.yml b/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label.yml index 98aa5d6dd978..742de20687c0 100644 --- a/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label.yml +++ b/test/e2e-v2/cases/mongodb/expected/metrics-has-value-label.yml @@ -28,9 +28,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/mongodb/expected/metrics-has-value.yml b/test/e2e-v2/cases/mongodb/expected/metrics-has-value.yml index 445dcebcb3b5..458c5980acac 100644 --- a/test/e2e-v2/cases/mongodb/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/mongodb/expected/metrics-has-value.yml @@ -24,9 +24,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/mqe/expected/aggregateLabels-OP.yml b/test/e2e-v2/cases/mqe/expected/aggregateLabels-OP.yml index fb972e235a8c..7b1676057120 100644 --- a/test/e2e-v2/cases/mqe/expected/aggregateLabels-OP.yml +++ b/test/e2e-v2/cases/mqe/expected/aggregateLabels-OP.yml @@ -24,9 +24,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null \ No newline at end of file diff --git a/test/e2e-v2/cases/mqe/expected/aggregation-OP.yml b/test/e2e-v2/cases/mqe/expected/aggregation-OP.yml index 36eba09754c0..698dbca16d04 100644 --- a/test/e2e-v2/cases/mqe/expected/aggregation-OP.yml +++ b/test/e2e-v2/cases/mqe/expected/aggregation-OP.yml @@ -22,4 +22,5 @@ results: - id: null value: "100" traceid: null + owner: null error: null diff --git a/test/e2e-v2/cases/mqe/expected/binary-OP.yml b/test/e2e-v2/cases/mqe/expected/binary-OP.yml index b76d90669d6d..a6c9fec4fe64 100644 --- a/test/e2e-v2/cases/mqe/expected/binary-OP.yml +++ b/test/e2e-v2/cases/mqe/expected/binary-OP.yml @@ -24,9 +24,11 @@ results: - id: {{ notEmpty .id }} value: "650" traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/mqe/expected/compare-OP.yml b/test/e2e-v2/cases/mqe/expected/compare-OP.yml index 0c9ea503db74..dcc366f05e79 100644 --- a/test/e2e-v2/cases/mqe/expected/compare-OP.yml +++ b/test/e2e-v2/cases/mqe/expected/compare-OP.yml @@ -24,9 +24,11 @@ results: - id: {{ notEmpty .id }} value: "1" traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/mqe/expected/func-OP.yml b/test/e2e-v2/cases/mqe/expected/func-OP.yml index 3eb4d5f750c0..d3d608726a95 100644 --- a/test/e2e-v2/cases/mqe/expected/func-OP.yml +++ b/test/e2e-v2/cases/mqe/expected/func-OP.yml @@ -24,9 +24,11 @@ results: - id: {{ notEmpty .id }} value: "300" traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/mqe/expected/isPresent-OP-false.yml b/test/e2e-v2/cases/mqe/expected/isPresent-OP-false.yml index ef3a769d5573..7f08fdaae253 100644 --- a/test/e2e-v2/cases/mqe/expected/isPresent-OP-false.yml +++ b/test/e2e-v2/cases/mqe/expected/isPresent-OP-false.yml @@ -22,4 +22,5 @@ results: - id: null value: "0" traceid: null + owner: null error: null diff --git a/test/e2e-v2/cases/mqe/expected/isPresent-OP-true.yml b/test/e2e-v2/cases/mqe/expected/isPresent-OP-true.yml index 3e4fc7d6eba7..3213492227e2 100644 --- a/test/e2e-v2/cases/mqe/expected/isPresent-OP-true.yml +++ b/test/e2e-v2/cases/mqe/expected/isPresent-OP-true.yml @@ -22,4 +22,5 @@ results: - id: null value: "1" traceid: null + owner: null error: null diff --git a/test/e2e-v2/cases/mqe/expected/labels-old.yml b/test/e2e-v2/cases/mqe/expected/labels-old.yml index 145742e7d243..90f730e7546e 100644 --- a/test/e2e-v2/cases/mqe/expected/labels-old.yml +++ b/test/e2e-v2/cases/mqe/expected/labels-old.yml @@ -26,9 +26,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} - metric: labels: @@ -39,9 +41,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} - metric: labels: @@ -52,9 +56,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/mqe/expected/no-OP.yml b/test/e2e-v2/cases/mqe/expected/no-OP.yml index b1c68a83f639..97fcfe03b95a 100644 --- a/test/e2e-v2/cases/mqe/expected/no-OP.yml +++ b/test/e2e-v2/cases/mqe/expected/no-OP.yml @@ -24,9 +24,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/mqe/expected/relabels-OP.yml b/test/e2e-v2/cases/mqe/expected/relabels-OP.yml index fd720d0a508a..c21e86a2809c 100644 --- a/test/e2e-v2/cases/mqe/expected/relabels-OP.yml +++ b/test/e2e-v2/cases/mqe/expected/relabels-OP.yml @@ -26,9 +26,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} - metric: labels: @@ -39,9 +41,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} - metric: labels: @@ -52,9 +56,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/mqe/expected/relabels-binary-OP.yml b/test/e2e-v2/cases/mqe/expected/relabels-binary-OP.yml index bc296091f8a7..6076a562a0c7 100644 --- a/test/e2e-v2/cases/mqe/expected/relabels-binary-OP.yml +++ b/test/e2e-v2/cases/mqe/expected/relabels-binary-OP.yml @@ -26,9 +26,11 @@ results: - id: {{ notEmpty .id }} value: "1" traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} - metric: labels: @@ -39,9 +41,11 @@ results: - id: {{ notEmpty .id }} value: "1" traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} - metric: labels: @@ -52,9 +56,11 @@ results: - id: {{ notEmpty .id }} value: "1" traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/mqe/expected/sort-label-value-OP.yml b/test/e2e-v2/cases/mqe/expected/sort-label-value-OP.yml index 7c150655fd42..9b495cc019e5 100644 --- a/test/e2e-v2/cases/mqe/expected/sort-label-value-OP.yml +++ b/test/e2e-v2/cases/mqe/expected/sort-label-value-OP.yml @@ -26,9 +26,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} - metric: labels: @@ -39,9 +41,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} - metric: labels: @@ -52,9 +56,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/mqe/expected/sort-value-OP.yml b/test/e2e-v2/cases/mqe/expected/sort-value-OP.yml index c7404ed68a3a..12ae6bdf5688 100644 --- a/test/e2e-v2/cases/mqe/expected/sort-value-OP.yml +++ b/test/e2e-v2/cases/mqe/expected/sort-value-OP.yml @@ -28,9 +28,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/mqe/expected/topN-OP-instance.yml b/test/e2e-v2/cases/mqe/expected/topN-OP-instance.yml index 41b90b7c3165..df5c572ee1df 100644 --- a/test/e2e-v2/cases/mqe/expected/topN-OP-instance.yml +++ b/test/e2e-v2/cases/mqe/expected/topN-OP-instance.yml @@ -22,4 +22,5 @@ results: - id: provider1 value: "100" traceid: null + owner: null error: null diff --git a/test/e2e-v2/cases/mqe/expected/topN-OP-service.yml b/test/e2e-v2/cases/mqe/expected/topN-OP-service.yml index d067a4266ddb..76b98b170da4 100644 --- a/test/e2e-v2/cases/mqe/expected/topN-OP-service.yml +++ b/test/e2e-v2/cases/mqe/expected/topN-OP-service.yml @@ -22,7 +22,9 @@ results: - id: e2e-service-consumer value: "100" traceid: null + owner: null - id: e2e-service-provider value: "100" traceid: null + owner: null error: null diff --git a/test/e2e-v2/cases/mqe/expected/trend-OP.yml b/test/e2e-v2/cases/mqe/expected/trend-OP.yml index b1c68a83f639..97fcfe03b95a 100644 --- a/test/e2e-v2/cases/mqe/expected/trend-OP.yml +++ b/test/e2e-v2/cases/mqe/expected/trend-OP.yml @@ -24,9 +24,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/mqe/expected/viewAsSeq-OP.yml b/test/e2e-v2/cases/mqe/expected/viewAsSeq-OP.yml index b1c68a83f639..97fcfe03b95a 100644 --- a/test/e2e-v2/cases/mqe/expected/viewAsSeq-OP.yml +++ b/test/e2e-v2/cases/mqe/expected/viewAsSeq-OP.yml @@ -24,9 +24,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/mysql/expected/metrics-has-value.yml b/test/e2e-v2/cases/mysql/expected/metrics-has-value.yml index f31c83316fd8..8cd3239bcd32 100644 --- a/test/e2e-v2/cases/mysql/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/mysql/expected/metrics-has-value.yml @@ -39,9 +39,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-level-service_instance_id.yml b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-level-service_instance_id.yml index b37d8c8c26d3..1c3c2081bf85 100644 --- a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-level-service_instance_id.yml +++ b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-level-service_instance_id.yml @@ -30,9 +30,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-level.yml b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-level.yml index 30f6c3ac464c..d96a5e1e7e7d 100644 --- a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-level.yml +++ b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-level.yml @@ -28,9 +28,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-percentile-service_instance_id.yml b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-percentile-service_instance_id.yml index 1b44d8215dab..65fcbfa94685 100644 --- a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-percentile-service_instance_id.yml +++ b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-percentile-service_instance_id.yml @@ -30,9 +30,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-percentile.yml b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-percentile.yml index 8aad5254ae31..f3f3bfaee26b 100644 --- a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-percentile.yml +++ b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-percentile.yml @@ -28,9 +28,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-service_instance_id.yml b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-service_instance_id.yml index 19b72ff2a984..768b67c420f1 100644 --- a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-service_instance_id.yml +++ b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-service_instance_id.yml @@ -28,9 +28,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-state-service_instance_id.yml b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-state-service_instance_id.yml index 0dcc068f1d67..b65f05f40d17 100644 --- a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-state-service_instance_id.yml +++ b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-state-service_instance_id.yml @@ -30,9 +30,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-state.yml b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-state.yml index f4657e96742b..1e881f87e4f2 100644 --- a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-state.yml +++ b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-state.yml @@ -28,9 +28,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-status-service_instance_id.yml b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-status-service_instance_id.yml index c702462eee00..d001ddc7b3aa 100644 --- a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-status-service_instance_id.yml +++ b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-status-service_instance_id.yml @@ -30,9 +30,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-status.yml b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-status.yml index e92170c86904..558e2b9d28b0 100644 --- a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-status.yml +++ b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-status.yml @@ -28,9 +28,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-type-service_instance_id.yml b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-type-service_instance_id.yml index 38236611987d..525408f94c49 100644 --- a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-type-service_instance_id.yml +++ b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-type-service_instance_id.yml @@ -30,9 +30,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-type.yml b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-type.yml index 359e65c72d41..625beb72f05c 100644 --- a/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-type.yml +++ b/test/e2e-v2/cases/nginx/expected/metrics-has-value-label-type.yml @@ -28,9 +28,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/nginx/expected/metrics-has-value.yml b/test/e2e-v2/cases/nginx/expected/metrics-has-value.yml index 445dcebcb3b5..458c5980acac 100644 --- a/test/e2e-v2/cases/nginx/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/nginx/expected/metrics-has-value.yml @@ -24,9 +24,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/nodejs/expected/metrics-has-value.yml b/test/e2e-v2/cases/nodejs/expected/metrics-has-value.yml index 445dcebcb3b5..37b19de246b5 100644 --- a/test/e2e-v2/cases/nodejs/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/nodejs/expected/metrics-has-value.yml @@ -23,9 +23,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} {{- end}} diff --git a/test/e2e-v2/cases/php/expected/metrics-has-value.yml b/test/e2e-v2/cases/php/expected/metrics-has-value.yml index 445dcebcb3b5..37b19de246b5 100644 --- a/test/e2e-v2/cases/php/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/php/expected/metrics-has-value.yml @@ -23,9 +23,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} {{- end}} diff --git a/test/e2e-v2/cases/postgresql/expected/metrics-has-value-label-datname.yml b/test/e2e-v2/cases/postgresql/expected/metrics-has-value-label-datname.yml index c8bf10fdb835..2fb23c20c9a3 100644 --- a/test/e2e-v2/cases/postgresql/expected/metrics-has-value-label-datname.yml +++ b/test/e2e-v2/cases/postgresql/expected/metrics-has-value-label-datname.yml @@ -28,9 +28,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/postgresql/expected/metrics-has-value-label.yml b/test/e2e-v2/cases/postgresql/expected/metrics-has-value-label.yml index 19b72ff2a984..768b67c420f1 100644 --- a/test/e2e-v2/cases/postgresql/expected/metrics-has-value-label.yml +++ b/test/e2e-v2/cases/postgresql/expected/metrics-has-value-label.yml @@ -28,9 +28,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/postgresql/expected/metrics-has-value.yml b/test/e2e-v2/cases/postgresql/expected/metrics-has-value.yml index 445dcebcb3b5..458c5980acac 100644 --- a/test/e2e-v2/cases/postgresql/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/postgresql/expected/metrics-has-value.yml @@ -24,9 +24,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/profiling/ebpf/access_log/expected/metrics-has-value.yml b/test/e2e-v2/cases/profiling/ebpf/access_log/expected/metrics-has-value.yml index fb972e235a8c..d228fd61ed68 100644 --- a/test/e2e-v2/cases/profiling/ebpf/access_log/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/profiling/ebpf/access_log/expected/metrics-has-value.yml @@ -23,9 +23,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} {{- end}} diff --git a/test/e2e-v2/cases/profiling/ebpf/access_log/expected/metrics-sorted-has-value.yml b/test/e2e-v2/cases/profiling/ebpf/access_log/expected/metrics-sorted-has-value.yml index 499642fe7bc3..5f05b5e751d4 100644 --- a/test/e2e-v2/cases/profiling/ebpf/access_log/expected/metrics-sorted-has-value.yml +++ b/test/e2e-v2/cases/profiling/ebpf/access_log/expected/metrics-sorted-has-value.yml @@ -23,6 +23,7 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null {{- end}} {{- end}} diff --git a/test/e2e-v2/cases/profiling/ebpf/continuous/expected/metrics-has-value.yml b/test/e2e-v2/cases/profiling/ebpf/continuous/expected/metrics-has-value.yml index 445dcebcb3b5..37b19de246b5 100644 --- a/test/e2e-v2/cases/profiling/ebpf/continuous/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/profiling/ebpf/continuous/expected/metrics-has-value.yml @@ -23,9 +23,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} {{- end}} diff --git a/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-client-value-label.yml b/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-client-value-label.yml index 8aad5254ae31..6ba869f7ad34 100644 --- a/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-client-value-label.yml +++ b/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-client-value-label.yml @@ -27,8 +27,10 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} + owner: null value: null traceid: null {{- end}} diff --git a/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-http1-value-label.yml b/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-http1-value-label.yml index 0e04ce36e245..38c5ca61f38f 100644 --- a/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-http1-value-label.yml +++ b/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-http1-value-label.yml @@ -25,9 +25,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} - metric: @@ -38,8 +40,10 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} + owner: null value: null traceid: null {{- end}} @@ -51,9 +55,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} - metric: @@ -65,8 +71,10 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} {{- end}} diff --git a/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-server-value-label.yml b/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-server-value-label.yml index 8aad5254ae31..6ba869f7ad34 100644 --- a/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-server-value-label.yml +++ b/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-server-value-label.yml @@ -27,8 +27,10 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} + owner: null value: null traceid: null {{- end}} diff --git a/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-value.yml b/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-value.yml index fb972e235a8c..d228fd61ed68 100644 --- a/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/profiling/ebpf/network/expected/metrics-has-value.yml @@ -23,9 +23,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} {{- end}} diff --git a/test/e2e-v2/cases/pulsar/expected/metrics-has-value-instance-bookie-label.yml b/test/e2e-v2/cases/pulsar/expected/metrics-has-value-instance-bookie-label.yml index a416e8bb1fd5..cb9054a2a2c5 100644 --- a/test/e2e-v2/cases/pulsar/expected/metrics-has-value-instance-bookie-label.yml +++ b/test/e2e-v2/cases/pulsar/expected/metrics-has-value-instance-bookie-label.yml @@ -26,9 +26,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/pulsar/expected/metrics-has-value-instance-broker-label.yml b/test/e2e-v2/cases/pulsar/expected/metrics-has-value-instance-broker-label.yml index c29f1202b6c8..7cdaa6e61286 100644 --- a/test/e2e-v2/cases/pulsar/expected/metrics-has-value-instance-broker-label.yml +++ b/test/e2e-v2/cases/pulsar/expected/metrics-has-value-instance-broker-label.yml @@ -26,9 +26,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/pulsar/expected/metrics-has-value.yml b/test/e2e-v2/cases/pulsar/expected/metrics-has-value.yml index 445dcebcb3b5..458c5980acac 100644 --- a/test/e2e-v2/cases/pulsar/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/pulsar/expected/metrics-has-value.yml @@ -24,9 +24,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/python/expected/metrics-has-value.yml b/test/e2e-v2/cases/python/expected/metrics-has-value.yml index 445dcebcb3b5..37b19de246b5 100644 --- a/test/e2e-v2/cases/python/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/python/expected/metrics-has-value.yml @@ -23,9 +23,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} {{- end}} diff --git a/test/e2e-v2/cases/rabbitmq/expected/metrics-has-value-instance-label.yml b/test/e2e-v2/cases/rabbitmq/expected/metrics-has-value-instance-label.yml index b79f942ae8c6..4ed4e4b83e98 100644 --- a/test/e2e-v2/cases/rabbitmq/expected/metrics-has-value-instance-label.yml +++ b/test/e2e-v2/cases/rabbitmq/expected/metrics-has-value-instance-label.yml @@ -26,9 +26,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/rabbitmq/expected/metrics-has-value-service-label.yml b/test/e2e-v2/cases/rabbitmq/expected/metrics-has-value-service-label.yml index 2c487abf347d..4c41e09322cd 100644 --- a/test/e2e-v2/cases/rabbitmq/expected/metrics-has-value-service-label.yml +++ b/test/e2e-v2/cases/rabbitmq/expected/metrics-has-value-service-label.yml @@ -26,9 +26,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/rabbitmq/expected/metrics-has-value.yml b/test/e2e-v2/cases/rabbitmq/expected/metrics-has-value.yml index fb972e235a8c..7b1676057120 100644 --- a/test/e2e-v2/cases/rabbitmq/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/rabbitmq/expected/metrics-has-value.yml @@ -24,9 +24,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null \ No newline at end of file diff --git a/test/e2e-v2/cases/redis/expected/metrics-has-value.yml b/test/e2e-v2/cases/redis/expected/metrics-has-value.yml index 445dcebcb3b5..458c5980acac 100644 --- a/test/e2e-v2/cases/redis/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/redis/expected/metrics-has-value.yml @@ -24,9 +24,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/redis/expected/metrics-single-value.yml b/test/e2e-v2/cases/redis/expected/metrics-single-value.yml index fee351e688a9..048f5453687c 100644 --- a/test/e2e-v2/cases/redis/expected/metrics-single-value.yml +++ b/test/e2e-v2/cases/redis/expected/metrics-single-value.yml @@ -24,6 +24,7 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/rocketmq/expected/metrics-has-value-empty-label.yml b/test/e2e-v2/cases/rocketmq/expected/metrics-has-value-empty-label.yml index 8a18b379d1f1..c27d05d0f2d7 100644 --- a/test/e2e-v2/cases/rocketmq/expected/metrics-has-value-empty-label.yml +++ b/test/e2e-v2/cases/rocketmq/expected/metrics-has-value-empty-label.yml @@ -24,9 +24,11 @@ results: - id: {{ notEmpty .id }} value: null traceid: null + owner: null - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null {{- end }} {{- end}} error: null diff --git a/test/e2e-v2/cases/rocketmq/expected/metrics-has-value-group-label.yml b/test/e2e-v2/cases/rocketmq/expected/metrics-has-value-group-label.yml index 4897ee1e245c..01e6b011acff 100644 --- a/test/e2e-v2/cases/rocketmq/expected/metrics-has-value-group-label.yml +++ b/test/e2e-v2/cases/rocketmq/expected/metrics-has-value-group-label.yml @@ -26,9 +26,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/rocketmq/expected/metrics-has-value-label-brokerIP.yml b/test/e2e-v2/cases/rocketmq/expected/metrics-has-value-label-brokerIP.yml index c4494e3c6e7b..53e36b5bc7be 100644 --- a/test/e2e-v2/cases/rocketmq/expected/metrics-has-value-label-brokerIP.yml +++ b/test/e2e-v2/cases/rocketmq/expected/metrics-has-value-label-brokerIP.yml @@ -28,9 +28,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/rocketmq/expected/metrics-has-value-label.yml b/test/e2e-v2/cases/rocketmq/expected/metrics-has-value-label.yml index e0cabd0e97b4..588c791aa2d6 100644 --- a/test/e2e-v2/cases/rocketmq/expected/metrics-has-value-label.yml +++ b/test/e2e-v2/cases/rocketmq/expected/metrics-has-value-label.yml @@ -32,9 +32,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/rocketmq/expected/metrics-has-value.yml b/test/e2e-v2/cases/rocketmq/expected/metrics-has-value.yml index fb972e235a8c..7b1676057120 100644 --- a/test/e2e-v2/cases/rocketmq/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/rocketmq/expected/metrics-has-value.yml @@ -24,9 +24,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null \ No newline at end of file diff --git a/test/e2e-v2/cases/satellite/native-protocols/expected/metrics-has-value.yml b/test/e2e-v2/cases/satellite/native-protocols/expected/metrics-has-value.yml index 445dcebcb3b5..37b19de246b5 100644 --- a/test/e2e-v2/cases/satellite/native-protocols/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/satellite/native-protocols/expected/metrics-has-value.yml @@ -23,9 +23,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} {{- end}} diff --git a/test/e2e-v2/cases/simple/expected/metrics-has-value-percentile.yml b/test/e2e-v2/cases/simple/expected/metrics-has-value-percentile.yml index 8aad5254ae31..cfce15019f10 100644 --- a/test/e2e-v2/cases/simple/expected/metrics-has-value-percentile.yml +++ b/test/e2e-v2/cases/simple/expected/metrics-has-value-percentile.yml @@ -27,9 +27,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} {{- end}} diff --git a/test/e2e-v2/cases/simple/expected/metrics-has-value.yml b/test/e2e-v2/cases/simple/expected/metrics-has-value.yml index 445dcebcb3b5..37b19de246b5 100644 --- a/test/e2e-v2/cases/simple/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/simple/expected/metrics-has-value.yml @@ -23,9 +23,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} {{- end}} diff --git a/test/e2e-v2/cases/so11y/expected/metrics-has-value-label.yml b/test/e2e-v2/cases/so11y/expected/metrics-has-value-label.yml index 8c627313279c..f69256342b81 100644 --- a/test/e2e-v2/cases/so11y/expected/metrics-has-value-label.yml +++ b/test/e2e-v2/cases/so11y/expected/metrics-has-value-label.yml @@ -25,9 +25,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} {{- end}} diff --git a/test/e2e-v2/cases/so11y/expected/metrics-has-value-percentile.yml b/test/e2e-v2/cases/so11y/expected/metrics-has-value-percentile.yml index 2459c8870d90..e20e27ebe695 100644 --- a/test/e2e-v2/cases/so11y/expected/metrics-has-value-percentile.yml +++ b/test/e2e-v2/cases/so11y/expected/metrics-has-value-percentile.yml @@ -25,9 +25,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} - metric: @@ -39,9 +41,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end }} {{- end}} error: null diff --git a/test/e2e-v2/cases/so11y/expected/metrics-has-value.yml b/test/e2e-v2/cases/so11y/expected/metrics-has-value.yml index 445dcebcb3b5..37b19de246b5 100644 --- a/test/e2e-v2/cases/so11y/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/so11y/expected/metrics-has-value.yml @@ -23,9 +23,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} {{- end}} diff --git a/test/e2e-v2/cases/storage/expected/metrics-has-value-percentile.yml b/test/e2e-v2/cases/storage/expected/metrics-has-value-percentile.yml index 8aad5254ae31..cfce15019f10 100644 --- a/test/e2e-v2/cases/storage/expected/metrics-has-value-percentile.yml +++ b/test/e2e-v2/cases/storage/expected/metrics-has-value-percentile.yml @@ -27,9 +27,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} {{- end}} diff --git a/test/e2e-v2/cases/storage/expected/metrics-has-value.yml b/test/e2e-v2/cases/storage/expected/metrics-has-value.yml index 445dcebcb3b5..37b19de246b5 100644 --- a/test/e2e-v2/cases/storage/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/storage/expected/metrics-has-value.yml @@ -23,9 +23,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} {{- end}} diff --git a/test/e2e-v2/cases/storage/expected/topN-OP-endpoint.yml b/test/e2e-v2/cases/storage/expected/topN-OP-endpoint.yml index efa972ca03c1..5406006d70a6 100644 --- a/test/e2e-v2/cases/storage/expected/topN-OP-endpoint.yml +++ b/test/e2e-v2/cases/storage/expected/topN-OP-endpoint.yml @@ -23,9 +23,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: "100" + owner: null traceid: null - id: {{ notEmpty .id }} value: "100" + owner: null traceid: null {{- end }} {{- end }} diff --git a/test/e2e-v2/cases/storage/expected/topN-OP-service.yml b/test/e2e-v2/cases/storage/expected/topN-OP-service.yml index efa972ca03c1..b45180f5e244 100644 --- a/test/e2e-v2/cases/storage/expected/topN-OP-service.yml +++ b/test/e2e-v2/cases/storage/expected/topN-OP-service.yml @@ -22,9 +22,11 @@ results: values: {{- contains .values }} - id: {{ notEmpty .id }} + owner: null value: "100" traceid: null - id: {{ notEmpty .id }} + owner: null value: "100" traceid: null {{- end }} diff --git a/test/e2e-v2/cases/ttl/expected/metrics-has-value.yml b/test/e2e-v2/cases/ttl/expected/metrics-has-value.yml index 445dcebcb3b5..37b19de246b5 100644 --- a/test/e2e-v2/cases/ttl/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/ttl/expected/metrics-has-value.yml @@ -23,9 +23,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} {{- end}} diff --git a/test/e2e-v2/cases/virtual-mq/expected/metrics-has-value.yml b/test/e2e-v2/cases/virtual-mq/expected/metrics-has-value.yml index fb972e235a8c..7b1676057120 100644 --- a/test/e2e-v2/cases/virtual-mq/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/virtual-mq/expected/metrics-has-value.yml @@ -24,9 +24,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null \ No newline at end of file diff --git a/test/e2e-v2/cases/vm/expected/metrics-has-average-value-label-zabbix.yml b/test/e2e-v2/cases/vm/expected/metrics-has-average-value-label-zabbix.yml index 1b4fd57bb44f..2189b5dc8abe 100644 --- a/test/e2e-v2/cases/vm/expected/metrics-has-average-value-label-zabbix.yml +++ b/test/e2e-v2/cases/vm/expected/metrics-has-average-value-label-zabbix.yml @@ -25,9 +25,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} - metric: @@ -38,9 +40,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} {{- end}} diff --git a/test/e2e-v2/cases/vm/expected/metrics-has-average-value-label.yml b/test/e2e-v2/cases/vm/expected/metrics-has-average-value-label.yml index 534aa6c05d2b..85c2d872c4b0 100644 --- a/test/e2e-v2/cases/vm/expected/metrics-has-average-value-label.yml +++ b/test/e2e-v2/cases/vm/expected/metrics-has-average-value-label.yml @@ -25,9 +25,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} - metric: @@ -38,9 +40,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} {{- end}} diff --git a/test/e2e-v2/cases/vm/expected/metrics-has-mountpoint-value-label.yml b/test/e2e-v2/cases/vm/expected/metrics-has-mountpoint-value-label.yml index 857209abf45c..a803e4dd8a64 100644 --- a/test/e2e-v2/cases/vm/expected/metrics-has-mountpoint-value-label.yml +++ b/test/e2e-v2/cases/vm/expected/metrics-has-mountpoint-value-label.yml @@ -25,9 +25,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} - metric: @@ -38,9 +40,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} {{- end}} diff --git a/test/e2e-v2/cases/vm/expected/metrics-has-value.yml b/test/e2e-v2/cases/vm/expected/metrics-has-value.yml index 445dcebcb3b5..37b19de246b5 100644 --- a/test/e2e-v2/cases/vm/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/vm/expected/metrics-has-value.yml @@ -23,9 +23,11 @@ results: {{- contains .values }} - id: {{ notEmpty .id }} value: {{ .value }} + owner: null traceid: null - id: {{ notEmpty .id }} value: null + owner: null traceid: null {{- end}} {{- end}} diff --git a/test/e2e-v2/cases/vm/expected/metrics-has-vfs-value-label.yml b/test/e2e-v2/cases/vm/expected/metrics-has-vfs-value-label.yml index a15b45cf6d33..084fd6095101 100644 --- a/test/e2e-v2/cases/vm/expected/metrics-has-vfs-value-label.yml +++ b/test/e2e-v2/cases/vm/expected/metrics-has-vfs-value-label.yml @@ -28,9 +28,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/cases/vm/expected/topN.yml b/test/e2e-v2/cases/vm/expected/topN.yml index 181649fd4d69..bb3af0dc725d 100644 --- a/test/e2e-v2/cases/vm/expected/topN.yml +++ b/test/e2e-v2/cases/vm/expected/topN.yml @@ -24,6 +24,7 @@ results: - id: vm-service value: {{ .value }} traceid: null + owner: null {{- end }} {{- end }} error: null diff --git a/test/e2e-v2/cases/win/expected/metrics-has-value.yml b/test/e2e-v2/cases/win/expected/metrics-has-value.yml index 445dcebcb3b5..458c5980acac 100644 --- a/test/e2e-v2/cases/win/expected/metrics-has-value.yml +++ b/test/e2e-v2/cases/win/expected/metrics-has-value.yml @@ -24,9 +24,11 @@ results: - id: {{ notEmpty .id }} value: {{ .value }} traceid: null + owner: null - id: {{ notEmpty .id }} value: null traceid: null + owner: null {{- end}} {{- end}} error: null diff --git a/test/e2e-v2/script/env b/test/e2e-v2/script/env index 6f6cbc4531ad..bfefeaf92836 100644 --- a/test/e2e-v2/script/env +++ b/test/e2e-v2/script/env @@ -26,4 +26,4 @@ SW_ROVER_COMMIT=6bbd39aa701984482330d9dfb4dbaaff0527d55c SW_BANYANDB_COMMIT=05cf5e1426e0b3926819c2272497923cd705f72b SW_AGENT_PHP_COMMIT=3192c553002707d344bd6774cfab5bc61f67a1d3 -SW_CTL_COMMIT=bce7faaabbd57ed1f40156af8a8eb6c3eccea4ae +SW_CTL_COMMIT=6210a3b79089535af782ca51359ce6c5b68890b2