Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
killuaz丶x
SkyWalking
提交
bd38ec49
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,发现更多精彩内容 >>
未验证
提交
bd38ec49
编写于
5月 30, 2021
作者:
Z
Zhenxu
提交者:
GitHub
5月 30, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add HTTP implementation of logs reporting protocol (#7038)
上级
6a73607a
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
144 addition
and
3 deletion
+144
-3
CHANGES.md
CHANGES.md
+1
-0
docs/en/protocols/Log-Data-Protocol.md
docs/en/protocols/Log-Data-Protocol.md
+39
-1
oap-server/server-receiver-plugin/skywalking-log-recevier-plugin/src/main/java/org/apache/skywalking/oap/server/recevier/log/provider/LogModuleProvider.java
...g/oap/server/recevier/log/provider/LogModuleProvider.java
+8
-1
oap-server/server-receiver-plugin/skywalking-log-recevier-plugin/src/main/java/org/apache/skywalking/oap/server/recevier/log/provider/handler/grpc/LogReportServiceHandler.java
...er/log/provider/handler/grpc/LogReportServiceHandler.java
+1
-1
oap-server/server-receiver-plugin/skywalking-log-recevier-plugin/src/main/java/org/apache/skywalking/oap/server/recevier/log/provider/handler/rest/LogReportServiceRestHandler.java
...og/provider/handler/rest/LogReportServiceRestHandler.java
+95
-0
未找到文件。
CHANGES.md
浏览文件 @
bd38ec49
...
...
@@ -56,6 +56,7 @@ Release Notes.
*
Fix counter misuse in the alarm core. Alarm can't be triggered in time.
*
Events can be configured as alarm source.
*
Make the number of core worker in meter converter thread pool configurable.
*
Add HTTP implementation of logs reporting protocol.
#### UI
*
Add logo for kong plugin.
...
...
docs/en/protocols/Log-Data-Protocol.md
浏览文件 @
bd38ec49
...
...
@@ -8,7 +8,7 @@ Report `native-proto` format log via gRPC.
[
gRPC service define
](
https://github.com/apache/skywalking-data-collect-protocol/blob/master/logging/Logging.proto
)
## Native
Json
Protocol
## Native
Kafka
Protocol
Report
`native-json`
format log via kafka.
...
...
@@ -43,3 +43,41 @@ Json log record example:
}
```
## HTTP API
Report
`json`
format logs via HTTP API, the endpoint is http://
<oap-address>
:12800/logs.
Json log record example:
```
json
[
{
"timestamp"
:
1618161813371
,
"service"
:
"Your_ApplicationName"
,
"serviceInstance"
:
"3a5b8da5a5ba40c0b192e91b5c80f1a8@192.168.1.8"
,
"traceContext"
:
{
"traceId"
:
"ddd92f52207c468e9cd03ddd107cd530.69.16181331190470001"
,
"spanId"
:
"0"
,
"traceSegmentId"
:
"ddd92f52207c468e9cd03ddd107cd530.69.16181331190470000"
},
"tags"
:
{
"data"
:
[
{
"key"
:
"level"
,
"value"
:
"INFO"
},
{
"key"
:
"logger"
,
"value"
:
"com.example.MyLogger"
}
]
},
"body"
:
{
"text"
:
{
"text"
:
"log message"
}
}
}
]
```
oap-server/server-receiver-plugin/skywalking-log-recevier-plugin/src/main/java/org/apache/skywalking/oap/server/recevier/log/provider/LogModuleProvider.java
浏览文件 @
bd38ec49
...
...
@@ -20,6 +20,7 @@ package org.apache.skywalking.oap.server.recevier.log.provider;
import
org.apache.skywalking.oap.log.analyzer.module.LogAnalyzerModule
;
import
org.apache.skywalking.oap.server.core.CoreModule
;
import
org.apache.skywalking.oap.server.core.server.GRPCHandlerRegister
;
import
org.apache.skywalking.oap.server.core.server.JettyHandlerRegister
;
import
org.apache.skywalking.oap.server.library.module.ModuleConfig
;
import
org.apache.skywalking.oap.server.library.module.ModuleDefine
;
import
org.apache.skywalking.oap.server.library.module.ModuleProvider
;
...
...
@@ -27,7 +28,8 @@ import org.apache.skywalking.oap.server.library.module.ModuleStartException;
import
org.apache.skywalking.oap.server.library.module.ServiceNotProvidedException
;
import
org.apache.skywalking.oap.server.receiver.sharing.server.SharingServerModule
;
import
org.apache.skywalking.oap.server.recevier.log.module.LogModule
;
import
org.apache.skywalking.oap.server.recevier.log.provider.handler.LogReportServiceHandler
;
import
org.apache.skywalking.oap.server.recevier.log.provider.handler.grpc.LogReportServiceHandler
;
import
org.apache.skywalking.oap.server.recevier.log.provider.handler.rest.LogReportServiceRestHandler
;
import
org.apache.skywalking.oap.server.telemetry.TelemetryModule
;
public
class
LogModuleProvider
extends
ModuleProvider
{
...
...
@@ -59,6 +61,11 @@ public class LogModuleProvider extends ModuleProvider {
.
getService
(
GRPCHandlerRegister
.
class
);
grpcHandlerRegister
.
addHandler
(
new
LogReportServiceHandler
(
getManager
()));
JettyHandlerRegister
jettyHandlerRegister
=
getManager
().
find
(
SharingServerModule
.
NAME
)
.
provider
()
.
getService
(
JettyHandlerRegister
.
class
);
jettyHandlerRegister
.
addHandler
(
new
LogReportServiceRestHandler
(
getManager
()));
}
@Override
...
...
oap-server/server-receiver-plugin/skywalking-log-recevier-plugin/src/main/java/org/apache/skywalking/oap/server/recevier/log/provider/handler/LogReportServiceHandler.java
→
oap-server/server-receiver-plugin/skywalking-log-recevier-plugin/src/main/java/org/apache/skywalking/oap/server/recevier/log/provider/handler/
grpc/
LogReportServiceHandler.java
浏览文件 @
bd38ec49
...
...
@@ -15,7 +15,7 @@
* limitations under the License.
*/
package
org.apache.skywalking.oap.server.recevier.log.provider.handler
;
package
org.apache.skywalking.oap.server.recevier.log.provider.handler
.grpc
;
import
io.grpc.stub.StreamObserver
;
import
lombok.extern.slf4j.Slf4j
;
...
...
oap-server/server-receiver-plugin/skywalking-log-recevier-plugin/src/main/java/org/apache/skywalking/oap/server/recevier/log/provider/handler/rest/LogReportServiceRestHandler.java
0 → 100644
浏览文件 @
bd38ec49
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.apache.skywalking.oap.server.recevier.log.provider.handler.rest
;
import
com.google.gson.Gson
;
import
com.google.gson.JsonArray
;
import
com.google.gson.JsonElement
;
import
java.io.BufferedReader
;
import
java.util.ArrayList
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.skywalking.apm.network.logging.v3.LogData
;
import
org.apache.skywalking.oap.log.analyzer.module.LogAnalyzerModule
;
import
org.apache.skywalking.oap.log.analyzer.provider.log.ILogAnalyzerService
;
import
org.apache.skywalking.oap.server.library.module.ModuleManager
;
import
org.apache.skywalking.oap.server.library.server.jetty.JettyHandler
;
import
org.apache.skywalking.oap.server.library.util.ProtoBufJsonUtils
;
import
org.apache.skywalking.oap.server.telemetry.TelemetryModule
;
import
org.apache.skywalking.oap.server.telemetry.api.CounterMetrics
;
import
org.apache.skywalking.oap.server.telemetry.api.HistogramMetrics
;
import
org.apache.skywalking.oap.server.telemetry.api.MetricsCreator
;
import
org.apache.skywalking.oap.server.telemetry.api.MetricsTag
;
@Slf4j
public
class
LogReportServiceRestHandler
extends
JettyHandler
{
private
final
Gson
gson
=
new
Gson
();
private
final
HistogramMetrics
histogram
;
private
final
CounterMetrics
errorCounter
;
private
final
ILogAnalyzerService
logAnalyzerService
;
public
LogReportServiceRestHandler
(
final
ModuleManager
moduleManager
)
{
final
MetricsCreator
metricsCreator
=
moduleManager
.
find
(
TelemetryModule
.
NAME
)
.
provider
()
.
getService
(
MetricsCreator
.
class
);
logAnalyzerService
=
moduleManager
.
find
(
LogAnalyzerModule
.
NAME
)
.
provider
()
.
getService
(
ILogAnalyzerService
.
class
);
histogram
=
metricsCreator
.
createHistogramMetric
(
"log_in_latency"
,
"The process latency of log"
,
new
MetricsTag
.
Keys
(
"protocol"
),
new
MetricsTag
.
Values
(
"http"
)
);
errorCounter
=
metricsCreator
.
createCounter
(
"log_analysis_error_count"
,
"The error number of log analysis"
,
new
MetricsTag
.
Keys
(
"protocol"
),
new
MetricsTag
.
Values
(
"http"
)
);
}
@Override
protected
void
doPost
(
final
HttpServletRequest
req
,
final
HttpServletResponse
resp
)
{
try
(
final
HistogramMetrics
.
Timer
ignored
=
histogram
.
createTimer
())
{
final
BufferedReader
reader
=
req
.
getReader
();
final
StringBuilder
content
=
new
StringBuilder
();
for
(
String
line
=
reader
.
readLine
();
line
!=
null
;
line
=
reader
.
readLine
())
{
content
.
append
(
line
);
}
final
JsonArray
array
=
gson
.
fromJson
(
content
.
toString
(),
JsonArray
.
class
);
final
ArrayList
<
LogData
.
Builder
>
logs
=
new
ArrayList
<>(
array
.
size
());
for
(
final
JsonElement
it
:
array
)
{
final
LogData
.
Builder
builder
=
LogData
.
newBuilder
();
ProtoBufJsonUtils
.
fromJSON
(
it
.
toString
(),
builder
);
logs
.
add
(
builder
);
}
logs
.
forEach
(
logAnalyzerService:
:
doAnalysis
);
}
catch
(
final
Exception
e
)
{
log
.
error
(
e
.
getMessage
(),
e
);
errorCounter
.
inc
();
}
}
@Override
public
String
pathSpec
()
{
return
"/logs"
;
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录