From 6a241aed758e65b54dc6225b42fc852aa878f8c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Thu, 12 Aug 2021 09:44:19 +0800 Subject: [PATCH] [Break Change] Remove endpoint name in backend log and browser log query (#7444) * Remove page path in the browser log query condition. * Remove endpoint name in the backend log query condition. --- CHANGES.md | 3 +++ .../log/listener/RecordAnalysisListener.java | 1 - .../analysis/manual/log/AbstractLogRecord.java | 11 ----------- .../analysis/manual/log/LogRecordDispatcher.java | 1 - .../manual/errorlog/BrowserErrorLogRecord.java | 14 +------------- .../errorlog/BrowserErrorLogRecordDispatcher.java | 1 - .../core/browser/source/BrowserErrorLog.java | 3 --- .../server/core/query/BrowserLogQueryService.java | 3 +-- .../oap/server/core/query/LogQueryService.java | 2 -- .../query/input/BrowserErrorLogQueryCondition.java | 1 - .../server/core/query/input/LogQueryCondition.java | 1 - .../oap/server/core/source/AbstractLog.java | 1 - .../core/storage/query/IBrowserLogQueryDAO.java | 1 - .../server/core/storage/query/ILogQueryDAO.java | 1 - .../query/graphql/resolver/BrowserLogQuery.java | 3 +-- .../oap/query/graphql/resolver/LogQuery.java | 1 - .../src/main/resources/query-protocol | 2 +- .../errorlog/listener/ErrorLogRecordListener.java | 1 - .../elasticsearch/query/BrowserLogQueryEsDAO.java | 13 ++++--------- .../plugin/elasticsearch/query/LogQueryEsDAO.java | 10 ++++------ .../query/BrowserLogQueryEs7DAO.java | 13 ++++--------- .../elasticsearch7/query/LogQueryEs7DAO.java | 10 ++++------ .../plugin/influxdb/query/BrowserLogQuery.java | 6 ------ .../storage/plugin/influxdb/query/LogQuery.java | 10 ++++------ .../plugin/jdbc/h2/dao/H2BrowserLogQueryDAO.java | 6 ------ .../storage/plugin/jdbc/h2/dao/H2LogQueryDAO.java | 11 ++++------- .../plugin/jdbc/h2/dao/H2LogRecordBuilder.java | 3 --- .../dao/PostgreSQLBrowserLogQueryDAO.java | 4 ++-- .../apache/skywalking/e2e/SimpleQueryClient.java | 1 - .../org/apache/skywalking/e2e/log/LogsQuery.java | 10 ---------- test/e2e/e2e-data/src/main/resources/logs.gql | 1 - 31 files changed, 33 insertions(+), 116 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index a819d644cf..d23a5bd0d7 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/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/listener/RecordAnalysisListener.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/listener/RecordAnalysisListener.java index a312cec928..21d2d563a5 100644 --- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/listener/RecordAnalysisListener.java +++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/listener/RecordAnalysisListener.java @@ -85,7 +85,6 @@ public class RecordAnalysisListener implements LogAnalysisListener { if (StringUtil.isNotEmpty(logData.getEndpoint())) { String endpointName = namingControl.formatEndpointName(serviceName, logData.getEndpoint()); log.setEndpointId(IDManager.EndpointID.buildId(serviceId, endpointName)); - log.setEndpointName(endpointName); } // trace TraceContext traceContext = logData.getTraceContext(); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/log/AbstractLogRecord.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/log/AbstractLogRecord.java index 66557d75de..583bd6a4db 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/log/AbstractLogRecord.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/log/AbstractLogRecord.java @@ -33,13 +33,10 @@ import org.apache.skywalking.oap.server.core.storage.StorageHashMapBuilder; import org.apache.skywalking.oap.server.core.storage.annotation.Column; import org.apache.skywalking.oap.server.library.util.CollectionUtils; -import static java.util.Objects.nonNull; - public abstract class AbstractLogRecord extends Record { public static final String SERVICE_ID = "service_id"; public static final String SERVICE_INSTANCE_ID = "service_instance_id"; - public static final String ENDPOINT_NAME = "endpoint_name"; public static final String ENDPOINT_ID = "endpoint_id"; public static final String TRACE_ID = "trace_id"; public static final String TRACE_SEGMENT_ID = "trace_segment_id"; @@ -64,10 +61,6 @@ public abstract class AbstractLogRecord extends Record { private String endpointId; @Setter @Getter - @Column(columnName = ENDPOINT_NAME, matchQuery = true) - private String endpointName; - @Setter - @Getter @Column(columnName = TRACE_ID, length = 150) private String traceId; @Setter @@ -122,9 +115,6 @@ public abstract class AbstractLogRecord extends Record { map.put(SERVICE_ID, record.getServiceId()); map.put(SERVICE_INSTANCE_ID, record.getServiceInstanceId()); map.put(ENDPOINT_ID, record.getEndpointId()); - if (nonNull(record.getEndpointName())) { - map.put(ENDPOINT_NAME, record.getEndpointName()); - } map.put(TRACE_ID, record.getTraceId()); map.put(TRACE_SEGMENT_ID, record.getTraceSegmentId()); map.put(SPAN_ID, record.getSpanId()); @@ -144,7 +134,6 @@ public abstract class AbstractLogRecord extends Record { record.setServiceId((String) dbMap.get(SERVICE_ID)); record.setServiceInstanceId((String) dbMap.get(SERVICE_INSTANCE_ID)); record.setEndpointId((String) dbMap.get(ENDPOINT_ID)); - record.setEndpointName((String) dbMap.get(ENDPOINT_NAME)); record.setTraceId((String) dbMap.get(TRACE_ID)); record.setTraceSegmentId((String) dbMap.get(TRACE_SEGMENT_ID)); record.setSpanId(((Number) dbMap.get(SPAN_ID)).intValue()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/log/LogRecordDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/log/LogRecordDispatcher.java index be03ecde6b..c18826f538 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/log/LogRecordDispatcher.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/log/LogRecordDispatcher.java @@ -33,7 +33,6 @@ public class LogRecordDispatcher implements SourceDispatcher { record.setServiceId(source.getServiceId()); record.setServiceInstanceId(source.getServiceInstanceId()); record.setEndpointId(source.getEndpointId()); - record.setEndpointName(source.getEndpointName()); record.setTraceId(source.getTraceId()); record.setTraceSegmentId(source.getTraceSegmentId()); record.setSpanId(source.getSpanId()); 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 7a856c53c4..3df5ca6c12 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"; @@ -73,11 +70,6 @@ public class BrowserErrorLogRecord extends Record { @Column(columnName = PAGE_PATH_ID) private String pagePathId; - @Setter - @Getter - @Column(columnName = PAGE_PATH, matchQuery = true) - private String pagePath; - @Setter @Getter @Column(columnName = 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 e2a2630cff..5b27805d4b 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 countQuery = select() .count(BrowserErrorLogRecord.SERVICE_ID) .from(client.getDatabase(), BrowserErrorLogRecord.INDEX_NAME) diff --git a/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/LogQuery.java b/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/LogQuery.java index d58baed6f7..091a109c62 100644 --- a/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/LogQuery.java +++ b/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/LogQuery.java @@ -23,6 +23,7 @@ import java.io.IOException; import java.util.List; import java.util.Map; import lombok.extern.slf4j.Slf4j; +import org.apache.skywalking.oap.server.core.analysis.IDManager; import org.apache.skywalking.oap.server.core.analysis.manual.log.AbstractLogRecord; import org.apache.skywalking.oap.server.core.analysis.manual.log.LogRecord; import org.apache.skywalking.oap.server.core.analysis.manual.searchtag.Tag; @@ -47,7 +48,6 @@ import org.influxdb.querybuilder.clauses.ConjunctionClause; import static java.util.Objects.nonNull; import static org.apache.skywalking.apm.util.StringUtil.isNotEmpty; import static org.apache.skywalking.oap.server.core.analysis.manual.log.AbstractLogRecord.ENDPOINT_ID; -import static org.apache.skywalking.oap.server.core.analysis.manual.log.AbstractLogRecord.ENDPOINT_NAME; import static org.apache.skywalking.oap.server.core.analysis.manual.log.AbstractLogRecord.SERVICE_ID; import static org.apache.skywalking.oap.server.core.analysis.manual.log.AbstractLogRecord.SERVICE_INSTANCE_ID; import static org.apache.skywalking.oap.server.core.analysis.manual.log.AbstractLogRecord.SPAN_ID; @@ -73,7 +73,6 @@ public class LogQuery implements ILogQueryDAO { public Logs queryLogs(final String serviceId, final String serviceInstanceId, final String endpointId, - final String endpointName, final TraceScopeCondition relatedTrace, final Order queryOrder, final int from, @@ -101,9 +100,6 @@ public class LogQuery implements ILogQueryDAO { if (isNotEmpty(endpointId)) { recallQuery.and(eq(ENDPOINT_ID, endpointId)); } - if (isNotEmpty(endpointName)) { - recallQuery.and(contains(ENDPOINT_NAME, endpointName.replaceAll("/", "\\\\/"))); - } if (nonNull(relatedTrace)) { if (isNotEmpty(relatedTrace.getTraceId())) { recallQuery.and(eq(TRACE_ID, relatedTrace.getTraceId())); @@ -164,7 +160,9 @@ public class LogQuery implements ILogQueryDAO { log.setServiceId((String) data.get(SERVICE_ID)); log.setServiceInstanceId((String) data.get(SERVICE_INSTANCE_ID)); log.setEndpointId((String) data.get(ENDPOINT_ID)); - log.setEndpointName((String) data.get(ENDPOINT_NAME)); + if (log.getEndpointId() != null) { + log.setEndpointName(IDManager.EndpointID.analysisId(log.getEndpointId()).getEndpointName()); + } log.setTraceId((String) data.get(TRACE_ID)); log.setTimestamp(((Number) data.get(TIMESTAMP)).longValue()); log.setContentType( 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 909bf5e380..3c23e2be00 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()) { 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/H2LogQueryDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2LogQueryDAO.java index da47d8a5fd..69c1210c16 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2LogQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2LogQueryDAO.java @@ -29,6 +29,7 @@ import java.util.List; import org.apache.skywalking.apm.util.StringUtil; import org.apache.skywalking.oap.server.core.Const; import org.apache.skywalking.oap.server.core.CoreModule; +import org.apache.skywalking.oap.server.core.analysis.IDManager; import org.apache.skywalking.oap.server.core.analysis.manual.log.AbstractLogRecord; import org.apache.skywalking.oap.server.core.analysis.manual.log.LogRecord; import org.apache.skywalking.oap.server.core.analysis.manual.searchtag.Tag; @@ -48,7 +49,6 @@ import static java.util.Objects.nonNull; import static org.apache.skywalking.oap.server.core.analysis.manual.log.AbstractLogRecord.CONTENT; import static org.apache.skywalking.oap.server.core.analysis.manual.log.AbstractLogRecord.CONTENT_TYPE; import static org.apache.skywalking.oap.server.core.analysis.manual.log.AbstractLogRecord.ENDPOINT_ID; -import static org.apache.skywalking.oap.server.core.analysis.manual.log.AbstractLogRecord.ENDPOINT_NAME; import static org.apache.skywalking.oap.server.core.analysis.manual.log.AbstractLogRecord.SERVICE_ID; import static org.apache.skywalking.oap.server.core.analysis.manual.log.AbstractLogRecord.SERVICE_INSTANCE_ID; import static org.apache.skywalking.oap.server.core.analysis.manual.log.AbstractLogRecord.SPAN_ID; @@ -78,7 +78,6 @@ public class H2LogQueryDAO implements ILogQueryDAO { public Logs queryLogs(String serviceId, String serviceInstanceId, String endpointId, - String endpointName, TraceScopeCondition relatedTrace, Order queryOrder, int from, @@ -121,10 +120,6 @@ public class H2LogQueryDAO implements ILogQueryDAO { sql.append(" and ").append(AbstractLogRecord.ENDPOINT_ID).append(" = ?"); parameters.add(endpointId); } - if (StringUtil.isNotEmpty(endpointName)) { - sql.append(" and ").append(ENDPOINT_NAME).append(" like concat('%',?,'%')"); - parameters.add(endpointName); - } if (nonNull(relatedTrace)) { if (StringUtil.isNotEmpty(relatedTrace.getTraceId())) { sql.append(" and ").append(TRACE_ID).append(" = ?"); @@ -184,7 +179,9 @@ public class H2LogQueryDAO implements ILogQueryDAO { log.setServiceId(resultSet.getString(SERVICE_ID)); log.setServiceInstanceId(resultSet.getString(SERVICE_INSTANCE_ID)); log.setEndpointId(resultSet.getString(ENDPOINT_ID)); - log.setEndpointName(resultSet.getString(ENDPOINT_NAME)); + if (log.getEndpointId() != null) { + log.setEndpointName(IDManager.EndpointID.analysisId(log.getEndpointId()).getEndpointName()); + } log.setTraceId(resultSet.getString(TRACE_ID)); log.setTimestamp(resultSet.getLong(TIMESTAMP)); log.setContentType(ContentType.instanceOf(resultSet.getInt(CONTENT_TYPE))); 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/H2LogRecordBuilder.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2LogRecordBuilder.java index 721dd9544d..a83b420f86 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2LogRecordBuilder.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2LogRecordBuilder.java @@ -31,7 +31,6 @@ import static org.apache.skywalking.oap.server.core.analysis.manual.log.Abstract import static org.apache.skywalking.oap.server.core.analysis.manual.log.LogRecord.CONTENT; import static org.apache.skywalking.oap.server.core.analysis.manual.log.LogRecord.CONTENT_TYPE; import static org.apache.skywalking.oap.server.core.analysis.manual.log.LogRecord.ENDPOINT_ID; -import static org.apache.skywalking.oap.server.core.analysis.manual.log.LogRecord.ENDPOINT_NAME; import static org.apache.skywalking.oap.server.core.analysis.manual.log.LogRecord.SERVICE_ID; import static org.apache.skywalking.oap.server.core.analysis.manual.log.LogRecord.SERVICE_INSTANCE_ID; import static org.apache.skywalking.oap.server.core.analysis.manual.log.LogRecord.SPAN_ID; @@ -56,7 +55,6 @@ public class H2LogRecordBuilder extends AbstractSearchTagBuilder { record.setServiceId((String) dbMap.get(SERVICE_ID)); record.setServiceInstanceId((String) dbMap.get(SERVICE_INSTANCE_ID)); record.setEndpointId((String) dbMap.get(ENDPOINT_ID)); - record.setEndpointName((String) dbMap.get(ENDPOINT_NAME)); record.setTraceId((String) dbMap.get(TRACE_ID)); record.setTraceSegmentId((String) dbMap.get(TRACE_SEGMENT_ID)); record.setSpanId(((Number) dbMap.get(SPAN_ID)).intValue()); @@ -81,7 +79,6 @@ public class H2LogRecordBuilder extends AbstractSearchTagBuilder { map.put(SERVICE_ID, storageData.getServiceId()); map.put(SERVICE_INSTANCE_ID, storageData.getServiceInstanceId()); map.put(ENDPOINT_ID, storageData.getEndpointId()); - map.put(ENDPOINT_NAME, storageData.getEndpointName()); map.put(TRACE_ID, storageData.getTraceId()); map.put(TRACE_SEGMENT_ID, storageData.getTraceSegmentId()); map.put(SPAN_ID, storageData.getSpanId()); diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/postgresql/dao/PostgreSQLBrowserLogQueryDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/postgresql/dao/PostgreSQLBrowserLogQueryDAO.java index b7742a4627..36d1ec2000 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/postgresql/dao/PostgreSQLBrowserLogQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/postgresql/dao/PostgreSQLBrowserLogQueryDAO.java @@ -22,11 +22,11 @@ import org.apache.skywalking.oap.server.library.client.jdbc.hikaricp.JDBCHikariC import org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao.H2BrowserLogQueryDAO; public class PostgreSQLBrowserLogQueryDAO extends H2BrowserLogQueryDAO { - + public PostgreSQLBrowserLogQueryDAO(JDBCHikariCPClient h2Client) { super(h2Client); } - + @Override protected String buildCountStatement(String sql) { return "select count(*) total from (select 1 " + sql + " ) tempTable "; diff --git a/test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/SimpleQueryClient.java b/test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/SimpleQueryClient.java index 873e418c43..f38bd6f53f 100644 --- a/test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/SimpleQueryClient.java +++ b/test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/SimpleQueryClient.java @@ -410,7 +410,6 @@ public class SimpleQueryClient { .collect(Collectors.joining()) .replace("{serviceId}", query.serviceId()) .replace("{endpointId}", query.endpointId()) - .replace("{endpointName}", query.endpointName()) .replace("{start}", query.start()) .replace("{end}", query.end()) .replace("{step}", query.step()) diff --git a/test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/log/LogsQuery.java b/test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/log/LogsQuery.java index 5b2956abb7..f894456071 100644 --- a/test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/log/LogsQuery.java +++ b/test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/log/LogsQuery.java @@ -29,7 +29,6 @@ public class LogsQuery extends AbstractQuery { private String serviceId; private String endpointId = ""; - private String endpointName = ""; private String pageNum = "1"; private String pageSize = "15"; private String needTotal = "true"; @@ -55,15 +54,6 @@ public class LogsQuery extends AbstractQuery { return this; } - public String endpointName() { - return endpointName; - } - - public LogsQuery endpointName(String endpointName) { - this.endpointName = endpointName; - return this; - } - public String pageNum() { return pageNum; } diff --git a/test/e2e/e2e-data/src/main/resources/logs.gql b/test/e2e/e2e-data/src/main/resources/logs.gql index fdf8b3af3a..075f592153 100644 --- a/test/e2e/e2e-data/src/main/resources/logs.gql +++ b/test/e2e/e2e-data/src/main/resources/logs.gql @@ -37,7 +37,6 @@ "condition": { "serviceId": "{serviceId}", "endpointId": "{endpointId}", - "endpointName": "{endpointName}", "queryDuration": { "start": "{start}", "end": "{end}",