This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch log-endpoint-query in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit d0983d551945f393e9de0e99fa2d4fe42477d823 Author: Wu Sheng <[email protected]> AuthorDate: Wed Aug 11 21:12:55 2021 +0800 Remove page path in the browser log query condition. --- CHANGES.md | 3 +++ .../browser/manual/errorlog/BrowserErrorLogRecord.java | 14 +------------- .../manual/errorlog/BrowserErrorLogRecordDispatcher.java | 1 - .../oap/server/core/browser/source/BrowserErrorLog.java | 3 --- .../oap/server/core/query/BrowserLogQueryService.java | 3 +-- .../core/query/input/BrowserErrorLogQueryCondition.java | 1 - .../oap/server/core/storage/query/IBrowserLogQueryDAO.java | 1 - .../oap/query/graphql/resolver/BrowserLogQuery.java | 3 +-- .../query-graphql-plugin/src/main/resources/query-protocol | 2 +- .../parser/errorlog/listener/ErrorLogRecordListener.java | 1 - .../plugin/elasticsearch/query/BrowserLogQueryEsDAO.java | 6 ------ .../plugin/elasticsearch7/query/BrowserLogQueryEs7DAO.java | 6 ------ .../storage/plugin/influxdb/query/BrowserLogQuery.java | 5 ----- .../storage/plugin/jdbc/h2/dao/H2BrowserLogQueryDAO.java | 6 ------ 14 files changed, 7 insertions(+), 48 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index a819d64..d23a5bd 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -29,6 +29,9 @@ Release Notes. * [Break Change] Remove endpoint name in the trace query condition. Only support `query by endpoint id`. * Fix `ProfileSnapshotExporterTest` case on `OpenJDK Runtime Environment AdoptOpenJDK-11.0.11+9 (build 11.0.11+9)`, MacOS. +* [Break Change] Remove page path in the browser log query condition. Only support `query by page path id`. +* [Break Change] Remove endpoint name in the backend log query condition. Only support `query by endpoint id`. +* [Break Change] Fix typo for a column `page_path_id`(was `pate_path_id`) of storage entity `browser_error_log`. #### UI diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/manual/errorlog/BrowserErrorLogRecord.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/manual/errorlog/BrowserErrorLogRecord.java index 7a856c5..3df5ca6 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/manual/errorlog/BrowserErrorLogRecord.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/manual/errorlog/BrowserErrorLogRecord.java @@ -33,8 +33,6 @@ import org.apache.skywalking.oap.server.core.storage.annotation.Column; import org.apache.skywalking.oap.server.core.storage.annotation.SuperDataset; import org.apache.skywalking.oap.server.library.util.CollectionUtils; -import static java.util.Objects.nonNull; - @SuperDataset @Stream(name = BrowserErrorLogRecord.INDEX_NAME, scopeId = DefaultScopeDefine.BROWSER_ERROR_LOG, builder = BrowserErrorLogRecord.Builder.class, processor = RecordStreamProcessor.class) public class BrowserErrorLogRecord extends Record { @@ -42,8 +40,7 @@ public class BrowserErrorLogRecord extends Record { public static final String UNIQUE_ID = "unique_id"; public static final String SERVICE_ID = "service_id"; public static final String SERVICE_VERSION_ID = "service_version_id"; - public static final String PAGE_PATH_ID = "pate_path_id"; - public static final String PAGE_PATH = "page_path"; + public static final String PAGE_PATH_ID = "page_path_id"; public static final String TIMESTAMP = "timestamp"; public static final String ERROR_CATEGORY = "error_category"; public static final String DATA_BINARY = "data_binary"; @@ -75,11 +72,6 @@ public class BrowserErrorLogRecord extends Record { @Setter @Getter - @Column(columnName = PAGE_PATH, matchQuery = true) - private String pagePath; - - @Setter - @Getter @Column(columnName = TIMESTAMP) private long timestamp; @@ -101,7 +93,6 @@ public class BrowserErrorLogRecord extends Record { record.setServiceId((String) dbMap.get(SERVICE_ID)); record.setServiceVersionId((String) dbMap.get(SERVICE_VERSION_ID)); record.setPagePathId((String) dbMap.get(PAGE_PATH_ID)); - record.setPagePath((String) dbMap.get(PAGE_PATH)); record.setTimestamp(((Number) dbMap.get(TIMESTAMP)).longValue()); record.setTimeBucket(((Number) dbMap.get(TIME_BUCKET)).longValue()); record.setErrorCategory(((Number) dbMap.get(ERROR_CATEGORY)).intValue()); @@ -121,9 +112,6 @@ public class BrowserErrorLogRecord extends Record { map.put(SERVICE_ID, storageData.getServiceId()); map.put(SERVICE_VERSION_ID, storageData.getServiceVersionId()); map.put(PAGE_PATH_ID, storageData.getPagePathId()); - if (nonNull(storageData.getPagePath())) { - map.put(PAGE_PATH, storageData.getPagePath()); - } map.put(TIMESTAMP, storageData.getTimestamp()); map.put(TIME_BUCKET, storageData.getTimeBucket()); map.put(ERROR_CATEGORY, storageData.getErrorCategory()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/manual/errorlog/BrowserErrorLogRecordDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/manual/errorlog/BrowserErrorLogRecordDispatcher.java index e2a2630..5b27805 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/manual/errorlog/BrowserErrorLogRecordDispatcher.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/manual/errorlog/BrowserErrorLogRecordDispatcher.java @@ -29,7 +29,6 @@ public class BrowserErrorLogRecordDispatcher implements SourceDispatcher<Browser record.setServiceId(source.getServiceId()); record.setServiceVersionId(source.getServiceVersionId()); record.setPagePathId(source.getPagePathId()); - record.setPagePath(source.getPagePath()); record.setTimestamp(source.getTimestamp()); record.setTimeBucket(source.getTimeBucket()); record.setErrorCategory(source.getErrorCategory().getValue()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/source/BrowserErrorLog.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/source/BrowserErrorLog.java index b8a723f..0699f27 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/source/BrowserErrorLog.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/source/BrowserErrorLog.java @@ -53,9 +53,6 @@ public class BrowserErrorLog extends Source { private String pagePathId; @Getter @Setter - private String pagePath; - @Getter - @Setter private long timestamp; @Getter @Setter diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/BrowserLogQueryService.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/BrowserLogQueryService.java index a3ae47c..a967305 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/BrowserLogQueryService.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/BrowserLogQueryService.java @@ -46,7 +46,6 @@ public class BrowserLogQueryService implements Service { public BrowserErrorLogs queryBrowserErrorLogs(final String serviceId, final String serviceVersionId, final String pagePathId, - final String pagePath, final ErrorCategory category, final long startSecondTB, final long endSecondTB, @@ -58,7 +57,7 @@ public class BrowserLogQueryService implements Service { .orElse(null); return getBrowserLogQueryDAO().queryBrowserErrorLogs( - serviceId, serviceVersionId, pagePathId, pagePath, errorCategory, startSecondTB, endSecondTB, + serviceId, serviceVersionId, pagePathId, errorCategory, startSecondTB, endSecondTB, page.getLimit(), page.getFrom() ); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/BrowserErrorLogQueryCondition.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/BrowserErrorLogQueryCondition.java index 441538f..acc723e 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/BrowserErrorLogQueryCondition.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/BrowserErrorLogQueryCondition.java @@ -28,7 +28,6 @@ public class BrowserErrorLogQueryCondition { private String serviceId; private String serviceVersionId; private String pagePathId; - private String pagePath; private ErrorCategory category; private Duration queryDuration; private Pagination paging; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IBrowserLogQueryDAO.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IBrowserLogQueryDAO.java index a96ec59..a8352ff 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IBrowserLogQueryDAO.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IBrowserLogQueryDAO.java @@ -30,7 +30,6 @@ public interface IBrowserLogQueryDAO extends Service { BrowserErrorLogs queryBrowserErrorLogs(String serviceId, String serviceVersionId, String pagePathId, - String pagePath, BrowserErrorCategory category, long startSecondTB, long endSecondTB, diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/BrowserLogQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/BrowserLogQuery.java index 3298f12..bb39b82 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/BrowserLogQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/BrowserLogQuery.java @@ -52,8 +52,7 @@ public class BrowserLogQuery implements GraphQLQueryResolver { return getQueryService().queryBrowserErrorLogs( condition.getServiceId(), condition.getServiceVersionId(), condition.getPagePathId(), - condition.getPagePath(), condition.getCategory() - , startSecondTB, endSecondTB, condition.getPaging() + condition.getCategory(), startSecondTB, endSecondTB, condition.getPaging() ); } } 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 17e1aea..e9ecb51 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 17e1aea1ea1818de4b96e06a6dc41e9a78eb7105 +Subproject commit e9ecb5153fbab9ab21d805c898d05fbe45e7c4d6 diff --git a/oap-server/server-receiver-plugin/skywalking-browser-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/browser/provider/parser/errorlog/listener/ErrorLogRecordListener.java b/oap-server/server-receiver-plugin/skywalking-browser-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/browser/provider/parser/errorlog/listener/ErrorLogRecordListener.java index 793a076..60096a9 100644 --- a/oap-server/server-receiver-plugin/skywalking-browser-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/browser/provider/parser/errorlog/listener/ErrorLogRecordListener.java +++ b/oap-server/server-receiver-plugin/skywalking-browser-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/browser/provider/parser/errorlog/listener/ErrorLogRecordListener.java @@ -87,7 +87,6 @@ public class ErrorLogRecordListener implements ErrorLogAnalysisListener { // page String pagePath = namingControl.formatEndpointName(serviceName, decorator.getPagePath()); - errorLog.setPagePath(pagePath); errorLog.setPagePathId(IDManager.EndpointID.buildId(serviceId, pagePath)); // raw data diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/BrowserLogQueryEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/BrowserLogQueryEsDAO.java index 71c073b..120c33e 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/BrowserLogQueryEsDAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/BrowserLogQueryEsDAO.java @@ -46,7 +46,6 @@ public class BrowserLogQueryEsDAO extends EsDAO implements IBrowserLogQueryDAO { public BrowserErrorLogs queryBrowserErrorLogs(final String serviceId, final String serviceVersionId, final String pagePathId, - final String pagePath, final BrowserErrorCategory category, final long startSecondTB, final long endSecondTB, @@ -61,11 +60,6 @@ public class BrowserLogQueryEsDAO extends EsDAO implements IBrowserLogQueryDAO { boolQueryBuilder.must().add( QueryBuilders.rangeQuery(BrowserErrorLogRecord.TIME_BUCKET).gte(startSecondTB).lte(endSecondTB)); } - - if (!Strings.isNullOrEmpty(pagePath)) { - String matchCName = MatchCNameBuilder.INSTANCE.build(BrowserErrorLogRecord.PAGE_PATH); - boolQueryBuilder.must().add(QueryBuilders.matchPhraseQuery(matchCName, pagePath)); - } if (StringUtil.isNotEmpty(serviceId)) { boolQueryBuilder.must().add(QueryBuilders.termQuery(BrowserErrorLogRecord.SERVICE_ID, serviceId)); } diff --git a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/BrowserLogQueryEs7DAO.java b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/BrowserLogQueryEs7DAO.java index 370993a..0730fac 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/BrowserLogQueryEs7DAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/BrowserLogQueryEs7DAO.java @@ -45,7 +45,6 @@ public class BrowserLogQueryEs7DAO extends BrowserLogQueryEsDAO { public BrowserErrorLogs queryBrowserErrorLogs(final String serviceId, final String serviceVersionId, final String pagePathId, - final String pagePath, final BrowserErrorCategory category, final long startSecondTB, final long endSecondTB, @@ -60,11 +59,6 @@ public class BrowserLogQueryEs7DAO extends BrowserLogQueryEsDAO { boolQueryBuilder.must().add( QueryBuilders.rangeQuery(BrowserErrorLogRecord.TIME_BUCKET).gte(startSecondTB).lte(endSecondTB)); } - - if (!Strings.isNullOrEmpty(pagePath)) { - String matchCName = MatchCNameBuilder.INSTANCE.build(BrowserErrorLogRecord.PAGE_PATH); - boolQueryBuilder.must().add(QueryBuilders.matchPhraseQuery(matchCName, pagePath)); - } if (StringUtil.isNotEmpty(serviceId)) { boolQueryBuilder.must().add(QueryBuilders.termQuery(BrowserErrorLogRecord.SERVICE_ID, serviceId)); } diff --git a/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/BrowserLogQuery.java b/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/BrowserLogQuery.java index 7d1fa1b..85d4ede 100644 --- a/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/BrowserLogQuery.java +++ b/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/BrowserLogQuery.java @@ -50,7 +50,6 @@ public class BrowserLogQuery implements IBrowserLogQueryDAO { public BrowserErrorLogs queryBrowserErrorLogs(final String serviceId, final String serviceVersionId, final String pagePathId, - final String pagePath, final BrowserErrorCategory category, final long startSecondTB, final long endSecondTB, @@ -80,10 +79,6 @@ public class BrowserLogQuery implements IBrowserLogQueryDAO { if (nonNull(category)) { recallQuery.and(eq(BrowserErrorLogRecord.ERROR_CATEGORY, category.getValue())); } - if (StringUtil.isNotEmpty(pagePath)) { - recallQuery.and(contains(BrowserErrorLogRecord.PAGE_PATH, pagePath.replaceAll("/", "\\\\/"))); - } - WhereQueryImpl<SelectQueryImpl> countQuery = select() .count(BrowserErrorLogRecord.SERVICE_ID) .from(client.getDatabase(), BrowserErrorLogRecord.INDEX_NAME) diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2BrowserLogQueryDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2BrowserLogQueryDAO.java index 909bf5e..3c23e2b 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2BrowserLogQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2BrowserLogQueryDAO.java @@ -17,7 +17,6 @@ package org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao; -import com.google.common.base.Strings; import java.io.IOException; import java.sql.Connection; import java.sql.ResultSet; @@ -43,7 +42,6 @@ public class H2BrowserLogQueryDAO implements IBrowserLogQueryDAO { public BrowserErrorLogs queryBrowserErrorLogs(String serviceId, String serviceVersionId, String pagePathId, - String pagePath, BrowserErrorCategory category, long startSecondTB, long endSecondTB, @@ -79,10 +77,6 @@ public class H2BrowserLogQueryDAO implements IBrowserLogQueryDAO { sql.append(" and ").append(BrowserErrorLogRecord.ERROR_CATEGORY).append(" = ?"); parameters.add(category.getValue()); } - if (!Strings.isNullOrEmpty(pagePath)) { - sql.append(" and ").append(BrowserErrorLogRecord.PAGE_PATH).append(" like concat('%',?,'%')"); - parameters.add(pagePath); - } BrowserErrorLogs logs = new BrowserErrorLogs(); try (Connection connection = h2Client.getConnection()) {
