Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
killuaz丶x
SkyWalking
提交
ba6d49ad
S
SkyWalking
项目概览
killuaz丶x
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / SkyWalking
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
ba6d49ad
编写于
2月 07, 2021
作者:
Z
zhang-wei
提交者:
GitHub
2月 07, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update the timestamp field type for LogQuery (#6335)
上级
5e8f1eb5
变更
15
显示空白变更内容
内联
并排
Showing
15 changed file
with
30 addition
and
17 deletion
+30
-17
CHANGES.md
CHANGES.md
+1
-0
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/Log.java
...org/apache/skywalking/oap/server/core/query/type/Log.java
+1
-1
oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol
...in/query-graphql-plugin/src/main/resources/query-protocol
+1
-1
oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/LogQueryEsDAO.java
...ver/storage/plugin/elasticsearch/query/LogQueryEsDAO.java
+1
-1
oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/LogQueryEs7DAO.java
...r/storage/plugin/elasticsearch7/query/LogQueryEs7DAO.java
+1
-1
oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/LogQuery.java
...ng/oap/server/storage/plugin/influxdb/query/LogQuery.java
+1
-1
oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2LogQueryDAO.java
.../oap/server/storage/plugin/jdbc/h2/dao/H2LogQueryDAO.java
+1
-1
test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/browser/BrowserErrorLogMatcher.java
...apache/skywalking/e2e/browser/BrowserErrorLogMatcher.java
+3
-3
test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/dashboard/DashboardConfigurationMatcher.java
...ywalking/e2e/dashboard/DashboardConfigurationMatcher.java
+2
-2
test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/log/Log.java
...data/src/main/java/org/apache/skywalking/e2e/log/Log.java
+1
-1
test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/trace/TraceMatcher.java
...in/java/org/apache/skywalking/e2e/trace/TraceMatcher.java
+1
-1
test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/verification/AbstractMatcher.java
...g/apache/skywalking/e2e/verification/AbstractMatcher.java
+12
-0
test/e2e/e2e-data/src/test/java/org/apache/skywalking/e2e/TestLogsMatcher.java
.../test/java/org/apache/skywalking/e2e/TestLogsMatcher.java
+2
-2
test/e2e/e2e-data/src/test/resources/log.yml
test/e2e/e2e-data/src/test/resources/log.yml
+1
-1
test/e2e/e2e-test/src/test/resources/expected/log/logs.yml
test/e2e/e2e-test/src/test/resources/expected/log/logs.yml
+1
-1
未找到文件。
CHANGES.md
浏览文件 @
ba6d49ad
...
@@ -17,6 +17,7 @@ Release Notes.
...
@@ -17,6 +17,7 @@ Release Notes.
*
Metrics combination API supports abandoning results.
*
Metrics combination API supports abandoning results.
*
Add a new concept "Event" and its implementations to collect events.
*
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.
*
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
#### UI
Update selector scroller to show in all pages.
Update selector scroller to show in all pages.
...
...
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/Log.java
浏览文件 @
ba6d49ad
...
@@ -33,7 +33,7 @@ public class Log {
...
@@ -33,7 +33,7 @@ public class Log {
private
String
endpointId
;
private
String
endpointId
;
private
String
endpointName
;
private
String
endpointName
;
private
String
traceId
;
private
String
traceId
;
private
Stri
ng
timestamp
;
private
Lo
ng
timestamp
;
private
ContentType
contentType
=
ContentType
.
NONE
;
private
ContentType
contentType
=
ContentType
.
NONE
;
private
String
content
;
private
String
content
;
private
final
List
<
KeyValue
>
tags
;
private
final
List
<
KeyValue
>
tags
;
...
...
query-protocol
@
42d6783d
比较
e0d3698d
...
42d6783d
Subproject commit
e0d3698dcd776230646acaeb219841adea193acf
Subproject commit
42d6783d8c1a0d0d4c2b28e58dc1f47dd554964e
oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/LogQueryEsDAO.java
浏览文件 @
ba6d49ad
...
@@ -150,7 +150,7 @@ public class LogQueryEsDAO extends EsDAO implements ILogQueryDAO {
...
@@ -150,7 +150,7 @@ public class LogQueryEsDAO extends EsDAO implements ILogQueryDAO {
log
.
setEndpointId
((
String
)
searchHit
.
getSourceAsMap
().
get
(
AbstractLogRecord
.
ENDPOINT_ID
));
log
.
setEndpointId
((
String
)
searchHit
.
getSourceAsMap
().
get
(
AbstractLogRecord
.
ENDPOINT_ID
));
log
.
setEndpointName
((
String
)
searchHit
.
getSourceAsMap
().
get
(
AbstractLogRecord
.
ENDPOINT_NAME
));
log
.
setEndpointName
((
String
)
searchHit
.
getSourceAsMap
().
get
(
AbstractLogRecord
.
ENDPOINT_NAME
));
log
.
setTraceId
((
String
)
searchHit
.
getSourceAsMap
().
get
(
AbstractLogRecord
.
TRACE_ID
));
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
(
log
.
setContentType
(
ContentType
.
instanceOf
(
((
Number
)
searchHit
.
getSourceAsMap
().
get
(
AbstractLogRecord
.
CONTENT_TYPE
)).
intValue
()));
((
Number
)
searchHit
.
getSourceAsMap
().
get
(
AbstractLogRecord
.
CONTENT_TYPE
)).
intValue
()));
log
.
setContent
((
String
)
searchHit
.
getSourceAsMap
().
get
(
AbstractLogRecord
.
CONTENT
));
log
.
setContent
((
String
)
searchHit
.
getSourceAsMap
().
get
(
AbstractLogRecord
.
CONTENT
));
...
...
oap-server/server-storage-plugin/storage-elasticsearch7-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch7/query/LogQueryEs7DAO.java
浏览文件 @
ba6d49ad
...
@@ -150,7 +150,7 @@ public class LogQueryEs7DAO extends EsDAO implements ILogQueryDAO {
...
@@ -150,7 +150,7 @@ public class LogQueryEs7DAO extends EsDAO implements ILogQueryDAO {
log
.
setEndpointId
((
String
)
searchHit
.
getSourceAsMap
().
get
(
AbstractLogRecord
.
ENDPOINT_ID
));
log
.
setEndpointId
((
String
)
searchHit
.
getSourceAsMap
().
get
(
AbstractLogRecord
.
ENDPOINT_ID
));
log
.
setEndpointName
((
String
)
searchHit
.
getSourceAsMap
().
get
(
AbstractLogRecord
.
ENDPOINT_NAME
));
log
.
setEndpointName
((
String
)
searchHit
.
getSourceAsMap
().
get
(
AbstractLogRecord
.
ENDPOINT_NAME
));
log
.
setTraceId
((
String
)
searchHit
.
getSourceAsMap
().
get
(
AbstractLogRecord
.
TRACE_ID
));
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
(
log
.
setContentType
(
ContentType
.
instanceOf
(
((
Number
)
searchHit
.
getSourceAsMap
().
get
(
AbstractLogRecord
.
CONTENT_TYPE
)).
intValue
()));
((
Number
)
searchHit
.
getSourceAsMap
().
get
(
AbstractLogRecord
.
CONTENT_TYPE
)).
intValue
()));
log
.
setContent
((
String
)
searchHit
.
getSourceAsMap
().
get
(
AbstractLogRecord
.
CONTENT
));
log
.
setContent
((
String
)
searchHit
.
getSourceAsMap
().
get
(
AbstractLogRecord
.
CONTENT
));
...
...
oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/LogQuery.java
浏览文件 @
ba6d49ad
...
@@ -166,7 +166,7 @@ public class LogQuery implements ILogQueryDAO {
...
@@ -166,7 +166,7 @@ public class LogQuery implements ILogQueryDAO {
log
.
setEndpointId
((
String
)
data
.
get
(
ENDPOINT_ID
));
log
.
setEndpointId
((
String
)
data
.
get
(
ENDPOINT_ID
));
log
.
setEndpointName
((
String
)
data
.
get
(
ENDPOINT_NAME
));
log
.
setEndpointName
((
String
)
data
.
get
(
ENDPOINT_NAME
));
log
.
setTraceId
((
String
)
data
.
get
(
TRACE_ID
));
log
.
setTraceId
((
String
)
data
.
get
(
TRACE_ID
));
log
.
setTimestamp
(
data
.
get
(
TIMESTAMP
).
toString
());
log
.
setTimestamp
(
((
Number
)
data
.
get
(
TIMESTAMP
)).
longValue
());
log
.
setContentType
(
log
.
setContentType
(
ContentType
.
instanceOf
(((
Number
)
data
.
get
(
AbstractLogRecord
.
CONTENT_TYPE
)).
intValue
()));
ContentType
.
instanceOf
(((
Number
)
data
.
get
(
AbstractLogRecord
.
CONTENT_TYPE
)).
intValue
()));
log
.
setContent
((
String
)
data
.
get
(
AbstractLogRecord
.
CONTENT
));
log
.
setContent
((
String
)
data
.
get
(
AbstractLogRecord
.
CONTENT
));
...
...
oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2LogQueryDAO.java
浏览文件 @
ba6d49ad
...
@@ -186,7 +186,7 @@ public class H2LogQueryDAO implements ILogQueryDAO {
...
@@ -186,7 +186,7 @@ public class H2LogQueryDAO implements ILogQueryDAO {
log
.
setEndpointId
(
resultSet
.
getString
(
ENDPOINT_ID
));
log
.
setEndpointId
(
resultSet
.
getString
(
ENDPOINT_ID
));
log
.
setEndpointName
(
resultSet
.
getString
(
ENDPOINT_NAME
));
log
.
setEndpointName
(
resultSet
.
getString
(
ENDPOINT_NAME
));
log
.
setTraceId
(
resultSet
.
getString
(
TRACE_ID
));
log
.
setTraceId
(
resultSet
.
getString
(
TRACE_ID
));
log
.
setTimestamp
(
resultSet
.
get
Stri
ng
(
TIMESTAMP
));
log
.
setTimestamp
(
resultSet
.
get
Lo
ng
(
TIMESTAMP
));
log
.
setContentType
(
ContentType
.
instanceOf
(
resultSet
.
getInt
(
CONTENT_TYPE
)));
log
.
setContentType
(
ContentType
.
instanceOf
(
resultSet
.
getInt
(
CONTENT_TYPE
)));
log
.
setContent
(
resultSet
.
getString
(
CONTENT
));
log
.
setContent
(
resultSet
.
getString
(
CONTENT
));
String
dataBinaryBase64
=
resultSet
.
getString
(
TAGS_RAW_DATA
);
String
dataBinaryBase64
=
resultSet
.
getString
(
TAGS_RAW_DATA
);
...
...
test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/browser/BrowserErrorLogMatcher.java
浏览文件 @
ba6d49ad
...
@@ -72,11 +72,11 @@ public class BrowserErrorLogMatcher extends AbstractMatcher<BrowserErrorLog> {
...
@@ -72,11 +72,11 @@ public class BrowserErrorLogMatcher extends AbstractMatcher<BrowserErrorLog> {
}
}
if
(
nonNull
(
getLine
()))
{
if
(
nonNull
(
getLine
()))
{
doVerify
(
getLine
(),
String
.
valueOf
(
log
.
getLine
()
));
doVerify
(
getLine
(),
log
.
getLine
(
));
}
}
if
(
nonNull
(
getCol
()))
{
if
(
nonNull
(
getCol
()))
{
doVerify
(
getCol
(),
String
.
valueOf
(
log
.
getCol
()
));
doVerify
(
getCol
(),
log
.
getCol
(
));
}
}
if
(
nonNull
(
getStack
()))
{
if
(
nonNull
(
getStack
()))
{
...
@@ -88,7 +88,7 @@ public class BrowserErrorLogMatcher extends AbstractMatcher<BrowserErrorLog> {
...
@@ -88,7 +88,7 @@ public class BrowserErrorLogMatcher extends AbstractMatcher<BrowserErrorLog> {
}
}
if
(
nonNull
(
getFirstReportedError
()))
{
if
(
nonNull
(
getFirstReportedError
()))
{
doVerify
(
getFirstReportedError
(),
String
.
valueOf
(
log
.
isFirstReportedError
()
));
doVerify
(
getFirstReportedError
(),
log
.
isFirstReportedError
(
));
}
}
}
}
}
}
test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/dashboard/DashboardConfigurationMatcher.java
浏览文件 @
ba6d49ad
...
@@ -34,7 +34,7 @@ public class DashboardConfigurationMatcher extends AbstractMatcher<DashboardConf
...
@@ -34,7 +34,7 @@ public class DashboardConfigurationMatcher extends AbstractMatcher<DashboardConf
doVerify
(
this
.
name
,
configuration
.
getName
());
doVerify
(
this
.
name
,
configuration
.
getName
());
doVerify
(
this
.
type
,
String
.
valueOf
(
configuration
.
getType
()));
doVerify
(
this
.
type
,
String
.
valueOf
(
configuration
.
getType
()));
doVerify
(
this
.
configuration
,
configuration
.
getConfiguration
());
doVerify
(
this
.
configuration
,
configuration
.
getConfiguration
());
doVerify
(
this
.
activated
,
String
.
valueOf
(
configuration
.
isActivated
()
));
doVerify
(
this
.
activated
,
configuration
.
isActivated
(
));
doVerify
(
this
.
disabled
,
String
.
valueOf
(
configuration
.
isDisabled
()
));
doVerify
(
this
.
disabled
,
configuration
.
isDisabled
(
));
}
}
}
}
test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/log/Log.java
浏览文件 @
ba6d49ad
...
@@ -33,7 +33,7 @@ public class Log {
...
@@ -33,7 +33,7 @@ public class Log {
private
String
endpointName
;
private
String
endpointName
;
private
String
endpointId
;
private
String
endpointId
;
private
String
traceId
;
private
String
traceId
;
private
Stri
ng
timestamp
;
private
Lo
ng
timestamp
;
private
String
contentType
;
private
String
contentType
;
private
String
content
;
private
String
content
;
private
List
<
KeyValue
>
tags
;
private
List
<
KeyValue
>
tags
;
...
...
test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/trace/TraceMatcher.java
浏览文件 @
ba6d49ad
...
@@ -93,7 +93,7 @@ public class TraceMatcher extends AbstractMatcher<Trace> {
...
@@ -93,7 +93,7 @@ public class TraceMatcher extends AbstractMatcher<Trace> {
private
void
verifyDuration
(
Trace
trace
)
{
private
void
verifyDuration
(
Trace
trace
)
{
final
String
expected
=
this
.
getDuration
();
final
String
expected
=
this
.
getDuration
();
final
String
actual
=
String
.
valueOf
(
trace
.
getDuration
()
);
final
int
actual
=
trace
.
getDuration
(
);
doVerify
(
expected
,
actual
);
doVerify
(
expected
,
actual
);
}
}
...
...
test/e2e/e2e-data/src/main/java/org/apache/skywalking/e2e/verification/AbstractMatcher.java
浏览文件 @
ba6d49ad
...
@@ -33,6 +33,18 @@ public abstract class AbstractMatcher<T> {
...
@@ -33,6 +33,18 @@ public abstract class AbstractMatcher<T> {
public
abstract
void
verify
(
T
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
)
{
protected
void
doVerify
(
String
expected
,
String
actual
)
{
Matcher
matcher
=
NN_MATCHER
.
matcher
(
expected
);
Matcher
matcher
=
NN_MATCHER
.
matcher
(
expected
);
if
(
matcher
.
find
())
{
if
(
matcher
.
find
())
{
...
...
test/e2e/e2e-data/src/test/java/org/apache/skywalking/e2e/TestLogsMatcher.java
浏览文件 @
ba6d49ad
...
@@ -51,7 +51,7 @@ public class TestLogsMatcher {
...
@@ -51,7 +51,7 @@ public class TestLogsMatcher {
.
setEndpointName
(
"/traffic"
)
.
setEndpointName
(
"/traffic"
)
.
setEndpointId
(
"ZTJl.1_L3RyYWZmaWM="
)
.
setEndpointId
(
"ZTJl.1_L3RyYWZmaWM="
)
.
setTraceId
(
"ac81b308-0d66-4c69-a7af-a023a536bd3e"
)
.
setTraceId
(
"ac81b308-0d66-4c69-a7af-a023a536bd3e"
)
.
setTimestamp
(
"1609665785987"
)
.
setTimestamp
(
1609665785987L
)
.
setContentType
(
"TEXT"
)
.
setContentType
(
"TEXT"
)
.
setContent
(
"log"
)
.
setContent
(
"log"
)
.
setTags
(
.
setTags
(
...
@@ -63,7 +63,7 @@ public class TestLogsMatcher {
...
@@ -63,7 +63,7 @@ public class TestLogsMatcher {
.
setEndpointName
(
"/traffic"
)
.
setEndpointName
(
"/traffic"
)
.
setEndpointId
(
"ZTJl.1_L3RyYWZmaWM="
)
.
setEndpointId
(
"ZTJl.1_L3RyYWZmaWM="
)
.
setTraceId
(
"ac81b308-0d66-4c69-a7af-a023a536bd3e"
)
.
setTraceId
(
"ac81b308-0d66-4c69-a7af-a023a536bd3e"
)
.
setTimestamp
(
"1609665785987"
)
.
setTimestamp
(
1609665785987L
)
.
setContentType
(
"TEXT"
)
.
setContentType
(
"TEXT"
)
.
setContent
(
"log"
)
.
setContent
(
"log"
)
.
setTags
(
.
setTags
(
...
...
test/e2e/e2e-data/src/test/resources/log.yml
浏览文件 @
ba6d49ad
...
@@ -21,7 +21,7 @@ logs:
...
@@ -21,7 +21,7 @@ logs:
endpointName
:
/traffic
endpointName
:
/traffic
endpointId
:
not
null
endpointId
:
not
null
traceId
:
"
ac81b308-0d66-4c69-a7af-a023a536bd3e"
traceId
:
"
ac81b308-0d66-4c69-a7af-a023a536bd3e"
timestamp
:
not
null
timestamp
:
gt
0
contentType
:
TEXT
contentType
:
TEXT
content
:
log
content
:
log
tags
:
tags
:
...
...
test/e2e/e2e-test/src/test/resources/expected/log/logs.yml
浏览文件 @
ba6d49ad
...
@@ -19,7 +19,7 @@ logs:
...
@@ -19,7 +19,7 @@ logs:
serviceInstanceName
:
not
null
serviceInstanceName
:
not
null
serviceInstanceId
:
not
null
serviceInstanceId
:
not
null
traceId
:
not
null
traceId
:
not
null
timestamp
:
not
null
timestamp
:
gt
0
contentType
:
TEXT
contentType
:
TEXT
content
:
not
null
content
:
not
null
tags
:
tags
:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录