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

Update the timestamp field type for LogQuery (#6335)

This commit is contained in:
zhang-wei 2021-02-07 12:09:51 +08:00 committed by GitHub
parent 5e8f1eb552
commit ba6d49ad91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -17,6 +17,7 @@ Release Notes.
* Metrics combination API supports abandoning results.
* Add a new concept "Event" and its implementations to collect events.
* Add some defensive codes for NPE and bump up Kubernetes client version to expose exception stack trace.
* Update the `timestamp` field type for `LogQuery`.
#### UI
Update selector scroller to show in all pages.

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

@ -33,7 +33,7 @@ public class Log {
private String endpointId;
private String endpointName;
private String traceId;
private String timestamp;
private Long timestamp;
private ContentType contentType = ContentType.NONE;
private String content;
private final List<KeyValue> tags;

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

@ -1 +1 @@
Subproject commit e0d3698dcd776230646acaeb219841adea193acf
Subproject commit 42d6783d8c1a0d0d4c2b28e58dc1f47dd554964e

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

@ -150,7 +150,7 @@ public class LogQueryEsDAO extends EsDAO implements ILogQueryDAO {
log.setEndpointId((String) searchHit.getSourceAsMap().get(AbstractLogRecord.ENDPOINT_ID));
log.setEndpointName((String) searchHit.getSourceAsMap().get(AbstractLogRecord.ENDPOINT_NAME));
log.setTraceId((String) searchHit.getSourceAsMap().get(AbstractLogRecord.TRACE_ID));
log.setTimestamp(searchHit.getSourceAsMap().get(AbstractLogRecord.TIMESTAMP).toString());
log.setTimestamp(((Number) searchHit.getSourceAsMap().get(AbstractLogRecord.TIMESTAMP)).longValue());
log.setContentType(ContentType.instanceOf(
((Number) searchHit.getSourceAsMap().get(AbstractLogRecord.CONTENT_TYPE)).intValue()));
log.setContent((String) searchHit.getSourceAsMap().get(AbstractLogRecord.CONTENT));

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

@ -150,7 +150,7 @@ public class LogQueryEs7DAO extends EsDAO implements ILogQueryDAO {
log.setEndpointId((String) searchHit.getSourceAsMap().get(AbstractLogRecord.ENDPOINT_ID));
log.setEndpointName((String) searchHit.getSourceAsMap().get(AbstractLogRecord.ENDPOINT_NAME));
log.setTraceId((String) searchHit.getSourceAsMap().get(AbstractLogRecord.TRACE_ID));
log.setTimestamp(searchHit.getSourceAsMap().get(AbstractLogRecord.TIMESTAMP).toString());
log.setTimestamp(((Number) searchHit.getSourceAsMap().get(AbstractLogRecord.TIMESTAMP)).longValue());
log.setContentType(ContentType.instanceOf(
((Number) searchHit.getSourceAsMap().get(AbstractLogRecord.CONTENT_TYPE)).intValue()));
log.setContent((String) searchHit.getSourceAsMap().get(AbstractLogRecord.CONTENT));

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

@ -166,7 +166,7 @@ public class LogQuery implements ILogQueryDAO {
log.setEndpointId((String) data.get(ENDPOINT_ID));
log.setEndpointName((String) data.get(ENDPOINT_NAME));
log.setTraceId((String) data.get(TRACE_ID));
log.setTimestamp(data.get(TIMESTAMP).toString());
log.setTimestamp(((Number) data.get(TIMESTAMP)).longValue());
log.setContentType(
ContentType.instanceOf(((Number) data.get(AbstractLogRecord.CONTENT_TYPE)).intValue()));
log.setContent((String) data.get(AbstractLogRecord.CONTENT));

2
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

@ -186,7 +186,7 @@ public class H2LogQueryDAO implements ILogQueryDAO {
log.setEndpointId(resultSet.getString(ENDPOINT_ID));
log.setEndpointName(resultSet.getString(ENDPOINT_NAME));
log.setTraceId(resultSet.getString(TRACE_ID));
log.setTimestamp(resultSet.getString(TIMESTAMP));
log.setTimestamp(resultSet.getLong(TIMESTAMP));
log.setContentType(ContentType.instanceOf(resultSet.getInt(CONTENT_TYPE)));
log.setContent(resultSet.getString(CONTENT));
String dataBinaryBase64 = resultSet.getString(TAGS_RAW_DATA);

6
test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/browser/BrowserErrorLogMatcher.java
View File

@ -72,11 +72,11 @@ public class BrowserErrorLogMatcher extends AbstractMatcher<BrowserErrorLog> {
}
if (nonNull(getLine())) {
doVerify(getLine(), String.valueOf(log.getLine()));
doVerify(getLine(), log.getLine());
}
if (nonNull(getCol())) {
doVerify(getCol(), String.valueOf(log.getCol()));
doVerify(getCol(), log.getCol());
}
if (nonNull(getStack())) {
@ -88,7 +88,7 @@ public class BrowserErrorLogMatcher extends AbstractMatcher<BrowserErrorLog> {
}
if (nonNull(getFirstReportedError())) {
doVerify(getFirstReportedError(), String.valueOf(log.isFirstReportedError()));
doVerify(getFirstReportedError(), log.isFirstReportedError());
}
}
}

4
test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/dashboard/DashboardConfigurationMatcher.java
View File

@ -34,7 +34,7 @@ public class DashboardConfigurationMatcher extends AbstractMatcher<DashboardConf
doVerify(this.name, configuration.getName());
doVerify(this.type, String.valueOf(configuration.getType()));
doVerify(this.configuration, configuration.getConfiguration());
doVerify(this.activated, String.valueOf(configuration.isActivated()));
doVerify(this.disabled, String.valueOf(configuration.isDisabled()));
doVerify(this.activated, configuration.isActivated());
doVerify(this.disabled, configuration.isDisabled());
}
}

2
test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/log/Log.java
View File

@ -33,7 +33,7 @@ public class Log {
private String endpointName;
private String endpointId;
private String traceId;
private String timestamp;
private Long timestamp;
private String contentType;
private String content;
private List<KeyValue> tags;

2
test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/trace/TraceMatcher.java
View File

@ -93,7 +93,7 @@ public class TraceMatcher extends AbstractMatcher<Trace> {
private void verifyDuration(Trace trace) {
final String expected = this.getDuration();
final String actual = String.valueOf(trace.getDuration());
final int actual = trace.getDuration();
doVerify(expected, actual);
}

12
test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/verification/AbstractMatcher.java
View File

@ -33,6 +33,18 @@ public abstract class AbstractMatcher<T> {
public abstract void verify(T t);
protected void doVerify(String expected, int actual) {
this.doVerify(expected, String.valueOf(actual));
}
protected void doVerify(String expected, long actual) {
this.doVerify(expected, String.valueOf(actual));
}
protected void doVerify(String expected, boolean actual) {
this.doVerify(expected, String.valueOf(actual));
}
protected void doVerify(String expected, String actual) {
Matcher matcher = NN_MATCHER.matcher(expected);
if (matcher.find()) {

4
test/e2e/e2e-data/src/test/java/org/apache/skywalking/e2e/TestLogsMatcher.java
View File

@ -51,7 +51,7 @@ public class TestLogsMatcher {
.setEndpointName("/traffic")
.setEndpointId("ZTJl.1_L3RyYWZmaWM=")
.setTraceId("ac81b308-0d66-4c69-a7af-a023a536bd3e")
.setTimestamp("1609665785987")
.setTimestamp(1609665785987L)
.setContentType("TEXT")
.setContent("log")
.setTags(
@ -63,7 +63,7 @@ public class TestLogsMatcher {
.setEndpointName("/traffic")
.setEndpointId("ZTJl.1_L3RyYWZmaWM=")
.setTraceId("ac81b308-0d66-4c69-a7af-a023a536bd3e")
.setTimestamp("1609665785987")
.setTimestamp(1609665785987L)
.setContentType("TEXT")
.setContent("log")
.setTags(

2
test/e2e/e2e-data/src/test/resources/log.yml
View File

@ -21,7 +21,7 @@ logs:
endpointName: /traffic
endpointId: not null
traceId: "ac81b308-0d66-4c69-a7af-a023a536bd3e"
timestamp: not null
timestamp: gt 0
contentType: TEXT
content: log
tags:

2
test/e2e/e2e-test/src/test/resources/expected/log/logs.yml
View File

@ -19,7 +19,7 @@ logs:
serviceInstanceName: not null
serviceInstanceId: not null
traceId: not null
timestamp: not null
timestamp: gt 0
contentType: TEXT
content: not null
tags: