Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
6efa15c2
S
SkyWalking
项目概览
apache
/
SkyWalking
上一次同步 1 年多
通知
302
Star
21345
Fork
6091
代码
文件
提交
分支
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
6efa15c2
编写于
11月 19, 2022
作者:
Y
yswdqz
提交者:
GitHub
11月 19, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Modify the format of timebucket in ExtractorSpec (#9988)
上级
281be8e3
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
12 addition
and
12 deletion
+12
-12
oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/extractor/ExtractorSpec.java
...ng/oap/log/analyzer/dsl/spec/extractor/ExtractorSpec.java
+10
-10
test/e2e-v2/cases/mysql/mysql-slowsql/fluent-bit-script.lua
test/e2e-v2/cases/mysql/mysql-slowsql/fluent-bit-script.lua
+1
-1
test/e2e-v2/cases/postgresql/postgres-exporter/fluent-bit-script.lua
.../cases/postgresql/postgres-exporter/fluent-bit-script.lua
+1
-1
未找到文件。
oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/extractor/ExtractorSpec.java
浏览文件 @
6efa15c2
...
...
@@ -23,10 +23,6 @@ import com.google.common.collect.ImmutableMap;
import
groovy.lang.Closure
;
import
groovy.lang.DelegatesTo
;
import
java.time.Instant
;
import
java.time.LocalDateTime
;
import
java.time.ZoneId
;
import
java.time.format.DateTimeFormatter
;
import
java.util.Collection
;
import
java.util.Map
;
import
java.util.Objects
;
...
...
@@ -50,13 +46,17 @@ import org.apache.skywalking.oap.meter.analyzer.dsl.SampleFamilyBuilder;
import
org.apache.skywalking.oap.server.analyzer.provider.trace.parser.listener.DatabaseSlowStatementBuilder
;
import
org.apache.skywalking.oap.server.analyzer.provider.trace.parser.listener.SampledTraceBuilder
;
import
org.apache.skywalking.oap.server.core.CoreModule
;
import
org.apache.skywalking.oap.server.core.analysis.DownSampling
;
import
org.apache.skywalking.oap.server.core.analysis.Layer
;
import
org.apache.skywalking.oap.server.core.analysis.TimeBucket
;
import
org.apache.skywalking.oap.server.core.analysis.meter.MeterSystem
;
import
org.apache.skywalking.oap.server.core.analysis.record.Record
;
import
org.apache.skywalking.oap.server.core.analysis.worker.RecordStreamProcessor
;
import
org.apache.skywalking.oap.server.core.config.NamingControl
;
import
org.apache.skywalking.oap.server.core.source.DatabaseSlowStatement
;
import
org.apache.skywalking.oap.server.core.source.ISource
;
import
org.apache.skywalking.oap.server.core.source.ServiceMeta
;
import
org.apache.skywalking.oap.server.core.source.SourceReceiver
;
import
org.apache.skywalking.oap.server.library.module.ModuleManager
;
...
...
@@ -80,8 +80,6 @@ public class ExtractorSpec extends AbstractSpec {
private
final
SourceReceiver
sourceReceiver
;
private
static
final
DateTimeFormatter
DTF
=
DateTimeFormatter
.
ofPattern
(
"yyyyMMddHHmmss"
);
public
ExtractorSpec
(
final
ModuleManager
moduleManager
,
final
LogAnalyzerModuleConfig
moduleConfig
)
throws
ModuleStartException
{
super
(
moduleManager
,
moduleConfig
);
...
...
@@ -269,13 +267,12 @@ public class ExtractorSpec extends AbstractSpec {
DatabaseSlowStatementBuilder
builder
=
new
DatabaseSlowStatementBuilder
(
namingControl
);
builder
.
setLayer
(
Layer
.
nameOf
(
log
.
getLayer
()));
LocalDateTime
localDateTime
=
Instant
.
ofEpochSecond
(
log
.
getTimestamp
()).
atZone
(
ZoneId
.
systemDefault
()).
toLocalDateTime
();
String
timeBucket
=
DTF
.
format
(
localDateTime
);
builder
.
setTimeBucket
(
Long
.
parseLong
(
timeBucket
));
long
timeBucket
=
TimeBucket
.
getTimeBucket
(
log
.
getTimestamp
(),
DownSampling
.
Minute
);
builder
.
setServiceName
(
log
.
getService
());
ServiceMeta
serviceMeta
=
new
ServiceMeta
();
serviceMeta
.
setName
(
namingControl
.
formatServiceName
(
log
.
getService
()));
String
serviceName
=
namingControl
.
formatServiceName
(
log
.
getService
());
serviceMeta
.
setName
(
serviceName
);
serviceMeta
.
setLayer
(
builder
.
getLayer
());
serviceMeta
.
setTimeBucket
(
builder
.
getTimeBucket
());
BINDING
.
get
().
databaseSlowStatement
(
builder
);
...
...
@@ -290,6 +287,9 @@ public class ExtractorSpec extends AbstractSpec {
return
;
}
long
timeBucketForDB
=
TimeBucket
.
getTimeBucket
(
log
.
getTimestamp
(),
DownSampling
.
Second
);
builder
.
setTimeBucket
(
timeBucketForDB
);
String
entityId
=
serviceMeta
.
getEntityId
();
builder
.
prepare
();
DatabaseSlowStatement
databaseSlowStatement
=
builder
.
toDatabaseSlowStatement
();
...
...
test/e2e-v2/cases/mysql/mysql-slowsql/fluent-bit-script.lua
浏览文件 @
6efa15c2
...
...
@@ -34,7 +34,7 @@ function rewrite_body(tag, timestamp, record)
h1
=
string.sub
(
time
,
9
,
10
)
min1
=
string.sub
(
time
,
11
,
12
)
s1
=
string.sub
(
time
,
13
,
14
)
re1
[
"time"
]
=
os.time
()
re1
[
"time"
]
=
os.time
()
*
1000
re1
[
"layer"
]
=
"MYSQL"
record
[
"layer"
]
=
"MYSQL"
...
...
test/e2e-v2/cases/postgresql/postgres-exporter/fluent-bit-script.lua
浏览文件 @
6efa15c2
...
...
@@ -23,7 +23,7 @@ function rewrite_body(tag, timestamp, record)
arr
=
split
(
log
,
"
\n
"
)
re1
=
{}
re1
[
"time"
]
=
os.time
()
re1
[
"time"
]
=
os.time
()
*
1000
re1
[
"layer"
]
=
"POSTGRESQL"
record
[
"layer"
]
=
"POSTGRESQL"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录