You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2021/08/11 13:59:20 UTC
[skywalking] branch log-endpoint-query updated: Remove endpoint
name in the backend log query condition.
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
The following commit(s) were added to refs/heads/log-endpoint-query by this push:
new 236bdc4 Remove endpoint name in the backend log query condition.
236bdc4 is described below
commit 236bdc4a4a9b1fb80387b6922e6f2d2f75030a97
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Wed Aug 11 21:59:07 2021 +0800
Remove endpoint name in the backend log query condition.
---
.../analyzer/provider/log/listener/RecordAnalysisListener.java | 1 -
.../oap/server/core/analysis/manual/log/AbstractLogRecord.java | 10 ----------
.../server/core/analysis/manual/log/LogRecordDispatcher.java | 1 -
.../skywalking/oap/server/core/query/LogQueryService.java | 2 --
.../oap/server/core/query/input/LogQueryCondition.java | 1 -
.../apache/skywalking/oap/server/core/source/AbstractLog.java | 1 -
.../skywalking/oap/server/core/storage/query/ILogQueryDAO.java | 1 -
.../apache/skywalking/oap/query/graphql/resolver/LogQuery.java | 1 -
.../plugin/elasticsearch/query/BrowserLogQueryEsDAO.java | 7 ++++---
.../storage/plugin/elasticsearch/query/LogQueryEsDAO.java | 8 ++------
.../storage/plugin/elasticsearch7/query/LogQueryEs7DAO.java | 8 ++------
.../server/storage/plugin/influxdb/query/BrowserLogQuery.java | 1 -
.../oap/server/storage/plugin/influxdb/query/LogQuery.java | 8 ++------
.../oap/server/storage/plugin/jdbc/h2/dao/H2LogQueryDAO.java | 9 ++-------
.../jdbc/postgresql/dao/PostgreSQLBrowserLogQueryDAO.java | 4 ++--
15 files changed, 14 insertions(+), 49 deletions(-)
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 a312cec..21d2d56 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 66557d7..670127f 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,8 +33,6 @@ 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";
@@ -64,10 +62,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 +116,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 +135,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 be03ecd..c18826f 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<Log> {
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/query/LogQueryService.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/LogQueryService.java
index 344e432..5fbf0ed 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/LogQueryService.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/LogQueryService.java
@@ -58,7 +58,6 @@ public class LogQueryService implements Service {
public Logs queryLogs(String serviceId,
String serviceInstanceId,
String endpointId,
- String endpointName,
TraceScopeCondition relatedTrace,
Pagination paging,
Order queryOrder,
@@ -83,7 +82,6 @@ public class LogQueryService implements Service {
Logs logs = getLogQueryDAO().queryLogs(serviceId,
serviceInstanceId,
endpointId,
- endpointName,
relatedTrace,
queryOrder,
page.getFrom(), page.getLimit(),
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/LogQueryCondition.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/LogQueryCondition.java
index baa189c..8b5f31c 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/LogQueryCondition.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/LogQueryCondition.java
@@ -31,7 +31,6 @@ public class LogQueryCondition {
private String serviceId;
private String serviceInstanceId;
private String endpointId;
- private String endpointName;
private TraceScopeCondition relatedTrace;
private Duration queryDuration;
private Pagination paging;
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/AbstractLog.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/AbstractLog.java
index 332e94a..63a36d1 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/AbstractLog.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/AbstractLog.java
@@ -33,7 +33,6 @@ public abstract class AbstractLog extends Source {
private String serviceId;
private String serviceInstanceId;
private String endpointId;
- private String endpointName;
private String traceId;
private String traceSegmentId;
private int spanId;
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/ILogQueryDAO.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/ILogQueryDAO.java
index 802363f..f7c7b94 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/ILogQueryDAO.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/ILogQueryDAO.java
@@ -39,7 +39,6 @@ public interface ILogQueryDAO extends Service {
Logs queryLogs(String serviceId,
String serviceInstanceId,
String endpointId,
- String endpointName,
TraceScopeCondition relatedTrace,
Order queryOrder,
int from,
diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogQuery.java
index 8610ef7..8ec49f0 100644
--- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogQuery.java
+++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogQuery.java
@@ -66,7 +66,6 @@ public class LogQuery implements GraphQLQueryResolver {
condition.getServiceId(),
condition.getServiceInstanceId(),
condition.getEndpointId(),
- condition.getEndpointName(),
condition.getRelatedTrace(),
condition.getPaging(),
queryOrder,
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 120c33e..f17824e 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
@@ -17,7 +17,6 @@
package org.apache.skywalking.oap.server.storage.plugin.elasticsearch.query;
-import com.google.common.base.Strings;
import java.io.IOException;
import org.apache.skywalking.apm.util.StringUtil;
import org.apache.skywalking.oap.server.core.browser.manual.errorlog.BrowserErrorLogRecord;
@@ -28,7 +27,6 @@ import org.apache.skywalking.oap.server.core.storage.query.IBrowserLogQueryDAO;
import org.apache.skywalking.oap.server.library.client.elasticsearch.ElasticSearchClient;
import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base.EsDAO;
import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base.IndexController;
-import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base.MatchCNameBuilder;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.index.query.BoolQueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
@@ -77,7 +75,10 @@ public class BrowserLogQueryEsDAO extends EsDAO implements IBrowserLogQueryDAO {
sourceBuilder.size(limit);
sourceBuilder.from(from);
SearchResponse response = getClient()
- .search(IndexController.LogicIndicesRegister.getPhysicalTableName(BrowserErrorLogRecord.INDEX_NAME), sourceBuilder);
+ .search(
+ IndexController.LogicIndicesRegister.getPhysicalTableName(BrowserErrorLogRecord.INDEX_NAME),
+ sourceBuilder
+ );
BrowserErrorLogs logs = new BrowserErrorLogs();
logs.setTotal((int) response.getHits().totalHits);
diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/LogQueryEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/LogQueryEsDAO.java
index cd0194d..fca69bb 100644
--- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/LogQueryEsDAO.java
+++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/LogQueryEsDAO.java
@@ -20,6 +20,7 @@ package org.apache.skywalking.oap.server.storage.plugin.elasticsearch.query;
import java.io.IOException;
import java.util.List;
+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;
@@ -61,7 +62,6 @@ public class LogQueryEsDAO extends EsDAO 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,
@@ -89,10 +89,6 @@ public class LogQueryEsDAO extends EsDAO implements ILogQueryDAO {
if (isNotEmpty(endpointId)) {
mustQueryList.add(QueryBuilders.termQuery(AbstractLogRecord.ENDPOINT_ID, endpointId));
}
- if (isNotEmpty(endpointName)) {
- String matchCName = MatchCNameBuilder.INSTANCE.build(AbstractLogRecord.ENDPOINT_NAME);
- mustQueryList.add(QueryBuilders.matchPhraseQuery(matchCName, endpointName));
- }
if (nonNull(relatedTrace)) {
if (isNotEmpty(relatedTrace.getTraceId())) {
mustQueryList.add(QueryBuilders.termQuery(AbstractLogRecord.TRACE_ID, relatedTrace.getTraceId()));
@@ -150,7 +146,7 @@ public class LogQueryEsDAO extends EsDAO implements ILogQueryDAO {
log.setServiceInstanceId((String) searchHit.getSourceAsMap()
.get(AbstractLogRecord.SERVICE_INSTANCE_ID));
log.setEndpointId((String) searchHit.getSourceAsMap().get(AbstractLogRecord.ENDPOINT_ID));
- log.setEndpointName((String) searchHit.getSourceAsMap().get(AbstractLogRecord.ENDPOINT_NAME));
+ log.setEndpointName(IDManager.EndpointID.analysisId(log.getEndpointId()).getEndpointName());
log.setTraceId((String) searchHit.getSourceAsMap().get(AbstractLogRecord.TRACE_ID));
log.setTimestamp(((Number) searchHit.getSourceAsMap().get(AbstractLogRecord.TIMESTAMP)).longValue());
log.setContentType(ContentType.instanceOf(
diff --git a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/LogQueryEs7DAO.java b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/LogQueryEs7DAO.java
index 370a84a..252c66f 100644
--- a/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/LogQueryEs7DAO.java
+++ b/oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/LogQueryEs7DAO.java
@@ -20,6 +20,7 @@ package org.apache.skywalking.oap.server.storage.plugin.elasticsearch7.query;
import java.io.IOException;
import java.util.List;
+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;
@@ -61,7 +62,6 @@ public class LogQueryEs7DAO extends EsDAO 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,
@@ -89,10 +89,6 @@ public class LogQueryEs7DAO extends EsDAO implements ILogQueryDAO {
if (isNotEmpty(endpointId)) {
mustQueryList.add(QueryBuilders.termQuery(AbstractLogRecord.ENDPOINT_ID, endpointId));
}
- if (isNotEmpty(endpointName)) {
- String matchCName = MatchCNameBuilder.INSTANCE.build(AbstractLogRecord.ENDPOINT_NAME);
- mustQueryList.add(QueryBuilders.matchPhraseQuery(matchCName, endpointName));
- }
if (nonNull(relatedTrace)) {
if (isNotEmpty(relatedTrace.getTraceId())) {
mustQueryList.add(QueryBuilders.termQuery(AbstractLogRecord.TRACE_ID, relatedTrace.getTraceId()));
@@ -150,7 +146,7 @@ public class LogQueryEs7DAO extends EsDAO implements ILogQueryDAO {
log.setServiceInstanceId((String) searchHit.getSourceAsMap()
.get(AbstractLogRecord.SERVICE_INSTANCE_ID));
log.setEndpointId((String) searchHit.getSourceAsMap().get(AbstractLogRecord.ENDPOINT_ID));
- log.setEndpointName((String) searchHit.getSourceAsMap().get(AbstractLogRecord.ENDPOINT_NAME));
+ log.setEndpointName(IDManager.EndpointID.analysisId(log.getEndpointId()).getEndpointName());
log.setTraceId((String) searchHit.getSourceAsMap().get(AbstractLogRecord.TRACE_ID));
log.setTimestamp(((Number) searchHit.getSourceAsMap().get(AbstractLogRecord.TIMESTAMP)).longValue());
log.setContentType(ContentType.instanceOf(
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 85d4ede..fb68e20 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
@@ -35,7 +35,6 @@ import org.influxdb.querybuilder.SelectQueryImpl;
import org.influxdb.querybuilder.WhereQueryImpl;
import static java.util.Objects.nonNull;
-import static org.influxdb.querybuilder.BuiltQuery.QueryBuilder.contains;
import static org.influxdb.querybuilder.BuiltQuery.QueryBuilder.eq;
import static org.influxdb.querybuilder.BuiltQuery.QueryBuilder.gte;
import static org.influxdb.querybuilder.BuiltQuery.QueryBuilder.lte;
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 d58baed..2d66831 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,7 @@ 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));
+ 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/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 da47d8a..c31a36d 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,7 @@ 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));
+ 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/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 b7742a4..36d1ec2 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 ";