kazusa
/
skywalking
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[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.
This commit is contained in:
吴晟 Wu Sheng 2021-08-12 09:44:19 +08:00 committed by GitHub
parent 375138887a
commit 6a241aed75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
31 changed files with 33 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.md
View File

@ -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

1
oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/listener/RecordAnalysisListener.java
View File

@ -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();

11
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/log/AbstractLogRecord.java
View File

@ -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());

1
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/log/LogRecordDispatcher.java
View File

@ -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());

14
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/manual/errorlog/BrowserErrorLogRecord.java
View File

@ -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());

1
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/manual/errorlog/BrowserErrorLogRecordDispatcher.java
View File

@ -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());

3
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/source/BrowserErrorLog.java
View File

@ -53,9 +53,6 @@ public class BrowserErrorLog extends Source {
private String pagePathId;
@Getter
@Setter
private String pagePath;
@Getter
@Setter
private long timestamp;
@Getter
@Setter

3
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/BrowserLogQueryService.java
View File

@ -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()
);

2
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/LogQueryService.java
View File

@ -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(),

1
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/BrowserErrorLogQueryCondition.java
View File

@ -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;

1
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/LogQueryCondition.java
View File

@ -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;

1
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/AbstractLog.java
View File

@ -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;

1
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IBrowserLogQueryDAO.java
View File

@ -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,

1
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/ILogQueryDAO.java
View File

@ -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,

3
oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/BrowserLogQuery.java
View File

@ -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()
);
}
}

1
oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogQuery.java
View File

@ -66,7 +66,6 @@ public class LogQuery implements GraphQLQueryResolver {
condition.getServiceId(),
condition.getServiceInstanceId(),
condition.getEndpointId(),
condition.getEndpointName(),
condition.getRelatedTrace(),
condition.getPaging(),
queryOrder,

2
oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol

@ -1 +1 @@
Subproject commit 17e1aea1ea1818de4b96e06a6dc41e9a78eb7105
Subproject commit e9ecb5153fbab9ab21d805c898d05fbe45e7c4d6

1
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
View File

@ -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

13
oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/BrowserLogQueryEsDAO.java
View File

@ -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;
@ -46,7 +44,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 +58,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));
}
@ -83,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);

10
oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/LogQueryEsDAO.java
View File

@ -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,9 @@ 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));
if (log.getEndpointId() != null) {
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(

13
oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/BrowserLogQueryEs7DAO.java
View File

@ -17,7 +17,6 @@
package org.apache.skywalking.oap.server.storage.plugin.elasticsearch7.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;
@ -26,7 +25,6 @@ import org.apache.skywalking.oap.server.core.query.type.BrowserErrorLog;
import org.apache.skywalking.oap.server.core.query.type.BrowserErrorLogs;
import org.apache.skywalking.oap.server.library.client.elasticsearch.ElasticSearchClient;
import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base.IndexController;
import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base.MatchCNameBuilder;
import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.query.BrowserLogQueryEsDAO;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.index.query.BoolQueryBuilder;
@ -45,7 +43,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 +57,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));
}
@ -82,7 +74,10 @@ public class BrowserLogQueryEs7DAO extends BrowserLogQueryEsDAO {
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().getTotalHits().value);

10
oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/LogQueryEs7DAO.java
View File

@ -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,9 @@ 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));
if (log.getEndpointId() != null) {
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(

6
oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/BrowserLogQuery.java
View File

@ -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;
@ -50,7 +49,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 +78,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)

10
oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/LogQuery.java
View File

@ -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(

6
oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2BrowserLogQueryDAO.java
View File

@ -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()) {

11
oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2LogQueryDAO.java
View File

@ -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)));

3
oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2LogRecordBuilder.java
View File

@ -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> {
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<Record> {
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());

4
oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/postgresql/dao/PostgreSQLBrowserLogQueryDAO.java
View File

@ -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 ";

1
test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/SimpleQueryClient.java
View File

@ -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())

10
test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/log/LogsQuery.java
View File

@ -29,7 +29,6 @@ public class LogsQuery extends AbstractQuery<LogsQuery> {
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<LogsQuery> {
return this;
}
public String endpointName() {
return endpointName;
}
public LogsQuery endpointName(String endpointName) {
this.endpointName = endpointName;
return this;
}
public String pageNum() {
return pageNum;
}

1
test/e2e/e2e-data/src/main/resources/logs.gql
View File

@ -37,7 +37,6 @@
"condition": {
"serviceId": "{serviceId}",
"endpointId": "{endpointId}",
"endpointName": "{endpointName}",
"queryDuration": {
"start": "{start}",
"end": "{end}",